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

refact: changed numerical values of milks to names

Browse Source
This commit is contained in:
ysandler 2017-03-04 20:03:18 -06:00 committed by Joshua Shoemaker
parent dc70911920
commit 0d73f61fdb
4 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
index.html
View File

@ -295,29 +295,29 @@
<div id="milk-menu" class="drink-menu five-buttons" style="display: none;"> <div id="milk-menu" class="drink-menu five-buttons" style="display: none;">
<h5>Milks</h5> <h5>Milks</h5>
<button class="button-brown" data-name="MILK" data-value="2">NONFAT</button> <button class="button-brown" data-name="MILK" data-value="Nonfat">NONFAT</button>
<button class="button-brown" data-name="MILK" data-value="7">1% MILK</button> <button class="button-brown" data-name="MILK" data-value="1% Milk">1% MILK</button>
<button class="empty-button" data-name="" data-value="">.</button> <button class="empty-button" data-name="" data-value="">.</button>
<button class="button-brown" data-name="MILK" data-value="2">WITH NONFAT</button> <button class="button-brown" data-name="MILK" data-value="with Nonfat">WITH NONFAT</button>
<button class="button-brown" data-name="MILK" data-value="7">WITH 1% MILK</button> <button class="button-brown" data-name="MILK" data-value="with 1% Milk">WITH 1% MILK</button>
<button class="button-brown" data-name="MILK" data-value="1">2% MILK</button> <button class="button-brown" data-name="MILK" data-value="2% Milk">2% MILK</button>
<button class="button-brown" data-name="MILK" data-value="3">WHOLE MILK</button> <button class="button-brown" data-name="MILK" data-value="Whole Milk">WHOLE MILK</button>
<button class="empty-button" data-name="" data-value="">.</button> <button class="empty-button" data-name="" data-value="">.</button>
<button class="button-brown" data-name="MILK" data-value="2">WITH 2% MILK</button> <button class="button-brown" data-name="MILK" data-value="with 2% Milk">WITH 2% MILK</button>
<button class="button-brown" data-name="MILK" data-value="3">WITH WHOLE MILK</button> <button class="button-brown" data-name="MILK" data-value="with Whole Milk">WITH WHOLE MILK</button>
<button class="button-brown" data-name="MILK" data-value="5">SOY MILK</button> <button class="button-brown" data-name="MILK" data-value="Soy Milk">SOY MILK</button>
<button class="button-brown" data-name="MILK" data-value="10">LACTAID MILK</button> <button class="button-brown" data-name="MILK" data-value="Lactaid Milk">LACTAID MILK</button>
<button class="empty-button" data-name="" data-value="">.</button> <button class="empty-button" data-name="" data-value="">.</button>
<button class="button-brown" data-name="MILK" data-value="5">WITH SOY MILK</button> <button class="button-brown" data-name="MILK" data-value="with Soy Milk">WITH SOY MILK</button>
<button class="button-brown" data-name="MILK" data-value="10">WITH LACTAID MILK</button> <button class="button-brown" data-name="MILK" data-value="with Lactaid Milk">WITH LACTAID MILK</button>
<button class="button-brown" data-name="MILK" data-value="4">COCONUT MILK</button> <button class="button-brown" data-name="MILK" data-value="Coconut Milk">COCONUT MILK</button>
<button class="button-brown" data-name="MILK" data-value="6">ALMOUNDMILK</button> <button class="button-brown" data-name="MILK" data-value="Almoundmilk">ALMOUNDMILK</button>
<button class="empty-button" data-name="" data-value="">.</button> <button class="empty-button" data-name="" data-value="">.</button>
<button class="button-brown" data-name="MILK" data-value="4">WITH COCONUT MILK</button> <button class="button-brown" data-name="MILK" data-value="with Coconut Milk">WITH COCONUT MILK</button>
<button class="button-brown" data-name="MILK" data-value="6">WITH ALMOUNDMILK</button> <button class="button-brown" data-name="MILK" data-value="with Almoundmilk">WITH ALMOUNDMILK</button>
<button class="button-brown" data-name="MILK" data-value="8">BREVE</button> <button class="button-brown" data-name="MILK" data-value="8">BREVE</button>
<button class="button-brown" data-name="MILK" data-value="9">HEAVY CREAM</button> <button class="button-brown" data-name="MILK" data-value="9">HEAVY CREAM</button>

3
js/app.js
View File

@ -38,6 +38,9 @@ document.addEventListener('DOMContentLoaded', function(){
case "SYRUP": case "SYRUP":
Object.assign(currentDrink.recipe, addSyrup(currentDrink.recipe, dataValue, currentDrink.size)); Object.assign(currentDrink.recipe, addSyrup(currentDrink.recipe, dataValue, currentDrink.size));
break; break;
case "MILK":
currentDrink = changeMilk(currentDrink,dataValue);
break;
case "OTHER": case "OTHER":
Object.assign(currentDrink.recipe, addOther(currentDrink.recipe, dataValue, currentDrink.size)); Object.assign(currentDrink.recipe, addOther(currentDrink.recipe, dataValue, currentDrink.size));
break; break;

5
js/createDrink.js
View File

@ -37,6 +37,11 @@ function changeSize(drink, size) {
return drink; return drink;
} }
function changeMilk(drink, milk){
drink.recipe.milk = milk;
return drink;
}
function changeIced(drink){ function changeIced(drink){
if(drink.iced === undefined) if(drink.iced === undefined)
drink.iced = true; drink.iced = true;

10
js/order.js
View File

@ -34,6 +34,7 @@ function orderDisplay(drink){
let o = { let o = {
name: "default Drink <br>", name: "default Drink <br>",
iced: "", iced: "",
milk: "",
syrups: "", syrups: "",
other: "", other: "",
size: "", size: "",
@ -101,6 +102,14 @@ function orderDisplay(drink){
} }
if(drink.recipe.milk){
o.milk = drink.recipe.milk + "<br>";
}
else{
o.milk = "";
}
switch(drink.caffeine){ switch(drink.caffeine){
case "Decaf": case "Decaf":
o.caffeine = "Decaf <br>"; o.caffeine = "Decaf <br>";
@ -135,6 +144,7 @@ function orderDisplay(drink){
o.name + o.name +
o.shotDeclaration + o.shotDeclaration +
o.caffeine + o.caffeine +
o.milk +
o.syrups + o.syrups +
o.other; o.other;
} }