From d148d2149b703b95929ea6dc081b721efa95fdfd Mon Sep 17 00:00:00 2001 From: Gavin Riggi Date: Mon, 9 Dec 2019 05:31:33 -0500 Subject: [PATCH 1/2] Prettied up some buttons, fixed some awful UI stuff --- system/#pos_boot.sh# | 4 ++++ system/datastore/datastore.db | Bin 28672 -> 28672 bytes system/display/custLookup.css | 9 ++++++++- system/display/custLookup.html | 6 +++--- system/display/login.css | 3 ++- system/display/pos.css | 16 +++++++++++++++- system/display/pos.html | 25 +++++++++++++------------ system/main.js | 13 ++++++++----- 8 files changed, 53 insertions(+), 23 deletions(-) create mode 100755 system/#pos_boot.sh# diff --git a/system/#pos_boot.sh# b/system/#pos_boot.sh# new file mode 100755 index 0000000..0b4893e --- /dev/null +++ b/system/#pos_boot.sh# @@ -0,0 +1,4 @@ +#!/bin/bash +sleep 10 +cd /.RPiPOS/442projects-team-7/system +npm start diff --git a/system/datastore/datastore.db b/system/datastore/datastore.db index edbad0b633e47e0eec3e322a274f374ea1ba3c34..58ae6bfb952acb2468287b4903b06568ecad98ca 100644 GIT binary patch delta 405 zcmZp8z}WDBae_2s;zSu|)TjqW^rnYf>Ua08c@W*R3RY0pdd3(A-JF@GcR2sC_g8s7^clc&j_T=z*50CwIVY) zF;BrcKRHp?St36t5n`-~C6|M$k zv5)(9&EG`vUn_ygQlKH)kF7njSP%nw>bjc#`*grvfGSIt&Gg5;5G%gPb^W~z~!JS PITHwGZA$ph&&UJ-P4!tX diff --git a/system/display/custLookup.css b/system/display/custLookup.css index abdf20c..03de780 100644 --- a/system/display/custLookup.css +++ b/system/display/custLookup.css @@ -16,6 +16,13 @@ html, body { transform: translate(-50%, -50%); text-align: center; } +input { + border:none; +} +button { + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); +} + tbody { display:block; height:95%; @@ -232,4 +239,4 @@ input[type=button] { input[type=button]:hover{ background-color: #808080; -} \ No newline at end of file +} diff --git a/system/display/custLookup.html b/system/display/custLookup.html index 643453e..bbc2824 100644 --- a/system/display/custLookup.html +++ b/system/display/custLookup.html @@ -10,7 +10,7 @@
- + @@ -82,7 +82,7 @@ - + @@ -179,4 +179,4 @@ - \ No newline at end of file + diff --git a/system/display/login.css b/system/display/login.css index 11b2698..341da42 100644 --- a/system/display/login.css +++ b/system/display/login.css @@ -43,11 +43,12 @@ form .login { h1 .login { } -label .login { +label.login.centered { display: inline-block; text-align: right; font-size: 120%; font-weight: bold; + width: 150px; } input[type=password],input[type=text] { diff --git a/system/display/pos.css b/system/display/pos.css index 71429f2..6829448 100644 --- a/system/display/pos.css +++ b/system/display/pos.css @@ -40,6 +40,9 @@ tr:hover { transform: translate(-50%, -50%); text-align: center; } +button { + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); +} /*Quick Button Panel*/ aside { width:30%; @@ -65,6 +68,7 @@ div.pbtns { padding: 2%; width: 31%; height: 100px; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); } .qbtn-group button:hover{ @@ -77,6 +81,7 @@ div.pbtns { padding: 2%; width: 31%; height: 100px; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); } .ubtn-group button:hover{ @@ -89,6 +94,7 @@ div.pbtns { padding: 2%; width: 31%; height: 75px; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); } .pbtn-group button:hover{ @@ -101,6 +107,7 @@ div.flex-row { } div.customer-column { flex: 50%; + height: 2em; } #Customer-Info { padding-left: 1%; @@ -195,6 +202,7 @@ div.customer-column { font-size: 36px; color: #818181; background-color: #1b1b1b; + border:none; transition: 0.3s; } @@ -202,6 +210,9 @@ div.customer-column { padding: 8px; text-decoration: none; font-size: 36px; + float: left; + clear: left; + width: 220px; } .fulloverlay input[type=number] { @@ -319,6 +330,7 @@ div #Quick-Buttons { top: 59px; background: #2F2F2F; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); } section { position: absolute; @@ -328,6 +340,7 @@ section { top: 59px; background: #2F2F2F; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); } div #Transaction-Info-Panel { position: relative; @@ -380,7 +393,7 @@ div #Column-Headers { } div #SKU-Column { position: relative; - width: 10%; + width: 114px; height: 30px; left: 0px; top: 0px; @@ -534,6 +547,7 @@ label .login { width: 150px; height: 30px; margin: 4px 2px; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); } input[type=text]:focus, input[type=password]:focus { diff --git a/system/display/pos.html b/system/display/pos.html index 23e3cde..196d956 100644 --- a/system/display/pos.html +++ b/system/display/pos.html @@ -238,22 +238,22 @@ Customer Info
-

654321

+

-

John Doe

+

Guest

-

(555) 555-5555

+

-

john.doe@example.com

+

@@ -264,7 +264,7 @@

Available:

-

3

+

0

@@ -280,7 +280,7 @@

Remaining:

-

3

+

0

@@ -327,7 +327,7 @@
- +

Protein

@@ -353,9 +353,9 @@

Utility

- - - + + +
CID # Customer Name Phone #