Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Commit 384808c

Browse files
wbpricewbprice
authored
Merge pull request #54 from beetalogist/update-splash-page
Update splash page
2 parents 5626bdc + f329f53 commit 384808c

16 files changed

Lines changed: 162 additions & 28 deletions

File tree

‎api/controllers/ViewController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const Controller = require('trails/controller');
55
module.exports = class ViewController extends Controller {
66

77
splash(request, reply) {
8-
reply.view('environments/Splash');
8+
reply.view('components/environments/Splash');
99
}
1010

1111
stopList(request, reply) {

‎client/images/Hrt_logo2.png‎

2.91 KB
Loading

‎client/images/background.png‎

100 Bytes
Loading

‎client/images/logo-blue.svg‎

Lines changed: 83 additions & 0 deletions
Loading

‎client/images/logo-small.png‎

5.9 KB
Loading

‎client/js/components/ecosystems/Header.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ class Header extends React.Component {
55
render() {
66
return (
77
<header className="app-header">
8-
<Icon source="/dist/images/logo-white.png" height="36" width="36"/>
98
<h1 className="app-header--title">HRTb.us</h1>
109
</header>
1110
)

‎client/js/components/ecosystems/StopFinder.js‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,31 @@ const Component = React.Component;
66
class StopFinder extends Component {
77
render() {
88
return (
9-
<section>
9+
<section id="StopFinder">
10+
<h1>HRTB.us</h1>
11+
<h2>Stop Finder</h2>
12+
<div>
13+
<h3>By Stop Number</h3>
1014
<form method="GET" action="/api/v1/stopId">
11-
<label for="stopId">Stop Number:</label>
15+
<label htmlFor="stopId">Stop Number:</label>
1216
<input id="stopId" name="stopId" type="number" />
13-
<button>Search</button>
17+
<button className="loadMore">Search</button>
1418
</form>
19+
</div>
20+
<div>
21+
<h3>By Street Intersection</h3>
22+
<form method="GET" action="/api/v1/intersections">
23+
<fieldset>
24+
<label htmlFor="intersection1">First Street: </label>
25+
<input id="intersection1" name="intersection1" placeholder="First Street" />
26+
</fieldset>
27+
<fieldset>
28+
<label htmlFor="intersection2">Second Street: </label>
29+
<input id="intersection2" name="intersection2" placeholder="Second Street" />
30+
</fieldset>
31+
<button class="loadMore">Search</button>
32+
</form>
33+
</div>
1534
</section>
1635
)
1736
}

‎client/js/components/environments/Splash.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,20 @@ const React = require('react');
44
const Component = React.Component;
55

66
const Icon = require('./../atoms/Icon');
7+
const Header = require('./../ecosystems/Header');
78
const StopFinder = require('./../ecosystems/StopFinder');
89

910
class Splash extends Component {
1011
render() {
1112
return (
1213
<article className="splash-page">
13-
<Icon source="/dist/images/logo-white.png" height="144" width="144"/>
14-
<StopFinder />
14+
<Header />
15+
<section className="pure-g">
16+
<div className="pure-u-1-1">
17+
<Icon source="/dist/images/logo-blue.svg" height="144" width="144"/>
18+
<StopFinder />
19+
</div>
20+
</section>
1521
</article>
1622

1723
)

‎client/js/components/layout.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ const Component = React.createClass({
1515
<title>HRT Bus Finder</title>
1616
<meta charSet="utf-8"></meta>
1717
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"></meta>
18+
<link rel="stylesheet" href="https://unpkg.com/purecss@0.6.2/build/pure-min.css" integrity="sha384-UQiGfs9ICog+LwheBSRCt1o5cbyKIHbwjWscjemyBMT9YCUMZffs6UqUTd0hObXD" crossorigin="anonymous" />
1819
<link rel="stylesheet" href="/dist/css/style.css" />
19-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/4.1.1/normalize.min.css" />
20+
<link href="https://fonts.googleapis.com/css?family=Arvo" rel="stylesheet" />
2021
</head>
2122

2223
<body>

‎client/js/palette.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
const palette = {
2+
primaryColorDark: '#82A6BA',
3+
primaryColor: '#A7BFCC',
4+
primaryColorLight: '#BBDEFB',
5+
primaryColorText: '#FFFFFF',
6+
primaryTextColor: '#212121',
7+
secondaryTextColor: '#757575',
8+
}
9+
10+
module.exports = palette;

0 commit comments

Comments
 (0)