From 72ce255b43af7d353f6dfc4bb1bfd1aff55a6588 Mon Sep 17 00:00:00 2001
From: CzBiX <gliuwr@gmail.com>
Date: Fri, 2 Oct 2020 20:17:04 +0800
Subject: [PATCH] Fix login form

---
 src/App.vue                  |  1 -
 src/components/LoginForm.vue | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index bafa6ea..308439d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -22,7 +22,6 @@
     <add-form v-if="preferences" />
     <login-form
       v-if="needAuth"
-      v-model="needAuth"
     />
     <logs-dialog
       v-if="drawerOptions.showLogs"
diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index 3a1315d..ba66db0 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -1,6 +1,6 @@
 <template>
   <v-dialog
-    v-model="value"
+    :value="true"
     persistent
     width="25em"
   >
@@ -74,23 +74,20 @@ import api from '@/Api';
 import { useStore } from '@/store';
 
 export default defineComponent({
-  props: {
-    value: Boolean,
-  },
-  setup(props, { emit }) {
+  setup(_, { emit }) {
+    const store = useStore();
     const data = reactive({
       valid: false,
       submitting: false,
       showPassword: false,
       loginError: null,
-      baseUrl: location.href,
+      baseUrl: store.getters.config.baseUrl || location.href,
       params: {
-        username: null,
-        password: null,
+        username: '',
+        password: '',
       },
       form: null,
     });
-    const store = useStore();
 
     const submit = async () => {
       if (data.submitting) {
@@ -106,10 +103,14 @@ export default defineComponent({
         const resp = await api.login(data.params, data.baseUrl);
 
         if (resp === 'Ok.') {
+          api.changeBaseUrl(data.baseUrl);
+
           store.commit('updateConfig', {
             key: 'baseUrl',
             value: data.baseUrl,
           });
+          store.commit('updateNeedAuth', false);
+
           emit('input', false);
           return;
         }