From 76d63038be3278b06c04e3f78cdc53b3de4398c2 Mon Sep 17 00:00:00 2001
From: ysandler <ysandler@tzed.io>
Date: Mon, 30 Jan 2017 16:32:26 -0600
Subject: [PATCH] feat: added dink type tabs

---
 css/style.css |  4 ++++
 index.html    | 16 +++++++++++++---
 js/order.js   | 10 +++++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/css/style.css b/css/style.css
index 1c102b8..167fa85 100644
--- a/css/style.css
+++ b/css/style.css
@@ -20,6 +20,10 @@ button{
     border-color:rgba(255,255,255,0);
 }
 
+.drink-menu{
+    height: 560px;
+}
+
 #app{
     width: 960px;
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index 4717840..a8a025b 100644
--- a/index.html
+++ b/index.html
@@ -41,7 +41,7 @@
                 </div>
 
                 <div id="menu" class="seven columns">
-                    <div id="options-menu">
+                    <div id="options-menu" class="drink-menu">
                     <h5>Drink Options</h5>
                         <button class="button-primary" data-name="ICED" data-value="">ICED</button>
 
@@ -90,7 +90,7 @@
                     </div>
                     
                     
-                    <div id="recipe-menu" style="display: none;">
+                    <div id="recipe-menu" class="drink-menu" style="display: none;">
                         <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="LATTE">LATTE</button>
@@ -103,7 +103,7 @@
                     </div>
                     
                     
-                    <div id="syrup-menu" style="display: none;">
+                    <div id="syrup-menu" class="drink-menu" style="display: none;">
                         <h5>Syrups</h5>
                         <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>
@@ -114,9 +114,19 @@
                         <button class="button-primary" data-name="SYRUP" data-value="MOCHA">MOCHA</button>
                     </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 class="one columns" id="drink-builder-options">
                         <button class="button-primary" data-name="CONTROL" data-value="OPTIONS">DRINK</button>
                         <button class="button-primary" data-name="CONTROL" data-value="RECIPE">RECIPE</button>
diff --git a/js/order.js b/js/order.js
index 9dc1834..fed10c0 100644
--- a/js/order.js
+++ b/js/order.js
@@ -31,6 +31,7 @@ orderSection.addEventListener('click', function(e){
 function orderDisplay(drink){
     let o = {
         name: "default Drink <br>",
+        iced: "",
         syrups: "",
         size: ""
     }
@@ -60,6 +61,13 @@ function orderDisplay(drink){
         o.name = drink.recipe.name + "<br>";
     }
 
+    if(drink.iced){
+        o.iced = "ICED<br>"
+    }
+    else{
+        o.iced = ""
+    }
+
     
     switch(drink.caffeine){
         case caffeineTypes.DECAF:
@@ -78,5 +86,5 @@ function orderDisplay(drink){
         }, this);
     }
 
-    return o.size + o.name + o.syrups + o.caffeine;
+    return o.size + o.name + o.iced + o.syrups + o.caffeine;
 }