Skip to content

Commit 6db76ff

Browse files
committed
fix: user없을 때 렌더링 방지
user가 없을 때 렌더링 돼서 에러가 남 user 없으면 LoadingPage 렌더링 시켜서 방지
1 parent 54d093e commit 6db76ff

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

client/src/App.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { useState, useEffect } from 'react';
22
import { Routes, Route, useNavigate } from 'react-router-dom';
33
import { getAuth } from 'src/apis/auth';
44
import UserContext, { User } from 'src/contexts/user';
5-
import { LoginPage, OAuthPage, WorkspacePage } from 'src/pages';
5+
import { LoadingPage, LoginPage, OAuthPage, WorkspacePage } from 'src/pages';
66
import 'styles/reset.scss';
77

88
function App() {
9-
const [user, setUser] = useState<User>({ id: -1, name: '', avatarUrl: '' });
9+
const [user, setUser] = useState<User | null>(null);
1010
const navigate = useNavigate();
1111

1212
const autoLogin = async () => {
@@ -22,14 +22,16 @@ function App() {
2222
autoLogin();
2323
}, []);
2424

25-
return (
25+
return user ? (
2626
<UserContext.Provider value={{ user, setUser }}>
2727
<Routes>
2828
<Route path="/" element={<LoginPage />} />
2929
<Route path="/oauth" element={<OAuthPage />} />
3030
<Route path="/workspace" element={<WorkspacePage />} />
3131
</Routes>
3232
</UserContext.Provider>
33+
) : (
34+
<LoadingPage />
3335
);
3436
}
3537

client/src/contexts/user.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export interface User {
77
}
88

99
interface IUserContext {
10-
user?: User;
11-
setUser: Dispatch<SetStateAction<User>>;
10+
user: User;
11+
setUser: Dispatch<SetStateAction<User | null>>;
1212
}
1313

1414
const UserContext = createContext<IUserContext | null>(null);

0 commit comments

Comments
 (0)