verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Merge pull request 'TEST_hotFix_disable_outLayout' (!1210) from hotFix_disable_outLayout into test
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1210
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2022-12-19 06:30:24 +00:00
parent 0ad4a1ae3a 47f624ec04
commit 3524c027a0
5 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
e2e/paths/01-salix/04_recoverPassword.spec.js
View File

@ -1,7 +1,8 @@
import selectors from '../../helpers/selectors'; import selectors from '../../helpers/selectors';
import getBrowser from '../../helpers/puppeteer'; import getBrowser from '../../helpers/puppeteer';
describe('Login path', async() => { // https://redmine.verdnatura.es/issues/4995 fix login
xdescribe('RecoverPassword path', async() => {
let browser; let browser;
let page; let page;

5
front/salix/components/app/app.html
View File

@ -1,8 +1,9 @@
<vn-layout <vn-layout
ng-if="$ctrl.showLayout"> ng-if="$ctrl.showLayout">
</vn-layout> </vn-layout>
<vn-out-layout <ui-view
name="login"
ng-if="!$ctrl.showLayout"> ng-if="!$ctrl.showLayout">
</vn-out-layout> </ui-view>
<vn-snackbar vn-id="snackbar"></vn-snackbar> <vn-snackbar vn-id="snackbar"></vn-snackbar>
<vn-debug-info></vn-debug-info> <vn-debug-info></vn-debug-info>

57
front/salix/components/login/login.html
View File

@ -1,27 +1,32 @@
<vn-textfield <div class="box">
label="User" <img src="./logo.svg"/>
ng-model="$ctrl.user" <form name="form" ng-submit="$ctrl.submit()">
vn-id="userField" <vn-textfield
vn-focus> label="User"
</vn-textfield> ng-model="$ctrl.user"
<vn-textfield vn-id="userField"
label="Password" vn-focus>
ng-model="$ctrl.password" </vn-textfield>
type="password"> <vn-textfield
</vn-textfield> label="Password"
<vn-check ng-model="$ctrl.password"
label="Do not close session" type="password">
ng-model="$ctrl.remember" </vn-textfield>
name="remember"> <vn-check
</vn-check> label="Do not close session"
<div class="footer"> ng-model="$ctrl.remember"
<vn-submit label="Enter" ng-click="$ctrl.submit()"></vn-submit> name="remember">
<div class="spinner-wrapper"> </vn-check>
<vn-spinner enable="$ctrl.loading"></vn-spinner> <div class="footer">
</div> <vn-submit label="Enter" ng-click="$ctrl.submit()"></vn-submit>
<div class="vn-pt-lg"> <div class="spinner-wrapper">
<a ui-sref="recoverPassword" translate> <vn-spinner enable="$ctrl.loading"></vn-spinner>
I do not remember my password </div>
</a> <!--<div class="vn-pt-lg">
</div> <a ui-sref="recoverPassword" translate>
I do not remember my password
</a>
</div>-->
</div>
</form>
</div> </div>

2
front/salix/components/login/style.scss
View File

@ -25,7 +25,7 @@ vn-recover-password{
} }
} }
vn-out-layout{ vn-login{
position: absolute; position: absolute;
height: 100%; height: 100%;
width: 100%; width: 100%;

4
front/salix/routes.js
View File

@ -9,7 +9,9 @@ function config($stateProvider, $urlRouterProvider) {
.state('login', { .state('login', {
url: '/login?continue', url: '/login?continue',
description: 'Login', description: 'Login',
template: '<vn-login></vn-login>' views: {
'login': {template: '<vn-login></vn-login>'},
}
}) })
.state('recoverPassword', { .state('recoverPassword', {
url: '/recover-password', url: '/recover-password',