From ed68637059c266911118148347d2cd904bfed61d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 15 Dec 2022 15:05:17 +0100
Subject: [PATCH 1/3] disable outLayout

---
 front/salix/components/app/app.html     |  5 ++-
 front/salix/components/login/login.html | 57 ++++++++++++++-----------
 front/salix/routes.js                   |  4 +-
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/front/salix/components/app/app.html b/front/salix/components/app/app.html
index f14fab2dd..d32c9f68b 100644
--- a/front/salix/components/app/app.html
+++ b/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>
diff --git a/front/salix/components/login/login.html b/front/salix/components/login/login.html
index a078fa0af..807e4b284 100644
--- a/front/salix/components/login/login.html
+++ b/front/salix/components/login/login.html
@@ -1,27 +1,32 @@
-<vn-textfield
-    label="User"
-    ng-model="$ctrl.user"
-    vn-id="userField"
-    vn-focus>
-</vn-textfield>
-<vn-textfield
-    label="Password"
-    ng-model="$ctrl.password"
-    type="password">
-</vn-textfield>
-<vn-check
-    label="Do not close session"
-    ng-model="$ctrl.remember"
-    name="remember">
-</vn-check>
-<div class="footer">
-    <vn-submit label="Enter" ng-click="$ctrl.submit()"></vn-submit>
-    <div class="spinner-wrapper">
-        <vn-spinner enable="$ctrl.loading"></vn-spinner>
-    </div>
-    <div class="vn-pt-lg">
-        <a ui-sref="recoverPassword" translate>
-            I do not remember my password
-        </a>
-    </div>
+<div class="box">
+	<img src="./logo.svg"/>
+	<form name="form" ng-submit="$ctrl.submit()">
+        <vn-textfield
+            label="User"
+            ng-model="$ctrl.user"
+            vn-id="userField"
+            vn-focus>
+        </vn-textfield>
+        <vn-textfield
+            label="Password"
+            ng-model="$ctrl.password"
+            type="password">
+        </vn-textfield>
+        <vn-check
+            label="Do not close session"
+            ng-model="$ctrl.remember"
+            name="remember">
+        </vn-check>
+        <div class="footer">
+            <vn-submit label="Enter" ng-click="$ctrl.submit()"></vn-submit>
+            <div class="spinner-wrapper">
+                <vn-spinner enable="$ctrl.loading"></vn-spinner>
+            </div>
+            <!--<div class="vn-pt-lg">
+                <a ui-sref="recoverPassword" translate>
+                    I do not remember my password
+                </a>
+            </div>-->
+        </div>
+    </form>
 </div>
diff --git a/front/salix/routes.js b/front/salix/routes.js
index be893800f..613dc7288 100644
--- a/front/salix/routes.js
+++ b/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',

From 19cbd5b57b3a055e5dd1d1167c699dc38944b615 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 16 Dec 2022 08:43:34 +0100
Subject: [PATCH 2/3] fix css

---
 front/salix/components/login/style.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/salix/components/login/style.scss b/front/salix/components/login/style.scss
index 8985893f2..5a7e72245 100644
--- a/front/salix/components/login/style.scss
+++ b/front/salix/components/login/style.scss
@@ -25,7 +25,7 @@ vn-recover-password{
     }
 }
 
-vn-out-layout{
+vn-login{
 	position: absolute;
 	height: 100%;
 	width: 100%;

From 47f624ec043f4c44cceb4a1983b1f54b77b89149 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 16 Dec 2022 09:01:30 +0100
Subject: [PATCH 3/3] skip e2e test

---
 e2e/paths/01-salix/04_recoverPassword.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/e2e/paths/01-salix/04_recoverPassword.spec.js b/e2e/paths/01-salix/04_recoverPassword.spec.js
index 80ef32cb5..67e6362d3 100644
--- a/e2e/paths/01-salix/04_recoverPassword.spec.js
+++ b/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;