ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2026-03-10 21:25:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Still working on Auth State

Browse Source
This commit is contained in:
Clayton Wilson
2019-10-02 17:53:20 -04:00
parent dcd03d7888
commit 5df28e0e77
12 changed files with 363 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,30 +1,34 @@
/* eslint-disable */
import React, { Component } from 'react';
import React, { Component } from "react";
import './App.css';
import "./App.css";
import { BrowserRouter as Router } from 'react-router-dom';
import Route from 'react-router-dom/Route';
import Navbar from './components/layout/NavBar';
import jwtDecode from 'jwt-decode';
import { BrowserRouter as Router } from "react-router-dom";
import Route from "react-router-dom/Route";
import Navbar from "./components/layout/NavBar";
import jwtDecode from "jwt-decode";
// Redux
import { Provider } from "react-redux";
import store from "./redux/store";
// Components
import AuthRoute from './util/AuthRoute';
import AuthRoute from "./util/AuthRoute";
import home from './pages/Home';
import register from './pages/Register';
import login from './pages/Login';
import user from './pages/user';
import writeMicroblog from './Writing_Microblogs.js';
import edit from './pages/edit.js';
import userLine from './Userline.js';
import home from "./pages/Home";
import register from "./pages/Register";
import login from "./pages/Login";
import user from "./pages/user";
import writeMicroblog from "./Writing_Microblogs.js";
import edit from "./pages/edit.js";
import userLine from "./Userline.js";
let authenticated;
const token = localStorage.FBIdToken;
if (token) {
const decodedToken = jwtDecode(token);
if (decodedToken.exp * 1000 < Date.now()) {
window.location.href = '/login';
window.location.href = "/login";
authenticated = false;
} else {
authenticated = true;
@@ -34,21 +38,37 @@ if (token) {
class App extends Component {
render() {
return (
<Router>
<div className='container' >
<Navbar />
</div>
<div className="app">
<AuthRoute exact path="/" component={home} authenticated={authenticated}/>
<AuthRoute exact path="/register" component={register} authenticated={authenticated}/>
<AuthRoute exact path="/login" component={login} authenticated={authenticated}/>
<Route exact path="/user" component={user}/>
<Route exact path="/home" component={writeMicroblog}/>
<Route exact path="/edit" component={edit}/>
<Route exact path="/userline" component={userLine}/>
</div>
</Router>
<Provider store={store}>
<Router>
<div className="container">
<Navbar />
</div>
<div className="app">
<AuthRoute
exact
path="/"
component={home}
authenticated={authenticated}
/>
<AuthRoute
exact
path="/register"
component={register}
authenticated={authenticated}
/>
<AuthRoute
exact
path="/login"
component={login}
authenticated={authenticated}
/>
<Route exact path="/user" component={user} />
<Route exact path="/home" component={writeMicroblog} />
<Route exact path="/edit" component={edit} />
<Route exact path="/userline" component={userLine} />
</div>
</Router>
</Provider>
);
}
}