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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2022-12-20 10:40:23 +01:00
parent 47e1c05e47 70b1854cc5
commit 73ea928b33
7 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
db/changes/225001/.gitkeep Normal file
View File

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>

2
front/salix/components/app/app.js
View File

@ -21,7 +21,7 @@ export default class App extends Component {
get showLayout() { get showLayout() {
const state = this.$state.current.name || this.$location.$$path.substring(1).replace('/', '.'); const state = this.$state.current.name || this.$location.$$path.substring(1).replace('/', '.');
const outLayout = ['login', 'recoverPassword', 'resetPassword']; const outLayout = ['login', 'recoverPassword', 'resetPassword', 'reset-password'];
return state && !outLayout.some(ol => ol == state); return state && !outLayout.some(ol => ol == state);
} }

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

@ -1,3 +1,6 @@
<div class="box">
<img src="./logo.svg"/>
<form name="form" ng-submit="$ctrl.submit()">
<vn-textfield <vn-textfield
label="User" label="User"
ng-model="$ctrl.user" ng-model="$ctrl.user"
@ -19,9 +22,11 @@
<div class="spinner-wrapper"> <div class="spinner-wrapper">
<vn-spinner enable="$ctrl.loading"></vn-spinner> <vn-spinner enable="$ctrl.loading"></vn-spinner>
</div> </div>
<div class="vn-pt-lg"> <!--<div class="vn-pt-lg">
<a ui-sref="recoverPassword" translate> <a ui-sref="recoverPassword" translate>
I do not remember my password I do not remember my password
</a> </a>
</div>-->
</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',