File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -2,11 +2,11 @@ import { useState, useEffect } from 'react';
22import { Routes , Route , useNavigate } from 'react-router-dom' ;
33import { getAuth } from 'src/apis/auth' ;
44import UserContext , { User } from 'src/contexts/user' ;
5- import { LoginPage , OAuthPage , WorkspacePage } from 'src/pages' ;
5+ import { LoadingPage , LoginPage , OAuthPage , WorkspacePage } from 'src/pages' ;
66import 'styles/reset.scss' ;
77
88function 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
Original file line number Diff line number Diff line change @@ -7,8 +7,8 @@ export interface User {
77}
88
99interface IUserContext {
10- user ? : User ;
11- setUser : Dispatch < SetStateAction < User > > ;
10+ user : User ;
11+ setUser : Dispatch < SetStateAction < User | null > > ;
1212}
1313
1414const UserContext = createContext < IUserContext | null > ( null ) ;
You can’t perform that action at this time.
0 commit comments