Skip to content
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.

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

Yen #7

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
30275eb
Changed config, have to add more json manually
FredLoh Jan 12, 2016
74c19e0
Added pretty css
FredLoh Jan 12, 2016
eb4293a
Added code up to date
FredLoh Jan 12, 2016
726d508
Began working on resume
FredLoh Jan 12, 2016
ce0acc0
Added dynamic elements from firebase, 3 new tags
FredLoh Jan 14, 2016
992d64d
Minor changes to list
FredLoh Jan 14, 2016
6bca4d8
For daniel to get access
FredLoh Jan 15, 2016
6334bd5
Finished resume
FredLoh Jan 17, 2016
2f93ce9
Merge remote-tracking branch 'upstream/master
FredLoh Jan 19, 2016
c420184
Added three different indexes, changed JSON structure to firebase, de…
FredLoh Jan 19, 2016
1ed235b
All pages now refresh automatically
FredLoh Jan 19, 2016
0307d84
Implemented changes by @DanielMaxson
FredLoh Jan 20, 2016
4d42e84
Added skeleton code for button press, added button
FredLoh Jan 22, 2016
11d6cf6
Form now submits to DB correctly, have to change all pages code to co…
FredLoh Jan 22, 2016
21f0c52
Added Rishab's changes, fixed button bug. Implemented same styling ac…
FredLoh Jan 23, 2016
0a7a57f
Final commit for ToDO, forgot to do this on Friday
FredLoh Jan 23, 2016
8951860
Forgot to change index
FredLoh Jan 23, 2016
ca29f0e
Implemented Week 2 changes for resume
FredLoh Jan 24, 2016
d58f1bb
Merge remote-tracking branch 'upstream/master'
FredLoh Jan 25, 2016
09d01b5
Added changes pushed to branch
FredLoh Jan 26, 2016
e611c80
Merge remote-tracking branch 'upstream/master'
FredLoh Feb 2, 2016
ea3f22d
Week 3
FredLoh Jan 31, 2016
54801a9
React of resume
FredLoh Feb 5, 2016
975bcfd
Merge remote-tracking branch 'upstream/master'
FredLoh Feb 8, 2016
370306b
Pushing week 5
FredLoh Feb 9, 2016
0bf1ee7
Merge remote-tracking branch 'upstream/master'
FredLoh Feb 9, 2016
cf5f217
Ahmed+Rishab client mockup
AHAAAAAAA Feb 9, 2016
2be63af
Merge pull request #1 from FredLoh/client
FredLoh Feb 9, 2016
67f60f5
Rishab+Ahmed Finished week 5 client mockup
rishabkanwal Feb 9, 2016
e885ae4
Merge branch 'master' of github.com:FredLoh/book
FredLoh Feb 9, 2016
af62057
Added Yen's work
FredLoh Feb 9, 2016
65690d9
Merge pull request #2 from FredLoh/client
rishabkanwal Feb 9, 2016
1e19b63
Mockup Admin
Feb 9, 2016
13f84e1
Merge pull request #3 from FredLoh/yen
FredLoh Feb 9, 2016
5a9a651
Actually finished week 5 hackathon
rishabkanwal Feb 9, 2016
b2d6407
Merge pull request #4 from FredLoh/client
rishabkanwal Feb 9, 2016
6342c3c
Finished team
rishabkanwal Feb 12, 2016
4bf5f8e
Updated index for mockup
rishabkanwal Feb 12, 2016
2df735c
Workers now work
rishabkanwal Feb 12, 2016
c3e71d4
Merge pull request #5 from FredLoh/client
rishabkanwal Feb 12, 2016
d776e70
Changed worker location to boulder
rishabkanwal Feb 12, 2016
90d3ef8
admin page
Feb 12, 2016
ca5e0bb
Merge pull request #6 from FredLoh/yen
yeli7289 Feb 12, 2016
d1d1a24
ready to submit main and admin page
Feb 12, 2016
88f9286
Merge pull request #7 from FredLoh/yen
yeli7289 Feb 12, 2016
dc89da8
Changed worker location to boulder
rishabkanwal Feb 12, 2016
cbc4602
Cleaned up admin and index for Uber
rishabkanwal Feb 13, 2016
09501d4
Merge branch 'client' of https://github.com/FredLoh/book into client1
rishabkanwal Feb 13, 2016
c1dc1ba
Merge pull request #8 from FredLoh/admin
rishabkanwal Feb 13, 2016
77decef
Merge pull request #9 from FredLoh/client
rishabkanwal Feb 13, 2016
f3fca4a
Finished week 5
rishabkanwal Feb 13, 2016
006fdaa
Merge pull request #10 from FredLoh/client
rishabkanwal Feb 13, 2016
c915675
Updated worker dependencies
rishabkanwal Feb 13, 2016
0ac0504
..
Feb 13, 2016
a6fdce1
Merge pull request #11 from FredLoh/client
rishabkanwal Feb 14, 2016
330d964
..
Feb 17, 2016
2a09e57
..
Feb 17, 2016
ced80eb
Merge pull request #12 from FredLoh/yen
FredLoh Feb 17, 2016
7ec480b
driver and restaurant view
Feb 17, 2016
302de46
driver and restaurant view
Feb 17, 2016
e1e20e4
Merge pull request #13 from FredLoh/yen
yeli7289 Feb 17, 2016
d188ed4
update the click function of client and restaurant site
Feb 18, 2016
4553dd1
Merge pull request #14 from FredLoh/yen
yeli7289 Feb 18, 2016
ede4a2a
make index landing page more ok
AHAAAAAAA Feb 19, 2016
b14cd69
Update index.html
Boraz Feb 19, 2016
9bd2f23
Update index.html
Boraz Feb 19, 2016
b4b2012
Merge pull request #15 from FredLoh/Boraz-nav-working
Boraz Feb 19, 2016
2fc670f
Update index.html
Boraz Feb 19, 2016
be52690
Update index.html
Boraz Feb 19, 2016
e442eed
Added files via upload
Boraz Feb 19, 2016
0201dfe
Merge pull request #16 from FredLoh/Boraz-orders-button-after-login
Boraz Feb 19, 2016
7bd8e1f
Adding Orders.html page
Feb 20, 2016
0286e67
orders page fix by yen
Feb 21, 2016
2b2f46b
Merge pull request #17 from FredLoh/yen
yeli7289 Feb 21, 2016
4a21955
Merge remote-tracking branch 'upstream/master'
rishabkanwal Feb 21, 2016
d14e221
Merge pull request #18 from FredLoh/Week6
rishabkanwal Feb 21, 2016
588c86f
Updated plan and execution
rishabkanwal Feb 21, 2016
081dc24
Merge pull request #19 from FredLoh/Week6
rishabkanwal Feb 21, 2016
6d798b0
Added differences from original plan
rishabkanwal Feb 21, 2016
3f8e8f3
Merge pull request #20 from FredLoh/Week6
rishabkanwal Feb 21, 2016
01653f9
Make index page legible
AHAAAAAAA Feb 22, 2016
4888eac
background
Feb 22, 2016
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
1 change: 1 addition & 0 deletions build.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var branch = require('metalsmith-branch')
var rename = require('metalsmith-rename')
var inplace = require('metalsmith-in-place')
var _ = require('lodash')
var _ = require('chance')

metalsmith(__dirname)
.use(branch('**/*.md')
Expand Down
56 changes: 56 additions & 0 deletions build/apps/parking/garages.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<!DOCTYPE html>
<html>
<head>
<!--Import Google Icon Font-->
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!--Import materialize.css-->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/css/materialize.min.css">

<!--Let browser know website is optimized for mobile-->
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
</head>

<body>
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/js/materialize.min.js"></script>
<script src="https://cdn.firebase.com/js/client/2.3.2/firebase.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.0.0/lodash.min.js"></script>

<div class="container">

<h1>Garages</h1>
<ul class="collection" id="garages">
</ul>

</div>

<script>

// create a firebase reference to the root
var ref = new Firebase('https://publicdata-parking.firebaseio.com');

var data

// read data from the location san_francisco/garages, only once
ref.child('san_francisco/garages').once('value', function(snapshot){
data = snapshot.val()
console.log('data is loaded', data)

// filter the data
var garages = _.filter(data, function(d){
// keep only those values (d) that has "open_spaces" as a field
return _.has(d, 'open_spaces')
})

displayGarages(garages)
})

function displayGarages(garages){
// lodash _.forEach https://lodash.com/docs#forEach
_.forEach(garages, function(val, key){
$('#garages').append('<li class="collection-item">' + val['friendlyName'] + '</li>')
})
}
</script>
</body>
</html>
93 changes: 93 additions & 0 deletions build/apps/parking/garages_map.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<!DOCTYPE html>
<html>
<head>
<!--Import Google Icon Font-->
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!--Import materialize.css-->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/css/materialize.min.css">

<!--Import stylesheet for Leaflet to work-->
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.5/leaflet.css" />
<link rel="stylesheet" href="/css/leaflet.label.css" />

<!--Let browser know website is optimized for mobile-->
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
</head>

<body>
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/js/materialize.min.js"></script>
<script src="https://cdn.firebase.com/js/client/2.3.2/firebase.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.0.0/lodash.min.js"></script>
<script src="http://cdn.leafletjs.com/leaflet-0.7.5/leaflet.js"></script>
<script src="/js/leaflet.label.js"></script>

<div class="container">

<h1>Garages Map</h1>
<div id="map" style="height:500px"></div>

</div>

<script>

// create a firebase reference to the root
var ref = new Firebase('https://publicdata-parking.firebaseio.com');

var data

// read data from the location san_francisco/garages, only once
ref.child('san_francisco/garages').once('value', function(snapshot){
data = snapshot.val()
console.log('data is loaded', data)

var garages = _.filter(data, function(d){
return _.has(d, 'open_spaces')
})

drawGarages(garages)
})

var attributionText = 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>'

// create the map
var map = L.map($('#map')[0]).setView([37.78, -122.41], 13)
L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}', {
attribution: attributionText,
maxZoom: 18,
id: 'doubleshow.noeko77m',
accessToken: 'pk.eyJ1IjoiZG91Ymxlc2hvdyIsImEiOiJjaWZ5Y3B1eTE1MHRidWRtMG9uZXluajg4In0.u5ONW27Ly5cU7M5KYi6Y9Q'
}).addTo(map)

// create a layer group to hold all the markers
var markersLayerGroup = L.layerGroup()
// add the makers layer group to the map
markersLayerGroup.addTo(map)

// visualize garages on a map
function drawGarages(garages){

// clear all existing markers (if any)
markersLayerGroup.clearLayers()

_.forEach(garages, function(garage){
var points = garage.points
var latlng = [points[0], points[1]]

// create a circle layer
var circle = L.circle(latlng, 10, {
color: 'red',
fillColor: '#f03',
fillOpacity: 0.5
}).bindLabel('Label (Change Me)')

// add the circle layer to the makers layer group
markersLayerGroup.addLayer(circle)

})

}

</script>
</body>
</html>
1 change: 1 addition & 0 deletions build/apps/parking/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TODO:
12 changes: 12 additions & 0 deletions build/apps/parking/react/lib/react-dom.min.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* ReactDOM v0.14.7
*
* Copyright 2013-2015, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
*/
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e(require("react"));else if("function"==typeof define&&define.amd)define(["react"],e);else{var f;f="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,f.ReactDOM=e(f.React)}}(function(e){return e.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED});
Loading