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
41 changes: 31 additions & 10 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,42 @@
import React from "react";
import TopNav from "./components/TopNav";
import SideNav from "./components/SideNav";
//react-router
import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
//components
import Dashboard from "./components/Dashboard";
import Charts from "./components/Charts";
import Tables from "./components/Tables";
import Settings from "./components/Settings";
import Wall from "./components/Wall";
import Profiles from "./components/Profiles";
import Marquee from "./components/Marquee";
import Profile from "./components/Profile";

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"}}>
<Switch>
<Route exact path="/" component={Dashboard} />
<Route path="/charts" component={Charts} />
<Route path="/tables" component={Tables} />
<Route path="/settings" component={Settings} />
<Route path="/wall" component={Wall} />
<Route path="/profiles" component={Profiles} />
<Route path="/marquee/:text" component={Marquee} />
<Route path="/profile/:id" component={Profile} />
</Switch>
</div>
</div>
</div>
</div>

</Router>
);
}

Expand Down
10 changes: 10 additions & 0 deletions src/components/Charts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from "react";

const Charts = () => {
return (
<div>
Charts Component Here
</div>
);
};
export default Charts;
4 changes: 2 additions & 2 deletions src/components/Marquee.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import React from "react";

function Marquee(props) {
const message = "hello";
return (
<marquee>{message}</marquee>
return (
<marquee>{props.match.params.text}</marquee>
);
}

Expand Down
5 changes: 2 additions & 3 deletions src/components/Profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,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 (
return (
<div>
<h3>{user.firstName} {user.lastName}</h3>
<h4>{user.occupation}</h4>
Expand All @@ -18,4 +18,3 @@ function Profile(props) {
export default connect(function (state) {
return {users: state.users};
})(Profile);

10 changes: 6 additions & 4 deletions src/components/Profiles.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
import React from "react";
import {connect} from "react-redux";
// react-router-dom
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={`/user/${user.id}`}>
View
</Link>
</div>);
});
return (
return (
<div>{userDivs}</div>
);
}

export default connect(function (state) {
return {users: state.users};
})(Profiles);


10 changes: 10 additions & 0 deletions src/components/Settings.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from "react";

const Settings = () => {
return (
<div>
Settings Component Here
</div>
);
};
export default Settings;
44 changes: 31 additions & 13 deletions src/components/SideNav.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,47 @@
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">
{/*
<Link to="/"> <i className="fa fa-fw fa-dashboard" />
Dashboard
Dashboard
</Link>
*/}
</li>
<li>
<a href="charts.html">
<i className="fa fa-fw fa-bar-chart-o" /> Charts
</a>
<li className="active">
<Link to="/charts"> <i className="fa fa-fw fa-bar-chart-o" />
Charts
</Link>
</li>
<li className="active">
<Link to="/tables"> <i className="fa fa-fw fa-table" />
Tables
</Link>
</li>
<li className="active">
<Link to="/settings">
Settings
</Link>
</li>
<li>
<a href="tables.html">
<i className="fa fa-fw fa-table" /> Tables
</a>
<li className="active">
<Link to="/wall">
Wall
</Link>
</li>
<li className="active">
<Link to="/profiles">
Profiles
</Link>
</li>
<li className="active">
<Link to="/marquee/Hello Stephanie">
Marquee
</Link>
</li>
</ul>
</div>);
</div>);
}

export default SideNav;
10 changes: 10 additions & 0 deletions src/components/Tables.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from "react";

const Tables = () => {
return (
<div>
Tables Component Here
</div>
);
};
export default Tables;
10 changes: 10 additions & 0 deletions src/components/Wall.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from "react";

const Wall = () => {
return (
<div>
Wall Component Here
</div>
);
};
export default Wall;