From e9837fefdfe5b30dda1061f1a76a34445a4d90d7 Mon Sep 17 00:00:00 2001
From: Andrew Tu <drewtu2@yahoo.com>
Date: Sun, 23 Apr 2017 04:59:23 -0400
Subject: [PATCH] Everythign is workinggit statusgit status (i think)

---
 app.py                          |   4 +
 static/css/mystyle.css          |   3 +
 static/images/cloud.png         | Bin 0 -> 1459 bytes
 static/images/ice-cream.png     | Bin 0 -> 2066 bytes
 static/js/notificationEvents.js | 182 ++++++++++++++++++++------------
 templates/index.html            |   6 +-
 6 files changed, 125 insertions(+), 70 deletions(-)
 create mode 100644 static/images/cloud.png
 create mode 100644 static/images/ice-cream.png

diff --git a/app.py b/app.py
index 470bb1d..bae88f6 100644
--- a/app.py
+++ b/app.py
@@ -22,6 +22,10 @@ def index():
 def getImg(filename):
     return app.send_static_file('images/' + filename)
 
+@app.route('/data/facebank/<filename>/')
+def getData(filename):
+    return app.send_static_file('data/facebank/' + filename)
+
 @app.route('/dashboard/', methods=['GET'])
 def dashboard():
     if "command" in request.args:
diff --git a/static/css/mystyle.css b/static/css/mystyle.css
index 9c9266e..e9256b3 100644
--- a/static/css/mystyle.css
+++ b/static/css/mystyle.css
@@ -85,6 +85,9 @@ footer {
 
 #video{
 	background-color: blue;
+	background-image: url("../images/mitlogo.png");
+	background-repeat: no-repeat;
+	background-size: cover;
 	height: 100%;
 	width: 100%;
 	margin-left: 0px;
diff --git a/static/images/cloud.png b/static/images/cloud.png
new file mode 100644
index 0000000000000000000000000000000000000000..406847bf3981523fd3546004be8cc9a0dd87ad55
GIT binary patch
literal 1459
zcmV;k1x)&hP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm000vL000vL0o~0`R{#J28FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11u#iOK~#90?b=(cT~!qZ;BV}nmW!8a5v(bx%Ed?;XbaRPfI>qI
z0!;)=ikKKoA^0GW_=12E^^N$3iMI!11P#UuRtRXkaI;7iAvTm6?iV8@5}=WSP@uzy
zxlVF&diLpFd#|<EIpO@t%1-v0W6Xd4Yp$`z9CJoydOM@nHG!_NAVAjyy2gS4T@&aU
z3j%aapld7$&^3WU5E1L!@;&DTh=>iiHzE#c!~dKY00$tjxDDs?L4a1VAVAjyy2gAE
z;BnlK|F+?LECNKtRT1&?h&ZsWZDu}-b(#6<5dAKXh`S@=+<tAwH3RO#nb<O<2(_y=
z5wRS1V5KsH`Z^!Wg->8Neuo2F?rS;ziKp@5S=)|FfQs0uc%>2{YS`6jyQ~`gGdN;@
z?I-F^tx=GfcSXcT{7^}3_DpXR5eMN@_zYHK1>PAEJC&(Cc|DMsZ_Lom;dl!hGV_W3
zaf-Q86pe@pT#9dCDPG0j@mD;GRX7oA@D6Opg_*g1q>jh=3d}NXkHmvW+)xd2QJ=Ow
ztiv{C27L_^L-#!g27fG`Q)0vB8g`3tC0@hdux!2xa62Btsv+%H;aU82z6!7mi%0aa
zv3h;Zt!vwO5R8aLIHDr-bj}>98%IR^NJ+L<W#$V5+l?wfL@dP@l?Z(dK7u9H?YHnR
zJd7XXmu(4B@z{YanR(g3cEbu#rL<qdRmy<3Dev;m>bIweakL`N=}NHsF0RYW-9vRe
zJEw2qjLcj;u+fn3+&RjV-Gl3J$N)AU#rKqGzXM0N5Kqp>n>eVoAc*tu2Dad+A?#Nw
zNz5*6Y*>IJmDqFApf<Hq;fOd3H{$xtyr_=tlo|I-M4XJD;5QL*dS>1^jISAdKOPag
zltk$-lmAD=q4)~>jQ5^_1&D}`<5&1CE*X*N?ua-KH{pheI4(0^8pY=n?8dvM{kIaQ
z*;jz5GrjJ|pEbCY#bJ0Jzi7zcp~@?8cB3%>pR638*x=v;$Km^x?>Cjt=6@=ouf>X*
zKF_FpeV}OpZpS?hKl$HRWM5G}op<0?WgWj~iYV9A@Ow3$tHotM4j19<ip=>94gNGG
zcYhKa^jXPaE&g5g{qX)~L&fzz+%l2?RRH-q{)Cq+0z3N=tvUG5R!{ZUc+Y?~-@#tI
zfZi<au24SDYljv<soOn?mvB8U$4NN2p{IWeJ~xEjCDnuYS)cpID9hq+*7iNc$(O4j
zbX(ovGmcBC3?)vT;oiOYhapy#lMdEa)2FtAV-#R1UdLlI+}n;d!}y)tb-hoi!JU$s
zd(BZq#8zdK<bbAp_OMB*s(fKC55B@yEQyE}O*!mgJ$7W~BTYGN5nHO?P5l}~#NiQf
z<)AxIJ)EGt0`mcr59x!mw3)zH4Y&>0Q>wBLj?Qf?IH&r(tzU!8d`c;eoooORddmLU
zhnnHnIwo`dKhD-DGq)O0gr2hdvaUgrZQ^6tHAt|YCPLqs(NmVW$5%zgIg5z6SedD}
z3~Ez}uzEI|!26XV=FOS8c{G~sAR?A21=W``^L>pvuQI7kY8Dd4m;t^Uk0}eH^^N<V
z($S5|g5nB&HYPh5{O2o9dvR?meN5?W0@o<Th;7)cRBXm3hO)o#Y5YJr<dAq#Nzq&B
zbDxcoh**PfD;eSv{7*|Kw5DM(-mAnVN~P#lT#zlM=zVvFB4UY>Bpr`d&go9WVjP7(
z;HDhnRM;?>Gbcp4!hAR=*(w$U=$b&+SP-CV0$pQ4fUXI2jkmo3{|Dx17mjl-BF_K-
N002ovPDHLkV1g|ow-^8b

literal 0
HcmV?d00001

diff --git a/static/images/ice-cream.png b/static/images/ice-cream.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6ad894b0f816d09a21cff598ec53e948934f12a
GIT binary patch
literal 2066
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

literal 0
HcmV?d00001

diff --git a/static/js/notificationEvents.js b/static/js/notificationEvents.js
index 536bae4..bd5f629 100644
--- a/static/js/notificationEvents.js
+++ b/static/js/notificationEvents.js
@@ -1,53 +1,75 @@
-var recList = [{name:"Toscis", location:new google.maps.LatLng(42.363424, -71.099379)},
-                 {name:"Ben and Jerys", location:new google.maps.LatLng(42.348133, -71.084497)},
-                 {name:"JP Licks", location:new google.maps.LatLng(42.346997, -71.088657)}];
+var recList = [ {
+	name : "Toscis",
+	location : new google.maps.LatLng(42.363424, -71.099379)
+}, {
+	name : "Ben and Jerys",
+	location : new google.maps.LatLng(42.348133, -71.084497)
+}, {
+	name : "JP Licks",
+	location : new google.maps.LatLng(42.346997, -71.088657)
+} ];
 var count = 0;
-var recMarkerList= [];
+var recMarkerList = [];
 var currentNotification;
 var faceBank = {};
 
-function handleNotification(message){
+function handleNotification(message) {
 	activateDog()
 	if (message == "center") {
-    	moveMap("home");
-    } else if (message == "danger") {
+		moveMap("home");
+	} else if (message == "danger") {
 		// Alert to Danger!
-    	notif = createNotif("Warning", "You are nearing a high crime area!", "../images/warning64.png")
-    	activateNotif("notificationarea", notif)
-    } else if (message == "dropLocation") {
-    	index = count
-    	recMarkerList.push(apiDropMarker(recList[index]))
-    	
-    	if (count == recList.length - 1){
-    		count = 0; 
-    	} else{
-    		count = count + 1;	
-    	}
-    } else if (message == "removeMarkers") {
-    	setMapOnAll(null);
-    	recMarkerList= []
-    } else {// is a facedata from message!
-    	jsonstuff = JSON.parse(message); 
-    	addToFacebank(jsonstuff["data"][0], "", jsonstuff["data"][1])
+		notif = createNotification("Warning",
+				"You are nearing a high crime area!", "../images/warning64.png")
+		activateNotif("notificationarea", notif)
+	} else if (message == "dropLocation") {
+		index = count
+		recMarkerList.push(apiDropMarker(recList[index]))
+		notif = createNotification("Try this!",
+				"Mom thought you might be interested in some ice-cream!",
+				"../images/ice-cream.png")
+		activateNotif("notificationarea", notif)
+		if (count == recList.length - 1) {
+			count = 0;
+		} else {
+			count = count + 1;
+		}
+	} else if (message == "weather") {
+		index = count
+		notif = createNotification("Weather Alert!",
+				"Looking a little Rainy today!", "../images/cloud.png")
+		activateNotif("notificationarea", notif)
+	} else if (message == "removeMarkers") {
+		setMapOnAll(null);
+		recMarkerList = []
+	} else if (message == "removeFacebank") {
+		wipeFacebank();
+	} else {// is a facedata from message!
+		jsonstuff = JSON.parse(message);
+		addToFacebank(jsonstuff["data"][0], "", jsonstuff["data"][1])
+		displayFacebank()
 	}
 }
 
-function activateDog(){
-	document.getElementById("dog").src="../images/dogmoving.gif";
+function activateDog() {
+	document.getElementById("dog").src = "../images/dogmoving.gif";
 	window.setTimeout(deactivateDog, 5000);
 }
 
-function deactivateDog(){
-	document.getElementById("dog").src="../images/dogstatic.png";
+function deactivateDog() {
+	document.getElementById("dog").src = "../images/dogstatic.png";
 }
 
-function activateNotif(id, notifModel){
-	document.getElementById(id).appendChild(viewNotif(notifModel));
-	window.setTimeout(function(){deactivateNotif(id)}, 5000);
+function activateNotif(id, notifModel) {
+	console.log(id);
+	document.getElementById(id).innerHTML = viewNotif(notifModel);
+	window.setTimeout(function() {
+		deactivateNotif(id)
+	}, 10000);
 }
 
-function deactivateNotif(id){
-	document.getElementById(id).appendChild(emptyNotif);
+function deactivateNotif(id) {
+	document.getElementById(id).innerHTML = "";
 }
 
 /* 
@@ -62,28 +84,28 @@ function deactivateNotif(id){
 /*
  * Adds/updates a person to the faceBank
  */
-function addToFacebank(name, descripion, url){
-	switch(name) {
-    case "Andrew":
-    	descripion = "Northeastern Student"
-        break;
-    case "Mark":
-    	descripion = "Northeastern Student"
-        break;
-    case "Paul":
-    	descripion = "Northeastern Student"
-        break;
-    case "Nick":
-    	descripion = "Northeastern Student"
-        break;
-    case "Meg":
-    	descripion = "MIT Design student and Mentor"
-        break;
-    case "Federico":
-    	descripion = "Director of MIT Media Labs"
-        break;
-    default:
-    	descripion = "New Challenger!"
+function addToFacebank(name, descripion, url) {
+	switch (name) {
+	case "Andrew":
+		descripion = "Northeastern Student"
+		break;
+	case "Mark":
+		descripion = "Northeastern Student"
+		break;
+	case "Paul":
+		descripion = "Northeastern Student"
+		break;
+	case "Nick":
+		descripion = "Northeastern Student"
+		break;
+	case "Meg":
+		descripion = "MIT Design student and Mentor"
+		break;
+	case "Federico":
+		descripion = "Director of MIT Media Labs"
+		break;
+	default:
+		descripion = "New Challenger!"
 	}
 	faceBank[name] = createNotification(name, description, url);
 }
@@ -91,22 +113,48 @@ function addToFacebank(name, descripion, url){
 /*
  * Creates and returns a notification object
  */
-function createNotification(title, description, url){
-	obj = {"title":title, 
-			"description": description,
-			"url": url}
-	
+function createNotification(title, description, url) {
+	obj = {
+		"title" : title,
+		"description" : description,
+		"url" : url
+	}
+
 	return obj
 }
 
-function displayFacebank(){
-	faceBank.forEach(function(value, index, array){displayFace(value)})
+function displayFacebank() {
+	var fullString = "";
+	for ( var key in faceBank) {
+		fullString += viewNotif(faceBank[key])
+		document.getElementById("facebankContainer").innerHTML = fullString;
+	}
+}
+
+function wipeFacebank() {
+	faceBank = {};
+	document.getElementById("facebankContainer").innerHTML = "";
 }
 
 //TODO: Finish this function
-function viewNotif(notifModel)
-{
-	notifModel["title"],
-	notifModel["description"],
-	notifModel["url"]
+function viewNotif(notifModel) {
+	var notifView = "<div class=\"row notification\">\
+	<div class=\"col-md-3\">\
+		<div class=\"picture\">\
+			<img src="
+			+ notifModel["url"]
+			+ "></src>\
+		</div>\
+	</div>\
+	<div class=\"col-md-9 text_notifaction\">\
+		<strong>"
+			+ notifModel["title"]
+			+ "</strong><br> <span>"
+			+ notifModel["description"] + "</span>\
+	</div>\
+	</div>"
+
+	console.log(notifView)
+	return notifView
+
 }
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 6819935..4ffd2c2 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -57,7 +57,7 @@
 		<!-- Uncomment to allow background video to be set -->
 		<img id="stream"
 			 src="http://192.168.1.9:88/cgi-bin/CGIStream.cgi?cmd=GetMJStream&usr=nuvision&pwd=nuvision"></img>
-		<img width="100%" src="{{ url_for('static', filename='images/mitlogo.png') }}">
+		<!-- <img width="100%" src="{{ url_for('static', filename='images/mitlogo.png') }}"> -->
 	</div>
 
 	<div class="container no-margin content full-height">
@@ -75,7 +75,7 @@
 				</div>
 
 				<div id="notificationarea">
-					<div class="row notification">
+					<!-- <div class="row notification">
 						<div class="col-md-3">
 							<div class="picture">
 								<div id="thepic">
@@ -86,7 +86,7 @@ <h3>Pic</h3>
 						<div class="col-md-9 text_notifaction">
 							<strong>User Name</strong><br> <span>info</span>
 						</div>
-					</div>
+					</div> -->
 				</div>
 				<div id="facebankContainer">