Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes several cosmetic issues #50

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixes several cosmetic issues #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 72 additions & 116 deletions react-app/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,126 +1,82 @@
import React, { useState, useEffect } from "react";
import { BrowserRouter, Route, Switch } from "react-router-dom";
import LoginForm from "./components/auth/LoginForm";
import SignUpForm from "./components/auth/SignUpForm";
import NavBar from "./components/NavBar";
import ProtectedRoute from "./components/auth/ProtectedRoute";
import Profile from "./components/Profile";
import Feed from "./components/feed";
import Post from "./components/post";
import UserEdit from "./components/user-edit/UserEdit";
import React, { useState, useEffect } from 'react';
import { BrowserRouter, Route, Switch } from 'react-router-dom';
import LoginForm from './components/auth/LoginForm';
import SignUpForm from './components/auth/SignUpForm';
import NavBar from './components/NavBar';
import ProtectedRoute from './components/auth/ProtectedRoute';
import Profile from './components/Profile';
import Feed from './components/feed';
import Post from './components/post';
import UserEdit from './components/user-edit/UserEdit';
// import UploadUser from "./components/upload-post/UploadPost";
import LandingPage from "./components/landing-page/LandingPage";
import PostForm from "./components/upload-post/PostForm";
import LandingPage from './components/landing-page/LandingPage';
import PostForm from './components/upload-post/PostForm';
// import CommentForm from './components/comment/CommentForm';
import { authenticate } from "./services/auth";
import { authenticate } from './services/auth';

function App() {
const [authenticated, setAuthenticated] = useState(false);
const [loaded, setLoaded] = useState(false);
const [userdata, setUserdata] = useState({});
// const [userprofile, setuserprofile] = useState(false);
const [authenticated, setAuthenticated] = useState(false);
const [loaded, setLoaded] = useState(false);
const [userdata, setUserdata] = useState({});
// const [userprofile, setuserprofile] = useState(false);

useEffect(() => {
(async () => {
const user = await authenticate();
// const { username } = useParams();
// console.log("This is the user: " + username)
if (!user.errors) {
setAuthenticated(true);
setUserdata(user);
}
setLoaded(true);
})();
}, []);
useEffect(() => {
(async () => {
const user = await authenticate();
// const { username } = useParams();
// console.log("This is the user: " + username)
if (!user.errors) {
setAuthenticated(true);
setUserdata(user);
}
setLoaded(true);
})();
}, []);

if (!loaded) {
return null;
}
if (!loaded) {
return null;
}

return (
<BrowserRouter>
<Switch>
<Route path="/login" exact={true}>
<LoginForm
authenticated={authenticated}
setAuthenticated={setAuthenticated}
setUserdata={setUserdata}
/>
</Route>
<Route path="/sign-up" exact={true}>
<SignUpForm
authenticated={authenticated}
setAuthenticated={setAuthenticated}
/>
</Route>
<Route path="/landing" exact={true}>
<LandingPage
authenticated={authenticated}
setAuthenticated={setAuthenticated}
/>
</Route>
<ProtectedRoute
path={`/users/:username`}
exact={true}
authenticated={authenticated}
>
<NavBar
setAuthenticated={setAuthenticated}
userdata={userdata}
/>
<Profile userdata={userdata} />
</ProtectedRoute>
<ProtectedRoute
path={`/users/:user/edit`}
exact={true}
authenticated={authenticated}
>
<NavBar
setAuthenticated={setAuthenticated}
userdata={userdata}
/>
<UserEdit />
</ProtectedRoute>
{/* <ProtectedRoute path={`/$`} authenticated={authenticated}>
<UserPage />
</ProtectedRoute> */}
<ProtectedRoute
path="/"
exact={true}
authenticated={authenticated}
>
<NavBar
setAuthenticated={setAuthenticated}
userdata={userdata}
/>
<Feed />
</ProtectedRoute>
<ProtectedRoute
path="/posts/new"
exact={true}
authenticated={authenticated}
>
<NavBar
setAuthenticated={setAuthenticated}
userdata={userdata}
/>
<PostForm />
</ProtectedRoute>
<ProtectedRoute
path="/posts/:postId"
exact={true}
authenticated={authenticated}
>
{/* <CommentForm postId={1}></CommentForm> */}
<NavBar
setAuthenticated={setAuthenticated}
userdata={userdata}
/>
<Post />
</ProtectedRoute>
</Switch>
</BrowserRouter>
);
return (
<BrowserRouter>
<Switch>
<Route path='/login' exact={true}>
<LoginForm
authenticated={authenticated}
setAuthenticated={setAuthenticated}
setUserdata={setUserdata}
/>
</Route>
<Route path='/sign-up' exact={true}>
<SignUpForm authenticated={authenticated} setAuthenticated={setAuthenticated} />
</Route>
<Route path='/landing' exact={true}>
<LandingPage authenticated={authenticated} setAuthenticated={setAuthenticated} />
</Route>
<ProtectedRoute path={`/users/:username`} exact={true} authenticated={authenticated}>
<NavBar setAuthenticated={setAuthenticated} userdata={userdata} />
<Profile userdata={userdata} />
</ProtectedRoute>
<ProtectedRoute path={`/users/:user/edit`} exact={true} authenticated={authenticated}>
<NavBar setAuthenticated={setAuthenticated} userdata={userdata} />
<UserEdit />
</ProtectedRoute>
<ProtectedRoute path='/' exact={true} authenticated={authenticated}>
<NavBar setAuthenticated={setAuthenticated} userdata={userdata} />
<Feed />
</ProtectedRoute>
<ProtectedRoute path='/posts/new' exact={true} authenticated={authenticated}>
<NavBar setAuthenticated={setAuthenticated} userdata={userdata} />
<PostForm />
</ProtectedRoute>
<ProtectedRoute path='/posts/:postId' exact={true} authenticated={authenticated}>
{/* <CommentForm postId={1}></CommentForm> */}
<NavBar setAuthenticated={setAuthenticated} userdata={userdata} />
<Post />
</ProtectedRoute>
</Switch>
</BrowserRouter>
);
}

export default App;
Loading