Skip to content

Blizzard Blast
Blizzard Blast
Commit b79224cb authored by Martina Therese R. Reyes's avatar Martina Therese R. Reyes
Browse files
Options

Restyled the inventory and order html files

parent 3ba6e692
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 87 deletions
blizzardblast/static/css/styles.css
View file @ b79224cb
...@@ -129,13 +129,21 @@ header { ...@@ -129,13 +129,21 @@ header {
} }
/* ======== ORDER.HTML, RECEIPT.HTML, INVENTORY.HTML ============ */ /* ======== ORDER.HTML, RECEIPT.HTML, INVENTORY.HTML ============ */
/* POSITIONING OF BUTTONS AND ALL */
.title-area { .title-area {
text-align: center; text-align: center;
margin-bottom: 0;
}
.title-area>.view-subtitle {
text-align: center;
margin-top: -25px;
} }
.button-container { .buttonpanel {
display: flex; display: flex;
justify-content: space-evenly; justify-content: space-around;
} }
.order-button { .order-button {
...@@ -152,47 +160,16 @@ header { ...@@ -152,47 +160,16 @@ header {
color: #3B3355; color: #3B3355;
} }
#filter-area { .add-forms, .get-results {
display: flex; display: flex;
justify-content: center; justify-content: center;
} margin-top: -7px;
.search-bar {
border:none;
padding: 12px;
margin: 0 12px;
}
#filter-area>.search-button {
border: none;
background-color: #BFCDE0;
color: #3B3355;
margin: 0.3rem;
padding: 0.5rem;
border-radius: 2rem;
}
#filter-area>.search-button:hover {
text-decoration: underline;
cursor: pointer;
background-color: #3B3355;
color:#FEFCFD;
}
#search-filter {
border: #3B3355 1px solid;;
border-radius: 2rem;
padding: 0.6rem;
}
#CRUD-features {
display: flex;
justify-content: center;
margin: 4px auto;
padding: 10px; padding: 10px;
} }
.crud-button, .filter-button {
/* BUTTON STYLES */
.add, .loadresults {
border: none; border: none;
background-color: #BFCDE0; background-color: #BFCDE0;
color: #3B3355; color: #3B3355;
...@@ -201,21 +178,16 @@ header { ...@@ -201,21 +178,16 @@ header {
border-radius: 0.4rem; border-radius: 0.4rem;
} }
.filter-button:hover { .loadresults:hover {
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.crud-button:hover { .add:hover {
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
#order-table, #receipt-table, #scheduling-table {
display: flex;
justify-content: center;
}
a:link { a:link {
text-decoration: none; text-decoration: none;
border: none; border: none;
...@@ -228,12 +200,24 @@ a:hover { ...@@ -228,12 +200,24 @@ a:hover {
color: #5D5D81; color: #5D5D81;
} }
/* TABLE STYLES */
#order-table, #receipt-table, #scheduling-table {
display: flex;
justify-content: center;
}
table, th { table, th {
border: 1px solid black; border: 1px solid black;
padding: 10px; padding: 5px;
border-collapse: separate; border-collapse: separate;
} }
td {
padding:10px;
border: 1px solid black;
}
/* ============ REPORT.HTML =============== */ /* ============ REPORT.HTML =============== */
#report-area { #report-area {
......
blizzardblast/templates/inventory.html
View file @ b79224cb
...@@ -15,51 +15,41 @@ ...@@ -15,51 +15,41 @@
<option value="category">Category</option> <option value="category">Category</option>
<option value="name_alphabetical">Name: A-to-Z</option> <option value="name_alphabetical">Name: A-to-Z</option>
</select> </select>
<input class="search-bar" size=60 type="text" placeholder="Search..">
<button class="search-button">Search</button>
</div> </div>
<div id="CRUD-features"> <div class="inventory buttonpanel">
<button class="crud-button"><a href="{% url 'addinventory' %}">Add to Inventory</a></button> <button class="add ingredient"><a href="{% url 'addingredient' %}">Add Ingredient</a></button>
<button class="crud-button">Refresh</button> <button class="add"><a href="{% url 'addBaseFlavor' %}">Add Base Flavor</a></button>
</div> </div>
<div id="order-table"> <div id="order-table">
<table> <table>
<!-- TABLE HEADER --> <!-- TABLE HEADER -->
<tr> <tr>
<th>ingredient_id</th>
<th>Ingredient Name</th> <th>Ingredient Name</th>
<th>Category</th> <th>Category</th>
<th>Quantity</th> <th>Quantity</th>
<th>Price per Serving</th> <th>Price per Serving</th>
<th>Replenished Stock?</th>
</tr> </tr>
<!-- TABLE ROWS WITH INFO --> <!-- TABLE ROWS WITH INFO -->
{% for ingredient in inventory %}
<tr> <tr>
<th>111</th> {% if ingredient.ingredient_name == baseflavor.bf_name %}
<th>Vanilla Ice Cream</th> <td>{{baseflavor.bf_name}}</td>
<th>base</th> {% else %}
<th>100</th> <td>{{ingredient.ingredient_name}}</td>
<th>10</th> {% endif %}
</tr> <td>{{ingredient.category}}</td>
<td>{{ingredient.quantity}}</td>
<tr> <td>{{ingredient.price_per_serving}}</td>
<th>112</th> <td>{{ingredient.replenished_stock}}</td>
<th>Strawberry</th>
<th>fruits</th>
<th>50</th>
<th>20</th>
</tr>
<!-- TABLE ROW WITHOUT INFO -->
<tr>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr> </tr>
{% endfor %}
</table> </table>
</div> </div>
{% endblock %} {% endblock %}
blizzardblast/templates/order.html
View file @ b79224cb
...@@ -12,21 +12,29 @@ ...@@ -12,21 +12,29 @@
<h1 class='view-title'>Order</h1> <h1 class='view-title'>Order</h1>
<h3 class='view-subtitle'>Order Slip</h3> <h3 class='view-subtitle'>Order Slip</h3>
</div> </div>
<!-- SEARCH AREA-->
<div id="filter-area">
<button class="filter-button"><a href="{% url 'order' %}">Order Slip</a></button>
<button class="filter-button"><a href="{% url 'receipt' %}">Receipt</a></button>
<input class="search-bar" size=60 type="text" placeholder="Search..">
<button class="search-button">Search</button>
</div>
<div id="CRUD-features"> <div class="order buttonpanel">
<button class="crud-button"><a href="{% url 'addorder' %}">Add Order</a></button> <!-- GETTING THE RESULTS AREA-->
<button class="crud-button">Delete Order</button> <div class="getresults area">
<button class="crud-button">Refresh</button> <h4 class="title-area">Slips and Reciepts</h4>
<div class="get-results">
<button class="loadresults orderslip-button"><a href="{% url 'order' %}">Order Slip</a></button>
<button class="loadresults receipt-button"><a href="{% url 'receipt' %}">Receipt</a></button>
</div>
</div>
<!-- FILLING IN FORMS AREA-->
<div class="addingforms area">
<h4 class="title-area">Adding in new customers, items and orders</h4>
<div class="add-forms">
<button class="add orderform-button"><a href="{% url 'addorder' %}">Add Order</a></button>
<button class="add itemform-button"><a href="{% url 'additem' %}">Add Item</a></button>
<button class="add customerform-button"><a href="{% url 'addcustomer' %}">Add Customer</a></button>
</div>
</div>
</div> </div>
<!-- TABLE AREA-->
<div id="order-table"> <div id="order-table">
<table> <table>
<!-- TABLE HEADER --> <!-- TABLE HEADER -->
...@@ -34,7 +42,7 @@ ...@@ -34,7 +42,7 @@
<th>customer_name</th> <th>customer_name</th>
<th>date</th> <th>date</th>
<th>item</th> <th>item</th>
<th>Employee in charge</th> <th>Employee in charge</th>
</tr> </tr>
<!-- TABLE ROW WITH INFO --> <!-- TABLE ROW WITH INFO -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment