diff --git a/front/core/services/auth.js b/front/core/services/auth.js index a1dcfa395..d14c0bafd 100644 --- a/front/core/services/auth.js +++ b/front/core/services/auth.js @@ -23,7 +23,7 @@ export default class Auth { initialize() { let criteria = { - to: state => state.name != 'login' + to: state => !state.name.includes('login') }; this.$transitions.onStart(criteria, transition => { if (this.loggedIn) diff --git a/front/salix/components/index.js b/front/salix/components/index.js index ce4ad585a..e5e98acf4 100644 --- a/front/salix/components/index.js +++ b/front/salix/components/index.js @@ -6,6 +6,7 @@ import './home/home'; import './layout'; import './left-menu/left-menu'; import './login/login'; +import './login/recover-password'; import './module-card'; import './module-main'; import './side-menu/side-menu'; diff --git a/front/salix/components/login/locale/es.yml b/front/salix/components/login/locale/es.yml index 9c9ba5905..c34861bfb 100644 --- a/front/salix/components/login/locale/es.yml +++ b/front/salix/components/login/locale/es.yml @@ -1,4 +1,5 @@ User: Usuario Password: Contraseña Do not close session: No cerrar sesión -Enter: Entrar \ No newline at end of file +Enter: Entrar +I do not remember my password: No recuerdo mi contraseña diff --git a/front/salix/components/login/login.html b/front/salix/components/login/login.html index b15714a23..00ad67553 100644 --- a/front/salix/components/login/login.html +++ b/front/salix/components/login/login.html @@ -22,6 +22,11 @@
+
+ + I do not remember my password + +
diff --git a/front/salix/components/login/recover-password.html b/front/salix/components/login/recover-password.html new file mode 100644 index 000000000..4633a098d --- /dev/null +++ b/front/salix/components/login/recover-password.html @@ -0,0 +1,11 @@ +
+ +
+ + +
+
diff --git a/front/salix/components/login/recover-password.js b/front/salix/components/login/recover-password.js new file mode 100644 index 000000000..7841329bb --- /dev/null +++ b/front/salix/components/login/recover-password.js @@ -0,0 +1,22 @@ +import ngModule from '../../module'; +import './style.scss'; + +/** + * A simple login form. + */ +export default class Controller { + constructor($, $element) { + Object.assign(this, { + $, + $element, + user: localStorage.getItem('lastUser'), + remember: true + }); + } +} +Controller.$inject = ['$scope', '$element']; + +ngModule.vnComponent('vnRecoverPassword', { + template: require('./recover-password.html'), + controller: Controller +}); diff --git a/front/salix/components/login/style.scss b/front/salix/components/login/style.scss index 8ebf2a68c..0568b7f5e 100644 --- a/front/salix/components/login/style.scss +++ b/front/salix/components/login/style.scss @@ -71,4 +71,8 @@ vn-login { box-shadow: none; } } + + a{ + color: $color-primary; + } } diff --git a/front/salix/routes.js b/front/salix/routes.js index 600907ff1..36e52688d 100644 --- a/front/salix/routes.js +++ b/front/salix/routes.js @@ -13,6 +13,13 @@ function config($stateProvider, $urlRouterProvider) { login: {template: ''} } }) + .state('login.recover-password', { + url: '/recover-password', + description: 'Recover-password', + views: { + recoverPassword: {template: ''} + } + }) .state('home', { url: '/', description: 'Home',