Skip to content

Commit 4d4b65c

Browse files
se030juyeong-sdohun31wcho21
committed
fix: CI 오류 수정
Co-authored-by: Ruby <[email protected]> Co-authored-by: 백도훈 <[email protected]> Co-authored-by: Won-hee Cho <[email protected]>
1 parent 8bd10c1 commit 4d4b65c

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

client/src/App.tsx

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

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

1212
const autoLogin = async () => {

client/src/components/WorkspaceModal/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function WorkspaceModal({
2828
<>
2929
<span className={style.text}>{text}</span>
3030
<input className={style.input} type="text" onChange={onInput} />
31-
<Button text={btnText} isDisable={!inputValue.length} />
31+
<Button text={btnText} isDisabled={!inputValue.length} />
3232
</>
3333
</Modal>
3434
);

client/src/contexts/user.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { createContext, Dispatch, SetStateAction } from 'react';
22

3-
interface User {
3+
export interface User {
44
id: number;
55
name: string;
66
avatarUrl: string;
77
}
88

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

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

client/src/pages/OAuth/index.tsx

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,17 @@ import UserContext from 'src/contexts/user';
88
import style from './style.module.scss';
99

1010
function OAuthPage() {
11-
const { setUser } = useContext(UserContext);
11+
const userContext = useContext(UserContext);
12+
13+
if (userContext === null) {
14+
console.log('유저 컨텍스트를 찾을 수 없습니다.');
15+
16+
return (
17+
<>
18+
<Loader size={100} />
19+
</>
20+
);
21+
}
1222

1323
const location = useLocation();
1424
const navigate = useNavigate();
@@ -17,7 +27,8 @@ function OAuthPage() {
1727
try {
1828
const authorizedUser = await postAuthLogin(code);
1929

20-
setUser(authorizedUser);
30+
userContext.setUser(authorizedUser);
31+
2132
navigate('/workspace');
2233
} catch (e) {
2334
navigate('/');
@@ -28,9 +39,12 @@ function OAuthPage() {
2839
const search = new URLSearchParams(location.search);
2940
const code = search.get('code');
3041

31-
if (!code) navigate('/');
42+
if (!code) {
43+
navigate('/');
44+
return;
45+
}
3246

33-
login(code!);
47+
login(code);
3448
}, []);
3549

3650
return (

0 commit comments

Comments
 (0)