Skip to content
Open

Team #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
192 commits
Select commit Hold shift + click to select a range
dcf0208
yen-teh liu individual resume
Jan 16, 2016
1a24bd2
yenteh liu homework
Jan 16, 2016
3f4b529
yenteh liu homework
Jan 16, 2016
b472989
resubmit homework 1
Jan 20, 2016
fd95e30
Hackathon_week1
Jan 20, 2016
d3c248a
Hackathon_week1_revise
Jan 20, 2016
e2442c9
Hackathon_week1_revise
Jan 20, 2016
23c2e6f
Hackathon_week1_revise
Jan 20, 2016
40f4a9b
week2_individual
Jan 25, 2016
dcd32e8
week 3 individual
Feb 1, 2016
8e23bb5
fix version of team homework code
Feb 1, 2016
829fe13
Merge remote-tracking branch 'upstream/master'
Feb 1, 2016
e284c6c
react work
Feb 5, 2016
2f15988
individual week 4
Feb 6, 2016
818593e
admin mock
Feb 9, 2016
c8057c0
week 5 individual
Feb 15, 2016
3b9af3a
..
Feb 17, 2016
dede0db
week6 together individual
Feb 21, 2016
a100173
wrrk7 proposal
Feb 24, 2016
9442c0f
week7 proposal
Feb 24, 2016
0cbf372
revise
Feb 24, 2016
10f51f1
Merge pull request #1 from yeli7289/team
Feb 24, 2016
d5b2cc6
build initial react framework
Feb 26, 2016
214c3ec
Merge branch 'team' of github.com:yeli7289/book into team
Feb 26, 2016
de0c4d3
add react js,css and other boring stuff
Feb 26, 2016
6b16865
add beautiful images
Feb 26, 2016
a4a616b
make slides
Feb 26, 2016
562ea07
small change
Feb 26, 2016
bc63e61
map is almost doen
Feb 26, 2016
099e37d
small change layout
Feb 27, 2016
42b4ab3
add ads,forgive me.I really love this ads video:)
Feb 27, 2016
fa03069
add ads
Feb 27, 2016
9f40ac2
add ads.
lantian1989 Feb 27, 2016
51e55cc
week 7 individual
Feb 28, 2016
e86d602
Merge pull request #2 from yeli7289/team
Feb 28, 2016
4a5a48d
week7 individual
Feb 28, 2016
4a487ca
startCanvas
SerendpityZOEY Feb 28, 2016
4c80e30
AddSearch
SerendpityZOEY Feb 28, 2016
1fb3a04
add parallax
SerendpityZOEY Feb 28, 2016
54e532f
add page advertise popular cities
SerendpityZOEY Feb 29, 2016
b7344f0
add to popular
SerendpityZOEY Feb 29, 2016
d08d753
small change
SerendpityZOEY Feb 29, 2016
90c4691
chat room added
Feb 29, 2016
8b984e3
chat room added
Feb 29, 2016
394d460
Merge pull request #3 from yeli7289/team
Feb 29, 2016
531fe7c
..
Feb 27, 2016
9721bae
mute with close ads
Feb 29, 2016
d09b3b8
BDD in class
Mar 1, 2016
337f055
Merge pull request #4 from yeli7289/master
Mar 1, 2016
edfcc15
..
Mar 1, 2016
1464ca8
hackthon
Mar 1, 2016
9e55441
bdd
Mar 1, 2016
04820da
Merge pull request #5 from yeli7289/team
Mar 1, 2016
97abb83
Database Structure
Mar 2, 2016
c20bc88
Merge pull request #6 from yeli7289/master
Mar 2, 2016
e84d089
Firebas Structure
Mar 2, 2016
de44439
Merge pull request #7 from yeli7289/master
Mar 2, 2016
7a3a911
..
Mar 2, 2016
38d1bc7
Merge pull request #9 from yeli7289/team
Mar 2, 2016
8a37899
update
SerendpityZOEY Mar 3, 2016
e4a00ce
update
SerendpityZOEY Mar 3, 2016
472044c
Merge pull request #10 from yeli7289/team
Mar 3, 2016
a4b255d
Tommy Milestone1
Mar 3, 2016
8cc590d
Merge pull request #11 from yeli7289/master
Mar 3, 2016
0606c8c
action1
SerendpityZOEY Mar 3, 2016
1de14d9
action2
SerendpityZOEY Mar 3, 2016
e37a158
Added acitons click on map and post a message
rishabkanwal Mar 3, 2016
4ca914a
Merge pull request #12 from yeli7289/team
rishabkanwal Mar 3, 2016
8fa301a
action2
SerendpityZOEY Mar 3, 2016
81f3549
action2
SerendpityZOEY Mar 3, 2016
b935746
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY Mar 3, 2016
dab152f
Yun edit
Mar 3, 2016
d4aa5f5
Yun edit
Mar 3, 2016
cc16606
action2
SerendpityZOEY Mar 3, 2016
70047be
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY Mar 3, 2016
4fa7d2b
fixconflict
SerendpityZOEY Mar 3, 2016
beaced4
fixconflict
SerendpityZOEY Mar 3, 2016
a4aa091
Merge pull request #13 from yeli7289/master
Mar 3, 2016
9729631
Merge pull request #14 from yeli7289/team
Mar 3, 2016
bf4c669
Team Milstone1
Mar 3, 2016
1d75816
Merge pull request #15 from yeli7289/master
Mar 3, 2016
0653511
modifycanvas
SerendpityZOEY Mar 3, 2016
97ed7ac
modifycanvas
SerendpityZOEY Mar 3, 2016
08cb8c4
modifycanvas
SerendpityZOEY Mar 3, 2016
c80f5fc
week8 team
Mar 5, 2016
e7f967a
week8 Milestone2
Mar 5, 2016
72712d4
week8 Milestone2
Mar 5, 2016
6672f29
Merge pull request #16 from yeli7289/team
Mar 5, 2016
bdd4129
Merge pull request #17 from yeli7289/master
Mar 5, 2016
065d1e5
modifyStatus
SerendpityZOEY Mar 5, 2016
d85ddbb
modifyStatus
SerendpityZOEY Mar 5, 2016
e891753
modifyStatus
SerendpityZOEY Mar 5, 2016
1e301a9
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY Mar 5, 2016
5fc67cc
modifycanvas
SerendpityZOEY Mar 6, 2016
38abc74
startMultipleLayers
SerendpityZOEY Mar 6, 2016
386ab69
update 3
Mar 6, 2016
f4aa59d
simulator
Mar 6, 2016
9f3c8b0
simulator_yun
Mar 6, 2016
fb98692
Delete simulate-users2.js
lantian1989 Mar 6, 2016
b673aa5
canvas
SerendpityZOEY Mar 6, 2016
18324ba
fixconflict
SerendpityZOEY Mar 6, 2016
cfe952d
canvassimulate
SerendpityZOEY Mar 6, 2016
a0dbdc3
1
Mar 6, 2016
a422e8b
chat simulator
Mar 6, 2016
2453e6c
canvassimulate
SerendpityZOEY Mar 6, 2016
45e5ad1
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY Mar 6, 2016
1813928
fffr
Mar 6, 2016
81125e6
addRemove to refresh canvas
SerendpityZOEY Mar 6, 2016
a39d230
333
Mar 6, 2016
aa2b8e4
semi-final
Mar 6, 2016
4e24eb9
week8
Mar 6, 2016
bd43753
week8 except ClickOnMap
Mar 6, 2016
e6b708d
week8
Mar 6, 2016
ee9fa81
week8
Mar 6, 2016
531eab0
week8 re
Mar 6, 2016
5982470
Implemented map click simulation
rishabkanwal Mar 7, 2016
f95e26e
milestone
Mar 7, 2016
b9b594f
week8 milestone
Mar 7, 2016
ec8c1a6
Merge pull request #19 from yeli7289/team
Mar 7, 2016
bcd34bb
Merge pull request #18 from yeli7289/master
Mar 7, 2016
497c7a8
Merge pull request #20 from yeli7289/team
Mar 7, 2016
1a9ec7b
milestone 3
Mar 7, 2016
7696000
week8 milestone 3
Mar 7, 2016
3470ec9
Merge pull request #21 from yeli7289/master
Mar 7, 2016
8537b27
move html files (for react.js form)
Mar 10, 2016
3c86196
add chatroom component
Mar 13, 2016
5905362
startreact
SerendpityZOEY Mar 13, 2016
640cd23
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY Mar 13, 2016
e405b0b
login
SerendpityZOEY Mar 13, 2016
40f509f
stash
Mar 13, 2016
3e954ef
Tommy week9
Mar 13, 2016
129fbbc
change from Yun
Mar 14, 2016
fc2264b
changes
Mar 14, 2016
154bee7
change simulator
Mar 14, 2016
19bfee3
chatrrom bug solved
Mar 14, 2016
ada9d94
Finished Week 9
rishabkanwal Mar 14, 2016
260ff35
Merge pull request #22 from yeli7289/team
rishabkanwal Mar 14, 2016
ef274b0
modify simulate and canvas in html
SerendpityZOEY Mar 14, 2016
fdf3502
fix conflict
SerendpityZOEY Mar 14, 2016
0f86b1e
tommy done
Mar 14, 2016
25389d7
tommy done
Mar 14, 2016
4868c5b
tommy done
Mar 14, 2016
c3c9b57
Merge pull request #23 from yeli7289/team
Mar 14, 2016
4d67435
changeLayout
SerendpityZOEY Mar 14, 2016
91e9f30
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY Mar 14, 2016
98ef08f
modifyLayout
SerendpityZOEY Mar 14, 2016
9dc448d
small changes
SerendpityZOEY Mar 14, 2016
a3cd6de
Merge pull request #24 from yeli7289/team
Mar 14, 2016
1a46ed2
smallchanges
SerendpityZOEY Mar 17, 2016
b6d6156
update
SerendpityZOEY Mar 20, 2016
329f79e
setdiffmap
SerendpityZOEY Mar 20, 2016
04e6052
disablebutton
SerendpityZOEY Mar 20, 2016
e32df4e
Diff Map Initial Done
SerendpityZOEY Mar 21, 2016
e031d21
clean the code
SerendpityZOEY Mar 21, 2016
5f72db5
make button prettier
SerendpityZOEY Mar 21, 2016
5c94e06
Delete test.html
SerendpityZOEY Mar 21, 2016
83b2120
tiny change
SerendpityZOEY Mar 21, 2016
9a414cc
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY Mar 21, 2016
df5cf9b
clean code
SerendpityZOEY Mar 21, 2016
f6737f5
small change
SerendpityZOEY Mar 21, 2016
1bcc42b
small change
SerendpityZOEY Mar 21, 2016
e4f3158
modify
SerendpityZOEY Mar 23, 2016
66da398
week10
Mar 23, 2016
0679995
move canvas to react
SerendpityZOEY Mar 23, 2016
df925ee
fixconflict
SerendpityZOEY Mar 23, 2016
2d55f9c
chatroom need to be debugged
Mar 23, 2016
2cfd390
1
Mar 23, 2016
670136b
chatroom basic
Mar 24, 2016
f1ed5c3
..
Mar 24, 2016
bc1ac02
chatroom intermediate
Mar 24, 2016
62988d3
almost done version
Mar 25, 2016
b25dc26
almost done version
Mar 25, 2016
a7567bd
changelayout
SerendpityZOEY Mar 25, 2016
2681c41
add canvas to diff group
SerendpityZOEY Mar 26, 2016
d67c648
Delete popular.html
SerendpityZOEY Mar 26, 2016
5813d9e
Delete googlemaps.js
SerendpityZOEY Mar 26, 2016
9eaea1b
Merge remote-tracking branch 'origin' into team
SerendpityZOEY Mar 26, 2016
fcf34a8
modify action
SerendpityZOEY Mar 26, 2016
50bb861
Merge branch 'team' of https://github.com/yeli7289/book into team
SerendpityZOEY Mar 26, 2016
2d062a8
move to action
SerendpityZOEY Mar 26, 2016
54c4aea
move to action
SerendpityZOEY Mar 26, 2016
7f5cd8c
canvas done
SerendpityZOEY Mar 26, 2016
a352c6e
merge
Mar 26, 2016
2ecc1b3
Merge branch 'team' of github.com:yeli7289/book into team
Mar 26, 2016
a944699
Delete chat.html
lantian1989 Mar 29, 2016
f9aed5b
change the ugly layout
Mar 29, 2016
2840cc7
Merge branch 'team' of github.com:yeli7289/book into team
Mar 29, 2016
a1c7673
fix a lot of bugs
Mar 29, 2016
a76427a
format
Apr 3, 2016
044d859
format and btn
Apr 3, 2016
25093cb
format
Apr 3, 2016
a96c42c
bugs
Apr 3, 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
3 changes: 2 additions & 1 deletion build.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ metalsmith(__dirname)
.use(markdown({
smartypants: true,
gfm: true,
tables: true
tables: true,
langPrefix: ''
}))
.use(layouts({
engine: 'handlebars',
Expand Down
195 changes: 195 additions & 0 deletions build/apps/garages_map.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
<!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="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/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>

<style>
html {
font-family: GillSans, Calibri, Trebuchet, sans-serif;
background: url(images/sf2.jpg) no-repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}
</style>

<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="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js"></script>
<script src="/js/leaflet.label.js"></script>

<nav class="transparent">
<div class="nav-wrapper">
<ul class="left">
<li><a href="/" class="black-text">Home</a></li>
</ul>
<a href="/apps/parking/index.html" class="brand-logo center black-text">
<img class="responsive-img" id="logo" src="images/asia.png" alt="Team Asia logo." style="max-height: 55px; position: relative; transform: translateY(10%);"/>
</a>
<ul class="right">
<li><a href="garages.html" class="black-text"><i class="large material-icons">list</i></a></li>
<li class="active"><a href="garages_map.html" class="black-text"><i class="large material-icons">location_on</i></a></li>
</ul>
</div>
</nav>

<div class="container">
<h1> </h1>
<div id="map" style="height:500px"></div>

</div>

<footer class="transparent page-footer">
<div class="footer-copyright">
<div class="container black-text">
Caleb Hsu, Bader AlShumimiry, Yen-Teh Liu, Varshini Jagannath, Kavya Ravikumar
<a class="right" href="https://github.com/calebhsu/book-1">GitHub</a>
</div>
</div>
</footer>

<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').on('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)
})
//read data from our customer firebase
var ref_people = new Firebase('https://sfparking-teamasia.firebaseio.com');
ref_people.on('value',function(snapshot){
people = snapshot.val()
drawPeople(people)
})


var attributionText = 'Map data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors, <a href="https://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: 'varshinij.p0gd1h1f',
accessToken: 'pk.eyJ1IjoidmFyc2hpbmlqIiwiYSI6ImNpanhwemV2ajE3bTZ2cW01MDBodDN3MHkifQ.dW1sUpYJi8JBiVYmT7FlFw'
}).addTo(map)

// create a layer group to hold all the markers
var garagesLayerGroup = L.layerGroup()
var peopleLayerGroup = L.layerGroup()
// add the makers layer group to the map
garagesLayerGroup.addTo(map)
peopleLayerGroup.addTo(map)
// visualize people on the map
function drawPeople(people){
peopleLayerGroup.clearLayers()
_.forEach(people, function(person){
var myPeople = L.icon({
iconUrl: 'images/person.png',
iconSize: [40, 40],
// iconAnchor: [22, 94],
});
var latlng = [person.lat, person.lon]
var marker = L.marker(latlng,{icon: myPeople}).addTo(map);
marker.bindLabel(person.name)
peopleLayerGroup.addLayer(marker)

})

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

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

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

var label = '<b>' + garage.friendlyName + '</b>';
var d = new Date();
var currHour = parseInt(d.getHours());

_.forEach(garage.rates, function(rate){
var begTime = parseInt(rate.BEG);
var endTime = parseInt(rate.END);

if(typeof(rate.BEG)!="undefined") {
var amPMBeg = rate.BEG.split(" ");
if(amPMBeg[1] == "AM") {
if(parseInt(amPMBeg[0]) == 12){
begTime = 0;
}
}
else {
if(parseInt(amPMBeg[0]) < 12) {
begTime = parseInt(amPMBeg[0]) + 12
}
}
}

if(typeof(rate.END)!="undefined") {
var amPMEnd = rate.END.split(" ");
if(amPMEnd[1] == "AM") {
if(parseInt(amPMEnd[0]) == 12){
endTime = 24;
}
}
else {
if(parseInt(amPMEnd[0]) < 12) {
endTime = parseInt(amPMEnd[0]) + 12
}
}
}

if ( (parseInt(begTime) <= parseInt(currHour)) && ( parseInt(currHour) < parseInt(endTime)) ) {
label += '<br><b>Opens</b>: ' + rate.BEG + '<br><b>Closes</b>: ' + rate.END + '<br>' + '<i>Rate: $' + rate.RATE + ' ' + rate.RQ.toLowerCase() + '</i>'
}
})

var myIcon = L.icon({
iconUrl: 'images/marker.png',

iconSize: [40, 40],
iconAnchor: [22, 94],
popupAnchor: [-3, -76],

});

var marker = L.marker(latlng,{icon: myIcon}).addTo(map);
marker.bindPopup(label);

garagesLayerGroup.addLayer(marker)

})

}

</script>
</body>
</html>
Loading