diff --git a/front/salix/components/app/app.html b/front/salix/components/app/app.html index d32c9f68b..87728d630 100644 --- a/front/salix/components/app/app.html +++ b/front/salix/components/app/app.html @@ -3,7 +3,11 @@ + ng-if="!$ctrl.showLayout && !$ctrl.isRecover"> + + diff --git a/front/salix/components/app/app.js b/front/salix/components/app/app.js index 1f8cdb46e..3990aac13 100644 --- a/front/salix/components/app/app.js +++ b/front/salix/components/app/app.js @@ -15,7 +15,12 @@ export default class App extends Component { get showLayout() { let state = this.$state.current.name; - return state && state != 'login'; + return state && !state.includes('login'); + } + + get isRecover() { + let state = this.$state.current.name; + return state == 'login.recover-password'; } $onDestroy() { diff --git a/front/salix/components/login/locale/es.yml b/front/salix/components/login/locale/es.yml index c34861bfb..24ad53a08 100644 --- a/front/salix/components/login/locale/es.yml +++ b/front/salix/components/login/locale/es.yml @@ -1,5 +1,8 @@ User: Usuario Password: Contraseña +Email: Correo electrónico Do not close session: No cerrar sesión Enter: Entrar I do not remember my password: No recuerdo mi contraseña +Recover password: Recuperar contraseña +We will sent you an email to recover your password: Te enviaremos un correo para restablecer tu contraseña diff --git a/front/salix/components/login/recover-password.html b/front/salix/components/login/recover-password.html index 4633a098d..9461970c1 100644 --- a/front/salix/components/login/recover-password.html +++ b/front/salix/components/login/recover-password.html @@ -1,11 +1,21 @@
-
+
Recover password
+
+ We will sent you an email to recover your password +
+
diff --git a/front/salix/components/login/style.scss b/front/salix/components/login/style.scss index 0568b7f5e..ba48c8781 100644 --- a/front/salix/components/login/style.scss +++ b/front/salix/components/login/style.scss @@ -1,6 +1,7 @@ @import "variables"; -vn-login { +vn-login, +vn-recover-password{ position: absolute; height: 100%; width: 100%; @@ -61,6 +62,16 @@ vn-login { } } } + + h5{ + color: $color-primary; + } + + .text-secondary{ + text-align: center; + padding-bottom: 16px; + } + } @media screen and (max-width: 600px) { diff --git a/front/salix/routes.js b/front/salix/routes.js index 36e52688d..c015fbfbc 100644 --- a/front/salix/routes.js +++ b/front/salix/routes.js @@ -10,15 +10,13 @@ function config($stateProvider, $urlRouterProvider) { url: '/login?continue', description: 'Login', views: { - login: {template: ''} + 'login': {template: ''}, + 'recover-password': {template: ''} } }) .state('login.recover-password', { url: '/recover-password', - description: 'Recover-password', - views: { - recoverPassword: {template: ''} - } + description: 'Recover-password' }) .state('home', { url: '/',