From 75d05326d067857d22474cc91d069003d7b64b17 Mon Sep 17 00:00:00 2001 From: ngharo Date: Fri, 29 Dec 2017 00:02:05 -0600 Subject: VueJS front-end work in progress --- .gitignore | 2 + Makefile | 6 + data/imok.db | Bin 12288 -> 0 bytes server/button.py | 45 +++-- server/buttonDispatcher.py | 55 ++++-- server/dispatcher.py | 29 +++ server/lib/database.py | 5 +- www/css/normalize.css | 427 +++++++++++++++++++++++++++++++++++++++++++++ www/css/skeleton.css | 418 ++++++++++++++++++++++++++++++++++++++++++++ www/imok.css | 7 + www/imok.js | 64 +++++++ www/index.htm | 46 ++++- www/j.js | 2 - www/s.css | 3 - 14 files changed, 1068 insertions(+), 41 deletions(-) create mode 100644 Makefile delete mode 100644 data/imok.db create mode 100644 server/dispatcher.py create mode 100644 www/css/normalize.css create mode 100644 www/css/skeleton.css create mode 100644 www/imok.css create mode 100644 www/imok.js delete mode 100644 www/j.js delete mode 100644 www/s.css diff --git a/.gitignore b/.gitignore index 24c2769..1759bb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.pyc +*.swp +data/imok.db data/sessions/session-* diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..bb9d7e7 --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ +@phony: deploy + +TARGET="/var/www/imok.ngha.ro/" + +deploy: + rsync -vr www/ $(TARGET) diff --git a/data/imok.db b/data/imok.db deleted file mode 100644 index b3b3d18..0000000 Binary files a/data/imok.db and /dev/null differ diff --git a/server/button.py b/server/button.py index a5b52b8..1e79629 100644 --- a/server/button.py +++ b/server/button.py @@ -3,6 +3,7 @@ import sqlite3 import json from lib import uuid from lib import database +from time import time STATUS_INVENTORY = 0 STATUS_ACTIVE = 1 @@ -12,7 +13,7 @@ STATUS_DEAD = 4 def loadAll(): db = database.connect() - db.execute("SELECT id,status FROM buttons") + db.execute("SELECT id,status,last_pressed FROM buttons") results = [] while True: @@ -30,19 +31,22 @@ class Button(object): self.persisted = False self.id = None self.status = STATUS_INVENTORY + self.last_pressed = 0 + self.history = [] def toDict(self): return { 'id': self.id, - 'status': self.status + 'status': self.status, + 'last_pressed': self.last_pressed } def toJSON(self): - return json.dumps(self.toDict()) + return self.toDict() def loadById(self, id): db = database.connect() - db.execute("SELECT id,status FROM buttons WHERE id = ?" , (str(id),)) + db.execute("SELECT id,status,last_pressed FROM buttons WHERE id = ?" , (str(id),)) return self.loadFromDb(db.fetchone()) @@ -51,14 +55,18 @@ class Button(object): raise cherrypy.HTTPError(404, 'Button not found') self.persisted = True - self.id, self.status = dbrs + self.id, self.status, self.last_pressed = dbrs return self + def press(self): + if self.last_pressed: + self.history.insert(0, self.last_pressed) + + self.last_pressed = int(time()) + return self + def save(self): - cherrypy.log('SAVE {} -> {} (persisted: {})'.format( - self.id, self.status, self.persisted - )) db = database.connect() # validate @@ -67,17 +75,24 @@ class Button(object): # upsert: update elif self.persisted: - cherrypy.log("setting other status to " + str(self.status)) - db.execute("UPDATE buttons SET status = ? WHERE id = ?", - (int(self.status), str(self.id),) + db.execute("UPDATE buttons SET status = ?, last_pressed = ? WHERE id = ?", + (self.status, self.last_pressed, self.id,) ) # upsert: insert else: - cherrypy.log('INSERT {} -> {} (persisted: {})'.format( - self.id, self.status, self.persisted - )) - db.execute("INSERT INTO buttons VALUES (?, ?)", (self.id, self.status)) + db.execute("INSERT INTO buttons VALUES (?, ?, ?)", (self.id, self.status, self.last_pressed)) db.connection.commit() return self + + def delete(self): + db = database.connect() + + if self.id is None: + raise cherrypy.HTTPError(500, "uhh wat") + + db.execute("DELETE FROM buttons WHERE id = ?", (self.id,)) + db.connection.commit() + + return None diff --git a/server/buttonDispatcher.py b/server/buttonDispatcher.py index 5dac61c..59672d6 100644 --- a/server/buttonDispatcher.py +++ b/server/buttonDispatcher.py @@ -1,38 +1,59 @@ import json import cherrypy from button import loadAll, Button +from dispatcher import Dispatcher from lib import uuid +# Tweak: consider using serpy for serializing objects for JSON. + @cherrypy.expose -class ButtonDispatcher(object): +class ButtonDispatcher(Dispatcher): def GET(self, id=None): + # GET /button - return all buttons if id is None: - return json.dumps(loadAll()) - elif uuid.validate(id): - button = Button() - return button.loadById(id).toJSON() - else: - raise cherrypy.HTTPError(400, 'Invalid ID') + return self.response(loadAll()) + + # GET /button/{id} - return single button + self.validate_uuid(id) + + button = Button() + return self.response(button.loadById(id).toJSON()) def POST(self, id, status): - if not uuid.validate(id): - raise cherrypy.HTTPError(401) + # POST /button/{id}?status={} - updates button status + self.validate_uuid(id) button = Button() button.loadById(id) cherrypy.log("Updating status to " + str(status)) - button.status = status + # TODO validate status + button.status = int(status) button.save() - return button.toJSON() + return self.response(button.toJSON()) - def PUT(self): - cherrypy.log('Generating new button') + def PUT(self, id=None): button = Button() - button.id = uuid.gen() - return button.save().toJSON() + # PUT /button - creates button + if id is None: + button.id = uuid.gen() + return self.response(button.save().toJSON()) + + # PUT /button/{id} - presses button + else: + button.loadById(id) + button.press() + + button.save() + + return self.response(button.toJSON()) + + def DELETE(self, id): + # DELETE /button/{id} - deletes button + button = Button() + button.loadById(id) + button.delete() - def DELETE(self): - return 'DELETE BUTTON' + return self.response(True) diff --git a/server/dispatcher.py b/server/dispatcher.py new file mode 100644 index 0000000..36dd8da --- /dev/null +++ b/server/dispatcher.py @@ -0,0 +1,29 @@ +import json +import cherrypy +from lib import uuid + +class Dispatcher(object): + def validate_uuid(self, uuid4): + if not uuid.validate(uuid4): + self.error(1, 'Invalid UUID in request') + + def response(self, data): + # Pretty print responses + return json.dumps(data, sort_keys=True, indent=2, separators=(',', ': ')) + + def error(self, code, message='An application error occurred'): + raise cherrypy.HTTPError(400, + self.response({'error': {'code': int(code), 'message': str(message)}}) + ) + + def GET(self, id=None): + raise cherrypy.HTTPError(405) + + def POST(self, id, status): + raise cherrypy.HTTPError(405) + + def PUT(self): + raise cherrypy.HTTPError(405) + + def DELETE(self): + raise cherrypy.HTTPError(405) diff --git a/server/lib/database.py b/server/lib/database.py index d4e47e6..c144d07 100644 --- a/server/lib/database.py +++ b/server/lib/database.py @@ -1,5 +1,8 @@ import sqlite3 +import os def connect(): - connection = sqlite3.connect('../data/imok.db') + connection = sqlite3.connect( + os.path.dirname(os.path.realpath(__file__)) + '/../../data/imok.db' + ) return connection.cursor() diff --git a/www/css/normalize.css b/www/css/normalize.css new file mode 100644 index 0000000..81c6f31 --- /dev/null +++ b/www/css/normalize.css @@ -0,0 +1,427 @@ +/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ + +audio, +canvas, +progress, +video { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. + */ + +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ + +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove border when inside `a` element in IE 8/9/10. + */ + +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari. + */ + +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ + +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ + +button, +input, +optgroup, +select, +textarea { + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ + +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome + * (include `-moz` to future-proof). + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ + +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ + +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} \ No newline at end of file diff --git a/www/css/skeleton.css b/www/css/skeleton.css new file mode 100644 index 0000000..f28bf6c --- /dev/null +++ b/www/css/skeleton.css @@ -0,0 +1,418 @@ +/* +* Skeleton V2.0.4 +* Copyright 2014, Dave Gamache +* www.getskeleton.com +* Free to use under the MIT license. +* http://www.opensource.org/licenses/mit-license.php +* 12/29/2014 +*/ + + +/* Table of contents +–––––––––––––––––––––––––––––––––––––––––––––––––– +- Grid +- Base Styles +- Typography +- Links +- Buttons +- Forms +- Lists +- Code +- Tables +- Spacing +- Utilities +- Clearing +- Media Queries +*/ + + +/* Grid +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +.container { + position: relative; + width: 100%; + max-width: 960px; + margin: 0 auto; + padding: 0 20px; + box-sizing: border-box; } +.column, +.columns { + width: 100%; + float: left; + box-sizing: border-box; } + +/* For devices larger than 400px */ +@media (min-width: 400px) { + .container { + width: 85%; + padding: 0; } +} + +/* For devices larger than 550px */ +@media (min-width: 550px) { + .container { + width: 80%; } + .column, + .columns { + margin-left: 4%; } + .column:first-child, + .columns:first-child { + margin-left: 0; } + + .one.column, + .one.columns { width: 4.66666666667%; } + .two.columns { width: 13.3333333333%; } + .three.columns { width: 22%; } + .four.columns { width: 30.6666666667%; } + .five.columns { width: 39.3333333333%; } + .six.columns { width: 48%; } + .seven.columns { width: 56.6666666667%; } + .eight.columns { width: 65.3333333333%; } + .nine.columns { width: 74.0%; } + .ten.columns { width: 82.6666666667%; } + .eleven.columns { width: 91.3333333333%; } + .twelve.columns { width: 100%; margin-left: 0; } + + .one-third.column { width: 30.6666666667%; } + .two-thirds.column { width: 65.3333333333%; } + + .one-half.column { width: 48%; } + + /* Offsets */ + .offset-by-one.column, + .offset-by-one.columns { margin-left: 8.66666666667%; } + .offset-by-two.column, + .offset-by-two.columns { margin-left: 17.3333333333%; } + .offset-by-three.column, + .offset-by-three.columns { margin-left: 26%; } + .offset-by-four.column, + .offset-by-four.columns { margin-left: 34.6666666667%; } + .offset-by-five.column, + .offset-by-five.columns { margin-left: 43.3333333333%; } + .offset-by-six.column, + .offset-by-six.columns { margin-left: 52%; } + .offset-by-seven.column, + .offset-by-seven.columns { margin-left: 60.6666666667%; } + .offset-by-eight.column, + .offset-by-eight.columns { margin-left: 69.3333333333%; } + .offset-by-nine.column, + .offset-by-nine.columns { margin-left: 78.0%; } + .offset-by-ten.column, + .offset-by-ten.columns { margin-left: 86.6666666667%; } + .offset-by-eleven.column, + .offset-by-eleven.columns { margin-left: 95.3333333333%; } + + .offset-by-one-third.column, + .offset-by-one-third.columns { margin-left: 34.6666666667%; } + .offset-by-two-thirds.column, + .offset-by-two-thirds.columns { margin-left: 69.3333333333%; } + + .offset-by-one-half.column, + .offset-by-one-half.columns { margin-left: 52%; } + +} + + +/* Base Styles +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +/* NOTE +html is set to 62.5% so that all the REM measurements throughout Skeleton +are based on 10px sizing. So basically 1.5rem = 15px :) */ +html { + font-size: 62.5%; } +body { + font-size: 1.5em; /* currently ems cause chrome bug misinterpreting rems on body element */ + line-height: 1.6; + font-weight: 400; + font-family: "Raleway", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #222; } + + +/* Typography +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +h1, h2, h3, h4, h5, h6 { + margin-top: 0; + margin-bottom: 2rem; + font-weight: 300; } +h1 { font-size: 4.0rem; line-height: 1.2; letter-spacing: -.1rem;} +h2 { font-size: 3.6rem; line-height: 1.25; letter-spacing: -.1rem; } +h3 { font-size: 3.0rem; line-height: 1.3; letter-spacing: -.1rem; } +h4 { font-size: 2.4rem; line-height: 1.35; letter-spacing: -.08rem; } +h5 { font-size: 1.8rem; line-height: 1.5; letter-spacing: -.05rem; } +h6 { font-size: 1.5rem; line-height: 1.6; letter-spacing: 0; } + +/* Larger than phablet */ +@media (min-width: 550px) { + h1 { font-size: 5.0rem; } + h2 { font-size: 4.2rem; } + h3 { font-size: 3.6rem; } + h4 { font-size: 3.0rem; } + h5 { font-size: 2.4rem; } + h6 { font-size: 1.5rem; } +} + +p { + margin-top: 0; } + + +/* Links +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +a { + color: #1EAEDB; } +a:hover { + color: #0FA0CE; } + + +/* Buttons +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +.button, +button, +input[type="submit"], +input[type="reset"], +input[type="button"] { + display: inline-block; + height: 38px; + padding: 0 30px; + color: #555; + text-align: center; + font-size: 11px; + font-weight: 600; + line-height: 38px; + letter-spacing: .1rem; + text-transform: uppercase; + text-decoration: none; + white-space: nowrap; + background-color: transparent; + border-radius: 4px; + border: 1px solid #bbb; + cursor: pointer; + box-sizing: border-box; } +.button:hover, +button:hover, +input[type="submit"]:hover, +input[type="reset"]:hover, +input[type="button"]:hover, +.button:focus, +button:focus, +input[type="submit"]:focus, +input[type="reset"]:focus, +input[type="button"]:focus { + color: #333; + border-color: #888; + outline: 0; } +.button.button-primary, +button.button-primary, +input[type="submit"].button-primary, +input[type="reset"].button-primary, +input[type="button"].button-primary { + color: #FFF; + background-color: #33C3F0; + border-color: #33C3F0; } +.button.button-primary:hover, +button.button-primary:hover, +input[type="submit"].button-primary:hover, +input[type="reset"].button-primary:hover, +input[type="button"].button-primary:hover, +.button.button-primary:focus, +button.button-primary:focus, +input[type="submit"].button-primary:focus, +input[type="reset"].button-primary:focus, +input[type="button"].button-primary:focus { + color: #FFF; + background-color: #1EAEDB; + border-color: #1EAEDB; } + + +/* Forms +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +input[type="email"], +input[type="number"], +input[type="search"], +input[type="text"], +input[type="tel"], +input[type="url"], +input[type="password"], +textarea, +select { + height: 38px; + padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */ + background-color: #fff; + border: 1px solid #D1D1D1; + border-radius: 4px; + box-shadow: none; + box-sizing: border-box; } +/* Removes awkward default styles on some inputs for iOS */ +input[type="email"], +input[type="number"], +input[type="search"], +input[type="text"], +input[type="tel"], +input[type="url"], +input[type="password"], +textarea { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; } +textarea { + min-height: 65px; + padding-top: 6px; + padding-bottom: 6px; } +input[type="email"]:focus, +input[type="number"]:focus, +input[type="search"]:focus, +input[type="text"]:focus, +input[type="tel"]:focus, +input[type="url"]:focus, +input[type="password"]:focus, +textarea:focus, +select:focus { + border: 1px solid #33C3F0; + outline: 0; } +label, +legend { + display: block; + margin-bottom: .5rem; + font-weight: 600; } +fieldset { + padding: 0; + border-width: 0; } +input[type="checkbox"], +input[type="radio"] { + display: inline; } +label > .label-body { + display: inline-block; + margin-left: .5rem; + font-weight: normal; } + + +/* Lists +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +ul { + list-style: circle inside; } +ol { + list-style: decimal inside; } +ol, ul { + padding-left: 0; + margin-top: 0; } +ul ul, +ul ol, +ol ol, +ol ul { + margin: 1.5rem 0 1.5rem 3rem; + font-size: 90%; } +li { + margin-bottom: 1rem; } + + +/* Code +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +code { + padding: .2rem .5rem; + margin: 0 .2rem; + font-size: 90%; + white-space: nowrap; + background: #F1F1F1; + border: 1px solid #E1E1E1; + border-radius: 4px; } +pre > code { + display: block; + padding: 1rem 1.5rem; + white-space: pre; } + + +/* Tables +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +th, +td { + padding: 12px 15px; + text-align: left; + border-bottom: 1px solid #E1E1E1; } +th:first-child, +td:first-child { + padding-left: 0; } +th:last-child, +td:last-child { + padding-right: 0; } + + +/* Spacing +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +button, +.button { + margin-bottom: 1rem; } +input, +textarea, +select, +fieldset { + margin-bottom: 1.5rem; } +pre, +blockquote, +dl, +figure, +table, +p, +ul, +ol, +form { + margin-bottom: 2.5rem; } + + +/* Utilities +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +.u-full-width { + width: 100%; + box-sizing: border-box; } +.u-max-full-width { + max-width: 100%; + box-sizing: border-box; } +.u-pull-right { + float: right; } +.u-pull-left { + float: left; } + + +/* Misc +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +hr { + margin-top: 3rem; + margin-bottom: 3.5rem; + border-width: 0; + border-top: 1px solid #E1E1E1; } + + +/* Clearing +–––––––––––––––––––––––––––––––––––––––––––––––––– */ + +/* Self Clearing Goodness */ +.container:after, +.row:after, +.u-cf { + content: ""; + display: table; + clear: both; } + + +/* Media Queries +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +/* +Note: The best way to structure the use of media queries is to create the queries +near the relevant code. For example, if you wanted to change the styles for buttons +on small devices, paste the mobile query code up in the buttons section and style it +there. +*/ + + +/* Larger than mobile */ +@media (min-width: 400px) {} + +/* Larger than phablet (also point when grid becomes active) */ +@media (min-width: 550px) {} + +/* Larger than tablet */ +@media (min-width: 750px) {} + +/* Larger than desktop */ +@media (min-width: 1000px) {} + +/* Larger than Desktop HD */ +@media (min-width: 1200px) {} diff --git a/www/imok.css b/www/imok.css new file mode 100644 index 0000000..7437659 --- /dev/null +++ b/www/imok.css @@ -0,0 +1,7 @@ +#container { + padding: 5px; +} + +#create { + float: right; +} diff --git a/www/imok.js b/www/imok.js new file mode 100644 index 0000000..d985798 --- /dev/null +++ b/www/imok.js @@ -0,0 +1,64 @@ +function create() { + this.ready = false; + fetch('/v1/button', {method: 'PUT'}).then(response => { + if (response.ok) { + response.json().then(button => { + this.buttons.push(button); + this.ready = true; + }); + } + }); +} + +function update(index) { + var button = this.buttons[index]; + + this.ready = false; + var payload = new FormData(); + payload.append('id', button.id); + payload.append('status', button.status); + + fetch('/v1/button/', { + method: 'POST', + body: payload + }).then(response => { + this.ready = true; + }) +}; + +function remove(index) { + var button = this.buttons[index]; + + this.ready = false; + fetch('/v1/button/' + button.id, {method: 'DELETE'}).then(response => { + if (response.ok) { + response.json().then(ok => { + this.buttons.splice(index, 1); + this.ready = true; + }); + } + }); +} + +const $app = new Vue({ + el: '#container', + data: { + ready: false, + buttons: [] + }, + methods: { + create, + remove, + update + } +}); + +// GET /button +fetch('/v1/button').then(response => { + if (response.ok) { + response.json().then(buttons => { + $app.buttons = buttons; + $app.ready = true; + }) + } +}); diff --git a/www/index.htm b/www/index.htm index 9ba7132..447c6dd 100644 --- a/www/index.htm +++ b/www/index.htm @@ -1,13 +1,53 @@ - + + + + + +
+
+
+

Buttons

+
+
+ +
+
-
+ + + + + + + + + + + - + + + + + + +
idstatuslast pressed
+
{{ button.id }} + + {{ button.last_pressed }}
+ + diff --git a/www/j.js b/www/j.js deleted file mode 100644 index 8aeadc5..0000000 --- a/www/j.js +++ /dev/null @@ -1,2 +0,0 @@ -function Button() { -} diff --git a/www/s.css b/www/s.css deleted file mode 100644 index 699a279..0000000 --- a/www/s.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - margin: 0; -} -- cgit v1.2.3