diff --git a/frontend/src/views/HelloWorld.vue b/frontend/src/views/HelloWorld.vue
index 876f3fe..cdb5aee 100644
--- a/frontend/src/views/HelloWorld.vue
+++ b/frontend/src/views/HelloWorld.vue
@@ -182,7 +182,7 @@ const handleReject = (index: number, row: User) => {
avatar
- NAME: {{ }}
+ NAME: {{ $store.state.user.CodeName }}
{
{{ greetings }} ,
+ style="margin-left: 0.5%; margin-right: 0.5%"> {{ $store.state.user.CodeName }}
.
Welcome to the new world.
diff --git a/frontend/src/views/register.vue b/frontend/src/views/register.vue
index 0a74884..50a7ea5 100644
--- a/frontend/src/views/register.vue
+++ b/frontend/src/views/register.vue
@@ -6,7 +6,7 @@
-
+
@@ -28,12 +28,12 @@
-
+
-
+
@@ -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 => {