From c5967c3f8db9fda303e650f807e43250e3ae090a Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 28 Apr 2021 11:11:48 +0200
Subject: [PATCH 1/7] loading spinner on login

---
 frontend/package.json                        |  1 +
 frontend/src/plugins/dashboard-plugin.js     |  5 +++++
 frontend/src/views/Layout/AuthLayout_gdd.vue | 16 ++++++++++++++++
 frontend/src/views/Pages/Login.vue           |  4 ++++
 4 files changed, 26 insertions(+)

diff --git a/frontend/package.json b/frontend/package.json
index 00e0ca45b..18e561232 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -69,6 +69,7 @@
     "vue-good-table": "^2.21.3",
     "vue-i18n": "^8.22.4",
     "vue-jest": "^3.0.7",
+    "vue-loading-overlay": "^3.4.2",
     "vue-moment": "^4.1.0",
     "vue-qrcode": "^0.3.5",
     "vue-qrcode-reader": "^2.3.16",
diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js
index 9b6e350dc..881fecf7d 100755
--- a/frontend/src/plugins/dashboard-plugin.js
+++ b/frontend/src/plugins/dashboard-plugin.js
@@ -37,6 +37,10 @@ import 'vue-good-table/dist/vue-good-table.css'
 
 import VueMoment from 'vue-moment'
 
+import Loading from 'vue-loading-overlay'
+// import the styles
+import 'vue-loading-overlay/dist/vue-loading.css'
+
 Object.keys(rules).forEach((rule) => {
   extend(rule, {
     ...rules[rule], // copies rule configuration
@@ -56,6 +60,7 @@ export default {
     Vue.use(VueQrcodeReader)
     Vue.use(VueQrcode)
     Vue.use(VueFlatPickr)
+    Vue.use(Loading)
     configure({
       classes: {
         valid: 'is-valid',
diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue
index 5da4d8386..0e963e2ba 100644
--- a/frontend/src/views/Layout/AuthLayout_gdd.vue
+++ b/frontend/src/views/Layout/AuthLayout_gdd.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="main-content">
+    <loading :active.sync="isLoading" :is-full-page="fullPage"></loading>
     <template>
       <div class="main-content">
         <router-view></router-view>
@@ -9,9 +10,24 @@
   </div>
 </template>
 <script>
+// Import component
+import Loading from 'vue-loading-overlay'
+// Import stylesheet
+import 'vue-loading-overlay/dist/vue-loading.css'
+
 import ContentFooter from './ContentFooter.vue'
+
 export default {
+  data() {
+    return {
+      fullPage: true,
+    }
+  },
+  props: {
+    isLoading: { type: Boolean, default: false },
+  },
   components: {
+    Loading,
     ContentFooter,
   },
 }
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index f7c002d2a..08d58a3c3 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -110,6 +110,7 @@ export default {
   },
   methods: {
     async onSubmit() {
+      let loader = this.$loading.show()
       const result = await loginAPI.login(this.model.email, this.model.password)
       if (result.success) {
         this.$store.dispatch('login', {
@@ -117,11 +118,14 @@ export default {
           email: this.model.email,
         })
         this.$router.push('/overview')
+        loader.hide()
       } else {
+        loader.hide()
         this.loginfail = true
       }
     },
     closeAlert() {
+      loader.hide()
       this.loginfail = false
     },
   },

From df28df98d9fec27349a5a0a882afa441c4f30bc2 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 28 Apr 2021 12:52:23 +0200
Subject: [PATCH 2/7] spinner on component

---
 frontend/src/views/Pages/Login.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 08d58a3c3..472396e8d 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -67,7 +67,7 @@
                   </b-alert>
 
                   <!-- <b-form-checkbox v-model="model.rememberMe">{{ $t('site.login.remember')}}</b-form-checkbox> -->
-                  <div class="text-center">
+                  <div class="text-center"  ref="formContainer">
                     <base-button type="secondary" native-type="submit" class="my-4">
                       {{ $t('site.login.signin') }}
                     </base-button>
@@ -110,7 +110,12 @@ export default {
   },
   methods: {
     async onSubmit() {
-      let loader = this.$loading.show()
+ 
+       let loader = this.$loading.show({
+                  // Optional parameters
+                  container: this.$refs.formContainer
+                });
+      
       const result = await loginAPI.login(this.model.email, this.model.password)
       if (result.success) {
         this.$store.dispatch('login', {

From f94d1e8680ca9f9468c8def10a68cf93c4740a6b Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 28 Apr 2021 12:53:08 +0200
Subject: [PATCH 3/7] fix yarn lint

---
 frontend/src/views/Pages/Login.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 472396e8d..3a872fe41 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -67,7 +67,7 @@
                   </b-alert>
 
                   <!-- <b-form-checkbox v-model="model.rememberMe">{{ $t('site.login.remember')}}</b-form-checkbox> -->
-                  <div class="text-center"  ref="formContainer">
+                  <div class="text-center" ref="formContainer">
                     <base-button type="secondary" native-type="submit" class="my-4">
                       {{ $t('site.login.signin') }}
                     </base-button>
@@ -110,12 +110,11 @@ export default {
   },
   methods: {
     async onSubmit() {
- 
-       let loader = this.$loading.show({
-                  // Optional parameters
-                  container: this.$refs.formContainer
-                });
-      
+      let loader = this.$loading.show({
+        // Optional parameters
+        container: this.$refs.formContainer,
+      })
+
       const result = await loginAPI.login(this.model.email, this.model.password)
       if (result.success) {
         this.$store.dispatch('login', {

From 605c3f761484742e0a43b7bb5575d5beb127967a Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 28 Apr 2021 13:13:18 +0200
Subject: [PATCH 4/7] Apply suggestions from code review

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 frontend/src/views/Layout/AuthLayout_gdd.vue | 3 ---
 frontend/src/views/Pages/Login.vue           | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue
index 0e963e2ba..53c9b58a0 100644
--- a/frontend/src/views/Layout/AuthLayout_gdd.vue
+++ b/frontend/src/views/Layout/AuthLayout_gdd.vue
@@ -23,9 +23,6 @@ export default {
       fullPage: true,
     }
   },
-  props: {
-    isLoading: { type: Boolean, default: false },
-  },
   components: {
     Loading,
     ContentFooter,
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 3a872fe41..b910e1348 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -67,7 +67,7 @@
                   </b-alert>
 
                   <!-- <b-form-checkbox v-model="model.rememberMe">{{ $t('site.login.remember')}}</b-form-checkbox> -->
-                  <div class="text-center" ref="formContainer">
+                  <div class="text-center" ref="submitButton">
                     <base-button type="secondary" native-type="submit" class="my-4">
                       {{ $t('site.login.signin') }}
                     </base-button>
@@ -112,7 +112,7 @@ export default {
     async onSubmit() {
       let loader = this.$loading.show({
         // Optional parameters
-        container: this.$refs.formContainer,
+        container: this.$refs.submitButton,
       })
 
       const result = await loginAPI.login(this.model.email, this.model.password)

From 13e4bfff1d9b5ca3fad1cbe2fb7e19db62974a8a Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 28 Apr 2021 13:16:53 +0200
Subject: [PATCH 5/7] clear branch

---
 frontend/src/views/Layout/AuthLayout_gdd.vue | 13 -------------
 frontend/src/views/Pages/Login.vue           |  1 -
 2 files changed, 14 deletions(-)

diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue
index 53c9b58a0..5da4d8386 100644
--- a/frontend/src/views/Layout/AuthLayout_gdd.vue
+++ b/frontend/src/views/Layout/AuthLayout_gdd.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="main-content">
-    <loading :active.sync="isLoading" :is-full-page="fullPage"></loading>
     <template>
       <div class="main-content">
         <router-view></router-view>
@@ -10,21 +9,9 @@
   </div>
 </template>
 <script>
-// Import component
-import Loading from 'vue-loading-overlay'
-// Import stylesheet
-import 'vue-loading-overlay/dist/vue-loading.css'
-
 import ContentFooter from './ContentFooter.vue'
-
 export default {
-  data() {
-    return {
-      fullPage: true,
-    }
-  },
   components: {
-    Loading,
     ContentFooter,
   },
 }
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index b910e1348..ae793645b 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -114,7 +114,6 @@ export default {
         // Optional parameters
         container: this.$refs.submitButton,
       })
-
       const result = await loginAPI.login(this.model.email, this.model.password)
       if (result.success) {
         this.$store.dispatch('login', {

From f3357b4a87b3be4bc4c8a1248f61e9a66db81c24 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 28 Apr 2021 13:29:01 +0200
Subject: [PATCH 6/7] add yarn.lock

---
 frontend/yarn.lock | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 4d1b90966..44028c65e 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -13348,6 +13348,11 @@ vue-loader@^15.7.0:
     vue-hot-reload-api "^2.3.0"
     vue-style-loader "^4.1.0"
 
+vue-loading-overlay@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/vue-loading-overlay/-/vue-loading-overlay-3.4.2.tgz#34792a83218df1d35dff50121ce9fac2114f1c38"
+  integrity sha512-xcB+NPjl76eA0uggm707x3ZFgrNosZXpynHipyS3K+rrK1NztOV49R1LY+/4ij5W1KYANp7eRI2EIHrxCpmWAw==
+
 vue-moment@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/vue-moment/-/vue-moment-4.1.0.tgz#092a8ff723a96c6f85a0a8e23ad30f0bf320f3b0"

From 1bb0890e0af48c0dceeda9230c89ea8d4d40c142 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 29 Apr 2021 06:36:30 +0200
Subject: [PATCH 7/7] Update frontend/src/views/Pages/Login.vue

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 frontend/src/views/Pages/Login.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index ae793645b..8504915c0 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -111,7 +111,6 @@ export default {
   methods: {
     async onSubmit() {
       let loader = this.$loading.show({
-        // Optional parameters
         container: this.$refs.submitButton,
       })
       const result = await loginAPI.login(this.model.email, this.model.password)