Collin Betori - Upload

package.json

@@ -16,7 +16,6 @@
   "scripts": {
     "start": "react-scripts start"
   },
-  "proxy": "http://localhost:3001",
   "browserslist": {
     "production": [
       ">0.2%",

src/App.js

@@ -1,21 +1,38 @@
 import React from "react";
 import TopNav from "./components/TopNav";
 import SideNav from "./components/SideNav";
+import Dashboard from "./components/Dashboard"
+import Profiles from "./components/Profiles"
+import Charts from "./components/Charts"
+import Tables from "./components/Tables"
+import Settings from "./components/Settings"
+import Marquee from "./components/Marquee"
+import Profile from "./components/Profile"
+import Wall from "./components/Wall"
+import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 
 function App() {
   return (
+    <Router>
     <div> 
       <div id="wrapper">
         <nav className="navbar navbar-inverse navbar-fixed-top" role="navigation">
           <TopNav />
           <SideNav />
         </nav>
         <div style={{backgroundColor: "white"}}>
-          {/* PUT YOUR ROUTES HERE */}
+          <Route path='/' exact component={Dashboard}/>
+          <Route path='/profiles' exact component={Profiles}/>
+          <Route path='/profile/:id' exact component={Profile}/>
+          <Route path='/charts' exact component={Charts}/>
+          <Route path='/tables' exact component={Tables}/>
+          <Route path='/settings' exact component={Settings}/>
+          <Route path='/wall' exact component={Wall}/>
+          <Route path='/marquee/:text' exact component={Marquee}/>
         </div>
       </div>
     </div>
-
+    </Router>
   );
 }
 

src/components/Charts.js

@@ -0,0 +1,7 @@
+import React from "react"
+
+export default function Charts(){
+    return(
+        <div>Get some charts</div>
+    )
+}

src/components/Marquee.js

@@ -1,7 +1,7 @@
 import React from "react";
 
 function Marquee(props) {
-  const message = "hello";
+  const message = props.match.params.text;
   return (   
     <marquee>{message}</marquee>
   );

src/components/Settings.js

@@ -0,0 +1,10 @@
+import React from 'react'
+import {connect} from 'react-redux'
+
+export default function Settings(props){
+    return(
+        <div>You need to make some settings</div>
+    )}
+
+
+