Skip to content

New ui updates #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
.DS_Store
dist/
.nyc_output
.coveralls.yml
# Logs
logs
*.log
Expand Down
2 changes: 0 additions & 2 deletions README.md

This file was deleted.

59 changes: 54 additions & 5 deletions UI/css/orders.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion UI/js/orders.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function addToOrder(){
newRow.appendChild(delBtnCell);
orderTable.appendChild(newRow);

document.getElementById('totalCell').innerHTML = '#' + totalBill;
document.getElementById('total-cell').innerHTML = '#' + totalBill;

}

Expand Down
6 changes: 3 additions & 3 deletions UI/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<div class="box-one login-wrapper center">
<!-- Login Form -->
<div id="login-box">
<form action="orders.html" id="loginForm" method="post">
<form action="orders.html" id="loginForm" method="">
<h3 class="text-center no-margin">Login to <span class="brand">iMenu</span></h3>
<br>
<input id="loginEmail" placeholder="Email" type="text">
<input id="loginPassword" placeholder="Password" type="password">
<input id="loginEmail" placeholder="Email: admin@admin.com" type="text">
<input id="loginPassword" placeholder="Password: admin2019" type="password">
<input id="loginButton" type="button" value="Login">
<p id="reset"><a href="#">Forgot Password?</a></p>
<p id="question">Don't have an account? &nbsp;&nbsp;<a class="signup" href="#" id="signup"> Sign up instead</a></p>
Expand Down
44 changes: 18 additions & 26 deletions UI/orders.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,37 +38,29 @@ <h1>iMenu</h1>
</nav>

<div class="main-jumbo-box">
<div id="menu-box-container">
<div id="menu-box-container" class="order-box-container">
<h1>My Order</h1>
<div id="order-box-outer">
<ul>
<li>ITEM</li>
<li>PRICE</li>
</ul>
<div id="order-box-inner">
<table>
<tbody id="order-table">
<tr>
<th></th>
<th>ITEM</th>
<th>PRICE</th>
</tr>
<tr>
<td>1</td>
<td>Rice & Stew</td>
<td>#700</td>
<td><i class="fas fa-trash-alt deleteOrderItem"></i></td>
</tr>
</tbody>
<tfoot>
<tr>
<td></td>
<td>Total</td>
<td id="totalCell"></td>
<td></td>
</tr>
</tfoot>
</table>
<ul>
<li><a id='cancelOrder' href="#">Cancel Order</a></li>
<li><a id='placeOrder' href="#">Place Order</a> </li>
</ul>
</div>
</table>
</div>
<ul id="total-box">
<li>TOTAL</li>
<li id="total-cell">#00.00</li>
</ul>
<ul>
<li><a id='cancelOrder' href="#">Cancel Order</a></li>
<li><a id='placeOrder' href="#">Place Order</a> </li>
</ul>
</div>

</div>

<div id="meal-box-container" class="main-inner-box">
Expand Down
82 changes: 0 additions & 82 deletions css/login.css

This file was deleted.

Loading