ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 18:28:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added page to display other users' profile

Browse Source
This commit is contained in:
Leon Liang 2019-11-19 13:57:24 -05:00
parent c6022dbc38
commit c8aa1fd050
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
twistter-frontend/src/App.js
View File

@ -19,8 +19,6 @@ import { logoutUser, getUserData } from "./redux/actions/userActions";
// Components // Components
import AuthRoute from "./util/AuthRoute"; import AuthRoute from "./util/AuthRoute";
// axios.defaults.baseURL = 'http://localhost:5006/twistter-e4649/us-central1/api';
// Pages // Pages
import home from "./pages/Home"; import home from "./pages/Home";
import signup from "./pages/Signup"; import signup from "./pages/Signup";
@ -33,6 +31,7 @@ import editProfile from "./pages/editProfile";
import userLine from "./Userline.js"; import userLine from "./Userline.js";
import verify from "./pages/verify"; import verify from "./pages/verify";
import Search from "./pages/Search.js"; import Search from "./pages/Search.js";
import otherUser from "./pages/otherUser";
const theme = createMuiTheme(themeObject); const theme = createMuiTheme(themeObject);
@ -65,11 +64,10 @@ class App extends Component {
</div> </div>
<div className="app"> <div className="app">
<Switch> <Switch>
{/* AuthRoute checks if the user is logged in and if they are it redirects them to /home */} {/* AuthRoute checks if the user is logged in and if they are it redirects them to /home */}
<AuthRoute exact path="/signup" component={signup} /> <AuthRoute exact path="/signup" component={signup} />
<AuthRoute exact path="/login" component={login} /> <AuthRoute exact path="/login" component={login} />
<AuthRoute exact path="/" component={home}/> <AuthRoute exact path="/" component={home} />
<Route exact path="/logout" component={logout} /> <Route exact path="/logout" component={logout} />
<Route exact path="/delete" component={Delete} /> <Route exact path="/delete" component={Delete} />
@ -77,11 +75,11 @@ class App extends Component {
<Route exact path="/home" component={home} /> <Route exact path="/home" component={home} />
<Route exact path="/user" component={user} /> <Route exact path="/user" component={user} />
<Route exact path="/edit" component={editProfile} /> <Route exact path="/edit" component={editProfile} />
<Route exact path="/verify" component={verify}/> <Route exact path="/verify" component={verify} />
<Route exact path="/search" component={Search} /> <Route exact path="/search" component={Search} />
<Route exact path="/user/:userhandle" component={otherUser} />
<AuthRoute exact path="/" component={home} /> <AuthRoute exact path="/" component={home} />
</Switch> </Switch>
</div> </div>
</Router> </Router>