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 edit-profile-frontend

Browse Source
This commit is contained in:
Clayton Wilson
2019-10-01 21:01:02 -04:00
committed by GitHub
parent c218081759 16973fb340
commit 88310714b2
11 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,13 +5,13 @@ 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 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';
// Pages
import home from './Home.js';
import register from './Register.js';
import login from './Login.js';
import user from './pages/user';
import writeMicroblog from './Writing_Microblogs.js';
import edit from './pages/edit.js';
import userLine from './Userline.js';
@@ -20,10 +20,9 @@ class App extends Component {
render() {
return (
<Router>
<div className='container'>
<div className='container' >
<Navbar />
</div>
<div className="app">
<Route exact path="/" component={home}/>
<Route exact path="/register" component={register}/>