Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
bcc6b49
Added static files for the site
KMaina Sep 3, 2018
86cceea
Added the landing image for the site
KMaina Sep 3, 2018
c8d102d
Add the HTML markup in the index.html file for the site
KMaina Sep 3, 2018
5b1fcaa
Added a reset.css file to remove default browser styles
KMaina Sep 4, 2018
8718f47
Design the landing page for the site
KMaina Sep 4, 2018
b591dd2
[#160219322] Add a background image and addition HTML markup
KMaina Sep 4, 2018
8bb9b3d
[Feature
KMaina Sep 5, 2018
9d4681b
[Feature
KMaina Sep 5, 2018
a7438a3
Remove index.html from the branch
KMaina Sep 5, 2018
39a6351
[Feature #160219330] Create a sign in page
KMaina Sep 5, 2018
19632ec
[Feature #160292841] Add images that are to be used in the site
KMaina Sep 5, 2018
c33a5d8
[Feature #160292841] Add styles for the user-order.html page
KMaina Sep 5, 2018
e02802a
[Feature #160292841] Add HTML markup for the user-order.html page
KMaina Sep 5, 2018
f694567
[Feature #160292841] Add a function that enables the menu slide in an…
KMaina Sep 5, 2018
61cd97b
Remove the sign-up and sign-in pages
KMaina Sep 5, 2018
a367176
Remove the user-order.html page from the branch
KMaina Sep 5, 2018
a204731
[Feature #160292858] Add styles for the user-order-history.html
KMaina Sep 5, 2018
05c5df3
[Feature #160292858] Add markup to the user-order-history.html page
KMaina Sep 5, 2018
3dde8e2
Remove user-order-history.html from the branch
KMaina Sep 5, 2018
7695675
[Feature #160298041] Add styles for the admin-orders.html page
KMaina Sep 5, 2018
ae1b4fd
[Feature #160298041] Add profile picture for the admin user
KMaina Sep 5, 2018
45395db
[Feature #160298041] Add HTML markup for the admin-orders.html page
KMaina Sep 5, 2018
c37c2a1
Remove admin-orders.html from this branch
KMaina Sep 5, 2018
e73e04d
[Feature #160298066] Add styles for the admin-order-edit.html file
KMaina Sep 5, 2018
dffa781
[Feature #160298066] Add a form to allow an admin to handle an order
KMaina Sep 5, 2018
bc8f58d
Remove admin-order-edit.html page from this branch
KMaina Sep 5, 2018
34543b8
[Feature #160298106] Add admin-order-complete.html
KMaina Sep 5, 2018
f5cd1ca
[Feature #160298106] Add a form to complete or decline an order
KMaina Sep 5, 2018
c3d2e18
Remove the admin-order-complete.html page from this branch
KMaina Sep 6, 2018
7d7d074
[Feature #160298197] Add styles for editing a meal or deleting a meal
KMaina Sep 6, 2018
cb6f65e
[Feature #160298197] Add a link to edit and button to delete a food item
KMaina Sep 6, 2018
de299de
[Feature #160298217] Add styles for the form to add a food item
KMaina Sep 6, 2018
56c5f0b
Remove admin-food.html from this branch
KMaina Sep 6, 2018
75039ed
[Feature #160298217] Add a form to add food items
KMaina Sep 6, 2018
3a1aae1
Remove admin-add-food.html from this branch
KMaina Sep 6, 2018
07f3a5e
[Feature #160298232] Add a form to edit food items
KMaina Sep 6, 2018
f338f1b
Add the index.html page
KMaina Sep 6, 2018
a7210ca
Add markup to the index.html page
KMaina Sep 6, 2018
570f2c1
Merge branch 'ft-sign-in-page-#160219330' into gh-pages
KMaina Sep 6, 2018
a277d50
Add links to the admin and user page
KMaina Sep 6, 2018
005c108
Add links to the admin and user page
KMaina Sep 6, 2018
9fb7994
Remove sign-in.html
KMaina Sep 6, 2018
0031641
Merge branch 'ft-user-order-history-160292858' into gh-pages
KMaina Sep 6, 2018
a7298b4
Merge branch 'ft-admin-order-all-160298041' into gh-pages
KMaina Sep 6, 2018
32ad651
Merge branch 'ft-accept-order-160298066' into gh-pages
KMaina Sep 6, 2018
ee423d1
Merge branch 'ft-order-compete-160298106' into gh-pages
KMaina Sep 6, 2018
003031b
Merge branch 'ft-all-food-items-160298197' into gh-pages
KMaina Sep 6, 2018
1667678
Merge branch 'ft-admin-food-add-160298217' into gh-pages
KMaina Sep 6, 2018
6ae3826
Merge branch 'ft-admin-edit-food-160298232' into gh-pages
KMaina Sep 6, 2018
2dbd3b8
Add the sign-up.html page
KMaina Sep 6, 2018
442b7f7
Add sign in page
KMaina Sep 6, 2018
b83e267
Add links to the user and admin page
KMaina Sep 6, 2018
38b64a0
Add the users page
KMaina Sep 6, 2018
35c9143
Add user history page
KMaina Sep 6, 2018
5087e2a
Edit links for the log out and menu navigation
KMaina Sep 6, 2018
2e85312
Edit links for the log out and menu navigation
KMaina Sep 6, 2018
9650d17
Edit links for the log out and menu navigation
KMaina Sep 6, 2018
9cc3995
Edit links for the log out and menu navigation
KMaina Sep 6, 2018
f3e2746
Edit links for the log out and menu navigation
KMaina Sep 6, 2018
961cf3e
[Chore #160742036] Remove unecessary files
KMaina Sep 25, 2018
906d7cb
[Chore #160742036] Change the background color
KMaina Sep 25, 2018
3774794
[Chore #160742036] Center the content on the page
KMaina Sep 25, 2018
7caf6c6
[Chore #160742036] Add a background to the form
KMaina Sep 25, 2018
9c6c949
[Chore #160742036] Redesign the form textarea
KMaina Sep 25, 2018
8a2305b
[Chore #160742036] Make the button larger and change the color
KMaina Sep 25, 2018
16045f2
[Chore #160742036] Remove unecessary styles
KMaina Sep 25, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions UI/admin-edit-food.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<!DOCTYPE html>
<html>
<head>
<link href="https://fonts.googleapis.com/css?family=Mukta" rel="stylesheet">
<link rel="stylesheet" href="css/reset.css">
<link rel="stylesheet" href="css/style.css">
<title>Admin- Add Food Item</title>
</head>
<body>
<div class="main-wrapper">
<nav id="menu">
<div class="toggle-btn" onclick="toggleSidebar()">
<span></span>
<span></span>
<span></span>
</div>
<ul>
<li>
<div><img src="img/admin.jpg" class="avi"></div>
<p>Hello, Ken <span class="copyright">(Admin)</span></p>
<p><a href="log-out.html">Log out</a></p>
</li>
<ul>
<li><a href="admin-orders.html" class="">Orders</a></li>
<li><a href="admin-order-edit.html" class="sublink">Accept/Decline Orders</a></li>
<li><a href="admin-order-delivered" class="sublink">Order Status</a></li>
</ul>
<ul>
<li><a href="admin-food.html">Food Items</a></li>
<li><a href="admin-add-food.html" class="sublink">Add Food Item</a></li>
</ul>
</ul>
</nav>
<div class="admin-order-edit">
<div class="admin-add-food">
<h1>Edit a Food Item</h1>
<p>Edit a food item in your catalog.</p>
<form>
<p>Change the image of the meal</p>
<p><input type="file" name=""></p>
<p>Edit the description of the meal you want to add.</p>
<p><textarea rows='5' cols='50'>A standard hamburger served with French fries and salad.</textarea></p>
<p><input type="submit" class="submit" value="Change"></p>
</form>
</div>
</div>
</div>
<footer id="index-footer">
<div class="footer-content">
<small>&copy;2018 Developed by: <span>Ken Maina</span></small>
</div>
</footer>
<script src="js/script.js"></script>
</body>
</html>
48 changes: 48 additions & 0 deletions UI/css/reset.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/

html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
147 changes: 147 additions & 0 deletions UI/css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
/* General styles */
body{
font-family: 'Mukta', sans-serif;
line-height: 1.5rem;
}

a {
text-decoration: none;
}

.name{
color: #0545ad;
}

/* Sliding Menu*/
#menu{
position: fixed;
width: 200px;
height: 100%;
background-color: #0a0416;
left: -200px;
transition: all 0.3s ease;
}

#menu.open{
left:0px;
}

#menu ul li{
padding: 15px 10px;
border-bottom: 1px solid white;
}

#menu ul li a{
color: white;
}

#menu ul li a:hover{
color: #47fff2;
}

#menu ul li a:active{
color: #ff84a5;
}


#menu .toggle-btn{
position: absolute;
left: 230px;
top: 20px;
}

#menu .toggle-btn span{
display: block;
width: 30px;
height: 5px;
background-color: #47fff2;
margin: 5px 0px;
}

.avi{
width: 150px;
height: 150px;
background-color: pink;
}

.avi img {
width:100%;
max-height:auto;
}

.sublink{
padding-left: 10px;
font-size: 0.8rem;
}

#index-footer{
height: 10vh;
width: 100%;
display: flex;
justify-content: center;
align-items: center;
background-color: #e2e2e2;
}

.footer-content {
text-align: center;
}

.footer-content small{
font-size: 0.75rem;
}

.submit{
width: 100%;
padding: 13px 0px;
border: 1px solid #fff;
cursor: pointer;
background-color: #0545ad;
color: #fff;
}

.submit:hover{
border: 1px solid #0545ad;
background-color: #fff;
color: #0545ad;
}

/* user-order.html */
.main-wrapper{
background-color: #fff;
}

/*admin-order-edit.html styles*/
.admin-order-edit{
height: 90vh;
text-align: center;
justify-content: center;
align-items: center;
display: flex;
flex-direction: column;
}

.admin-add-food{
border-radius: 5px;
background-color: #e2e2e2;
padding: 20px 40px;
}

.admin-add-food p{
padding-bottom: 20px;
color: #000;

}

.admin-add-food h1{
padding-bottom: 10px;
font-size: 2.5rem;
color: #000;
}

textarea {
padding: 10px;
line-height: 1.5;
border-radius: 5px;
border: 1px solid rgba(0,0,0,0.3);
}
Binary file added UI/img/admin.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/img/burger.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/img/chicken wing.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/img/french fries.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/img/landing.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/img/mario.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/img/pizza.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added UI/img/sandwich.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions UI/js/script.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
function toggleSidebar(){
document.getElementById("menu").classList.toggle('open');
}