Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 42 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 27 additions & 11 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,39 @@
import React from "react";
import TopNav from "./components/TopNav";
import SideNav from "./components/SideNav";
import { BrowserRouter as Router, Route, Link } from "react-router-dom";
import Dashboard from "./components/Dashboard"
import Profile from "./components/Profile"
import Marquee from "./components/Marquee"
import Profiles from "./components/Profiles"
import Wall from "./components/Wall"
import Charts from "./components/Charts"
import Tables from "./components/Tables"
import Settings from "./components/Settings"

function App() {
return (
<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 */}
<Router>
<div>
<div id="wrapper">
<nav className="navbar navbar-inverse navbar-fixed-top" role="navigation">
<TopNav />
<SideNav />
</nav>
<div style={{backgroundColor: "white"}}>
<Route path="/tables" exact component={Tables} />
<Route path="/charts" exact component={Charts} />
<Route path="/settings" exact component={Settings} />
<Route path="/wall" exact component={Wall} />
<Route path="/profiles" exact component={Profiles} />
<Route path="/marquee/:text" exact component={Marquee} />
<Route path="/profile/:id" exact component={Profile} />
<Route path="/" exact component={Dashboard} />
</div>
</div>
</div>
</div>

</Router>
);
}


export default App;
7 changes: 7 additions & 0 deletions src/components/Charts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from "react";
let Charts = () => {
return (
<div>These are charts</div>
)
}
export default Charts
2 changes: 1 addition & 1 deletion src/components/Marquee.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";

function Marquee(props) {
const message = "hello";
const message = props.match.params.text;
return (
<marquee>{message}</marquee>
);
Expand Down
3 changes: 2 additions & 1 deletion src/components/Profile.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from "react";
import {connect} from "react-redux";


function Profile(props) {
const userId = 0;
const userId = props.match.params.id;
const user = props.users.find(u => u.id == userId) || {};
return (
<div>
Expand Down
3 changes: 2 additions & 1 deletion src/components/Profiles.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import React from "react";
import {connect} from "react-redux";
import { Link } from "react-router-dom"

function Profiles(props) {
const userDivs = props.users.map((user,i) => {
return (
<div key={i}>
{user.firstName} - {user.lastName}
<a href="#"> View </a>
<Link to={"/profile/"+user.id}> View </Link>
</div>);
});
return (
Expand Down
7 changes: 7 additions & 0 deletions src/components/Settings.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from "react";
let Settings = () => {
return (
<div>These are settings</div>
)
}
export default Settings
41 changes: 33 additions & 8 deletions src/components/SideNav.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,52 @@
import React from "react";
// import {Link} from "react-router-dom";
import {Link} from "react-router-dom";

function SideNav() {
return (
<div className="collapse navbar-collapse navbar-ex1-collapse">
<ul className="nav navbar-nav side-nav">
<li className="active">
{/*
<li>
<Link to="/"> <i className="fa fa-fw fa-dashboard" />
Dashboard
</Link>
*/}
</li>
<li>
<a href="charts.html">
<Link to="/charts">
<i className="fa fa-fw fa-bar-chart-o" /> Charts
</a>
</Link>
</li>
<li>
<a href="tables.html">
<Link to="/tables">
<i className="fa fa-fw fa-table" /> Tables
</a>
</Link>
</li>
<li>
<Link to="/settings">
<i className="fa fa-fw fa-table" /> Settings
</Link>
</li>
<li>
<Link to="/wall">
<i className="fa fa-fw fa-table" /> Wall
</Link>
</li>
<li>
<Link to="/profiles">
<i className="fa fa-fw fa-table" /> Profiles
</Link>
</li>
<li>
<Link to="/marquee/ReactRouteMarquee">
<i className="fa fa-fw fa-table" /> Marquee Text 1
</Link>
</li>
<li>
<Link to="/marquee/MarqueeReactRoute">
<i className="fa fa-fw fa-table" /> Matquee Text 2
</Link>
</li>


</ul>
</div>);
}
Expand Down
Loading