ysandler/baristaMenu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: added dink type tabs

Browse Source
This commit is contained in:
ysandler 2017-01-30 16:32:26 -06:00 committed by Joshua Shoemaker
parent 7e6e2c6a0b
commit 76d63038be
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/style.css
View File

@ -20,6 +20,10 @@ button{
border-color:rgba(255,255,255,0); border-color:rgba(255,255,255,0);
} }
.drink-menu{
height: 560px;
}
#app{ #app{
width: 960px; width: 960px;
} }

16
index.html
View File

@ -41,7 +41,7 @@
</div> </div>
<div id="menu" class="seven columns"> <div id="menu" class="seven columns">
<div id="options-menu"> <div id="options-menu" class="drink-menu">
<h5>Drink Options</h5> <h5>Drink Options</h5>
<button class="button-primary" data-name="ICED" data-value="">ICED</button> <button class="button-primary" data-name="ICED" data-value="">ICED</button>
@ -90,7 +90,7 @@
</div> </div>
<div id="recipe-menu" style="display: none;"> <div id="recipe-menu" class="drink-menu" style="display: none;">
<h5>Drink Recipes</h5> <h5>Drink Recipes</h5>
<button class="button-primary" data-name="RECIPE" data-value="ESPRESSO">ESPRESSO</button> <button class="button-primary" data-name="RECIPE" data-value="ESPRESSO">ESPRESSO</button>
<button class="button-primary" data-name="RECIPE" data-value="LATTE">LATTE</button> <button class="button-primary" data-name="RECIPE" data-value="LATTE">LATTE</button>
@ -103,7 +103,7 @@
</div> </div>
<div id="syrup-menu" style="display: none;"> <div id="syrup-menu" class="drink-menu" style="display: none;">
<h5>Syrups</h5> <h5>Syrups</h5>
<button class="button-primary" data-name="SYRUP" data-value="VANILLA">VANILA</button> <button class="button-primary" data-name="SYRUP" data-value="VANILLA">VANILA</button>
<button class="button-primary" data-name="SYRUP" data-value="SFVANILLA">SF VANILLA</button> <button class="button-primary" data-name="SYRUP" data-value="SFVANILLA">SF VANILLA</button>
@ -114,7 +114,17 @@
<button class="button-primary" data-name="SYRUP" data-value="MOCHA">MOCHA</button> <button class="button-primary" data-name="SYRUP" data-value="MOCHA">MOCHA</button>
</div> </div>
<div class="drink-maker-tabs">
<button class="button-default" data-name="CONTROL" data-value="BREWED">BREWED</button>
<button class="button-default" data-name="CONTROL" data-value="ESPRESSO">ESPRESSO</button>
<button class="button-default" data-name="CONTROL" data-value="BLENDED">BLENDED</button>
<button class="button-default" data-name="CONTROL" data-value="TEA">TEA</button>
<button class="button-default" data-name="CONTROL" data-value="OTHER">OTHER</button>
</div> </div>
</div>
<div class="one columns" id="drink-builder-options"> <div class="one columns" id="drink-builder-options">

10
js/order.js
View File

@ -31,6 +31,7 @@ orderSection.addEventListener('click', function(e){
function orderDisplay(drink){ function orderDisplay(drink){
let o = { let o = {
name: "default Drink <br>", name: "default Drink <br>",
iced: "",
syrups: "", syrups: "",
size: "" size: ""
} }
@ -60,6 +61,13 @@ function orderDisplay(drink){
o.name = drink.recipe.name + "<br>"; o.name = drink.recipe.name + "<br>";
} }
if(drink.iced){
o.iced = "ICED<br>"
}
else{
o.iced = ""
}
switch(drink.caffeine){ switch(drink.caffeine){
case caffeineTypes.DECAF: case caffeineTypes.DECAF:
@ -78,5 +86,5 @@ function orderDisplay(drink){
}, this); }, this);
} }
return o.size + o.name + o.syrups + o.caffeine; return o.size + o.name + o.iced + o.syrups + o.caffeine;
} }