diff options
| -rw-r--r-- | src/Pages/ProfilePage/ProfilePage.tsx | 15 | ||||
| -rw-r--r-- | src/index.tsx | 6 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/Pages/ProfilePage/ProfilePage.tsx b/src/Pages/ProfilePage/ProfilePage.tsx index 65c3fcf..ee95769 100644 --- a/src/Pages/ProfilePage/ProfilePage.tsx +++ b/src/Pages/ProfilePage/ProfilePage.tsx @@ -2,19 +2,22 @@ import React from 'react'; import { User } from '../../types'; import SignInForm from './SignInForm'; import ProfileInfo from './ProfileInfo'; -import Feed from "../../Components/Feed/Feed"; +import Feed from '../../components/Feed/Feed'; interface PropTypes { setUser: (newUser: User | undefined) => void; user: User | undefined; } -const ProfilePage: React.FC<PropTypes> = ({ setUser, user}) => { +const ProfilePage: React.FC<PropTypes> = ({ setUser, user }) => { return ( - user ? <> - <ProfileInfo id={user?._id} setUser={setUser} /> - <Feed page={'Feed'}/> - </> + user + ? ( + <> + <ProfileInfo id={user?._id} setUser={setUser} /> + <Feed page="Feed" /> + </> + ) : <SignInForm setUser={setUser} /> ); }; diff --git a/src/index.tsx b/src/index.tsx index 88eb87d..5888170 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -9,9 +9,9 @@ import { CssBaseline } from '@material-ui/core'; import teal from '@material-ui/core/colors/teal'; import 'typeface-roboto'; -import Header from './Components/Header/Header'; -import Feed from './Components/Feed/Feed'; -import ProfilePage from './Pages/ProfilePage/ProfilePage'; +import Header from './components/Header/Header'; +import Feed from './components/Feed/Feed'; +import ProfilePage from './pages/ProfilePage/ProfilePage'; import { User } from './types'; import { get } from './requests'; |