Bug fix for navbar (#787)

* Update the component name to be consistent * Bug fix on using useFetchApi * Set default value when initialize the user store
OpenCSGs · Nov 15, 2024 · aa60945 · aa60945
1 parent 6d836d9
commit aa60945
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/frontend/src/components/navbar/TheNavbar.vue → frontend/src/components/navbar/Navbar.vue b/frontend/src/components/navbar/TheNavbar.vue → frontend/src/components/navbar/Navbar.vue
@@ -295,7 +295,7 @@
         location.href = `/${locale}/settings/locale`
       },
       async fetchUser() {
-        const {data, _} = await useFetchApi(`${this.csghubServer}/api/v1/user/${this.uuid}?type=uuid`).json()
+        const {data, _} = await useFetchApi(`/user/${this.uuid}?type=uuid`).json()
         if (data.value) {
           this.userAvatar = data.value.data.avatar
           this.userStore.initialize(data.value.data)

diff --git a/frontend/src/main.js b/frontend/src/main.js
@@ -18,7 +18,7 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import en from './locales/en.js'
 import zh from './locales/zh.js'
 
-import Navbar from "./components/navbar/TheNavbar.vue"
+import Navbar from "./components/navbar/Navbar.vue"
 import CommentList from "./components/comment/CommentList.vue"
 import EndpointDetail from "./components/endpoints/EndpointDetail.vue"
 import RepoDetail from "./components/shared/RepoDetail.vue"

diff --git a/frontend/src/stores/UserStore.js b/frontend/src/stores/UserStore.js
@@ -17,19 +17,19 @@ const useUserStore = defineStore('User', () => {
   const isLoggedIn = computed(() => username.value !== '')
 
   async function initialize(initialData) {
-    username.value = initialData.username
-    nickname.value = initialData.nickname
-    email.value = initialData.email
-    phone.value = initialData.phone
-    avatar.value = initialData.avatar
-    uuid.value = initialData.uuid
-    homepage.value = initialData.homepage
-    bio.value = initialData.bio
-    roles.value = initialData.roles
+    username.value = initialData.username || ''
+    nickname.value = initialData.nickname || ''
+    email.value = initialData.email || ''
+    phone.value = initialData.phone || ''
+    avatar.value = initialData.avatar || ''
+    uuid.value = initialData.uuid || ''
+    homepage.value = initialData.homepage || ''
+    bio.value = initialData.bio || ''
+    roles.value = initialData.roles || []
     if (initialData.orgs) {
       orgs.value = initialData.orgs
     }
-    lastLoginTime.value = initialData.lastLoginTime
+    lastLoginTime.value = initialData.lastLoginTime || ''
   }
 
   return {