Skip to content

Commit

Permalink
windows compile
Browse files Browse the repository at this point in the history
  • Loading branch information
VincentTheChu committed Apr 3, 2019
1 parent 1d177b3 commit 141101e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"react/no-did-mount-set-state": [0],
"import/extensions": [0],
"import/no-extraneous-dependencies": [0],
"import/no-unresolved": [0], // Until import plugin supports webpack 2 resolveModules
"import/no-unresolved": [0],
"compat/compat": 2
},
"settings": {
Expand Down
12 changes: 11 additions & 1 deletion client/modules/Entries/components/EntriesGroup/EntriesGroup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,48 +39,55 @@ const TEAMS = [
teamImg: pac,
projectDesc: 'PAC is a smartphone application that provides audio alerts to drivers when it senses an urgent emergency.',
link: 'https://okiyuki.github.io/ARCportfolio/public/portfolio.html',
link2: '/projects',
},
{
teamName: 'ESSENSE: Driver’s seat vibration pad',
memberList: 'Erich McMillan, Lindy Wong, Dean Ravida, Siyuan Gao, Joel Yun',
teamImg: teams,
projectDesc: 'ESSENCE is the new way to alert driver\'s of pedestrians who are preparing to cross the street at the intersection through vibrations.',
link: 'https://joelyun.wixsite.com/teams',
link2: '/projects',
},
{
teamName: 'M. I. A. -- My Instructional Assistant',
memberList: 'Maggie Chan, Tony Chan, Jodi Lam, Christine Tran, Christopher Yan',
teamImg: mia,
projectDesc: 'An AI instructional assistant that helps reinforce good driving habits by reducing visual cognitive load though the aid of real-time audio feedback from car sensor technology.',
link: 'https://docs.google.com/presentation/d/18qyh4fYF1w2llDMvokNLTqaY5xZAL_jgfhCgsVPwf18/edit',
link2: '/projects',
},
{
teamName: 'Spot: The Smart Parking App',
memberList: 'Shelly Bae, Daniel Won, Kyle Rico, Tayte Duong, Kellie Higa',
teamImg: spot,
projectDesc: 'SPOT is an application that aims to make parking in congested areas easier and more efficient by allowing people to give their parking and its location directly to someone else.',
link: 'http://spotsd.com/',
link2: '/projects',
},
{
teamName: 'MTS - Track Your Bus: Closing the gap between MTS and its users',
memberList: 'Arvin Dagoc, Vivian Trinh, Swarnakshi Kapil, Saul Mendez, Chengyang Yu',
teamImg: mts,
projectDesc: 'An application which rewards users for reporting MTS related problems.',
link: 'https://citywalkers.wixsite.com/portfolio',
link2: '/projects',
},
{
teamName: 'SafeD',
memberList: 'Steven Chen, Christopher Wong, Eric Liu, Bradley Day, Grace Chen',
teamImg: safed,
projectDesc: 'Our solution combines infrastructural changes and social awareness campaigns supplemented by an attachable device that enhances visibility for drivers. These combine to create better experiences for drivers while improving pedestrian safety.',
link: 'https://safeducsd.wixsite.com/safed',
link2: '/projects',
},
{
teamName: 'iCbus: Real-time Bus Capacity Forecasting System',
memberList: 'Yuxuan Zhou, Yuanqi Wang, Yujie Wang',
teamImg: icbus,
projectDesc: 'iCBus is a multi-platform bus forecasting system. Based on existing drivers\' control system, it provides drivers a new interface to send out more valuable information, containing bus capacity and wheelchair availability, which will be synchronously transferred to users\' mobile application.',
link: 'https://yuw281.wixsite.com/icbus',
link2: '/projects',
},
],
},
Expand All @@ -100,7 +107,7 @@ function EntriesGroup() {
{TEAMS.map(({ header, boxContent }) => (
<div key={header} className={styles.memberBox}>
<h2 className={styles.theEntries}>{header}</h2>
{boxContent.map(({ teamName, memberList, teamImg, projectDesc, link }) => (
{boxContent.map(({ teamName, memberList, teamImg, projectDesc, link, link2 }) => (
<div
key={teamName}
className={styles.memberInlineWrapper}
Expand All @@ -119,6 +126,9 @@ function EntriesGroup() {
</div>
</div>
</div>
<div>
<a href={link2}><h4>External page for this project</h4></a>
</div>
</div>
))}
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/modules/Jurors/Jurors.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable max-len*/
/* eslint-disable max-len */
import React from 'react';
import PropTypes from 'prop-types';
import Helmet from 'react-helmet';
Expand Down
2 changes: 1 addition & 1 deletion client/modules/ProjectsGroup/Project.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const TEAMS = [
projectLink: 'Link',
projectDesc: 'How can we make bicycles more visible to cars of the future? We think DSRC, the technology behind V2V communication, may be the answer.',
link: '',
}
},
],
},
];
Expand Down
2 changes: 2 additions & 0 deletions client/routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const getPosterTemplates = (nextState, cb) => require.ensure([], require => cb(n
const getJurors = (nextState, cb) => require.ensure([], require => cb(null, require('./modules/Jurors/Jurors').default), 'jurors');
const getEntries = (nextState, cb) => require.ensure([], require => cb(null, require('./modules/Entries/Entries').default), 'entries');
const getPlaceholder = (nextState, cb) => require.ensure([], require => cb(null, require('./modules/Placeholder/Placeholder').default), 'placeholder');
const getProjects = (nextState, cb) => require.ensure([], require => cb(null, require('./modules/ProjectsGroup/Project').default), 'Project');


function onRouteChange(prev, next) {
Expand All @@ -51,5 +52,6 @@ export default (
<Route path="/entries" getComponent={getEntries} />
<Route path="/placeholder" getComponent={getPlaceholder} />
<Route path="/press" getComponent={getPress} />
<Route path="/projects" getComponent={getProjects} />
</Route>
);

0 comments on commit 141101e

Please sign in to comment.