From 070a05c6e374642efc3894a0d35f7ba6c5d99beb Mon Sep 17 00:00:00 2001 From: KMaina Date: Tue, 25 Sep 2018 10:24:25 +0300 Subject: [PATCH 1/4] [Chore #160748981] Remove unnecessary files --- UI/admin-add-food.html | 57 ----------------------- UI/admin-edit-food.html | 57 ----------------------- UI/admin-food.html | 84 ---------------------------------- UI/admin-order-complete.html | 64 -------------------------- UI/admin-order-edit.html | 65 -------------------------- UI/css/style.css | 2 +- UI/index.html | 31 ------------- UI/sign-in.html | 33 -------------- UI/sign-up.html | 34 -------------- UI/user-order-history.html | 88 ------------------------------------ UI/user-order.html | 83 ---------------------------------- 11 files changed, 1 insertion(+), 597 deletions(-) delete mode 100644 UI/admin-add-food.html delete mode 100644 UI/admin-edit-food.html delete mode 100644 UI/admin-food.html delete mode 100644 UI/admin-order-complete.html delete mode 100644 UI/admin-order-edit.html delete mode 100644 UI/index.html delete mode 100644 UI/sign-in.html delete mode 100644 UI/sign-up.html delete mode 100644 UI/user-order-history.html delete mode 100644 UI/user-order.html diff --git a/UI/admin-add-food.html b/UI/admin-add-food.html deleted file mode 100644 index 0379c39..0000000 --- a/UI/admin-add-food.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - Admin- Add Food Item - - -
- -
-
-

Add a Food Item

-

Add a food item to your catalog

-
-
-
-

Add a beautiful image for your food item.

-

-

Give a short description of the meal you want to add.

-

-

-
-
-
-
- - - - \ No newline at end of file diff --git a/UI/admin-edit-food.html b/UI/admin-edit-food.html deleted file mode 100644 index 462ce20..0000000 --- a/UI/admin-edit-food.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - Admin- Add Food Item - - -
- -
-
-

Edit a Food Item

-

Edit a food item in your catalog.

-
-
-
-

Change the image of the meal

-

-

Edit the description of the meal you want to add.

-

-

-
-
-
-
- - - - \ No newline at end of file diff --git a/UI/admin-food.html b/UI/admin-food.html deleted file mode 100644 index 266c119..0000000 --- a/UI/admin-food.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - Admin- Food - - -
- -
-

Admin- Food Overview

-

Have an overview of the catalogs of food on dispay here. Edit or delete an item using the buttons provided.

-
-
-
-
-

A standard hamburger served with French fries and salad.

-

Edit

-

-
-
-
-
-

Enjoy classic French Fries as you enjoy a movie or on a picnic.

-

Edit

-

-
-
-
-
-

An extra large pzza that can be enjoyed with the whole company over a game of cards.

-

Edit

-

-
-
-
-
-

Perfect for your 10am tea as you unwind in the early morning!

-

Edit

-

-
-
-
-
-

Enjoy 8 juicy chicken wings as a sidemeal as you watch your game of football.

-

Edit

-

-
-
-
-
-
- - - - \ No newline at end of file diff --git a/UI/admin-order-complete.html b/UI/admin-order-complete.html deleted file mode 100644 index 9ba909b..0000000 --- a/UI/admin-order-complete.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - Admin- Approve order - - -
- -
-
-

Approve Order

-

Approve an order upon deliver, otherwise decline it.

-
-
-
-

Order number: 1

-

Order particulars: -

    -
  • Hamburger: 2 meals
    • -
  • Chicken wings: 2 meals
    • -
-

-

Order date: 9 July 2018

-

Approve

-

Decline

-

-
-
-
-
- - - - \ No newline at end of file diff --git a/UI/admin-order-edit.html b/UI/admin-order-edit.html deleted file mode 100644 index b54baf1..0000000 --- a/UI/admin-order-edit.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - Admin- Edit order - - - -
- -
-
-

Edit Order

-

Accept or decline orders that have already been made.

-
-
-
-

Order number: 1

-

Order particulars: -

    -
  • Hamburger: 2 meals
    • -
  • Chicken wings: 2 meals
    • -
-

-

Order date: 9 July 2018

-

Accept

-

Decline

-

-
-
-
-
- - - - \ No newline at end of file diff --git a/UI/css/style.css b/UI/css/style.css index 8ac3136..7930aee 100644 --- a/UI/css/style.css +++ b/UI/css/style.css @@ -185,7 +185,7 @@ input[type=password]{ /* user-order.html */ .main-wrapper{ /*height: 90vh;*/ - background-color: #efe1f4 + background-color: #efe1f4; } .order-main, .admin-main { diff --git a/UI/index.html b/UI/index.html deleted file mode 100644 index 675d56c..0000000 --- a/UI/index.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - Welcome To Fasty Food Fast - - -
-
-
-

Welcome to Tasty Food Fast

-

Here at Tasty Food Fast we aim to get you finger lickin' dishes wherever you are at the touch of a button. All you need to do is place an order for yor dish and await it wherever you are.

-

What are you waiting for? Sign up with us if you haven't already and leave the rest to us!

-
- Sign Up - Sign In -
-
-
-
- - - - - \ No newline at end of file diff --git a/UI/sign-in.html b/UI/sign-in.html deleted file mode 100644 index e53aa2b..0000000 --- a/UI/sign-in.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - Sign In - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/UI/sign-up.html b/UI/sign-up.html deleted file mode 100644 index 24c5b32..0000000 --- a/UI/sign-up.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - Sign Up - - -
-
- -
-
- - - - - \ No newline at end of file diff --git a/UI/user-order-history.html b/UI/user-order-history.html deleted file mode 100644 index 313e9ca..0000000 --- a/UI/user-order-history.html +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - Order History - - -
- -
-

Order History

-

View your order history.

-
-
-
-

Date

-

Order Number

-

Order Particulars

-

Action

-
-
-
-

9 July 2018

-

1

-
-

Hamburger: 2 meals

-

Chicken wings: 2 meals

-
-

Accepted

-
-
-
-

14 July 2018

-

1

-
-

Hamburger: 2 meals

-

Chicken wings: 2 meals

-

Pizza wings: 1 meals

-
-

Declined

-
-
-
-

28 August 2018

-

1

-
-

Hamburger: 2 meals

-

Chicken wings: 2 meals

-
-

Accepted

-
-
-
-

6 September 2018

-

1

-
-

Sandwich: 4 meals

-
-

Accepted

-
-
-
-
- - - - \ No newline at end of file diff --git a/UI/user-order.html b/UI/user-order.html deleted file mode 100644 index 110c86c..0000000 --- a/UI/user-order.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - User Order - - -
- -
-

Order Your Meal

-

Select from our list of delicious meals below and await it as it gets to your doorstep. Order by marking the chekbox of the meal you want to order and indicate the number of meals you would want. Once done navigate to the bottom and click on the add button.

-
-
-
-
-

A standard hamburger served with French fries and salad.

-

Order a hamburger?

-

Quantity:

-
-
-
-
-

Enjoy classic French Fries as you enjoy a movie or on a picnic.

-

Order French Fries?

-

Quantity:

-
-
-
-
-

An extra large pzza that can be enjoyed with the whole company over a game of cards.

-

Order a pizza?

-

Quantity:

-
-
-
-
-

Perfect for your 10am tea as you unwind in the early morning!

-

Order a sandwich?

-

Quantity:

-
-
-
-
-

Enjoy 8 juicy chicken wings as a sidemeal as you watch your game of football.

-

Order chicken wings?

-

Quantity:

-
-
-
-
-
-
-
-
-
-
-
- - - - \ No newline at end of file From 51f9937081b46531e51136b427d27732ba2e3f2a Mon Sep 17 00:00:00 2001 From: KMaina Date: Tue, 25 Sep 2018 10:25:29 +0300 Subject: [PATCH 2/4] [Chore #160748981] Change the background color --- UI/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/css/style.css b/UI/css/style.css index 7930aee..8fb2b8f 100644 --- a/UI/css/style.css +++ b/UI/css/style.css @@ -185,7 +185,7 @@ input[type=password]{ /* user-order.html */ .main-wrapper{ /*height: 90vh;*/ - background-color: #efe1f4; + background-color: #fff; } .order-main, .admin-main { From 4d92df5ecacbfd487c953b5d5c6308de522a3d38 Mon Sep 17 00:00:00 2001 From: KMaina Date: Tue, 25 Sep 2018 10:27:30 +0300 Subject: [PATCH 3/4] [Chore #160748981] Add a a color to the form --- UI/css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UI/css/style.css b/UI/css/style.css index 8fb2b8f..260f5f1 100644 --- a/UI/css/style.css +++ b/UI/css/style.css @@ -212,8 +212,8 @@ input[type=password]{ margin: 0 auto; width: 80%; align-items: center; - /*background-color: pink;*/ - border: 1px solid white; + background-color: #e2e2e2; + border: 1px solid rgba(0,0,0,0.3); border-radius: 5px; } From 7302ee78ca59d5f3e60b4fb6c9bd408c257fde6d Mon Sep 17 00:00:00 2001 From: KMaina Date: Tue, 25 Sep 2018 10:30:56 +0300 Subject: [PATCH 4/4] [Chore #160748981] Add an edit button --- UI/admin-orders.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/UI/admin-orders.html b/UI/admin-orders.html index de29893..a970cfc 100644 --- a/UI/admin-orders.html +++ b/UI/admin-orders.html @@ -52,7 +52,7 @@

Orders Page

Chicken wings: 2 meals

Mario

-

Accepted

+


@@ -64,7 +64,7 @@

Orders Page

Pizza wings: 1 meals

Mario

-

Declined

+


@@ -75,7 +75,7 @@

Orders Page

Chicken wings: 2 meals

Mario

-

Accepted

+


@@ -85,7 +85,7 @@

Orders Page

Sandwich: 4 meals

Mario

-

Accepted

+


@@ -95,7 +95,7 @@

Orders Page

Chicken wings: 2 meals

Luigi

-

On Transit

+


@@ -105,7 +105,7 @@

Orders Page

Chicken wings: 2 meals

Luigi

-

Pending Approval

+