Azusa Kawakami / CSE 170 Group Project

Commit 07e7dee0157324d72956ce2929bcdcd75404480d

Authored by Paul Wallace 2016-10-27 18:48:01 -0700

Exists in master

Update the website to show the different buttons for walking, driving and bussing

Showing 5 changed files with 179 additions and 16 deletions Side-by-side Diff

public/images/bus.svg
public/images/car-compact.svg
public/images/pedestrian-walking.svg
public/stylesheets/main.css
views/pages/index.ejs

	1	+<?xml version="1.0" encoding="iso-8859-1"?>
	2	+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
	3	+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
	4	+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	5	+ width="76.334px" height="76.334px" viewBox="0 0 76.334 76.334" style="enable-background:new 0 0 76.334 76.334;"
	6	+ xml:space="preserve">
	7	+<g>
	8	+ <path d="M2.386,21.467h2.386v14.312H2.386C1.067,35.779,0,34.717,0,33.394v-9.542C0,22.54,1.067,21.467,2.386,21.467z
	9	+ M73.948,21.467h-2.388v14.312h2.388c1.317,0,2.386-1.062,2.386-2.385v-9.542C76.334,22.54,75.268,21.467,73.948,21.467z
	10	+ M66.792,16.698v42.937c0,2.638-2.133,4.771-4.771,4.771v4.771c0,2.639-2.133,4.771-4.771,4.771h-4.772
	11	+ c-2.637,0-4.771-2.137-4.771-4.771v-4.771H28.626v4.771c0,2.639-2.134,4.771-4.771,4.771h-4.769c-2.638,0-4.771-2.137-4.771-4.771
	12	+ v-4.771c-2.637,0-4.771-2.137-4.771-4.771V16.698C9.542,8.796,15.954,2.386,23.855,2.386H52.48
	13	+ C60.382,2.386,66.792,8.794,66.792,16.698z M28.626,11.928h19.083V7.157H28.626V11.928z M23.855,54.866
	14	+ c0-2.641-2.134-4.771-4.769-4.771c-2.637,0-4.771,2.133-4.771,4.771c0,2.635,2.134,4.771,4.771,4.771
	15	+ C21.72,59.636,23.855,57.499,23.855,54.866z M62.021,54.866c0-2.641-2.133-4.771-4.771-4.771s-4.771,2.133-4.771,4.771
	16	+ c0,2.635,2.136,4.771,4.771,4.771C59.889,59.636,62.021,57.499,62.021,54.866z M62.021,16.698H14.313v28.625h47.708V16.698
	17	+ L62.021,16.698z"/>
	18	+</g>
	19	+<g>
	20	+</g>
	21	+<g>
	22	+</g>
	23	+<g>
	24	+</g>
	25	+<g>
	26	+</g>
	27	+<g>
	28	+</g>
	29	+<g>
	30	+</g>
	31	+<g>
	32	+</g>
	33	+<g>
	34	+</g>
	35	+<g>
	36	+</g>
	37	+<g>
	38	+</g>
	39	+<g>
	40	+</g>
	41	+<g>
	42	+</g>
	43	+<g>
	44	+</g>
	45	+<g>
	46	+</g>
	47	+<g>
	48	+</g>
	49	+</svg>

	1	+<?xml version="1.0" encoding="iso-8859-1"?>
	2	+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
	3	+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
	4	+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	5	+ width="447.645px" height="447.645px" viewBox="0 0 447.645 447.645" style="enable-background:new 0 0 447.645 447.645;"
	6	+ xml:space="preserve">
	7	+<g>
	8	+ <path d="M447.639,244.402c0-8.805-1.988-17.215-5.578-24.909c-0.37-1.956-0.793-3.909-1.322-5.89l-38.884-96.365l-0.263-0.867
	9	+ c-13.605-40.509-32.963-78.001-82.049-78.001H131.868c-50.296,0-68.069,38.421-81.972,77.776l-40.673,96.6
	10	+ C3.343,222.167,0,232.944,0,244.402v29.986c0,4.636,0.548,9.171,1.59,13.539C0.577,290.566,0,293.41,0,296.408v89.185
	11	+ c0,13.078,10.602,23.682,23.68,23.682h49.14c13.071,0,23.673-10.604,23.673-23.682v-44.599h257.46v44.599
	12	+ c0,13.078,10.604,23.682,23.683,23.682h46.326c13.083,0,23.683-10.604,23.683-23.682v-89.195c0-2.987-0.583-5.844-1.588-8.474
	13	+ c1.038-4.375,1.588-8.905,1.588-13.54v-29.981H447.639z M78.754,125.821c15.483-43.683,27.934-57.018,53.114-57.018h187.664
	14	+ c24.995,0,38.913,14.873,53.056,56.83l28.375,57.502c-9.265-3.431-19.461-5.335-30.173-5.335H76.849
	15	+ c-9.645,0-18.862,1.551-27.366,4.358L78.754,125.821z M103.129,285.776H51.281c-9.335,0-16.906-7.578-16.906-16.912
	16	+ c0-9.337,7.571-16.91,16.906-16.91h51.848c9.339,0,16.91,7.573,16.91,16.91C120.039,278.198,112.463,285.776,103.129,285.776z
	17	+ M286.284,282.389h-120.6c-5.913,0-10.704-4.794-10.704-10.704c0-5.921,4.791-10.713,10.704-10.713h120.6
	18	+ c5.92,0,10.71,4.792,10.71,10.713C296.994,277.595,292.204,282.389,286.284,282.389z M395.051,285.776h-51.846
	19	+ c-9.343,0-16.91-7.578-16.91-16.912c0-9.337,7.573-16.91,16.91-16.91h51.846c9.343,0,16.916,7.573,16.916,16.91
	20	+ C411.967,278.198,404.394,285.776,395.051,285.776z"/>
	21	+</g>
	22	+<g>
	23	+</g>
	24	+<g>
	25	+</g>
	26	+<g>
	27	+</g>
	28	+<g>
	29	+</g>
	30	+<g>
	31	+</g>
	32	+<g>
	33	+</g>
	34	+<g>
	35	+</g>
	36	+<g>
	37	+</g>
	38	+<g>
	39	+</g>
	40	+<g>
	41	+</g>
	42	+<g>
	43	+</g>
	44	+<g>
	45	+</g>
	46	+<g>
	47	+</g>
	48	+<g>
	49	+</g>
	50	+<g>
	51	+</g>
	52	+</svg>

	1	+<?xml version="1.0" encoding="iso-8859-1"?>
	2	+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
	3	+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	4	+ viewBox="0 0 470.642 470.642" style="enable-background:new 0 0 470.642 470.642;" xml:space="preserve">
	5	+<g>
	6	+ <g>
	7	+ <path style="fill:#010002;" d="M223.821,76.022c10.333-0.333,19-4.333,26-12s10.333-16.667,10-27
	8	+ c-0.333-10.335-4.167-19.168-11.5-26.5c-7.333-7.333-16.167-10.833-26.5-10.5s-19,4.333-26,12s-10.5,16.667-10.5,27
	9	+ s3.833,19.167,11.5,26.5S213.488,76.355,223.821,76.022z"/>
	10	+ <path style="fill:#010002;" d="M350.321,202.522l-55-30l-45-72c-8.667-10.667-19.333-16-32-16c-8.667,0-17,3.667-25,11l-68,69
	11	+ c-2,2.667-3.333,5.667-4,9l-9,77v2c0,4.666,1.667,8.666,5,12c3.333,3.332,7.333,5,12,5s8.5-1.668,11.5-5c3-3.334,4.833-7,5.5-11
	12	+ l7-66l24-24l-22,184l-39,87.001c-1.333,4-2,7.658-2,11.002c0,7.322,2.5,13.5,7.5,18.5s11.167,7.164,18.5,6.5
	13	+ c10,0,17.333-4.678,22-14l42-94.002c0-0.67,0.333-1.835,1-3.5c0.668-1.67,1.335-3.17,2-4.5c0.667-1.335,1-2.67,1-4l5-45.001
	14	+ l43,148.003c4.667,12,13,17.666,25,17c6.667,0,12.5-2.5,17.5-7.5s7.5-11.178,7.5-18.5c0-0.678-0.167-1.5-0.5-2.5
	15	+ s-0.5-1.836-0.5-2.502l-60-205.001l7-67l17,27c1.333,2,3,3.667,5,5l59,33c4,1.333,6.667,2,8,2c4.667,0,8.667-1.833,12-5.5
	16	+ c3.333-3.668,5-7.834,5-12.5C358.321,210.522,355.654,205.855,350.321,202.522z"/>
	17	+ </g>
	18	+</g>
	19	+<g>
	20	+</g>
	21	+<g>
	22	+</g>
	23	+<g>
	24	+</g>
	25	+<g>
	26	+</g>
	27	+<g>
	28	+</g>
	29	+<g>
	30	+</g>
	31	+<g>
	32	+</g>
	33	+<g>
	34	+</g>
	35	+<g>
	36	+</g>
	37	+<g>
	38	+</g>
	39	+<g>
	40	+</g>
	41	+<g>
	42	+</g>
	43	+<g>
	44	+</g>
	45	+<g>
	46	+</g>
	47	+<g>
	48	+</g>
	49	+</svg>

...	...	@@ -22,4 +22,14 @@
22	22	margin-top: 30px;
23	23	margin-bottom: 30px;
24	24	}
	25	+
	26	+.center-this {
	27	+ margin: 0 auto;
	28	+ width: 100%;
	29	+}
	30	+
	31	+.btn-space{
	32	+ margin-top: 10px;
	33	+ width: 50%;
	34	+}

1	1	<!DOCTYPE html>
2	2	<html lang="en">
3	3	<head>
4		- <% include ../partials/header %>
	4	+ <!-- <% include ../partials/header %> -->
5	5	</head>
6	6
7	7
8	8	<body>
9		-<!-- <nav class="fixed-nav-bar group nav-collapse">
10		- <ul class="group">
11		- <li><a href="Files/PaulWallaceResume.6.1.1.pdf" class="resume-link" target="_blank">Resume</a></li>
12		- </ul>
13		- <a href="#" id="pull" ontouchend="this.onclick=fix">Menu</a>
14		- </nav> -->
15		-
16		- <!--asdifhasdfasdfapsdbfasdfa-->
17		-
18		-
19		-
20	9	<div class="container-fluid">
21		-
22		-
23	10	<div class="jumbotron text-center">
24	11	<h1>Safe Routes</h1>
25	12	<p>The best way to find the safest routes.</p>
...	...	@@ -27,7 +14,7 @@
27	14
28	15	<!--What are for and type for?-->
29	16
30		- <form class="text-center" action="/landing">
	17	+ <form action="/landing">
31	18	<div class="form-group text-center">
32	19	<label for="currentLocation">From</label>
33	20	<input type="currentLocation" class="form-control" placeholder="Enter Current Location">
...	...	@@ -37,7 +24,23 @@
37	24	<label for="destination">To</label>
38	25	<input type="destination" class="form-control" placeholder="Enter Destination">
39	26	</div>
40		- <button type="submit" class="btn btn-primary">Go</button>
	27	+
	28	+ <div class="row">
	29	+ <button type="button" class="btn-default col-xs-4">
	30	+ <img class="img-responsive" src="images/pedestrian-walking.svg" alt="Walking Option" width="40" height="40">
	31	+ </button>
	32	+ <button type="button" class="btn-default col-xs-4">
	33	+ <img class="img-responsive" src="images/car-compact.svg" alt="Walking Option" width="40" height="40">
	34	+ </button>
	35	+ <button type="button" class="btn-default col-xs-4" onclick="javascript:autofill();">
	36	+ <img class="img-responsive" src="images/bus.svg" alt="Walking Option" width="40" height="40">
	37	+ </button>
	38	+ </div>
	39	+ <div class="text-center">
	40	+ <button type="submit" class="btn btn-primary btn-space">Go</button>
	41	+
	42	+ </div>
	43	+
41	44	</form>
42	45
43	46	</div>