refact: replaced enums with strings

index.html

@@ -293,6 +293,41 @@
                         <button class="button-default" data-name="" data-value="">MORE SEASONAL SYRUP</button>
                     </div>
 
+                    <div id="milk-menu" class="drink-menu five-buttons" style="display: none;">
+                        <h5>Milks</h5>
+                        <button class="button-brown" data-name="MILK" data-value="2">NONFAT</button>
+                        <button class="button-brown" data-name="MILK" data-value="7">1% MILK</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="7">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="3">WHOLE MILK</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="3">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="10">LACTAID MILK</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="10">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="6">ALMOUNDMILK</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="6">WITH ALMOUNDMILK</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="empty-button" data-name="" data-value="">.</button>
+                        <button class="button-brown" data-name="MILK" data-value="8">WITH BREVE</button>
+                        <button class="button-brown" data-name="MILK" data-value="9">WITH HEAVY CREAM</button>
+                        
+                        <button class="button-brown" data-name="CUSTOM" data-value="Add Dairy">ADD DAIRY</button>
+                    </div>
+
                     <div id="custom-menu" class="drink-menu six-buttons" style="display: none;">
                         <h5>Other</h5>
                         <button class="button-blue" data-name="OTHER" data-value="Ice">ICE</button>

js/app.js

@@ -60,6 +60,7 @@ document.addEventListener('DOMContentLoaded', function(){
                 brewedMenu.style.display = "none";
                 blendedMenu.style.display = "none";
                 teaMenu.style.display = "none";
+                milkMenu.style.display = "none";
                 customMenu.style.display = "none";
                 break;
             case "ESPRESSO":
@@ -69,6 +70,7 @@ document.addEventListener('DOMContentLoaded', function(){
                 syrupMenu.style.display = "none";
                 blendedMenu.style.display = "none";
                 teaMenu.style.display = "none";
+                milkMenu.style.display = "none";
                 customMenu.style.display = "none";
                 break;
             case "SYRUP":
@@ -78,6 +80,7 @@ document.addEventListener('DOMContentLoaded', function(){
                 syrupMenu.style.display = "block";
                 blendedMenu.style.display = "none";
                 teaMenu.style.display = "none";
+                milkMenu.style.display = "none";
                 customMenu.style.display = "none";
                 break;
             case "BREWED":
@@ -87,6 +90,7 @@ document.addEventListener('DOMContentLoaded', function(){
                 brewedMenu.style.display = "block";
                 blendedMenu.style.display = "none";
                 teaMenu.style.display = "none";
+                milkMenu.style.display = "none";
                 customMenu.style.display = "none";
                 break;
             case "BLENDED":
@@ -96,6 +100,7 @@ document.addEventListener('DOMContentLoaded', function(){
                 blendedMenu.style.display = "block";
                 brewedMenu.style.display = "none";
                 teaMenu.style.display = "none";
+                milkMenu.style.display = "none";
                 customMenu.style.display = "none";
                 break;
             case "TEA":
@@ -105,8 +110,19 @@ document.addEventListener('DOMContentLoaded', function(){
                 blendedMenu.style.display = "none";
                 brewedMenu.style.display = "none";
                 teaMenu.style.display = "block";
+                milkMenu.style.display = "none";
                 customMenu.style.display = "none";
                 break;
+            case "MILK":
+                drinkOptionsMenu.style.display = "none";
+                recipeMenu.style.display = "none";
+                syrupMenu.style.display = "none";
+                blendedMenu.style.display = "none";
+                brewedMenu.style.display = "none";
+                teaMenu.style.display = "none";
+                customMenu.style.display = "none";
+                milkMenu.style.display = "block";
+                break;
             case "CUSTOM":
                 drinkOptionsMenu.style.display = "none";
                 recipeMenu.style.display = "none";
@@ -115,6 +131,7 @@ document.addEventListener('DOMContentLoaded', function(){
                 brewedMenu.style.display = "none";
                 teaMenu.style.display = "none";
                 customMenu.style.display = "block";
+                milkMenu.style.display = "none";
                 break;
             
         }
@@ -125,6 +142,7 @@ document.addEventListener('DOMContentLoaded', function(){
     let brewedMenu = document.getElementById("brewed-menu");
     let blendedMenu = document.getElementById("blended-menu");
     let teaMenu = document.getElementById("tea-menu");
+    let milkMenu = document.getElementById("milk-menu");
     let customMenu = document.getElementById("custom-menu");
 
 

js/createDrink.js

@@ -2,18 +2,16 @@
 
 function createDrink(){
     return {
-        size: drinkSizes.GRANDE,
+        size: "Grande",
         iced: false,
-        caffeine: caffeineTypes.NORMAL,
+        caffeine: "Normal",
-        type: drinkTypes.DRINK,
         recipe: {
             assigned: false,
-            shotType: shotTypes.NORMAL,
+            shotType: "Normal",
             syrups: [],
             addedSyrups: [],
             other: [],
-            addedOthers: [],
+            addedOthers: []
-            milk: milkTypes.NONE,
         },
     }
 }
@@ -21,19 +19,19 @@ function createDrink(){
 function changeSize(drink, size) {
     switch(size){
         case "SHORT":
-            drink.size = drinkSizes.SHORT;
+            drink.size = "Short";
             break;
         case "TALL":
-            drink.size = drinkSizes.TALL;
+            drink.size = "Tall";
             break;
         case "GRANDE":
-            drink.size = drinkSizes.GRANDE;
+            drink.size = "Grande";
             break;
         case "VENTI":
-            drink.size = drinkSizes.VENTI;
+            drink.size = "Venti";
             break;
         case "TRENTA":
-            drink.size = drinkSizes.TRENTA;
+            drink.size = "Trenta";
             break;
     }
     return drink;
@@ -50,35 +48,35 @@ function changeIced(drink){
 function changeCaffeine(drink, caffeine){
     switch(caffeine){
         case "DECAF":
-            if(drink.caffeine === caffeineTypes.DECAF){
+            if(drink.caffeine === "Decaf"){
-                drink.caffeine = caffeineTypes.NORMAL;
+                drink.caffeine = "Normal";
             }
             else{
-                drink.caffeine = caffeineTypes.DECAF;
+                drink.caffeine = "Decaf";
             }
             break;
         case "HALFCAF":
-            if(drink.caffeine === caffeineTypes.HALFCAF){
+            if(drink.caffeine === "1/2 Decaf"){
-                drink.caffeine = caffeineTypes.NORMAL;
+                drink.caffeine = "Normal";
             }
             else{
-                drink.caffeine = caffeineTypes.HALFCAF;
+                drink.caffeine = "1/2 Decaf";
             }
             break;
         case "TWOTHIRDS":
-            if(drink.caffeine === caffeineTypes.TWOTHIRDSCAF){
+            if(drink.caffeine === "2/3 Decaf"){
-                drink.caffeine = caffeineTypes.NORMAL;
+                drink.caffeine = "Normal";
             }
             else{
-                drink.caffeine = caffeineTypes.TWOTHIRDSCAF;
+                drink.caffeine = "2/3 Decaf";
             }
             break;
         case "THREEFOURTHS":
-            if(drink.caffeine === caffeineTypes.THREEFOURTHSCAF){
+            if(drink.caffeine === "3/4 Decaf"){
-                drink.caffeine = caffeineTypes.NORMAL;
+                drink.caffeine = "Normal";
             }
             else{
-                drink.caffeine = caffeineTypes.THREEFOURTHSCAF;
+                drink.caffeine = "3/4 Decaf";
             }
             break;
     }
@@ -87,20 +85,20 @@ function changeCaffeine(drink, caffeine){
 
 function changeShotType(drink, shotType) {
     switch(shotType){
-        case "RESTRETTO":
+        case "Restretto":
-            if(drink.recipe.shotType === shotTypes.RESTRETTO){
+            if(drink.recipe.shotType === "Restretto"){
-                drink.recipe.shotType = shotTypes.NORMAL;
+                drink.recipe.shotType = "Normal";
             }
             else{
-                drink.recipe.shotType = shotTypes.RESTRETTO;
+                drink.recipe.shotType = "Restretto";
             }
         break;
-        case "LONG":
+        case "Long":
-            if(drink.recipe.shotType === shotTypes.LONG){
+            if(drink.recipe.shotType === "Long"){
-                drink.recipe.shotType = shotTypes.NORMAL;
+                drink.recipe.shotType = "Normal";
             }
             else{
-                drink.recipe.shotType = shotTypes.LONG;
+                drink.recipe.shotType = "Long";
             }
         break;
     }
@@ -350,15 +348,15 @@ function standardPumps(size, mod){
         modValue = mod;
 
     switch(size){
-        case drinkSizes.SHORT:
+        case "Short":
             return 2 + modValue;
-        case drinkSizes.TALL:
+        case "Tall":
             return 3 + modValue;
-        case drinkSizes.GRANDE:
+        case "Grande":
             return 4 + modValue;
-        case drinkSizes.VENTI:
+        case "Venti":
             return 5 + modValue;
-        case drinkSizes.TRENTA:
+        case "Trenta":
             return 7 + modValue;
     }
 }
@@ -371,13 +369,13 @@ function standardShots(size, mod){
         modValue = mod;
 
     switch(size){
-        case drinkSizes.SHORT:
+        case "Short":
             return 1 + modValue;
-        case drinkSizes.TALL:
+        case "Tall":
             return 1 + modValue;
-        case drinkSizes.GRANDE:
+        case "Grande":
             return 2 + modValue;
-        case drinkSizes.VENTI:
+        case "Venti":
             return 2 + modValue;
     }
 }

js/customTypes.js

@@ -1,47 +0,0 @@
-"use strict"
-
-const shotTypes = {
-    NORMAL: 0,
-    LONG: 1,
-    RESTRETTO: 2
-}
-
-const milkTypes = {
-    NONE: 0,
-    TWOPERCENT: 1,
-    NONFAT: 2,
-    WHOLE: 3,
-    COCONUT: 4,
-    SOY: 5,
-    ALMOND: 6,
-    ONEPERCENT: 7,
-    BREVE: 8,
-    HEAVYCREAM: 9
-}
-
-const drinkTypes = {
-    DRINK: 0,
-    BREW: 1,
-    ESPRESSO: 2,
-    FRAPPUCCINO: 3,
-    HOTTEA: 4,
-    ICEDTEA: 5,
-    COLDOTHER: 6,
-    HOTOTHER: 7
-}
-
-const drinkSizes = {
-    SHORT: 0,
-    TALL: 1,
-    GRANDE: 2,
-    VENTI: 3,
-    TRENTA: 4
-}
-
-const caffeineTypes = {
-    NORMAL: 1,
-    DECAF: 2,
-    HALFCAF: 3,
-    TWOTHIRDSCAF: 4,
-    THREEFOURTHSCAF: 5
-}

js/order.js

@@ -69,19 +69,19 @@ function orderDisplay(drink){
     }
 
     switch(drink.size){
-        case drinkSizes.SHORT:
+        case "Short":
             o.size = "SH ";
             break;
-        case drinkSizes.TALL:
+        case "Tall":
             o.size = "TL ";
             break;
-        case drinkSizes.GRANDE:
+        case "Grande":
             o.size = "GR "; 
             break;
-        case drinkSizes.VENTI:
+        case "Venti":
             o.size = "VT ";
             break;
-        case drinkSizes.TRENTA:
+        case "Trenta":
             o.size = "TR ";
             break;
     }
@@ -94,7 +94,7 @@ function orderDisplay(drink){
     }
 
     if(drink.iced){
-        o.iced = "ICED<br>"
+        o.iced = "ICED "
     }
     else{
         o.iced = ""
@@ -102,16 +102,16 @@ function orderDisplay(drink){
 
     
     switch(drink.caffeine){
-        case caffeineTypes.DECAF:
+        case "Decaf":
             o.caffeine = "Decaf <br>";
             break;
-        case caffeineTypes.HALFCAF:
+        case "1/2 Decaf":
             o.caffeine = "1/2 Decaf <br>";
             break;
-        case caffeineTypes.TWOTHIRDSCAF:
+        case "2/3 Decaf":
             o.caffeine = "2/3 Decaf <br>";
             break;
-        case caffeineTypes.THREEFOURTHSCAF:
+        case "3/4 Decaf":
             o.caffeine = "3/4 Decaf <br>";
             break;
         default:
@@ -131,8 +131,8 @@ function orderDisplay(drink){
     }
 
     return  o.size + 
-            o.name + 
             o.iced + 
+            o.name + 
             o.shotDeclaration + 
             o.caffeine + 
             o.syrups + 

js/standardRecipies.js

@@ -6,7 +6,7 @@ function americano (drink) {
         name: "Americano",
         assigned: true,
         shots: standardShots(drink.size, 1),
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
  }
@@ -24,7 +24,7 @@ function espressoMacchiato (drink) {
         name: "Espresso Macchiato",
         assigned: true,
         shots: standardShots(drink.size),
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
  }
@@ -42,7 +42,7 @@ function espressoMacchiato (drink) {
         name: "Starbucks Double Shot On Ice",
         assigned: true,
         shots: shotsSBDS(),
-        milk: milkTypes.TWOPERCENT,
+        milk: "2% Milk",
         syrups: [
             {
                 name: "Classic",
@@ -70,7 +70,7 @@ function latte (drink) {
         name: "Latte",
         assigned: true,
         shots: standardShots(drink.size),
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
  }
@@ -80,7 +80,7 @@ function cinnamonDolceLatte (drink) {
         name: "Cinnamon Dolce Latte",
         assigned: true,
         shots: standardShots(drink.size),
-        milk: milkTypes.TWOPERCENT,
+        milk: "2% Milk",
         syrups: [
             {
                 name: "Cinnamon Dolce",
@@ -96,7 +96,7 @@ function cinnamonDolceLatte (drink) {
         name: "Cappuccino",
         assigned: true,
         shots: standardShots(drink.size),
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
  }
@@ -106,7 +106,7 @@ function cinnamonDolceLatte (drink) {
         name: "Flat White",
         assigned: true,
         shots: standardShots(drink.size),
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     function shotsSBDS(){
         switch (drink.size){
@@ -128,7 +128,7 @@ function cinnamonDolceLatte (drink) {
         name: "Latte Macchiato",
         assigned: true,
         shots: standardShots(drink.size),
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
  }
@@ -138,7 +138,7 @@ function skinnyLatte (drink) {
         name: "Skinny Syrup Latte",
         assigned: true,
         shots: standardShots(drink.size),
-        milk: milkTypes.NONFAT
+        milk: "Nonfat Milk"
     }
     return recipe;
  }
@@ -148,7 +148,7 @@ function skinnyLatte (drink) {
         name: "Skinny Cinnamon Dolce Latte",
         assigned: true,
         shots: standardShots(drink.size),
-        milk: milkTypes.TWOPERCENT,
+        milk: "2% Milk",
         syrups: [
             {
                 name: "SF Cinnamon Dolce",
@@ -164,7 +164,7 @@ function skinnyLatte (drink) {
         name: "Caramel Macchiato",
         assigned: true,
         shots: standardShots(drink.size),
-        milk: milkTypes.TWOPERCENT,
+        milk: "2% Milk",
         syrups: [
             {
                 name: "Vanilla",
@@ -180,7 +180,7 @@ function skinnyLatte (drink) {
         name: "Skinny Caramel Macchiato",
         assigned: true,
         shots: standardShots(drink.size),
-        milk: milkTypes.NONFAT,
+        milk: "Nonfat Milk",
         syrups: [
             {
                 name: "SF Vanilla",
@@ -196,7 +196,7 @@ function skinnyLatte (drink) {
         name: "Skinny Caramel Macchiato",
         assigned: true,
         shots: standardShots(drink.size),
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
  }
@@ -212,7 +212,7 @@ function mocha(drink){
             }
         ],
         shots: standardShots(drink.size),
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
 }
@@ -228,7 +228,7 @@ function skinnyMocha(drink){
             }
         ],
         shots: standardShots(drink.size),
-        milk: milkTypes.NONFAT
+        milk: "Nonfat Milk"
     }
     return recipe;
 }
@@ -244,7 +244,7 @@ function whiteMocha(drink){
             }
         ],
         shots: standardShots(drink.size),
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
 }
@@ -260,7 +260,7 @@ function pumpkinSpiceLatte(drink){
             }
         ],
         shots: standardShots(drink.size),
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
 }
@@ -280,7 +280,7 @@ function coffeeFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -305,7 +305,7 @@ function mochaFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -330,7 +330,7 @@ function caramelFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -359,7 +359,7 @@ function javachipFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -382,7 +382,7 @@ function cafeVanillaFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -391,7 +391,7 @@ function espressoFrapp(drink){
     let recipe = {
         name: "Espresso Frapp",
         assigned: true,
-        milk: milkTypes.WHOLE,
+        milk: "Whole Milk",
         shots: (function(){
             if(drink.size == drinkSizes.VENTI){
                 return 2;
@@ -430,7 +430,7 @@ function whiteMochaFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -449,7 +449,7 @@ function chaiFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -474,7 +474,7 @@ function doubleChocolateChipFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -493,7 +493,7 @@ function vanillaBeanFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -512,7 +512,7 @@ function whiteMochaCreamFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -530,7 +530,7 @@ function strawBerryCreamFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -555,7 +555,7 @@ function greenTeaFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -570,7 +570,7 @@ function syrupCreamFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -589,7 +589,7 @@ function oparahChaiFrapp(drink){
                 count: standardPumps(drink.size) - 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -611,7 +611,7 @@ function strawberrySmoothe(drink){
                 count: 1
             }
         ],
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
 }
@@ -636,7 +636,7 @@ function chocolateSmoothe(drink){
                 count: 1
             }
         ],
-        milk: milkTypes.WHOLE
+        milk: "Whole Milk"
     }
     return recipe;
 }
@@ -679,7 +679,7 @@ function chaiTeaLatte(drink){
                 count: standardPumps(drink.size)
             }
         ],
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
 }
@@ -694,7 +694,7 @@ function oparahChaiTeaLatte(drink){
                 count: standardPumps(drink.size)
             }
         ],
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
 }
@@ -709,7 +709,7 @@ function greenTeaLatte(drink){
                 count: standardPumps(drink.size)
             }
         ],
-        milk: milkTypes.TWOPERCENT
+        milk: "2% Milk"
     }
     return recipe;
 }