Skip to content
Snippets Groups Projects
Commit 1ddbdf2a authored by 석찬 윤's avatar 석찬 윤
Browse files

Merge branch 'main' into 'develop'

# Conflicts:
#   src/store/authStore.js
parents 5d4e5e6a ee4d9d0a
No related branches found
No related tags found
6 merge requests!30fix: 친구목록 조회 오류 해결,!29[#15]시간 인덱스 관련 최적화,!27[#14] FCM 토큰 포함 로그인 로직 수정,!26[#14] FCM 토큰 포함 로그인 로직 수정,!25[#14] FCM 토큰 포함 로그인 로직 수정,!24[#13] 스케줄 페이지 스타일 개선
Pipeline #10921 passed
.gitlab-ci.yml merge=ours
\ No newline at end of file
...@@ -12,7 +12,7 @@ const useAuthStore = create((set) => ({ ...@@ -12,7 +12,7 @@ const useAuthStore = create((set) => ({
const userInfo = await getSessionInfo(); const userInfo = await getSessionInfo();
set({ user: userInfo }); set({ user: userInfo });
localStorage.setItem("user", userInfo); localStorage.setItem("user", userInfo);
const nickname = userInfo.user.name || "Unknown"; const nickname = userInfo.name || "Unknown";
localStorage.setItem("nickname", nickname); localStorage.setItem("nickname", nickname);
console.log("반환값 userInfo: " + userInfo); console.log("반환값 userInfo: " + userInfo);
const localuser = localStorage.getItem("user"); const localuser = localStorage.getItem("user");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment