From 01d9b85bcf8d9cfd2155c53feb29a3a956dcea5e Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Thu, 10 Mar 2016 09:28:41 +0100 Subject: [PATCH] added fixed footer --- board.html | 90 +++++++++++++++++++++------ db.json | 174 ++++++++++++++++++++++++++++++++++++++++++++--------- server.js | 17 +++++- 3 files changed, 234 insertions(+), 47 deletions(-) diff --git a/board.html b/board.html index 3e05a09..2dae9cc 100644 --- a/board.html +++ b/board.html @@ -2,6 +2,7 @@ + SMS Board @@ -9,12 +10,61 @@ + + - +
- -

Send an SMS with a message to +43 681 2033 4015

-
+ +

Send an SMS with a message to +43 681 2033 4015

+
-
-

Send an SMS with a message to +43 681 2033 4015



- -
+
+ diff --git a/db.json b/db.json index f0e9f9e..150df10 100644 --- a/db.json +++ b/db.json @@ -1,52 +1,172 @@ { "messages": [ { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,14:26:33+04\"\r", - "number": "+4369910088886", - "time": "14:26:33", - "message": "1" + "numberString": "", + "number": "+43 681 2033 4015", + "time": "now", + "message": "SMS MessageBoard", + "color": 0 }, { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,14:26:37+04\"\r", + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,19:19:25+04\"\r", "number": "+4369910088886", - "time": "14:26:37", - "message": "2😉" + "time": "19:19:25", + "message": "Next", + "color": 1 }, { - "numberString": "+CMT: \"002B003400330036003600340035003300300035003900390036\",\"\",\"16/03/09,14:43:49+04\"\r", + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,19:19:43+04\"\r", + "number": "+4369910088886", + "time": "19:19:43", + "message": "Emoji support 😃👍🙈🙊🎉🙉🤑🎁😺🎈", + "color": 2 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,19:19:54+04\"\r", + "number": "+4369910088886", + "time": "19:19:54", + "message": "Multicolor", + "color": 3 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,19:20:18+04\"\r", + "number": "+4369910088886", + "time": "19:20:18", + "message": "...and other tricks! 😉", + "color": 4 + }, + { + "numberString": "+CMT: \"002B003400330036003600340035003300300035003900390036\",\"\",\"16/03/09,19:29:45+04\"\r", "number": "+436645305996", - "time": "14:43:49", - "message": "Spruch des Tages:\n💤😀😇" + "time": "19:29:45", + "message": "Hi 😁", + "color": 0 }, { - "numberString": "+CMT: \"002B003400330036003600340035003300300035003900390036\",\"\",\"16/03/09,14:42:55+04\"\r", + "numberString": "+CMT: \"002B003400330036003600340035003300300035003900390036\",\"\",\"16/03/09,19:30:05+04\"\r", "number": "+436645305996", - "time": "14:42:55", - "message": "Spruch des Tages:\n💤😀😇" + "time": "19:30:05", + "message": "Animations", + "color": 1 }, { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,16:03:56+04\"\r", - "number": "+4369910088886", - "time": "16:03:56", - "message": "Test 400" + "numberString": "+CMT: \"002B003400330036003600340035003300300035003900390036\",\"\",\"16/03/09,19:32:09+04\"\r", + "number": "+436645305996", + "time": "19:32:09", + "message": "Hallo nici 😇", + "color": 2 }, { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,16:04:09+04\"\r", + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,19:36:27+04\"\r", "number": "+4369910088886", - "time": "16:04:09", - "message": "Haha" + "time": "19:36:27", + "message": "Hallo Familie 😊🙉🎉", + "color": 3 }, { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,16:04:47+04\"\r", - "number": "+4369910088886", - "time": "16:04:47", - "message": "Hahi" + "numberString": "+CMT: \"002B003400330036003600340035003300300035003900390036\",\"\",\"16/03/09,19:37:44+04\"\r", + "number": "+436645305996", + "time": "19:37:44", + "message": "Emojis funktionieren jetzt auch 😍", + "color": 4 }, { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,16:05:47+04\"\r", + "numberString": "+CMT: \"002B0034003300360036003400370035003000350037003900370032\",\"\",\"16/03/09,20:35:42+04\"\r", + "number": "+4366475057972", + "time": "20:35:42", + "message": "Hey ", + "color": 0 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,20:35:42+04\"\r", "number": "+4369910088886", - "time": "16:05:47", - "message": "W" + "time": "20:35:42", + "message": "Hallo Timon", + "color": 1 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,20:35:58+04\"\r", + "number": "+4369910088886", + "time": "20:35:58", + "message": "😘👌🎁😉😍😄👌", + "color": 2 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:36:42+04\"\r", + "number": "+4369910088886", + "time": "22:36:42", + "message": "Hahahahahah das is lustig", + "color": 3 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:36:53+04\"\r", + "number": "+4369910088886", + "time": "22:36:53", + "message": "Ich 😁👍", + "color": 4 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:37:08+04\"\r", + "number": "+4369910088886", + "time": "22:37:08", + "message": "Haha fritsch", + "color": 0 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:51:08+04\"\r", + "number": "+4369910088886", + "time": "22:51:08", + "message": "😛ahhhhhhh rage!!!!", + "color": 1 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:51:19+04\"\r", + "number": "+4369910088886", + "time": "22:51:19", + "message": "Djdndjdcjdosndhf", + "color": 2 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:51:33+04\"\r", + "number": "+4369910088886", + "time": "22:51:33", + "message": "Node.js for the win", + "color": 3 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:51:53+04\"\r", + "number": "+4369910088886", + "time": "22:51:53", + "message": "Bootstrap ruelz 😛🙈🎉", + "color": 4 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:57:20+04\"\r", + "number": "+4369910088886", + "time": "22:57:20", + "message": "I ❤️ Socket.io", + "color": 0 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/10,09:19:15+04\"\r", + "number": "+4369910088886", + "time": "09:19:15", + "message": "Test", + "color": 1 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/10,09:19:42+04\"\r", + "number": "+4369910088886", + "time": "09:19:42", + "message": "Test g", + "color": 2 + }, + { + "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/10,09:25:17+04\"\r", + "number": "+4369910088886", + "time": "09:25:17", + "message": "More", + "color": 3 } ] } \ No newline at end of file diff --git a/server.js b/server.js index dce1fcd..64c258d 100644 --- a/server.js +++ b/server.js @@ -16,6 +16,7 @@ var portName = '/dev/tty.usbmodemFD121'; //change this to your Arduino port var numberStringRecieved = ""; var numberRecieved = ""; var timeRecieved = ""; +var color = 0; // utility function for ucs2 decode function ucs2Parse(ucs2){ @@ -31,6 +32,10 @@ function ucs2Parse(ucs2){ // handle contains locations to browse to (vote and poll); pathnames. function startServer(route,handle,debug) { + + db('messages').size(); //call this once to establish the db if there is nothing in the json file + if(db('messages').size() == 0)db('messages').push({ numberString: "",number: "+43 681 2033 4015", time: "now", message: "SMS MessageBoard",color: 0 }); + // on request event function onRequest(request, response) { // parse the requested url into pathname. pathname will be compared @@ -69,9 +74,10 @@ function initSocketIO(httpServer,debug) var times = db('messages').chain().takeRight(number).map('time').value(); var numbers = db('messages').chain().takeRight(number).map('number').value(); var messages = db('messages').chain().takeRight(number).map('message').value(); + var colors = db('messages').chain().takeRight(number).map('color').value(); for(var i = 0; i < messages.length; i++){ - socket.emit('newMessage',times[i],numbers[i],messages[i]); + socket.emit('newMessage',times[i],numbers[i],messages[i],colors[i]); } }); @@ -104,10 +110,15 @@ function serialListener(debug) if(numberRecieved){ //console.log("emit"); + var color = db('messages').chain().takeRight(1).map('color').value(); + console.log(JSON.stringify(color)); + if (color == null)color = 0;//no messages yet + color++; + if(color > 4) color = 0; var messageRecieved = ucs2Parse(data); - db('messages').push({ numberString: numberStringRecieved,number: numberRecieved, time: timeRecieved, message: messageRecieved }); + db('messages').push({ numberString: numberStringRecieved,number: numberRecieved, time: timeRecieved, message: messageRecieved,color: color }); //add a new message to the board directly - socketServer.emit('newMessage', timeRecieved, numberRecieved, messageRecieved); + socketServer.emit('newMessage', timeRecieved, numberRecieved, messageRecieved,color); numberStringRecieved = null; numberRecieved = null; timeRecieved = null;