mirror of
https://github.com/ClaytonWWilson/CS307-Team24.git
synced 2026-03-10 21:25:04 +00:00
Modularize code and added NavBar component
This commit is contained in:
@@ -1,11 +1,14 @@
|
||||
/* eslint-disable */
|
||||
import React, { Component } from 'react';
|
||||
import logo from './images/twistter-logo.png';
|
||||
import { BrowserRouter as Router } from 'react-router-dom';
|
||||
import Route from 'react-router-dom/Route';
|
||||
import { BrowserRouter as Router, Route, Switch} from 'react-router-dom';
|
||||
import './App.css';
|
||||
|
||||
//TODO: reorganize imports
|
||||
|
||||
//components
|
||||
import Navbar from './components/layout/NavBar';
|
||||
|
||||
// pages
|
||||
import user from './pages/user';
|
||||
|
||||
@@ -95,12 +98,11 @@ class App extends Component {
|
||||
render() {
|
||||
return (
|
||||
<Router>
|
||||
<div className="app">
|
||||
<Navbar />
|
||||
<div className='container'>
|
||||
<Switch>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<Route path="/" exact render={
|
||||
() => {
|
||||
return (
|
||||
@@ -167,13 +169,13 @@ class App extends Component {
|
||||
}
|
||||
}/>
|
||||
|
||||
<Route exact path="/user" component={user} />
|
||||
<Route path="/user" exact component={user} />
|
||||
</Switch>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</Router>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user