Skip to content

Feature/routing #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 2, 2018
Merged

Feature/routing #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20bafec
React Router implemented
dolojimz Jul 2, 2018
5c49965
Cleaned up code and small styling
dolojimz Jul 2, 2018
9b8755b
Small about us change
dolojimz Jul 2, 2018
ee86ad3
Small style change
dolojimz Jul 2, 2018
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
69 changes: 69 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"react": "^16.4.0",
"react-dom": "^16.4.0",
"react-google-maps": "^9.4.5",
"react-router-dom": "^4.3.1",
"react-scripts": "1.1.4",
"react-time": "^4.3.0",
"request": "^2.87.0",
Expand Down
7 changes: 7 additions & 0 deletions src/components/AboutUs/AboutUs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
div.aboutUs{
height: 100vh;
}

div.aboutUs p{
text-align: center;
}
24 changes: 24 additions & 0 deletions src/components/AboutUs/AboutUs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React, { Component } from 'react';
import Header from './../Header/Header.js';
import Footer from './../Footer/Footer.js';

import './AboutUs.css'

export default class AboutUs extends Component {
render(){
return (
<html class="aboutUs-bg">
<div className='aboutUs'>
<Header/>
<div class="ui sizer vertical segment">
<h3 class="ui center aligned header">
<div class="ui huge header">About</div>
</h3>
<p>STSI LearningLab is a web application developed by two interns at STSI, Jimmy Flores and Emmett Dorlester, with the mentorship of STSI Employees Kevin Melendez and Ben Morris. The idea of LearningLab is to create a set of web applications to run on a Raspberry Pi, web applications consisting of a Weather App, a Traffic App, and more.</p>
</div>
<Footer />
</div>
</html>
);
}
}
62 changes: 14 additions & 48 deletions src/components/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,26 @@
import React, { Component } from 'react';
import Header from './Header/Header.js';
import Footer from './Footer/Footer.js';
import WeatherData from './WeatherCard/WeatherData.js';
import TrafficCard from './TrafficCard/TrafficCard.js';
import CardContainer from './CardContainer/CardContainer.js';
import home from './home.js';
import AboutUs from './AboutUs/AboutUs.js';
import TrafficCardArchive from './CardArchive/TrafficCardArchive.js';
import WeatherCardArchive from './CardArchive/WeatherCardArchive.js';
import {
BrowserRouter as Router,
Route
} from 'react-router-dom'

import './App.css';

export default class App extends Component {
constructor(props){
super(props);
this.state = {
fixedCard: null
};
}

render(){
let cards = [
<WeatherData
type='weather'
zipcode='22209'
key='Weather Card'
menuLabel='Weather Card'
/>,
<TrafficCard
zoom={12}
lat={38.9}
lng={-77.08}
location='Arlington, VA'
description='Current traffic in STSI area'
key='Traffic Card'
menuLabel='Traffic Card'
/>
];
let cardToDropdown = (card, index) => ({
label: card.props.menuLabel,
index: index
});
return (
<Router>
<div className='App'>
<Header
cardEntries={cards.map(cardToDropdown)}
onChange={(index) => {this.setState({fixedCard: index})}}
/>
<div className='ui centered cards'>
<div className='ui relaxed grid'>
<div className='row' />
<CardContainer
cardDuration={10000}
fadeTime={1000}
fixedCard={this.state.fixedCard}
>{cards}</CardContainer>
</div>
</div>
<Footer />
<Route path="/" exact component={home}/>
<Route path="/aboutUs" component={AboutUs}/>
<Route path="/WeatherCard" component={WeatherCardArchive}/>
<Route path="/TrafficCard" component={TrafficCardArchive}/>
</div>
</Router>
);
}
}
32 changes: 32 additions & 0 deletions src/components/CardArchive/TrafficCardArchive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import React, { Component } from 'react';
import Header from './../Header/Header.js';
import Footer from './../Footer/Footer.js';
import TrafficCard from './../TrafficCard/TrafficCard.js';

import './../App.css';


export default class TrafficCardArchive extends Component {
render(){
return (
<div className='TrafficCardArchive'>
<Header/>
<div className='ui centered cards'>
<div className='ui relaxed grid'>
<div className='row' />
<TrafficCard
zoom={12}
lat={38.9}
lng={-77.08}
location='Arlington, VA'
description='Current traffic in STSI area'
key='Traffic Card'
menuLabel='Traffic Card'
/>
</div>
</div>
<Footer />
</div>
);
}
}
29 changes: 29 additions & 0 deletions src/components/CardArchive/WeatherCardArchive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import React, { Component } from 'react';
import Header from './../Header/Header.js';
import Footer from './../Footer/Footer.js';
import WeatherData from './../WeatherCard/WeatherData.js';

import './../App.css';


export default class WeatherCardArchive extends Component {
render(){
return (
<div className='WeatherCardArchive'>
<Header/>
<div className='ui centered cards'>
<div className='ui relaxed grid'>
<div className='row' />
<WeatherData
type='weather'
zipcode='22209'
key='Weather Card'
menuLabel='Weather Card'
/>
</div>
</div>
<Footer />
</div>
);
}
}
5 changes: 0 additions & 5 deletions src/components/Header/Header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,3 @@ div.ui.item.dropdown:hover {
background-color: #f25253 !important;
color: white !important;
}

.ui.menu .ui.dropdown .menu>.item:hover {
background-color: #FFF !important;
color: #f25253 !important;
}
39 changes: 15 additions & 24 deletions src/components/Header/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,40 @@ import { Menu, Dropdown } from 'semantic-ui-react'

import './Header.css';


export default class Header extends Component {
constructor(props){
super(props);
this.state = {
activeItem: null
};
this.handleItemClick = this.handleItemClick.bind(this);
}

handleItemClick(event, {name}){
this.setState({
activeItem: name
});
}

render(){
let makeDropdownItem = (entry) => (
<Dropdown.Item onClick={() => this.props.onChange(entry.index)} key={entry.label}>
{entry.label}
</Dropdown.Item>
);
return (
<Menu>
<Menu.Item onClick={() => {this.props.onChange(null)}}>
<img
src='https://stsiinc.com/wp-content/uploads/2016/03/STSI_white_500x162.png'
alt='STSI'
style={{width:'100px', height:'33px'}}
/>
<Menu.Item onClick={() => {}}>
<a href = '/'>
<img
src='https://stsiinc.com/wp-content/uploads/2016/03/STSI_white_500x162.png'
alt='STSI'
style={{width:'100px', height:'33px'}}
/>
</a>
</Menu.Item>
<Menu.Menu position='right'>
<Dropdown item text='Card Archives'>
<Dropdown.Menu>
{this.props.cardEntries.map(makeDropdownItem)}
<Dropdown.Item>
<a href = '/WeatherCard'> Weather Card </a>
</Dropdown.Item>
<Dropdown.Item>
<a href = '/TrafficCard'> Traffic Card </a>
</Dropdown.Item>
</Dropdown.Menu>
</Dropdown>
<Menu.Item
name='aboutUs'
active={this.state.activeItem === 'aboutUs'}
href='/aboutUs/'
onClick={this.handleItemClick}
/>
/>
</Menu.Menu>
</Menu>
);
Expand Down
Loading