From 786d96e58af5c5ffe4fa74bbe71ddf6bf1d8c8ad Mon Sep 17 00:00:00 2001
From: Matthias Perret <moussadedijon@gmail.com>
Date: Mon, 16 Sep 2024 21:47:41 +0200
Subject: [PATCH] fix: login view

---
 frontend/src/assets/{ => style/bootstrap}/main.scss       | 8 ++------
 .../bootstrap/maps-override.scss}                         | 0
 .../bootstrap/vars-override.scss}                         | 7 +++++++
 frontend/src/assets/{ => style}/layout.scss               | 0
 frontend/src/assets/style/main.scss                       | 6 ++++++
 frontend/src/assets/{ => style}/variables.scss            | 0
 frontend/src/main.ts                                      | 2 +-
 frontend/src/views/security/LoginView.vue                 | 4 ++--
 8 files changed, 18 insertions(+), 9 deletions(-)
 rename frontend/src/assets/{ => style/bootstrap}/main.scss (83%)
 rename frontend/src/assets/{bootstrap-maps-override.scss => style/bootstrap/maps-override.scss} (100%)
 rename frontend/src/assets/{bootstrap-vars-override.scss => style/bootstrap/vars-override.scss} (53%)
 rename frontend/src/assets/{ => style}/layout.scss (100%)
 create mode 100644 frontend/src/assets/style/main.scss
 rename frontend/src/assets/{ => style}/variables.scss (100%)

diff --git a/frontend/src/assets/main.scss b/frontend/src/assets/style/bootstrap/main.scss
similarity index 83%
rename from frontend/src/assets/main.scss
rename to frontend/src/assets/style/bootstrap/main.scss
index d5c82a5..02eeef8 100644
--- a/frontend/src/assets/main.scss
+++ b/frontend/src/assets/style/bootstrap/main.scss
@@ -1,14 +1,12 @@
-@import 'variables';
-//@import '~filepond/dist/filepond.min.css';
 
 @import '~bootstrap/scss/functions';
 
-@import 'bootstrap-vars-override';
+@import 'vars-override';
 
 @import '~bootstrap/scss/variables';
 @import '~bootstrap/scss/variables-dark';
 
-@import 'bootstrap-maps-override';
+@import 'maps-override';
 
 @import '~bootstrap/scss/maps';
 @import '~bootstrap/scss/mixins';
@@ -33,5 +31,3 @@
 @import '~bootstrap/scss/spinners';
 
 @import '~bootstrap/scss/utilities/api';
-
-@import 'layout';
diff --git a/frontend/src/assets/bootstrap-maps-override.scss b/frontend/src/assets/style/bootstrap/maps-override.scss
similarity index 100%
rename from frontend/src/assets/bootstrap-maps-override.scss
rename to frontend/src/assets/style/bootstrap/maps-override.scss
diff --git a/frontend/src/assets/bootstrap-vars-override.scss b/frontend/src/assets/style/bootstrap/vars-override.scss
similarity index 53%
rename from frontend/src/assets/bootstrap-vars-override.scss
rename to frontend/src/assets/style/bootstrap/vars-override.scss
index 6ea78fd..74a19db 100644
--- a/frontend/src/assets/bootstrap-vars-override.scss
+++ b/frontend/src/assets/style/bootstrap/vars-override.scss
@@ -4,3 +4,10 @@ $link-color-dark: $primary;
 
 $input-btn-padding-y: 0.2rem;
 $input-btn-padding-x: 0.4rem;
+
+$btn-padding-y: 1px;
+
+$input-padding-y: 1px;
+
+$alert-padding-x: 6px;
+$alert-padding-y: 4px;
diff --git a/frontend/src/assets/layout.scss b/frontend/src/assets/style/layout.scss
similarity index 100%
rename from frontend/src/assets/layout.scss
rename to frontend/src/assets/style/layout.scss
diff --git a/frontend/src/assets/style/main.scss b/frontend/src/assets/style/main.scss
new file mode 100644
index 0000000..095b4ec
--- /dev/null
+++ b/frontend/src/assets/style/main.scss
@@ -0,0 +1,6 @@
+@import 'variables';
+//@import '~filepond/dist/filepond.min.css';
+
+@import 'bootstrap/main';
+
+@import 'layout';
diff --git a/frontend/src/assets/variables.scss b/frontend/src/assets/style/variables.scss
similarity index 100%
rename from frontend/src/assets/variables.scss
rename to frontend/src/assets/style/variables.scss
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index f6849f8..2f84e6f 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -1,4 +1,4 @@
-import './assets/main.scss'
+import './assets/style/main.scss'
 
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
diff --git a/frontend/src/views/security/LoginView.vue b/frontend/src/views/security/LoginView.vue
index d846932..da66818 100644
--- a/frontend/src/views/security/LoginView.vue
+++ b/frontend/src/views/security/LoginView.vue
@@ -73,7 +73,7 @@ onMounted(async () => {
           v-model="twoFactorAuthCode"
           @keyup.enter="twoFactorAuth"
           class="form-control"
-          type="string"
+          type="text"
           placeholder="Code"
           :disabled="isLoading"
         />
@@ -97,7 +97,7 @@ onMounted(async () => {
         <input
           v-model="password"
           @keyup.enter="connect"
-          class="form-control"
+          class="form-control ms-2"
           type="password"
           placeholder="Password"
           :disabled="isLoading"