From 2432b9a0ce8cb2cc4ed69a7dc5c579d8f9056415 Mon Sep 17 00:00:00 2001
From: keqingmoe <me@keqing.moe>
Date: Thu, 26 Dec 2024 22:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=99=BB=E5=BD=95=E5=92=8C?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E8=A1=A8=E5=8D=95=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8F=AF=E8=A7=81=E6=80=A7=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/components/LoginForm.vue    | 44 ++++--------------------------
 ui/src/components/RegisterForm.vue | 10 +++----
 2 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/ui/src/components/LoginForm.vue b/ui/src/components/LoginForm.vue
index d879712..88b3685 100644
--- a/ui/src/components/LoginForm.vue
+++ b/ui/src/components/LoginForm.vue
@@ -1,39 +1,8 @@
-<!-- <template>
-  <v-sheet class="mx-auto text-center" min-width="50%">
-    <v-form fast-fail @submit.prevent="submit">
-      <v-container>
-        <v-row>
-          <v-col>
-            <h1 class="text-h2 font-weight-bold">登录</h1>
-          </v-col>
-        </v-row>
-        <v-spacer></v-spacer>
-        <v-row>
-          <v-col>
-            <v-text-field v-model="userId" :rules="userIdRules" label="账号"></v-text-field>
-          </v-col>
-        </v-row>
-        <v-row>
-          <v-col>
-            <v-text-field v-model="password" :rules="passwordRules" :error-messages="passwordValidate"
-              label="密码"></v-text-field>
-          </v-col>
-        </v-row>
-
-        <v-row>
-          <v-col>
-            <v-btn :loading="loading" width="50%" text="注册" type="submit"></v-btn>
-          </v-col>
-        </v-row>
-      </v-container>
-    </v-form>
-  </v-sheet>
-</template> -->
 <template>
   <div>
     <v-form fast-fail @submit.prevent="submit">
-      <v-img class="mx-auto my-6" max-width="228"
-        src="https://cdn.vuetifyjs.com/docs/images/logos/vuetify-logo-v3-slim-text-light.svg"></v-img>
+      <!-- <v-img class="mx-auto my-6" max-width="228"
+        src="https://cdn.vuetifyjs.com/docs/images/logos/vuetify-logo-v3-slim-text-light.svg"></v-img> -->
 
       <v-card class="mx-auto pa-12 pb-8" elevation="8" max-width="448" rounded="lg">
         <v-text-field v-model="userId" prepend-inner-icon="mdi-account-circle" :rules="userIdRules"
@@ -42,7 +11,7 @@
         <v-divider :thickness="10" class="border-opacity-0"></v-divider>
 
         <v-text-field v-model="password" :rules="passwordRules" :error-messages="passwordValidate" label="密码"
-          :append-inner-icon="visible ? 'mdi-eye-off' : 'mdi-eye'" :type="visible ? 'text' : 'password'"
+          :append-inner-icon="visible ? 'mdi-eye' : 'mdi-eye-off'" :type="visible ? 'text' : 'password'"
           @click:append-inner="visible = !visible" prepend-inner-icon="mdi-lock-outline"></v-text-field>
 
         <v-divider :thickness="10" class="border-opacity-0"></v-divider>
@@ -82,7 +51,7 @@ import axios, { AxiosError } from 'axios';
 import { jwtDecode } from 'jwt-decode';
 import { ref } from 'vue';
 
-const visible = ref(true);
+const visible = ref(false);
 
 const authStore = useAuthStore();
 const storedToken = ref(authStore.token);
@@ -116,7 +85,6 @@ const login = async (userId: string, password: string) => {
     formData.append("user_id", userId);
     formData.append("password", password);
     let res = await axios.post('/api/auth/login', formData);
-    console.log(res.data);
     return res.data as LoginResponse;
   } catch (e) {
     let ex = e as AxiosError;
@@ -128,8 +96,8 @@ const submit = async (event: SubmitEvent) => {
   const results: any = await event;
   if (results.valid) {
     loading.value = true
-    console.log('valid')
     let res = await login(userId.value, password.value);
+    loading.value = false
     if (res?.error) {
       passwordValidate.value = res.error;
       await dialog('错误', `登录失败：${res.error}`);
@@ -137,9 +105,7 @@ const submit = async (event: SubmitEvent) => {
       await dialog('信息', `登录成功，你好 ${(jwtDecode(res.token as string) as any).user_id}。`);
       authStore.setToken(res.token as string);
     }
-    loading.value = false
   }
-  console.log(2);
 };
 
 const userIdRules: any = [(value: string) => {
diff --git a/ui/src/components/RegisterForm.vue b/ui/src/components/RegisterForm.vue
index d26d612..44234ab 100644
--- a/ui/src/components/RegisterForm.vue
+++ b/ui/src/components/RegisterForm.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <v-form fast-fail @submit.prevent="submit">
-      <v-img class="mx-auto my-6" max-width="228"
-        src="https://cdn.vuetifyjs.com/docs/images/logos/vuetify-logo-v3-slim-text-light.svg"></v-img>
+      <!-- <v-img class="mx-auto my-6" max-width="228"
+        src="https://cdn.vuetifyjs.com/docs/images/logos/vuetify-logo-v3-slim-text-light.svg"></v-img> -->
 
       <v-card class="mx-auto pa-12 pb-8" elevation="8" max-width="448" rounded="lg">
         <v-text-field v-model="userId" prepend-inner-icon="mdi-account-circle" :rules="userIdRules"
@@ -11,7 +11,7 @@
         <v-divider :thickness="10" class="border-opacity-0"></v-divider>
 
         <v-text-field v-model="password" :rules="passwordRules" label="密码"
-          :append-inner-icon="visible ? 'mdi-eye-off' : 'mdi-eye'" :type="visible ? 'text' : 'password'"
+          :append-inner-icon="visible ? 'mdi-eye' : 'mdi-eye-off'" :type="visible ? 'text' : 'password'"
           @click:append-inner="visible = !visible" prepend-inner-icon="mdi-lock-outline"></v-text-field>
 
         <v-divider :thickness="10" class="border-opacity-0"></v-divider>
@@ -49,7 +49,7 @@ import { useAuthStore } from '@/store/auth';
 import axios, { AxiosError } from 'axios';
 import { inject, ref } from 'vue';
 
-const visible = ref(true);
+const visible = ref(false);
 const model = defineModel();
 
 const authStore = useAuthStore();
@@ -96,13 +96,13 @@ const submit = async (event: SubmitEvent) => {
     loading.value = true
     console.log('valid')
     let res = await register(userId.value, password.value);
+    loading.value = false
     if (res?.error) {
       dialog('错误', `注册失败：${res.error}`);
     } else {
       await dialog('提示', '注册成功，请前往登录。');
       model.value = 0;
     }
-    loading.value = false
   }
   console.log(2);
 };