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

Merge branch 'master' into file_org

Browse Source
This commit is contained in:
Leon Liang
2019-10-01 19:00:19 -04:00
committed by GitHub
parent 89e8942624 fadb0f0399
commit 2e157b9088
11 changed files with 433 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,14 +5,15 @@ import './App.css';
import { BrowserRouter as Router } from 'react-router-dom';
import Route from 'react-router-dom/Route';
import NavBar, { Navbar } from './components/layout/NavBar';
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';
class App extends Component {
@@ -29,6 +30,7 @@ class App extends Component {
<Route exact path="/login" component={login}/>
<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>