From 45c59b0f36cb113552fd07a81e9737f9ac2feb54 Mon Sep 17 00:00:00 2001 From: code Block Date: Mon, 11 Feb 2019 07:12:22 +0100 Subject: [PATCH 1/5] Update login.html --- login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login.html b/login.html index 9aa7805..d8d5560 100644 --- a/login.html +++ b/login.html @@ -22,7 +22,7 @@
-
+

Login to iMenu


From db6566c87306f8f4e26e99e4e34e7017b5d6182f Mon Sep 17 00:00:00 2001 From: code Block Date: Mon, 11 Feb 2019 07:17:42 +0100 Subject: [PATCH 2/5] Add default login details to placeholders --- login.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/login.html b/login.html index d8d5560..24db8a9 100644 --- a/login.html +++ b/login.html @@ -25,8 +25,8 @@

Login to iMenu


- - + +

Forgot Password?

Don't have an account?   

From a702dfd436cfe57f1829e5d6160c1696238965af Mon Sep 17 00:00:00 2001 From: code Block Date: Mon, 11 Feb 2019 07:20:25 +0100 Subject: [PATCH 3/5] Update orders.html --- orders.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/orders.html b/orders.html index 3a8ac25..1d78ecd 100644 --- a/orders.html +++ b/orders.html @@ -48,12 +48,6 @@

My Order

ITEM PRICE - - 1 - Rice & Stew - #700 - - From 37ff1c33fc82760fb48aa96d6c87b82a9b8c0542 Mon Sep 17 00:00:00 2001 From: code Block Date: Sun, 17 Feb 2019 23:11:48 +0100 Subject: [PATCH 4/5] Update order summary on UI --- .gitignore | 3 +++ css/orders.css | 59 +++++++++++++++++++++++++++++++++++++++++++++----- js/orders.js | 2 +- orders.html | 38 +++++++++++++++----------------- 4 files changed, 76 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index d5f5881..2d5cb9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ .DS_Store +dist/ +.nyc_output +.coveralls.yml # Logs logs *.log diff --git a/css/orders.css b/css/orders.css index e3b6029..a2837e0 100644 --- a/css/orders.css +++ b/css/orders.css @@ -10,36 +10,85 @@ th{ th:nth-child(2){ width: 200px; } +td:nth-child(2){ + padding-left: 10px; +} th:nth-child(3){ width: 80px; } tfoot{ border-top: 50px solid #ffffff; } +tr{ + margin-top: 10px; +} td{ font-size: 12px; + padding: 5px 0; +} +.order-box-container{ + overflow: unset !important; + height: 680px; } #order-box-outer{ display: flex; flex-direction: column; - height: 500px; - padding: 20px 30px; + height: 600px; + padding: 20px 30px 20px 30px; border-radius: 5px; -webkit-box-shadow: 0px 0px 7px 0px rgba(83,19, 0, 0.5); - box-shadow: 0px 0px 7px 0px rgba(83, 19, 0, 0.5); + box-shadow: 0px 0px 7px 0px rgba(83, 19, 0, 0.5); +} +#order-box-outer ul:first-of-type{ + margin: 0 auto; + padding: 10px 0; + width: 322px; + border: solid #ff670c10 1px; + border-radius: 5px 5px 0 0; +} +#order-box-outer ul:first-of-type li:first-child{ + margin-left: 35px; +} +#order-box-outer ul:first-of-type li:nth-child(2){ + margin-left: 130px; +} +#order-box-inner{ + display: flex; + flex-direction: column; + height: 380px; + padding: 20px 10px; + border: solid 1px #ff650c10; + border-radius: 0 0 0 5px; overflow: scroll; } + table i{ font-size: 12px; } +ul#total-box{ + margin: 0 0 0 150px !important; + padding: 10px 0; + width: 172px !important; + border: solid #ff670c10 1px; + border-radius: 0 0 5px 5px; +} +ul#total-box li:first-child{ + margin-left: 10px; + padding-right: 20px; + font-size: 14px; + font-weight: 700; +} +ul#total-box li:nth-child(2){ + margin-left: 0px; + font-size: 14px; + font-weight: 700; +} .addToOrder{ color: #ffffff !important; font-size: 30px !important; } #order-box-outer ul{ list-style-type: none; - position: relative; - top: 130px; padding-left: 0 !important; width: 285px; margin: auto; diff --git a/js/orders.js b/js/orders.js index 6c9a9d5..ed8ebb2 100644 --- a/js/orders.js +++ b/js/orders.js @@ -37,7 +37,7 @@ function addToOrder(){ newRow.appendChild(delBtnCell); orderTable.appendChild(newRow); - document.getElementById('totalCell').innerHTML = '#' + totalBill; + document.getElementById('total-cell').innerHTML = '#' + totalBill; } diff --git a/orders.html b/orders.html index 1d78ecd..6426630 100644 --- a/orders.html +++ b/orders.html @@ -38,31 +38,29 @@

iMenu

-
From d7e8e435de6548f9c8ec00a9e2bd2a0334aee79d Mon Sep 17 00:00:00 2001 From: code Block Date: Sun, 17 Feb 2019 23:21:27 +0100 Subject: [PATCH 5/5] Move UI files into UI folder --- README.md | 2 - UI/css/orders.css | 59 ++++++++- UI/js/orders.js | 2 +- UI/login.html | 6 +- UI/orders.html | 44 +++--- css/login.css | 82 ------------ css/meals.css | 235 --------------------------------- css/menus.css | 128 ------------------ css/orders.css | 108 --------------- css/records.css | 46 ------- css/style.css | 113 ---------------- favicon.png | Bin 1388 -> 0 bytes imgs/avocado_mix_soup_.jpeg | Bin 7224 -> 0 bytes imgs/bean_avocado_dodo.jpeg | Bin 7380 -> 0 bytes imgs/bg.jpg | Bin 3142937 -> 0 bytes imgs/chicken_crispy_salad.jpeg | Bin 10835 -> 0 bytes imgs/corn_soup_salad.jpg | Bin 59323 -> 0 bytes imgs/french_rice_soup.jpg | Bin 315742 -> 0 bytes imgs/icon.png | Bin 1509 -> 0 bytes imgs/poisson_a_trois.jpg | Bin 603767 -> 0 bytes imgs/rice_stew.jpg | Bin 490195 -> 0 bytes imgs/salad_mix.jpeg | Bin 4981 -> 0 bytes imgs/swedish_bread_salad.jpeg | Bin 9458 -> 0 bytes index.html | 36 ----- js/login.js | 66 --------- js/meals.js | 106 --------------- js/menus.js | 41 ------ js/orders.js | 61 --------- js/script.js | 0 login.html | 55 -------- meals.html | 141 -------------------- menus.html | 142 -------------------- orders.html | 137 ------------------- records.html | 110 --------------- 34 files changed, 76 insertions(+), 1644 deletions(-) delete mode 100644 README.md delete mode 100644 css/login.css delete mode 100644 css/meals.css delete mode 100644 css/menus.css delete mode 100644 css/orders.css delete mode 100644 css/records.css delete mode 100644 css/style.css delete mode 100755 favicon.png delete mode 100644 imgs/avocado_mix_soup_.jpeg delete mode 100644 imgs/bean_avocado_dodo.jpeg delete mode 100644 imgs/bg.jpg delete mode 100644 imgs/chicken_crispy_salad.jpeg delete mode 100644 imgs/corn_soup_salad.jpg delete mode 100644 imgs/french_rice_soup.jpg delete mode 100644 imgs/icon.png delete mode 100644 imgs/poisson_a_trois.jpg delete mode 100644 imgs/rice_stew.jpg delete mode 100644 imgs/salad_mix.jpeg delete mode 100644 imgs/swedish_bread_salad.jpeg delete mode 100644 index.html delete mode 100644 js/login.js delete mode 100644 js/meals.js delete mode 100644 js/menus.js delete mode 100644 js/orders.js delete mode 100644 js/script.js delete mode 100644 login.html delete mode 100644 meals.html delete mode 100644 menus.html delete mode 100644 orders.html delete mode 100644 records.html diff --git a/README.md b/README.md deleted file mode 100644 index 10a9975..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# iMenu -Secure online meal-booking app diff --git a/UI/css/orders.css b/UI/css/orders.css index e3b6029..a2837e0 100644 --- a/UI/css/orders.css +++ b/UI/css/orders.css @@ -10,36 +10,85 @@ th{ th:nth-child(2){ width: 200px; } +td:nth-child(2){ + padding-left: 10px; +} th:nth-child(3){ width: 80px; } tfoot{ border-top: 50px solid #ffffff; } +tr{ + margin-top: 10px; +} td{ font-size: 12px; + padding: 5px 0; +} +.order-box-container{ + overflow: unset !important; + height: 680px; } #order-box-outer{ display: flex; flex-direction: column; - height: 500px; - padding: 20px 30px; + height: 600px; + padding: 20px 30px 20px 30px; border-radius: 5px; -webkit-box-shadow: 0px 0px 7px 0px rgba(83,19, 0, 0.5); - box-shadow: 0px 0px 7px 0px rgba(83, 19, 0, 0.5); + box-shadow: 0px 0px 7px 0px rgba(83, 19, 0, 0.5); +} +#order-box-outer ul:first-of-type{ + margin: 0 auto; + padding: 10px 0; + width: 322px; + border: solid #ff670c10 1px; + border-radius: 5px 5px 0 0; +} +#order-box-outer ul:first-of-type li:first-child{ + margin-left: 35px; +} +#order-box-outer ul:first-of-type li:nth-child(2){ + margin-left: 130px; +} +#order-box-inner{ + display: flex; + flex-direction: column; + height: 380px; + padding: 20px 10px; + border: solid 1px #ff650c10; + border-radius: 0 0 0 5px; overflow: scroll; } + table i{ font-size: 12px; } +ul#total-box{ + margin: 0 0 0 150px !important; + padding: 10px 0; + width: 172px !important; + border: solid #ff670c10 1px; + border-radius: 0 0 5px 5px; +} +ul#total-box li:first-child{ + margin-left: 10px; + padding-right: 20px; + font-size: 14px; + font-weight: 700; +} +ul#total-box li:nth-child(2){ + margin-left: 0px; + font-size: 14px; + font-weight: 700; +} .addToOrder{ color: #ffffff !important; font-size: 30px !important; } #order-box-outer ul{ list-style-type: none; - position: relative; - top: 130px; padding-left: 0 !important; width: 285px; margin: auto; diff --git a/UI/js/orders.js b/UI/js/orders.js index 6c9a9d5..ed8ebb2 100644 --- a/UI/js/orders.js +++ b/UI/js/orders.js @@ -37,7 +37,7 @@ function addToOrder(){ newRow.appendChild(delBtnCell); orderTable.appendChild(newRow); - document.getElementById('totalCell').innerHTML = '#' + totalBill; + document.getElementById('total-cell').innerHTML = '#' + totalBill; } diff --git a/UI/login.html b/UI/login.html index 9aa7805..24db8a9 100644 --- a/UI/login.html +++ b/UI/login.html @@ -22,11 +22,11 @@