From e4d5c9c1fa7df4e00784759cad3868f79ab2dae9 Mon Sep 17 00:00:00 2001 From: Davide Bongiovanni Date: Tue, 1 Nov 2016 18:35:51 +0100 Subject: [PATCH] Added buttons, fixed some visuals, added History bar --- fridge_lock.sublime-workspace | 201 ++++++++++++++++++++++++++++++++-- history.json | 32 +----- server.py | 8 ++ server.pyc | Bin 2599 -> 2960 bytes sftp-config.json | 45 ++++++++ sstart.sh | 2 +- static/style.css | 32 +++++- templates/status.html | 8 +- 8 files changed, 284 insertions(+), 44 deletions(-) create mode 100644 sftp-config.json diff --git a/fridge_lock.sublime-workspace b/fridge_lock.sublime-workspace index 41f1ae4..7d36e33 100644 --- a/fridge_lock.sublime-workspace +++ b/fridge_lock.sublime-workspace @@ -3,6 +3,18 @@ { "selected_items": [ + [ + "mar", + "margin-top" + ], + [ + "ta", + "text-align" + ], + [ + "col", + "color" + ], [ "ROS", "ROS_INFO" @@ -191,10 +203,6 @@ "p", "position" ], - [ - "ta", - "ta-c\ttext-align: center;" - ], [ "fon", "font-size" @@ -275,6 +283,41 @@ }, "buffers": [ + { + "file": "static/script.js", + "settings": + { + "buffer_size": 1375, + "encoding": "UTF-8", + "line_ending": "Unix" + } + }, + { + "file": "templates/status.html", + "settings": + { + "buffer_size": 1499, + "encoding": "UTF-8", + "line_ending": "Unix" + } + }, + { + "file": "static/style.css", + "settings": + { + "buffer_size": 1891, + "encoding": "UTF-8", + "line_ending": "Unix" + } + }, + { + "file": "static/colors", + "settings": + { + "buffer_size": 69, + "line_ending": "Unix" + } + } ], "build_system": "", "build_system_choices": @@ -284,9 +327,13 @@ "command_palette": { "height": 368.0, - "last_filter": "", + "last_filter": "re", "selected_items": [ + [ + "re", + "Indentation: Reindent Lines" + ], [ "prv", "PackageResourceViewer: Open Resource" @@ -308,7 +355,7 @@ "Indentation: Reindent Lines" ] ], - "width": 453.0 + "width": 417.0 }, "console": { @@ -329,10 +376,15 @@ }, "expanded_folders": [ - "/home/davide/fridge_lock" + "/home/davide/fridge_lock", + "/home/davide/fridge_lock/static", + "/home/davide/fridge_lock/templates" ], "file_history": [ + "/home/davide/fridge_lock/sstart.sh", + "/home/davide/fridge_lock/sftp-config.json", + "/home/davide/fridge_lock/history.json", "/home/davide/catkin_ws/src/sftp-config.json", "/home/davide/catkin_ws/src/ras_uarm_controller/src/uarm_controller.cpp", "/home/davide/catkin_ws/src/ras_uarm_controller/CMakeLists.txt", @@ -347,7 +399,6 @@ "/home/davide/fridge_lock/static/style.css", "/home/davide/fridge_lock/static/script.js", "/home/davide/fridge_lock/server.py", - "/home/davide/fridge_lock/history.json", "/home/davide/fridge_lock/cards/2924385363.json", "/home/davide/fridge_lock/cards/0967437296.json", "/home/davide/.config/sublime-text-3/Packages/User/Preferences.sublime-settings", @@ -384,6 +435,7 @@ "case_sensitive": false, "find_history": [ + "D7E2E2", "toPos", "moveTo", "cv_ptr", @@ -410,8 +462,139 @@ "groups": [ { + "selected": 1, "sheets": [ + { + "buffer": 0, + "file": "static/script.js", + "semi_transient": false, + "settings": + { + "buffer_size": 1375, + "regions": + { + }, + "selection": + [ + [ + 1375, + 1375 + ] + ], + "settings": + { + "color_scheme": "Packages/User/Color Highlighter/themes/predawn.tmTheme", + "incomplete_sync": null, + "remote_loading": false, + "synced": false, + "syntax": "Packages/JavaScript/JavaScript.sublime-syntax", + "translate_tabs_to_spaces": false + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "stack_index": 3, + "type": "text" + }, + { + "buffer": 1, + "file": "templates/status.html", + "semi_transient": false, + "settings": + { + "buffer_size": 1499, + "regions": + { + }, + "selection": + [ + [ + 883, + 883 + ] + ], + "settings": + { + "color_scheme": "Packages/User/Color Highlighter/themes/predawn.tmTheme", + "incomplete_sync": null, + "remote_loading": false, + "synced": false, + "syntax": "Packages/HTML/HTML.sublime-syntax", + "translate_tabs_to_spaces": false + }, + "translation.x": 0.0, + "translation.y": 330.0, + "zoom_level": 1.0 + }, + "stack_index": 0, + "type": "text" + }, + { + "buffer": 2, + "file": "static/style.css", + "semi_transient": false, + "settings": + { + "buffer_size": 1891, + "regions": + { + }, + "selection": + [ + [ + 228, + 228 + ] + ], + "settings": + { + "color_scheme": "Packages/User/Color Highlighter/themes/predawn.tmTheme", + "incomplete_sync": null, + "remote_loading": false, + "synced": false, + "syntax": "Packages/CSS/CSS.sublime-syntax", + "translate_tabs_to_spaces": false + }, + "translation.x": 0.0, + "translation.y": 132.0, + "zoom_level": 1.0 + }, + "stack_index": 1, + "type": "text" + }, + { + "buffer": 3, + "file": "static/colors", + "semi_transient": true, + "settings": + { + "buffer_size": 69, + "regions": + { + }, + "selection": + [ + [ + 15, + 15 + ] + ], + "settings": + { + "incomplete_sync": null, + "remote_loading": false, + "synced": false, + "syntax": "Packages/Text/Plain text.tmLanguage" + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "stack_index": 2, + "type": "text" + } ] } ], @@ -452,7 +635,7 @@ }, "output.sftp": { - "height": 0.0 + "height": 152.0 }, "pinned_build_system": "", "project": "fridge_lock.sublime-project", diff --git a/history.json b/history.json index bdfd23f..ab53fea 100644 --- a/history.json +++ b/history.json @@ -1,31 +1 @@ -[ - { - "time": 1475424208.055737, - "name": "Davide Bon", - "cardID": "2924385363" - }, - { - "cardID": "0861643457", - "name": "", - "time": 1475424209.151567}, - { - "time": 1475424209.758858, - "name": "Davide Bon", - "cardID": "2924385363" - }, - { - "cardID": "2924385363", - "name": "Davide Bon", - "time": 1475424211.022202 - }, - { - "time": 1475424212.244935, - "name": "", - "cardID": "0861643457" - }, - { - "cardID": "0861643457", - "name": "", - "time": 1475424213.343284 - } -] \ No newline at end of file +[{"cardID": "2924385363", "name": "Davide Bon", "time": 1475424208.055737}, {"time": 1475424209.151567, "name": "", "cardID": "0861643457"}, {"cardID": "2924385363", "name": "Davide Bon", "time": 1475424209.758858}, {"time": 1475424211.022202, "name": "Davide Bon", "cardID": "2924385363"}, {"cardID": "0861643457", "name": "", "time": 1475424212.244935}, {"time": 1475424213.343284, "name": "", "cardID": "0861643457"}] \ No newline at end of file diff --git a/server.py b/server.py index 51a9444..923dc7a 100644 --- a/server.py +++ b/server.py @@ -17,6 +17,14 @@ def somehtml(): event['time'] = epochFormat(event['time']) return render_template('status.html', events = history[::-1]) +@app.route('/users') +def users(): + return 'You have reached Users' + +@app.route('/history') +def history(): + return 'You have reached history' + @app.route('/getcardinfo/') def getCardInfo(cardID): return send_from_directory('cards', cardID + '.json') diff --git a/server.pyc b/server.pyc index b2f12659dc0a7893ff4477f6bad0545d74e6e444..2dd1b3d05016327210245979a65e4cfbf810d5df 100644 GIT binary patch delta 348 zcmZ23GC^FL`7N~Z^jiB=c7`kth7=x#W=4h-UWOJ15F?70 z0V>W17UzeF^D(3dfY?#|3@OYE!5V@aujeyyu>nofFD*_jDxR#ys3;`{E>X5W{FK z5X1vi0a67uVzMjqHb$Avf0$jE7=nm)$*#!6=sek*Q;|_% zaxQ0pr~pV7WJZuMh)@I(+>_%Ntu#SyvB}L(Da}c>V+68`K@JsQ6l0WNCPi J7711fB>+)IMZ*99 delta 144 zcmbOrzFb6_`79zbRJPa)i3{kucDa;JP8oZm?8S|MY zFJ#%uD6%=6)rE;saPl1XFg8J;`XJ%SKiIn&B{#QlC^9ixPhQ5Q$jCSO1XlpJ5J*-5 jL~u{;W3-x_&Mhb+0OSfViZMzs@-RuTNN`E8N+
+
History
{% for event in events %}
{{event.time}}
@@ -26,9 +27,12 @@
{% endfor %}
-
-

Card access manager

+

Card access manager

+
+
Users list
 +
+
Full history