From ba328ea550835a9dc7a92b986fb9b87604d28fa6 Mon Sep 17 00:00:00 2001 From: daniela-idara Date: Sun, 22 Sep 2019 04:38:41 -0500 Subject: [PATCH 1/2] updated --- package-lock.json | 56 ++++++++++++++++++++++++++++---------- src/App.js | 23 ++++++++++++++-- src/components/Charts.js | 9 ++++++ src/components/Marquee.js | 2 +- src/components/Profile.js | 2 +- src/components/Profiles.js | 3 +- src/components/Settings.js | 9 ++++++ src/components/SideNav.js | 6 ++-- src/components/Tables.js | 9 ++++++ src/components/Wall.js | 9 ++++++ 10 files changed, 106 insertions(+), 22 deletions(-) create mode 100644 src/components/Charts.js create mode 100644 src/components/Settings.js create mode 100644 src/components/Tables.js create mode 100644 src/components/Wall.js diff --git a/package-lock.json b/package-lock.json index 24bc2e3..c9f06b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3096,12 +3096,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3116,17 +3118,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3243,7 +3248,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3255,6 +3261,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3269,6 +3276,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3276,12 +3284,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -3300,6 +3310,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3380,7 +3391,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3392,6 +3404,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3513,6 +3526,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7486,12 +7500,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7506,17 +7522,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -7633,7 +7652,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -7645,6 +7665,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7659,6 +7680,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7666,12 +7688,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7690,6 +7714,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7770,7 +7795,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7782,6 +7808,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7903,6 +7930,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/src/App.js b/src/App.js index 15bddc9..22dca33 100644 --- a/src/App.js +++ b/src/App.js @@ -1,9 +1,19 @@ import React from "react"; import TopNav from "./components/TopNav"; import SideNav from "./components/SideNav"; +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'; +import Dashboard from './components/Dashboard'; +import {BrowserRouter, Switch, Route} from 'react-router-dom'; function App() { return ( +
- {/* PUT YOUR ROUTES HERE */} + + + + + + + + + +
- + ); } diff --git a/src/components/Charts.js b/src/components/Charts.js new file mode 100644 index 0000000..4dc1626 --- /dev/null +++ b/src/components/Charts.js @@ -0,0 +1,9 @@ +import React from 'react'; + +export default function Charts() { + return ( +
+ Charts +
+ ) +} \ No newline at end of file diff --git a/src/components/Marquee.js b/src/components/Marquee.js index 820e8c4..21565c7 100644 --- a/src/components/Marquee.js +++ b/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 ( {message} ); diff --git a/src/components/Profile.js b/src/components/Profile.js index c4eb646..7cc69ac 100644 --- a/src/components/Profile.js +++ b/src/components/Profile.js @@ -2,7 +2,7 @@ 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 (
diff --git a/src/components/Profiles.js b/src/components/Profiles.js index 3409812..f1b1e8a 100644 --- a/src/components/Profiles.js +++ b/src/components/Profiles.js @@ -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 (
{user.firstName} - {user.lastName} - View + View
); }); return ( diff --git a/src/components/Settings.js b/src/components/Settings.js new file mode 100644 index 0000000..53ad432 --- /dev/null +++ b/src/components/Settings.js @@ -0,0 +1,9 @@ +import React from 'react'; + +export default function Settings() { + return ( +
+ Settings +
+ ) +} \ No newline at end of file diff --git a/src/components/SideNav.js b/src/components/SideNav.js index 9caaf7c..077a363 100644 --- a/src/components/SideNav.js +++ b/src/components/SideNav.js @@ -1,16 +1,16 @@ import React from "react"; -// import {Link} from "react-router-dom"; +import {Link} from "react-router-dom"; function SideNav() { return (
diff --git a/src/components/Comments.js b/src/components/Comments.js index 2b3e3ac..ac29886 100644 --- a/src/components/Comments.js +++ b/src/components/Comments.js @@ -15,7 +15,7 @@ function Comments(props) { - +
View Details diff --git a/src/components/DonutChart.js b/src/components/DonutChart.js index 1a19751..e0eb404 100644 --- a/src/components/DonutChart.js +++ b/src/components/DonutChart.js @@ -9,7 +9,7 @@ function DonutChart() {
- View Details + View Details
diff --git a/src/components/MessagePreview.js b/src/components/MessagePreview.js index 3b3b15b..6afc7d4 100644 --- a/src/components/MessagePreview.js +++ b/src/components/MessagePreview.js @@ -4,7 +4,7 @@ import DateTime from "./DateTime"; function MessagePreview(props) { return (
  • - +
    diff --git a/src/components/Orders.js b/src/components/Orders.js index e9cdb71..d0b3f77 100644 --- a/src/components/Orders.js +++ b/src/components/Orders.js @@ -15,7 +15,7 @@ function Orders(props) {
    -     +
    View Details diff --git a/src/components/Profile.js b/src/components/Profile.js index 7cc69ac..f650cc1 100644 --- a/src/components/Profile.js +++ b/src/components/Profile.js @@ -3,7 +3,7 @@ import {connect} from "react-redux"; function Profile(props) { const userId = props.match.params.id; - const user = props.users.find(u => u.id == userId) || {}; + const user = props.users.find(u => u.id === userId) || {}; return (

    {user.firstName} {user.lastName}

    diff --git a/src/components/SideNav.js b/src/components/SideNav.js index 077a363..81c3002 100644 --- a/src/components/SideNav.js +++ b/src/components/SideNav.js @@ -13,15 +13,41 @@ function SideNav() { }
  • - + Charts - +
    • +
  • - + Tables - + +
    • + +
  • + + Profiles + +
    • + +
  • + + Wall + +
    • + +
  • + + Secret Message +
    • + +
  • + + Settings + +
    • + ); } diff --git a/src/components/TaskItem.js b/src/components/TaskItem.js index 4d7b0c8..c3015ee 100644 --- a/src/components/TaskItem.js +++ b/src/components/TaskItem.js @@ -1,7 +1,7 @@ import React from "react"; function TaskItem(props) { - return ( + return ( {props.task.date} {props.task.task} ); diff --git a/src/components/Tasks.js b/src/components/Tasks.js index 95326cf..69fc0d9 100644 --- a/src/components/Tasks.js +++ b/src/components/Tasks.js @@ -14,7 +14,7 @@ function Tasks(props) { - +
    View Details diff --git a/src/components/TasksPanel.js b/src/components/TasksPanel.js index 09e5d73..d125530 100644 --- a/src/components/TasksPanel.js +++ b/src/components/TasksPanel.js @@ -17,7 +17,7 @@ function TasksPanel(props) {
    diff --git a/src/components/Tickets.js b/src/components/Tickets.js index b83fbec..c1c62a0 100644 --- a/src/components/Tickets.js +++ b/src/components/Tickets.js @@ -16,7 +16,7 @@ function Tickets(props) { - +
    View Details diff --git a/src/components/TopNav.js b/src/components/TopNav.js index bd95f4c..381cb19 100644 --- a/src/components/TopNav.js +++ b/src/components/TopNav.js @@ -6,7 +6,7 @@ function TopNav(props) { return (
    );