merge dev -> dev-xrb

Xlucidator · Oct 16, 2022 · 339ae21 · 339ae21
2 parents 3c6b389 + a253403
commit 339ae21
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/frontend/src/views/HelloWorld.vue b/frontend/src/views/HelloWorld.vue
@@ -182,7 +182,7 @@ const handleReject = (index: number, row: User) => {
           <span> avatar </span>
         </div>
         <div class="userinfo">
-          <span class="font-bold text-xs"> NAME: {{  }} </span>
+          <span class="font-bold text-xs"> NAME: {{ $store.state.user.CodeName }} </span>
         </div>
         <el-menu
             default-active="2"
@@ -277,7 +277,7 @@ const handleReject = (index: number, row: User) => {
           <br/>
           <span class="text-xm " style="margin-left: 10%"> {{ greetings }} ,</span>
           <span class="text-xl font-extrabold"
-                style="margin-left: 0.5%; margin-right: 0.5%"> {{}} </span>
+                style="margin-left: 0.5%; margin-right: 0.5%"> {{ $store.state.user.CodeName }} </span>
           <span class="text-xm">.</span>
           <br/>
           <span class="text-xm test-bold" style="margin-left: 10%">Welcome to the new world.</span>

diff --git a/frontend/src/views/register.vue b/frontend/src/views/register.vue
@@ -6,7 +6,7 @@
   <div class="input-box">
     <el-form :model="form" label-width="120px">
       <el-form-item label="CodeName">
-        <el-input v-model="form.CodeName"/>
+        <el-input v-model="form.CodeName" @blur="checkSyntax(form.CodeName)"/>
       </el-form-item>
       <el-form-item label="Password">
         <el-input v-model="form.Password" :show-password="true"/>
@@ -28,12 +28,12 @@
       </el-form-item>
       <el-form-item label="Region">
         <el-select v-model="form.Region" placeholder="please select your zone">
-          <el-option v-for="op in region_options" :label="op.zhcn" :value="op.eng" />
+          <el-option v-for="op in region_options" :label="op.zhcn" :value="op.eng"/>
         </el-select>
       </el-form-item>
       <el-form-item label="Race">
         <el-select v-model="form.Race" placeholder="please select your zone">
-          <el-option v-for="op in race_options" :label="op.zhcn" :value="op.eng" />
+          <el-option v-for="op in race_options" :label="op.zhcn" :value="op.eng"/>
         </el-select>
       </el-form-item>
       <el-form-item label="Description">
@@ -68,10 +68,12 @@ import {useRouter} from "vue-router";
 import {register} from "../api/manager";
 import {NOTATION} from "../composable/utils";
 import {reactive} from "@vue/reactivity";
-import { ref } from "vue";
+import {ref} from "vue";
 
 const router = useRouter()
 
+let registerFlag = ref(1)
+
 const form = reactive({
   CodeName: '',
   Password: '',
@@ -86,9 +88,29 @@ const back = () => {
   router.push("/login")
 }
 
+const checkSyntax = (str) => {
+  const pattern = /^[A-za-z0-9][A-za-z0-9'.\s]*$/
+  if (str !== '') {
+    if (!pattern.test(str)) {
+      NOTATION(0, 'contains only alnum and \' and space')
+      registerFlag.value = 0
+    } else {
+      registerFlag.value = 1
+    }
+  } else {
+    registerFlag.value = 0
+    NOTATION(0, 'CodeName couldn\'t be null')
+  }
+}
+
 const onSubmit = () => {
+  if (form.Password === '') {
+    NOTATION(0, "passwords not null")
+  }
   if (form.Password !== form.PwConfirm) {
     NOTATION(0, "passwords do not coordinate")
+  } else if (!registerFlag.value) {
+    NOTATION(0, "please check your CodeName")
   } else {
     register(form)
         .then(res => {