Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
next build
  • Loading branch information
rkv14001 committed Apr 23, 2019
1 parent 4351a21 commit 5104c61
Show file tree
Hide file tree
Showing 9 changed files with 74 additions and 40 deletions.
26 changes: 13 additions & 13 deletions 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"
}
2 changes: 1 addition & 1 deletion Web-App/build/index.html
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"><link rel="shortcut icon" href="/oncampus-walking-web-display/favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/oncampus-walking-web-display/manifest.json"><title>React App</title><link href="/oncampus-walking-web-display/static/css/1.5ef21bbb.chunk.css" rel="stylesheet"><link href="/oncampus-walking-web-display/static/css/main.e3b1af55.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(a){function e(e){for(var r,n,t=e[0],o=e[1],u=e[2],i=0,l=[];i<t.length;i++)n=t[i],p[n]&&l.push(p[n][0]),p[n]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(a[r]=o[r]);for(s&&s(e);l.length;)l.shift()();return c.push.apply(c,u||[]),f()}function f(){for(var e,r=0;r<c.length;r++){for(var n=c[r],t=!0,o=1;o<n.length;o++){var u=n[o];0!==p[u]&&(t=!1)}t&&(c.splice(r--,1),e=i(i.s=n[0]))}return e}var n={},p={2:0},c=[];function i(e){if(n[e])return n[e].exports;var r=n[e]={i:e,l:!1,exports:{}};return a[e].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.m=a,i.c=n,i.d=function(e,r,n){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:n})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(r,e){if(1&e&&(r=i(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var n=Object.create(null);if(i.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var t in r)i.d(n,t,function(e){return r[e]}.bind(null,t));return n},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/oncampus-walking-web-display/";var r=window.webpackJsonp=window.webpackJsonp||[],t=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=t;f()}([])</script><script src="/oncampus-walking-web-display/static/js/1.1eabc802.chunk.js"></script><script src="/oncampus-walking-web-display/static/js/main.238a9abd.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"><link rel="shortcut icon" href="/favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><title>React App</title><link href="/static/css/1.2094b08e.chunk.css" rel="stylesheet"><link href="/static/css/main.ad566a30.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={2:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/1.c1314515.chunk.js"></script><script src="/static/js/main.cec9efec.chunk.js"></script></body></html>
4 changes: 2 additions & 2 deletions Web-App/build/service-worker.js
Expand Up @@ -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();
Expand All @@ -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: [/^\/_/,/\/[^\/]+\.[^\/]+$/],
});
4 changes: 2 additions & 2 deletions Web-App/package.json
Expand Up @@ -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",
Expand Down Expand Up @@ -30,6 +31,5 @@
"devDependencies": {
"gh-pages": "^2.0.1",
"node-sass": "^4.10.0"
},
"homepage": "https://renojvarghese.github.io/oncampus-walking-web-display/"
}
}
1 change: 0 additions & 1 deletion 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() {
Expand Down
27 changes: 23 additions & 4 deletions 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 (
<div className="App">
<Link to="/">
<a>Signout</a>
Signout
</Link>
<SearchBar />
<ParticipantContainer />
<Timepicker onChange={this.getData}/>
<ParticipantContainer data={this.state.data}/>
</div>
);
}
Expand Down
22 changes: 9 additions & 13 deletions 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
}) => (
<div className="part-box">
<div className="part-name">{name}</div>
<div className="part-start">Start Time: {start}</div>
<div className="part-end">End Time:{end}</div>
<div className="part-miles">Total Miles: {miles} mi</div>
</div>
);
export const ParticipantBox = (props) => {
let s = new Date(props.info.start_time);
let e = new Date(props.info.end_time);
return (<div className="part-box">
<div className="part-name">Participant Id: {props.info.user_id}</div>
<div className="part-start">Start Time: {s.toLocaleString()}</div>
<div className="part-end">End Time: {e.toLocaleString()}</div>
</div>);
};

export default ParticipantBox;
11 changes: 8 additions & 3 deletions 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 (
<div className="part-container">
<Link to="/map"><ParticipantBox /></Link>
<Link to="/map"><ParticipantBox /></Link>
{this.props.data.map( (participant,i) => {

return <ParticipantBox key={"participant_" + i}info={participant}/>
})}
</div>
);
}
Expand Down
17 changes: 16 additions & 1 deletion Web-App/yarn.lock
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 5104c61

Please sign in to comment.