diff --git a/Web-App/build/asset-manifest.json b/Web-App/build/asset-manifest.json
index d9a0458..e6226d0 100644
--- a/Web-App/build/asset-manifest.json
+++ b/Web-App/build/asset-manifest.json
@@ -1,15 +1,15 @@
{
- "main.css": "/oncampus-walking-web-display/static/css/main.e3b1af55.chunk.css",
- "main.js": "/oncampus-walking-web-display/static/js/main.238a9abd.chunk.js",
- "main.js.map": "/oncampus-walking-web-display/static/js/main.238a9abd.chunk.js.map",
- "static/css/1.5ef21bbb.chunk.css": "/oncampus-walking-web-display/static/css/1.5ef21bbb.chunk.css",
- "static/js/1.1eabc802.chunk.js": "/oncampus-walking-web-display/static/js/1.1eabc802.chunk.js",
- "static/js/1.1eabc802.chunk.js.map": "/oncampus-walking-web-display/static/js/1.1eabc802.chunk.js.map",
- "runtime~main.js": "/oncampus-walking-web-display/static/js/runtime~main.af550946.js",
- "runtime~main.js.map": "/oncampus-walking-web-display/static/js/runtime~main.af550946.js.map",
- "static/css/main.e3b1af55.chunk.css.map": "/oncampus-walking-web-display/static/css/main.e3b1af55.chunk.css.map",
- "static/css/1.5ef21bbb.chunk.css.map": "/oncampus-walking-web-display/static/css/1.5ef21bbb.chunk.css.map",
- "index.html": "/oncampus-walking-web-display/index.html",
- "precache-manifest.a16babba020f85f54ffd27c1514cc74e.js": "/oncampus-walking-web-display/precache-manifest.a16babba020f85f54ffd27c1514cc74e.js",
- "service-worker.js": "/oncampus-walking-web-display/service-worker.js"
+ "main.css": "/static/css/main.ad566a30.chunk.css",
+ "main.js": "/static/js/main.cec9efec.chunk.js",
+ "main.js.map": "/static/js/main.cec9efec.chunk.js.map",
+ "static/css/1.2094b08e.chunk.css": "/static/css/1.2094b08e.chunk.css",
+ "static/js/1.c1314515.chunk.js": "/static/js/1.c1314515.chunk.js",
+ "static/js/1.c1314515.chunk.js.map": "/static/js/1.c1314515.chunk.js.map",
+ "runtime~main.js": "/static/js/runtime~main.229c360f.js",
+ "runtime~main.js.map": "/static/js/runtime~main.229c360f.js.map",
+ "static/css/main.ad566a30.chunk.css.map": "/static/css/main.ad566a30.chunk.css.map",
+ "static/css/1.2094b08e.chunk.css.map": "/static/css/1.2094b08e.chunk.css.map",
+ "index.html": "/index.html",
+ "precache-manifest.4ab7f88071fb2a8305188b0deb634e26.js": "/precache-manifest.4ab7f88071fb2a8305188b0deb634e26.js",
+ "service-worker.js": "/service-worker.js"
}
\ No newline at end of file
diff --git a/Web-App/build/index.html b/Web-App/build/index.html
index 143647a..18a787f 100644
--- a/Web-App/build/index.html
+++ b/Web-App/build/index.html
@@ -1 +1 @@
-
React App
\ No newline at end of file
+React App
\ No newline at end of file
diff --git a/Web-App/build/service-worker.js b/Web-App/build/service-worker.js
index b6dd87f..80ebbc1 100644
--- a/Web-App/build/service-worker.js
+++ b/Web-App/build/service-worker.js
@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
- "/oncampus-walking-web-display/precache-manifest.a16babba020f85f54ffd27c1514cc74e.js"
+ "/precache-manifest.4ab7f88071fb2a8305188b0deb634e26.js"
);
workbox.clientsClaim();
@@ -28,7 +28,7 @@ self.__precacheManifest = [].concat(self.__precacheManifest || []);
workbox.precaching.suppressWarnings();
workbox.precaching.precacheAndRoute(self.__precacheManifest, {});
-workbox.routing.registerNavigationRoute("/oncampus-walking-web-display/index.html", {
+workbox.routing.registerNavigationRoute("/index.html", {
blacklist: [/^\/_/,/\/[^\/]+\.[^\/]+$/],
});
diff --git a/Web-App/package.json b/Web-App/package.json
index 8c862f0..9603124 100644
--- a/Web-App/package.json
+++ b/Web-App/package.json
@@ -3,6 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
+ "axios": "^0.18.0",
"react": "^16.6.3",
"react-datepicker": "^2.1.0",
"react-dom": "^16.6.3",
@@ -30,6 +31,5 @@
"devDependencies": {
"gh-pages": "^2.0.1",
"node-sass": "^4.10.0"
- },
- "homepage": "https://renojvarghese.github.io/oncampus-walking-web-display/"
+ }
}
diff --git a/Web-App/src/App.js b/Web-App/src/App.js
index 466e152..e7c740e 100644
--- a/Web-App/src/App.js
+++ b/Web-App/src/App.js
@@ -1,6 +1,5 @@
import React, { Component } from "react";
import "./scss/App.scss";
-import "react-datepicker/dist/react-datepicker.css";
import AppRouter from "./components/router";
class App extends Component {
render() {
diff --git a/Web-App/src/components/Dashboard/index.js b/Web-App/src/components/Dashboard/index.js
index 9b16d49..3459573 100644
--- a/Web-App/src/components/Dashboard/index.js
+++ b/Web-App/src/components/Dashboard/index.js
@@ -1,17 +1,36 @@
import React from "react";
import { Link } from "react-router-dom";
-import SearchBar from "../searchBar";
+import Timepicker from "../Timepicker";
import ParticipantContainer from "../participantContainer";
+import axios from "axios";
export default class Dashboard extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = { data : [] }
+ this.getData = this.getData.bind(this);
+ }
+
+ makeTimeString(date) {
+ return date.getFullYear() + date.getMonth() + date.getDay() + "T000000";
+ }
+ getData(start, end) {
+ let s = "" + start.getFullYear() + "" + start.getMonth() + "" + start.getDate() + "T000000";
+ let e = "" + end.getFullYear() + "" + end.getMonth() + "" + end.getDate() + "T000000";
+ const url = "http://sdp40.cse.uconn.edu/api/locationdata?start=" + s + "&end=" + e;
+ axios.get(url).then( res => {
+ this.setState({ data: res.data})
+ });
+
+ }
render() {
return (
);
}
diff --git a/Web-App/src/components/participantBox/index.js b/Web-App/src/components/participantBox/index.js
index 8e82894..25add4e 100644
--- a/Web-App/src/components/participantBox/index.js
+++ b/Web-App/src/components/participantBox/index.js
@@ -1,16 +1,12 @@
import React from "react";
-export const ParticipantBox = ({
- name = "PARTICPANT ID",
- start = "10/12",
- end = "Present",
- miles = 100
-}) => (
-
-
{name}
-
Start Time: {start}
-
End Time:{end}
-
Total Miles: {miles} mi
-
-);
+export const ParticipantBox = (props) => {
+ let s = new Date(props.info.start_time);
+ let e = new Date(props.info.end_time);
+ return (
+
Participant Id: {props.info.user_id}
+
Start Time: {s.toLocaleString()}
+
End Time: {e.toLocaleString()}
+
);
+};
export default ParticipantBox;
diff --git a/Web-App/src/components/participantContainer/index.js b/Web-App/src/components/participantContainer/index.js
index 8f143c1..a3e5c3a 100644
--- a/Web-App/src/components/participantContainer/index.js
+++ b/Web-App/src/components/participantContainer/index.js
@@ -1,12 +1,17 @@
import React, { Component } from "react";
import ParticipantBox from "../participantBox";
-import { Link } from "react-router-dom";
+
export default class ParticipantContainer extends Component {
+ convertDataToContainer(){
+
+ }
render() {
return (
-
-
+ {this.props.data.map( (participant,i) => {
+
+ return
+ })}
);
}
diff --git a/Web-App/yarn.lock b/Web-App/yarn.lock
index eb27c22..de44d9c 100644
--- a/Web-App/yarn.lock
+++ b/Web-App/yarn.lock
@@ -1267,6 +1267,14 @@ aws4@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+axios@^0.18.0:
+ version "0.18.0"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
+ integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=
+ dependencies:
+ follow-redirects "^1.3.0"
+ is-buffer "^1.1.5"
+
axobject-query@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
@@ -2523,7 +2531,7 @@ debug@=3.1.0:
dependencies:
ms "2.0.0"
-debug@^3.1.0:
+debug@^3.1.0, debug@^3.2.6:
version "3.2.6"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
dependencies:
@@ -3490,6 +3498,13 @@ follow-redirects@^1.0.0:
dependencies:
debug "=3.1.0"
+follow-redirects@^1.3.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
+ integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
+ dependencies:
+ debug "^3.2.6"
+
for-in@^0.1.3:
version "0.1.8"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"