Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

e2e/paths/01-salix/04_recoverPassword.spec.js

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

front/salix/components/app/app.html

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

front/salix/components/app/app.js

@@ -21,7 +21,7 @@ export default class App extends Component {
 
     get showLayout() {
         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);
     }
 

front/salix/components/login/login.html

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

front/salix/components/login/style.scss

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

front/salix/routes.js

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