Skip to content

Commit aa60945

Browse files
authored
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
1 parent 6d836d9 commit aa60945

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

frontend/src/components/navbar/TheNavbar.vue renamed to frontend/src/components/navbar/Navbar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
location.href = `/${locale}/settings/locale`
296296
},
297297
async fetchUser() {
298-
const {data, _} = await useFetchApi(`${this.csghubServer}/api/v1/user/${this.uuid}?type=uuid`).json()
298+
const {data, _} = await useFetchApi(`/user/${this.uuid}?type=uuid`).json()
299299
if (data.value) {
300300
this.userAvatar = data.value.data.avatar
301301
this.userStore.initialize(data.value.data)

frontend/src/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
1818
import en from './locales/en.js'
1919
import zh from './locales/zh.js'
2020

21-
import Navbar from "./components/navbar/TheNavbar.vue"
21+
import Navbar from "./components/navbar/Navbar.vue"
2222
import CommentList from "./components/comment/CommentList.vue"
2323
import EndpointDetail from "./components/endpoints/EndpointDetail.vue"
2424
import RepoDetail from "./components/shared/RepoDetail.vue"

frontend/src/stores/UserStore.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ const useUserStore = defineStore('User', () => {
1717
const isLoggedIn = computed(() => username.value !== '')
1818

1919
async function initialize(initialData) {
20-
username.value = initialData.username
21-
nickname.value = initialData.nickname
22-
email.value = initialData.email
23-
phone.value = initialData.phone
24-
avatar.value = initialData.avatar
25-
uuid.value = initialData.uuid
26-
homepage.value = initialData.homepage
27-
bio.value = initialData.bio
28-
roles.value = initialData.roles
20+
username.value = initialData.username || ''
21+
nickname.value = initialData.nickname || ''
22+
email.value = initialData.email || ''
23+
phone.value = initialData.phone || ''
24+
avatar.value = initialData.avatar || ''
25+
uuid.value = initialData.uuid || ''
26+
homepage.value = initialData.homepage || ''
27+
bio.value = initialData.bio || ''
28+
roles.value = initialData.roles || []
2929
if (initialData.orgs) {
3030
orgs.value = initialData.orgs
3131
}
32-
lastLoginTime.value = initialData.lastLoginTime
32+
lastLoginTime.value = initialData.lastLoginTime || ''
3333
}
3434

3535
return {

0 commit comments

Comments
 (0)