From 295b3a2cf34eb8127a5e5ca9257a91792c3dc560 Mon Sep 17 00:00:00 2001
From: Joel Salisbury <joel.salisbury@gmail.com>
Date: Thu, 16 Feb 2017 17:44:36 -0500
Subject: [PATCH 01/18] changes to all cats

---
 api/routes/category.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/routes/category.php b/api/routes/category.php
index 1122017..edf756b 100644
--- a/api/routes/category.php
+++ b/api/routes/category.php
@@ -22,9 +22,9 @@
   foreach( $cats as $cat ) {
 
     $q = new CategoryRankNutrientQuery;
-    $requestedCatRules = $q->filterByCategoryId($cat->getId())->find();
+    $requestedCatRules = $q->filterByCategoryId($cat->getId())->orderByRankId()->find();
     foreach($requestedCatRules as $rule) {
-      $rules[] = [
+      $rules[$rule->getNutrient()->getName()][] = [
         "nutrientName" => $rule->getNutrient()->getName(),
         "nutrientId" => $rule->getNutrient()->getId(),
         "operator" => $rule->getOperator(),

From 4e3afff78e7e957d61fba91aa30f569e0f045179 Mon Sep 17 00:00:00 2001
From: Joel Salisbury <joel.salisbury@gmail.com>
Date: Mon, 27 Feb 2017 10:29:55 -0500
Subject: [PATCH 02/18] decision endpoint now creates food and checks for
 existing food

---
 api/routes/decision.php | 162 ++++++++++++++++++++++++++--------------
 1 file changed, 105 insertions(+), 57 deletions(-)

diff --git a/api/routes/decision.php b/api/routes/decision.php
index 90d0ca0..68bd951 100644
--- a/api/routes/decision.php
+++ b/api/routes/decision.php
@@ -124,86 +124,134 @@ function getProductInfo($upc) {
 
 
 $app->get('/getDecision/{upc}/{category}', function($request, $response) {
+/** Checking to see if the food is already in the DB, in which case we save lots of time **/
 
-// get the nutrients by UPC
-$prodInfo = getProductInfo($request->getAttribute('upc'));
-$nutrients = $prodInfo['response']['body']['product_list']['products'][0]['product_nutrient_list']['product_nutrients'];
+  $q = new FoodQuery();
+  $barcode = $request->getAttribute('upc');
+  $food = $q::create()
+    ->useRankQuery()
+    ->endUse()
+    ->useCategoryQuery()
+    ->endUse()
+    ->filterByBarcode($barcode)
+    ->findOne();
 
-// get the whittled down nutrtient info shittily
-$theNuts = array();
+if($food){
+
+  $rank = $food->getRank();
+  $category = $food->getCategory();
+
+  $res['rankId'] = $food->getRankId();
+  $res['rankName'] = $rank->getName();
+
+
+  $res['request']['message'] = "Did not hit Fooducate. Food already exists in DB.";
 
-foreach ($nutrients as $nutrient) {
-  $theNuts[$nutrient['nutrient']['@attributes']['name']] = $nutrient['@attributes']['value'];
 }
 
-// echo "<h2>The Product has...</h2>";
-// echo "<pre>";
-// print_r($theNuts);
-// echo "</pre>";
+if(!$food) {
+      // get the nutrients by UPC
+      $prodInfo = getProductInfo($request->getAttribute('upc'));
+      $nutrients = $prodInfo['response']['body']['product_list']['products'][0]['product_nutrient_list']['product_nutrients'];
 
-// get the rules by category
- $q = new CategoryRankNutrientQuery;
-$c = new CategoryQuery();
+      // get the whittled down nutrtient info shittily
+      $theNuts = array();
 
+      foreach ($nutrients as $nutrient) {
+        $theNuts[$nutrient['nutrient']['@attributes']['name']] = $nutrient['@attributes']['value'];
+      }
 
- $allRules = $q->filterByCategoryId($request->getAttribute('category'))->find();
- //$res["food"] = $prodInfo;
- $res["food"]['brand'] = $prodInfo['response']['body']['product_list']['products'][0]["@attributes"]['brand'];
- $res["food"]['name'] = $prodInfo['response']['body']['product_list']['products'][0]["@attributes"]['name'];
+      // echo "<h2>The Product has...</h2>";
+      // echo "<pre>";
+      // print_r($theNuts);
+      // echo "</pre>";
 
- $res["request"]["categoryRuleRun"] = $c->findPk($request->getAttribute("category"))->getName();
+      // get the rules by category
+       $q = new CategoryRankNutrientQuery;
+       $c = new CategoryQuery();
 
 
-//default
- $res["rankId"] = 0;
- $res["rankName"] = "Red";
+       $allRules = $q->filterByCategoryId($request->getAttribute('category'))->find();
+       //$res["food"] = $prodInfo;
+       $res["food"]['brand'] = $prodInfo['response']['body']['product_list']['products'][0]["@attributes"]['brand'];
+       $res["food"]['name'] = $prodInfo['response']['body']['product_list']['products'][0]["@attributes"]['name'];
 
-// for each rule, evaluate ingredients
- foreach($allRules as $rule) {
-  $nut = $rule->getNutrient()->getName(); 
-  $operator = $rule->getOperator();
-  $threshold = $rule->getThreshold();
-  $presentVal = $theNuts[$nut];
+       $res["request"]["categoryRuleRun"] = $c->findPk($request->getAttribute("category"))->getName();
 
 
-  $pass = 0;
-    switch($operator) {
-      case "lte":
-        $pass = ($presentVal <= $threshold);
-      break;
+      //default
+       $res["rankId"] = 3;
+       $res["rankName"] = "Red";
 
-      case "lt":
-        $pass = ($presentVal < $threshold);
-      break;
+      // for each rule, evaluate ingredients
+       foreach($allRules as $rule) {
+        $nut = $rule->getNutrient()->getName(); 
+        $operator = $rule->getOperator();
+        $threshold = $rule->getThreshold();
+        $presentVal = $theNuts[$nut];
 
-      case "gt":
-        $pass = ($presentVal > $threshold);
-      break;
 
-      case "gte":
-        $pass = ($presentVal >= $threshold);
-      break;
+        $pass = 0;
+          switch($operator) {
+            case "lte":
+              $pass = ($presentVal <= $threshold);
+            break;
 
-      case "is":
-        $pass = ($presentVal == $threshold);
-      break;
-    }
+            case "lt":
+              $pass = ($presentVal < $threshold);
+            break;
 
+            case "gt":
+              $pass = ($presentVal > $threshold);
+            break;
 
-      $rules[$rule->getRank()->getName()][$rule->getNutrient()->getName()] = [
-        "operator" => $operator,
-        "threshold" => $threshold,
-        "passed" => $pass?"true" : "false"
-      ];
+            case "gte":
+              $pass = ($presentVal >= $threshold);
+            break;
 
-      $rules[$rule->getRank()->getName()]['passedRank'] = $pass?"true" : "false";
+            case "is":
+              $pass = ($presentVal == $threshold);
+            break;
+          }
 
-      if($pass) {
-        $res["rankId"] = $rule->getRank()->getId();
-        $res["rankName"] = $rule->getRank()->getName();
-      }
 
- }
+          $rules[$rule->getRank()->getName()][$rule->getNutrient()->getName()] = [
+            "operator" => $operator,
+            "threshold" => $threshold,
+            "passed" => $pass?"true" : "false"
+          ];
+
+          $rules[$rule->getRank()->getName()]['passedRank'] = $pass?"true" : "false";
+
+          if($pass) {
+            $res["rankId"] = $rule->getRank()->getId();
+            $res["rankName"] = $rule->getRank()->getName();
+          }
+        }
+
+
+        /** Now create this Food with the associated rank and category **/
+
+        $newFood = new Food;
+        
+        $newFoodCat = $request->getAttribute('category');
+
+        $newFoodRank = $res['rankId'];
+
+        $newFood->setRankId($newFoodRank);
+        $newFood->setCategoryId($newFoodCat);
+        $newFood->setBarcode($barcode);
+        
+
+          if($newFood->save()){
+            $msg = "New Food also added to DB.";
+          } else {
+            $msg = "There was an error saving this new Food to the DB";
+          }
+
+        $res['request']['message'] = $msg;
+
+}
 
 // echo "<h1>The rules expected...</h1>";
 // echo "<pre>";

From a24a3fa7e7309a8c112d548bcc1b021d1c5fce5b Mon Sep 17 00:00:00 2001
From: jsalisbury <joel.salisbury@gmail.com>
Date: Mon, 27 Feb 2017 21:34:29 -0500
Subject: [PATCH 03/18] hotfix for category obj

---
 api/routes/category.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/routes/category.php b/api/routes/category.php
index edf756b..c9865eb 100644
--- a/api/routes/category.php
+++ b/api/routes/category.php
@@ -8,10 +8,6 @@
   $q = new CategoryQuery;
   $cats = $q::create()->find();
 
-  
-
-
-
   $response_json = [
     "status" => [
       "code" => $response->getStatusCode(),
@@ -19,12 +15,13 @@
     ],
     "data" => []
   ];
-  foreach( $cats as $cat ) {
 
+  foreach( $cats as $cat ) {
+    $rules = [];
     $q = new CategoryRankNutrientQuery;
     $requestedCatRules = $q->filterByCategoryId($cat->getId())->orderByRankId()->find();
     foreach($requestedCatRules as $rule) {
-      $rules[$rule->getNutrient()->getName()][] = [
+      $rules[$rule->getRank()->getName()][] = [
         "nutrientName" => $rule->getNutrient()->getName(),
         "nutrientId" => $rule->getNutrient()->getId(),
         "operator" => $rule->getOperator(),
@@ -40,9 +37,12 @@
       "name" => $cat->getName(),
       "rules" => $rules
     ];
+
   }
+
   $response = $response->withJSON($response_json);
   return $response;
+
 });
 
 /**

From 71fad92937e71520c40bc9f0d498f41de81cfb3f Mon Sep 17 00:00:00 2001
From: jsalisbury <joel.salisbury@gmail.com>
Date: Mon, 27 Feb 2017 21:53:17 -0500
Subject: [PATCH 04/18] refactor again

---
 api/routes/category.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/routes/category.php b/api/routes/category.php
index c9865eb..1a7b3e2 100644
--- a/api/routes/category.php
+++ b/api/routes/category.php
@@ -21,7 +21,7 @@
     $q = new CategoryRankNutrientQuery;
     $requestedCatRules = $q->filterByCategoryId($cat->getId())->orderByRankId()->find();
     foreach($requestedCatRules as $rule) {
-      $rules[$rule->getRank()->getName()][] = [
+      $rules[$rule->getNutrient()->getName()][strtolower($rule->getRank()->getName())] = [
         "nutrientName" => $rule->getNutrient()->getName(),
         "nutrientId" => $rule->getNutrient()->getId(),
         "operator" => $rule->getOperator(),

From 88b61e30f50490db4c67cf59488bc4a8e3aa82b0 Mon Sep 17 00:00:00 2001
From: jsalisbury <joel.salisbury@gmail.com>
Date: Mon, 27 Feb 2017 22:14:11 -0500
Subject: [PATCH 05/18] another thing

---
 api/routes/category.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/routes/category.php b/api/routes/category.php
index 1a7b3e2..8717ce7 100644
--- a/api/routes/category.php
+++ b/api/routes/category.php
@@ -21,7 +21,7 @@
     $q = new CategoryRankNutrientQuery;
     $requestedCatRules = $q->filterByCategoryId($cat->getId())->orderByRankId()->find();
     foreach($requestedCatRules as $rule) {
-      $rules[$rule->getNutrient()->getName()][strtolower($rule->getRank()->getName())] = [
+      $rules[$rule->getNutrient()->getName()][][strtolower($rule->getRank()->getName())] = [
         "nutrientName" => $rule->getNutrient()->getName(),
         "nutrientId" => $rule->getNutrient()->getId(),
         "operator" => $rule->getOperator(),

From 8c883870ea24b70ce8c504b3183f6384d55f2cf0 Mon Sep 17 00:00:00 2001
From: jsalisbury <joel.salisbury@gmail.com>
Date: Mon, 27 Feb 2017 22:20:43 -0500
Subject: [PATCH 06/18] final update gah

---
 api/routes/category.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/routes/category.php b/api/routes/category.php
index 8717ce7..137363d 100644
--- a/api/routes/category.php
+++ b/api/routes/category.php
@@ -21,7 +21,7 @@
     $q = new CategoryRankNutrientQuery;
     $requestedCatRules = $q->filterByCategoryId($cat->getId())->orderByRankId()->find();
     foreach($requestedCatRules as $rule) {
-      $rules[$rule->getNutrient()->getName()][][strtolower($rule->getRank()->getName())] = [
+      $rules[$rule->getNutrient()->getName()][] = [
         "nutrientName" => $rule->getNutrient()->getName(),
         "nutrientId" => $rule->getNutrient()->getId(),
         "operator" => $rule->getOperator(),

From 6d551b5a37084bbbb396739d277ca4b326359de5 Mon Sep 17 00:00:00 2001
From: Timothy Morris <timthewebguy@gmail.com>
Date: Tue, 28 Feb 2017 10:55:17 -0500
Subject: [PATCH 07/18] categories now pulls from api

---
 app/app.js                     |   2 +-
 app/pages/categories/ctrl.js   |  12 +--
 app/pages/categories/view.html |  14 +--
 assets/js/bundle.js            | 170 ++++++++++++++++-----------------
 4 files changed, 95 insertions(+), 103 deletions(-)

diff --git a/app/app.js b/app/app.js
index b5998c6..8ae4155 100644
--- a/app/app.js
+++ b/app/app.js
@@ -20,7 +20,7 @@ app.factory('Food', function ($resource) {
 });
 
 app.factory('Categories', function($resource) {
-  return $resource('assets/json/categories.json');
+  return $resource('http://foodbank.develop.digitalmediauconn.org/api/index.php/category/all');
 });
 
 // TODO: 'Nutrients' factory TEMPORARY
diff --git a/app/pages/categories/ctrl.js b/app/pages/categories/ctrl.js
index 41a927d..d99d832 100644
--- a/app/pages/categories/ctrl.js
+++ b/app/pages/categories/ctrl.js
@@ -44,32 +44,28 @@ app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Catego
 	};
 
 	$scope.addRule = function(categoryName) {
-		var categoryIndex = $scope.getCategoryIndexFromName(categoryName);
+		/*var categoryIndex = $scope.getCategoryIndexFromName(categoryName);
 		if(categoryIndex != -1) {
 			$scope.categories[categoryIndex].rules.push({ nutrient: 'sugar',
 				rule_id: '0',
 				ranks:  [ { name: 'green', operation: 'lt', value: 5 },
 									{ name: 'yellow', operation: 'gt', value: 2 } ] });
-		}
+		}*/
 
 	};
 
 	$scope.removeRule = function(category, rule) {
-		for(var i = 0; i < category.rules.length; i++) {
+		/*for(var i = 0; i < category.rules.length; i++) {
 			if(category.rules[i] == rule) {
 				category.rules.splice(i, 1);
 			}
-		}
+		}*/
 	};
 
 	$scope.addCategory = function() {
 		$scope.categories.push({name: 'New Category', rules: []})
 	};
 
-	$scope.renameCategory = function(category, name) {
-		console.log(name);
-	};
-
 	$scope.removeCategory = function(category) {
 		for(var i = 0; i < $scope.categories.length; i++) {
 			if($scope.categories[i] == category) {
diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html
index 15c172b..7ecfec1 100644
--- a/app/pages/categories/view.html
+++ b/app/pages/categories/view.html
@@ -11,7 +11,7 @@
 				          <input placeholder="Placeholder" id="first_name" type="text" class="validate" ng-model="category.name">
 				          <label for="first_name">Category Name</label>
 				        </div>
-								<button class="btn grey lighten-2" style="float:right" ng-click="removeCategory(category)">Delete Category</button>
+								<button class="btn grey" style="float:right" ng-click="removeCategory(category)">Delete Category</button>
 							</div>
 					    <div class="col s12">
 					    	<table class="categoryTable">
@@ -23,22 +23,22 @@
 					    			</tr>
 					    		</thead>
 									<tbody>
-										<tr ng-repeat="rule in category.rules">
+										<tr ng-repeat="(rule_nutrient, rules) in category.rules">
 											<td>
 													<div class="input-field col s12">
 														<select>
-															<option ng-repeat="nutrient in nutrients" value="{{nutrient}}" ng-selected="nutrient==rule.nutrient">{{nutrient}}</option>
+															<option ng-repeat="nutrient in nutrients" value="{{nutrient}}" ng-selected="nutrient==rule_nutrient">{{nutrient}}</option>
 														</select>
 													</div>
 											</td>
-											<td ng-repeat="rank in rule.ranks">
+											<td ng-repeat="rank in rules">
 												<div class="input-field col s6">
 													<select>
-														<option ng-repeat="operation in operations" value="{{operation.name}}" ng-selected="operation.name==rank.operation">{{operation.symbol}}</option>
+														<option ng-repeat="operation in operations" value="{{operation.name}}" ng-selected="operation.name==rank.operator">{{operation.symbol}}</option>
 													</select>
 												</div>
 												<div class="input-field col s6">
-													<input type="number" value="{{rank.value | number}}">
+													<input type="number" value="{{rank.threshold | number}}">
 												</div>
 											</td>
 											<td><button class="btn red" ng-click="removeRule(category, rule)"><i class="material-icons">delete</i></button></td>
@@ -46,13 +46,13 @@
 									</tbody>
 					    	</table>
 								<button ng-click="addRule(category.name)" class="btn">Add Rule</button>
+								<button class="btn green" ng-click="saveData(category)">Save</button>
 					    </div>
 					  </div>
 					</div>
 		    </li>
 		  </ul>
 			<button class="btn blue" ng-click="addCategory()" onclick="UpdateTextFields()">Add Category</button>
-			<button class="btn" ng-click="saveData()">Save</button>
 		</div>
 		<!--<div class="col s12 m3">
 			<div class="card grey darken-3">
diff --git a/assets/js/bundle.js b/assets/js/bundle.js
index dc5bcbb..ca556cb 100644
--- a/assets/js/bundle.js
+++ b/assets/js/bundle.js
@@ -20,7 +20,7 @@ app.factory('Food', function ($resource) {
 });
 
 app.factory('Categories', function($resource) {
-  return $resource('assets/json/categories.json');
+  return $resource('http://foodbank.develop.digitalmediauconn.org/api/index.php/category/all');
 });
 
 // TODO: 'Nutrients' factory TEMPORARY
@@ -149,92 +149,6 @@ app.controller('404Ctrl', ['$scope', function ($scope) {
   $scope.var2 = "localStuff";
 }]);
 
-
-
-function GetRanks() {
-	return ['green', 'yellow'];
-}
-
-function GetNutrients() {
-	return ['sodium', 'sugar', 'satfat'];
-}
-
-function GetOperations() {
-	return [{name: 'lt', symbol: 'Less Than'},
-					{name: 'lte', symbol: 'Less Than or Equal'},
-					{name: 'gt', symbol: 'Greater Than'},
-					{name: 'gte', symbol: 'Greater Than or Equal'},
-					{name: 'e', symbol: 'Equal To'}];
-}
-
-function SaveData(categories) {
-	console.log('save');
-}
-
-app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Categories) {
-  $scope.page.title = 'Categories';
-  $scope.page.id = 'cat';
-  $scope.page.yourVar = "globalStuff";
-
-
-	// GET list of categories
-  Categories.get({}, function (data) {
-    $scope.categories = data.data;
-  });
-
-	$scope.ranks = GetRanks();
-	$scope.nutrients = GetNutrients();
-	$scope.operations = GetOperations();
-
-	$scope.getCategoryIndexFromName = function(categoryName) {
-		for(var i = 0; i < $scope.categories.length; i++) {
-			if($scope.categories[i].name == categoryName) {
-				return i;
-			}
-		}
-		return -1;
-	};
-
-	$scope.addRule = function(categoryName) {
-		var categoryIndex = $scope.getCategoryIndexFromName(categoryName);
-		if(categoryIndex != -1) {
-			$scope.categories[categoryIndex].rules.push({ nutrient: 'sugar',
-				rule_id: '0',
-				ranks:  [ { name: 'green', operation: 'lt', value: 5 },
-									{ name: 'yellow', operation: 'gt', value: 2 } ] });
-		}
-
-	};
-
-	$scope.removeRule = function(category, rule) {
-		for(var i = 0; i < category.rules.length; i++) {
-			if(category.rules[i] == rule) {
-				category.rules.splice(i, 1);
-			}
-		}
-	};
-
-	$scope.addCategory = function() {
-		$scope.categories.push({name: 'New Category', rules: []})
-	};
-
-	$scope.renameCategory = function(category, name) {
-		console.log(name);
-	};
-
-	$scope.removeCategory = function(category) {
-		for(var i = 0; i < $scope.categories.length; i++) {
-			if($scope.categories[i] == category) {
-				$scope.categories.splice(i, 1);
-			}
-		}
-	};
-
-	$scope.saveData = function() {
-		SaveData($scope.categories);
-	};
-}]);
-
 app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'Food', 'Categories', function ($scope, $http, Foods, Food, Categories) {
   $scope.page.title = 'Food';
   $scope.page.id = 'food';
@@ -382,6 +296,88 @@ app.factory('loginService', ['$http', function($http) {
     }
   };
 }]);
+
+
+function GetRanks() {
+	return ['green', 'yellow'];
+}
+
+function GetNutrients() {
+	return ['sodium', 'sugar', 'satfat'];
+}
+
+function GetOperations() {
+	return [{name: 'lt', symbol: 'Less Than'},
+					{name: 'lte', symbol: 'Less Than or Equal'},
+					{name: 'gt', symbol: 'Greater Than'},
+					{name: 'gte', symbol: 'Greater Than or Equal'},
+					{name: 'e', symbol: 'Equal To'}];
+}
+
+function SaveData(categories) {
+	console.log('save');
+}
+
+app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Categories) {
+  $scope.page.title = 'Categories';
+  $scope.page.id = 'cat';
+  $scope.page.yourVar = "globalStuff";
+
+
+	// GET list of categories
+  Categories.get({}, function (data) {
+    $scope.categories = data.data;
+  });
+
+	$scope.ranks = GetRanks();
+	$scope.nutrients = GetNutrients();
+	$scope.operations = GetOperations();
+
+	$scope.getCategoryIndexFromName = function(categoryName) {
+		for(var i = 0; i < $scope.categories.length; i++) {
+			if($scope.categories[i].name == categoryName) {
+				return i;
+			}
+		}
+		return -1;
+	};
+
+	$scope.addRule = function(categoryName) {
+		/*var categoryIndex = $scope.getCategoryIndexFromName(categoryName);
+		if(categoryIndex != -1) {
+			$scope.categories[categoryIndex].rules.push({ nutrient: 'sugar',
+				rule_id: '0',
+				ranks:  [ { name: 'green', operation: 'lt', value: 5 },
+									{ name: 'yellow', operation: 'gt', value: 2 } ] });
+		}*/
+
+	};
+
+	$scope.removeRule = function(category, rule) {
+		/*for(var i = 0; i < category.rules.length; i++) {
+			if(category.rules[i] == rule) {
+				category.rules.splice(i, 1);
+			}
+		}*/
+	};
+
+	$scope.addCategory = function() {
+		$scope.categories.push({name: 'New Category', rules: []})
+	};
+
+	$scope.removeCategory = function(category) {
+		for(var i = 0; i < $scope.categories.length; i++) {
+			if($scope.categories[i] == category) {
+				$scope.categories.splice(i, 1);
+			}
+		}
+	};
+
+	$scope.saveData = function() {
+		SaveData($scope.categories);
+	};
+}]);
+
 app.controller('NutrientsCtrl', ['$scope', 'Nutrients', 'Nutrient', function ($scope, Nutrients, Nutrient) {
   $scope.page.title = 'Nutrients';
   $scope.page.id = 'nutrients';

From 7488ecd00b2d35511a454cadeee5322633c0d02e Mon Sep 17 00:00:00 2001
From: jsalisbury <joel.salisbury@gmail.com>
Date: Thu, 2 Mar 2017 20:35:00 -0500
Subject: [PATCH 08/18] reverting back

---
 api/routes/category.php | 22 ++++++++++++----------
 api/routes/rules.php    |  4 +++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/api/routes/category.php b/api/routes/category.php
index 137363d..84a24cb 100644
--- a/api/routes/category.php
+++ b/api/routes/category.php
@@ -15,19 +15,21 @@
     ],
     "data" => []
   ];
-
+//[strtolower($rule->getRank()->getName())][$rule->getNutrient()->getName()]
   foreach( $cats as $cat ) {
     $rules = [];
     $q = new CategoryRankNutrientQuery;
-    $requestedCatRules = $q->filterByCategoryId($cat->getId())->orderByRankId()->find();
+    $requestedCatRules = $q->filterByCategoryId($cat->getId())->orderByNutrientId()->find();
     foreach($requestedCatRules as $rule) {
-      $rules[$rule->getNutrient()->getName()][] = [
-        "nutrientName" => $rule->getNutrient()->getName(),
-        "nutrientId" => $rule->getNutrient()->getId(),
-        "operator" => $rule->getOperator(),
-        "threshold" => $rule->getThreshold(),
-        "units" => $rule->getUnits(),
-        "rank" => $rule->getRankId()
+      $rules[]  = [
+      "ruleId" => $rule->getId(),
+      "nutrientName" => $rule->getNutrient()->getName(),
+      "nutrientId" => $rule->getNutrient()->getId(),
+      "operator" => $rule->getOperator(),
+      "threshold" => $rule->getThreshold(),
+      "units" => $rule->getUnits(),
+      "rank" => $rule->getRankId(),
+      "categoryId" => $rule->getCategoryId()
       ];
     }
 
@@ -35,7 +37,7 @@
     $response_json["data"][] = [
       "id" => $cat->getId(),
       "name" => $cat->getName(),
-      "rules" => $rules
+      "rules" => [$rules]
     ];
 
   }
diff --git a/api/routes/rules.php b/api/routes/rules.php
index 0b81736..83b1d1e 100644
--- a/api/routes/rules.php
+++ b/api/routes/rules.php
@@ -14,12 +14,14 @@
 
   foreach($requestedCatRules as $rule) {
     $response_json["data"][] = [
+      "ruleId" => $rule->getId(),
       "nutrientName" => $rule->getNutrient()->getName(),
       "nutrientId" => $rule->getNutrient()->getId(),
       "operator" => $rule->getOperator(),
       "threshold" => $rule->getThreshold(),
       "units" => $rule->getUnits(),
-      "rank" => $rule->getRankId()
+      "rank" => $rule->getRankId(),
+      "categoryId" => $rule->getCategoryId()
     ];
   }
 

From 31d7ca0ea8510ba72dc6e88662987f4ac1c0c728 Mon Sep 17 00:00:00 2001
From: jsalisbury <joel.salisbury@gmail.com>
Date: Thu, 2 Mar 2017 21:09:39 -0500
Subject: [PATCH 09/18] nutrient all

---
 api/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/index.php b/api/index.php
index 7475b8e..26a54b8 100644
--- a/api/index.php
+++ b/api/index.php
@@ -15,6 +15,7 @@
 require './routes/rules.php';
 require './routes/food.php';
 require './routes/decision.php';
+require './routes/nutrient.php';
 
 // Run App
 $app->run();
\ No newline at end of file

From 72c265a4bcdc27ef4b01c59d4f4d04e7fa60a160 Mon Sep 17 00:00:00 2001
From: jsalisbury <joel.salisbury@gmail.com>
Date: Thu, 2 Mar 2017 21:45:49 -0500
Subject: [PATCH 10/18] decision now adds food namee on insert

---
 api/routes/decision.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/routes/decision.php b/api/routes/decision.php
index 68bd951..14005aa 100644
--- a/api/routes/decision.php
+++ b/api/routes/decision.php
@@ -241,6 +241,7 @@ function getProductInfo($upc) {
         $newFood->setRankId($newFoodRank);
         $newFood->setCategoryId($newFoodCat);
         $newFood->setBarcode($barcode);
+        $newFood->setName($res["food"]['brand']." " .$res["food"]['name']);
         
 
           if($newFood->save()){

From 8ec2f9f527d3f17ee6c283119413de0a6bea191c Mon Sep 17 00:00:00 2001
From: jsalisbury <joel.salisbury@gmail.com>
Date: Thu, 2 Mar 2017 21:57:25 -0500
Subject: [PATCH 11/18] im a moron

---
 api/routes/nutrient.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 api/routes/nutrient.php

diff --git a/api/routes/nutrient.php b/api/routes/nutrient.php
new file mode 100644
index 0000000..2926551
--- /dev/null
+++ b/api/routes/nutrient.php
@@ -0,0 +1,25 @@
+<?php
+$app->get('/nutrient/all', function( $request, $response ) {
+  $q = new NutrientQuery;
+  $nuts = $q::create()->find();
+
+  $response_json = [
+    "status" => [
+      "code" => $response->getStatusCode(),
+      "message" => "OK"
+    ],
+    "data" => []
+  ];
+//[strtolower($rule->getRank()->getName())][$rule->getNutrient()->getName()]
+  foreach( $nuts as $nut ) {
+    $response_json["data"][] = [
+      "id" => $nut->getId(),
+      "name" => $nut->getName(),
+    ];
+
+  }
+
+  $response = $response->withJSON($response_json);
+  return $response;
+
+});
\ No newline at end of file

From 8a5462bec539ada2a89eca47d1d676dcbff865d5 Mon Sep 17 00:00:00 2001
From: Timothy Morris <timthewebguy@gmail.com>
Date: Mon, 6 Mar 2017 16:20:04 -0500
Subject: [PATCH 12/18] category CRUD

---
 app/app.js                     |   2 +-
 app/pages/categories/ctrl.js   |  50 ++++----
 app/pages/categories/view.html |  72 ++++++-----
 assets/js/bundle.js            | 212 +++++++++++++++++----------------
 4 files changed, 179 insertions(+), 157 deletions(-)

diff --git a/app/app.js b/app/app.js
index dfe3e57..2164777 100644
--- a/app/app.js
+++ b/app/app.js
@@ -20,7 +20,7 @@ app.factory('Categories', function($resource) {
 });
 
 app.factory('Nutrients', function($resource) {
-  return $resource('assets/json/nutrients.json');
+  return $resource('http://foodbank.develop.digitalmediauconn.org/api/index.php/nutrient/all');
 });
 
 // Just does a PUT request when u call Food.update
diff --git a/app/pages/categories/ctrl.js b/app/pages/categories/ctrl.js
index d99d832..c3b8dbe 100644
--- a/app/pages/categories/ctrl.js
+++ b/app/pages/categories/ctrl.js
@@ -1,6 +1,6 @@
 
 function GetRanks() {
-	return ['green', 'yellow'];
+	return [{name: 'green', id: 1}, {name: 'yellow', id: 2}];
 }
 
 function GetNutrients() {
@@ -15,14 +15,9 @@ function GetOperations() {
 					{name: 'e', symbol: 'Equal To'}];
 }
 
-function SaveData(categories) {
-	console.log('save');
-}
-
-app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Categories) {
+app.controller('CategoryCtrl', ['$scope', '$http', 'Categories', 'Nutrients', function ($scope, $http, Categories, Nutrients) {
   $scope.page.title = 'Categories';
   $scope.page.id = 'cat';
-  $scope.page.yourVar = "globalStuff";
 
 
 	// GET list of categories
@@ -31,9 +26,16 @@ app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Catego
   });
 
 	$scope.ranks = GetRanks();
-	$scope.nutrients = GetNutrients();
+
+	$scope.units = ['mg', 'g'];
+
+	Nutrients.get({}, function(data) {
+		$scope.nutrients = data.data;
+	});
+
 	$scope.operations = GetOperations();
 
+
 	$scope.getCategoryIndexFromName = function(categoryName) {
 		for(var i = 0; i < $scope.categories.length; i++) {
 			if($scope.categories[i].name == categoryName) {
@@ -44,26 +46,32 @@ app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Catego
 	};
 
 	$scope.addRule = function(categoryName) {
-		/*var categoryIndex = $scope.getCategoryIndexFromName(categoryName);
+		var categoryIndex = $scope.getCategoryIndexFromName(categoryName);
 		if(categoryIndex != -1) {
-			$scope.categories[categoryIndex].rules.push({ nutrient: 'sugar',
-				rule_id: '0',
-				ranks:  [ { name: 'green', operation: 'lt', value: 5 },
-									{ name: 'yellow', operation: 'gt', value: 2 } ] });
-		}*/
+			$scope.categories[categoryIndex].rules[0].push({
+            ruleId: 0,
+           	nutrientName: $scope.nutrients[0].name,
+            nutrientId: $scope.nutrients[0].id,
+            operator: "lte",
+            threshold: 10,
+            units: "mg",
+            rank: 1,
+            categoryId: categoryIndex
+          });
+		}
 
 	};
 
 	$scope.removeRule = function(category, rule) {
-		/*for(var i = 0; i < category.rules.length; i++) {
-			if(category.rules[i] == rule) {
-				category.rules.splice(i, 1);
+		for(var i = 0; i < category.rules[0].length; i++) {
+			if(category.rules[0][i] == rule) {
+				category.rules[0].splice(i, 1);
 			}
-		}*/
+		}
 	};
 
 	$scope.addCategory = function() {
-		$scope.categories.push({name: 'New Category', rules: []})
+		//$scope.categories.push({name: 'New Category', rules: []})
 	};
 
 	$scope.removeCategory = function(category) {
@@ -74,7 +82,7 @@ app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Catego
 		}
 	};
 
-	$scope.saveData = function() {
-		SaveData($scope.categories);
+	$scope.saveData = function(category) {
+		$http.post('http://foodbank.develop.digitalmediauconn.org/api/index.php/rules/saveBatch/' + category.id, category.rules[0]);
 	};
 }]);
diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html
index 7ecfec1..5d9511e 100644
--- a/app/pages/categories/view.html
+++ b/app/pages/categories/view.html
@@ -6,45 +6,51 @@
 		      <div class="collapsible-header">{{ category.name }}</div>
 		      <div class="collapsible-body">
 						<div class="row">
-							<div class="col s12">
+							<!--<div class="col s12">
 								<div class="input-field col s6">
 				          <input placeholder="Placeholder" id="first_name" type="text" class="validate" ng-model="category.name">
 				          <label for="first_name">Category Name</label>
 				        </div>
 								<button class="btn grey" style="float:right" ng-click="removeCategory(category)">Delete Category</button>
+							</div>-->
+							<div class="col s6" ng-repeat="rule in category.rules[0]">
+								<div class="card">
+			            <div class="card-content">
+			              <div class="row">
+			              	<div class="col s6">
+			              		<select>
+			              			<option ng-repeat="nutrient in nutrients" value="{{nutrient.name}}" ng-selected="nutrient.name==rule.nutrientName">{{nutrient.name}}</option>
+			              		</select>
+			              	</div>
+			              	<div class="col s6">
+			              		<select>
+			              			<option ng-repeat="rank in ranks" value="{{rank.id}}" ng-selected="rule.rank == rank.id">{{ rank.name }}</option>
+			              		</select>
+			              	</div>
+			              	<div class="col s4">
+			              		<select>
+													<option ng-repeat="operation in operations" value="{{operation.name}}" ng-selected="operation.name==rank.operator">{{operation.symbol}}</option>
+												</select>
+			              	</div>
+			              	<div class="col s4">
+			              		<input type="number" ng-model="rule.threshold" value="{{rule.threshold}}">
+			              	</div>
+			              	<div class="col s4">
+			              		<select>
+			              			<option ng-repeat="unit in units" value="{{unit}}" ng-selected="rule.units == unit">{{unit}}</option>
+			              		</select>
+			              	</div>
+			              	<div class="col s4">
+			              		<button class="btn red darken-3" ng-click="removeRule(category, rule)">Delete</button>
+			              	</div>
+			              </div>		
+			            </div>
+			          </div>
 							</div>
 					    <div class="col s12">
-					    	<table class="categoryTable">
-					    		<thead>
-					    			<tr>
-					    				<th>Nutrient</th>
-											<th ng-repeat="rank in ranks">{{rank}} condition</th>
-											<th></th>
-					    			</tr>
-					    		</thead>
-									<tbody>
-										<tr ng-repeat="(rule_nutrient, rules) in category.rules">
-											<td>
-													<div class="input-field col s12">
-														<select>
-															<option ng-repeat="nutrient in nutrients" value="{{nutrient}}" ng-selected="nutrient==rule_nutrient">{{nutrient}}</option>
-														</select>
-													</div>
-											</td>
-											<td ng-repeat="rank in rules">
-												<div class="input-field col s6">
-													<select>
-														<option ng-repeat="operation in operations" value="{{operation.name}}" ng-selected="operation.name==rank.operator">{{operation.symbol}}</option>
-													</select>
-												</div>
-												<div class="input-field col s6">
-													<input type="number" value="{{rank.threshold | number}}">
-												</div>
-											</td>
-											<td><button class="btn red" ng-click="removeRule(category, rule)"><i class="material-icons">delete</i></button></td>
-										</tr>
-									</tbody>
-					    	</table>
+					    	
+													
+												
 								<button ng-click="addRule(category.name)" class="btn">Add Rule</button>
 								<button class="btn green" ng-click="saveData(category)">Save</button>
 					    </div>
@@ -52,7 +58,7 @@
 					</div>
 		    </li>
 		  </ul>
-			<button class="btn blue" ng-click="addCategory()" onclick="UpdateTextFields()">Add Category</button>
+			<!--<button class="btn blue" ng-click="addCategory()" onclick="UpdateTextFields()">Add Category</button>-->
 		</div>
 		<!--<div class="col s12 m3">
 			<div class="card grey darken-3">
diff --git a/assets/js/bundle.js b/assets/js/bundle.js
index 8c0fe1a..f9c58dc 100644
--- a/assets/js/bundle.js
+++ b/assets/js/bundle.js
@@ -20,7 +20,7 @@ app.factory('Categories', function($resource) {
 });
 
 app.factory('Nutrients', function($resource) {
-  return $resource('assets/json/nutrients.json');
+  return $resource('http://foodbank.develop.digitalmediauconn.org/api/index.php/nutrient/all');
 });
 
 // Just does a PUT request when u call Food.update
@@ -81,6 +81,25 @@ app.config( function ($routeProvider, $locationProvider) {
     // $locationProvider.html5Mode(true);
 });
 
+app.controller('root', ['$scope', '$location', function ($scope, $location) {
+
+  $scope.$watch('page', function () {
+    $scope.title = $scope.page.title + ' | F2E';
+  }, true);
+
+  $scope.page = {
+    'title' : 'Root',
+    'id' : 'root',
+    'blackNav' : false
+  };
+
+  $scope.loop = ['Apple Pie','Bananas','Peas','Newman\'s Own Oil and Vinegar Dressing','Cucumber Salad','Kraft Macaroni and Cheese','Some food','Some more food','Some junk food','Some healthy food'];
+
+  $scope.go = function ( path ) {
+    $location.path( path );
+  };
+}]);
+
 app.controller('RestCtrl', ['$scope', 'Foods', function ($scope, Foods) {
   $scope.page.title = 'REST';
   $scope.page.id = 'rest';
@@ -126,37 +145,10 @@ app.controller('EmailController', ['$scope', function ($scope) {
   $scope.email = "rogangabe@gmail.com";
 }]);
 
-app.controller('root', ['$scope', '$location', function ($scope, $location) {
-
-  $scope.$watch('page', function () {
-    $scope.title = $scope.page.title + ' | F2E';
-  }, true);
-
-  $scope.page = {
-    'title' : 'Root',
-    'id' : 'root',
-    'blackNav' : false
-  };
-
-  $scope.loop = ['Apple Pie','Bananas','Peas','Newman\'s Own Oil and Vinegar Dressing','Cucumber Salad','Kraft Macaroni and Cheese','Some food','Some more food','Some junk food','Some healthy food'];
-
-  $scope.go = function ( path ) {
-    $location.path( path );
-  };
-}]);
-
-app.controller('404Ctrl', ['$scope', function ($scope) {
-  $scope.page.title = '404';
-  $scope.page.id = '404';
-  $scope.page.yourVar = "globalStuff";
-
-  $scope.var2 = "localStuff";
-}]);
-
 
 
 function GetRanks() {
-	return ['green', 'yellow'];
+	return [{name: 'green', id: 1}, {name: 'yellow', id: 2}];
 }
 
 function GetNutrients() {
@@ -171,14 +163,9 @@ function GetOperations() {
 					{name: 'e', symbol: 'Equal To'}];
 }
 
-function SaveData(categories) {
-	console.log('save');
-}
-
-app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Categories) {
+app.controller('CategoryCtrl', ['$scope', '$http', 'Categories', 'Nutrients', function ($scope, $http, Categories, Nutrients) {
   $scope.page.title = 'Categories';
   $scope.page.id = 'cat';
-  $scope.page.yourVar = "globalStuff";
 
 
 	// GET list of categories
@@ -187,9 +174,16 @@ app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Catego
   });
 
 	$scope.ranks = GetRanks();
-	$scope.nutrients = GetNutrients();
+
+	$scope.units = ['mg', 'g'];
+
+	Nutrients.get({}, function(data) {
+		$scope.nutrients = data.data;
+	});
+
 	$scope.operations = GetOperations();
 
+
 	$scope.getCategoryIndexFromName = function(categoryName) {
 		for(var i = 0; i < $scope.categories.length; i++) {
 			if($scope.categories[i].name == categoryName) {
@@ -200,26 +194,32 @@ app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Catego
 	};
 
 	$scope.addRule = function(categoryName) {
-		/*var categoryIndex = $scope.getCategoryIndexFromName(categoryName);
+		var categoryIndex = $scope.getCategoryIndexFromName(categoryName);
 		if(categoryIndex != -1) {
-			$scope.categories[categoryIndex].rules.push({ nutrient: 'sugar',
-				rule_id: '0',
-				ranks:  [ { name: 'green', operation: 'lt', value: 5 },
-									{ name: 'yellow', operation: 'gt', value: 2 } ] });
-		}*/
+			$scope.categories[categoryIndex].rules[0].push({
+            ruleId: 0,
+           	nutrientName: $scope.nutrients[0].name,
+            nutrientId: $scope.nutrients[0].id,
+            operator: "lte",
+            threshold: 10,
+            units: "mg",
+            rank: 1,
+            categoryId: categoryIndex
+          });
+		}
 
 	};
 
 	$scope.removeRule = function(category, rule) {
-		/*for(var i = 0; i < category.rules.length; i++) {
-			if(category.rules[i] == rule) {
-				category.rules.splice(i, 1);
+		for(var i = 0; i < category.rules[0].length; i++) {
+			if(category.rules[0][i] == rule) {
+				category.rules[0].splice(i, 1);
 			}
-		}*/
+		}
 	};
 
 	$scope.addCategory = function() {
-		$scope.categories.push({name: 'New Category', rules: []})
+		//$scope.categories.push({name: 'New Category', rules: []})
 	};
 
 	$scope.removeCategory = function(category) {
@@ -230,11 +230,72 @@ app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Catego
 		}
 	};
 
-	$scope.saveData = function() {
-		SaveData($scope.categories);
+	$scope.saveData = function(category) {
+		$http.post('http://foodbank.develop.digitalmediauconn.org/api/index.php/rules/saveBatch/' + category.id, category.rules[0]);
 	};
 }]);
 
+
+app.controller('LoginCtrl', ['$scope', 'loginService', function ($scope, loginService) {
+  $scope.page.title = 'Login';
+  $scope.page.id = 'login';
+  $scope.page.yourVar = "globalStuff";
+
+  $scope.selected = {
+    username: "",
+    password: ""
+  };
+
+  $scope.loginAttempt = {
+    username: "",
+    password: "",
+    attempt: false,
+    login: false
+  };
+
+  $scope.loginService = loginService;
+
+  $scope.login = function( username, password ) {
+    $scope.loginAttempt.username = username;
+    $scope.loginAttempt.password = password;
+    $scope.loginAttempt.attempt = true;
+    // Sanitize? Pre-check?
+    console.log($scope.loginService);
+    $scope.loginService.login( username, password ).then(function(response) {
+      console.log(response);
+      // Mock the fact that this takes longer
+      setTimeout(function() {
+        $scope.$apply(function() {
+          $scope.loginAttempt.login = response.login;
+          $scope.loginAttempt.attempt = false;
+        });
+      }, 1000);
+    }, function(error) {
+      console.error(error);
+    });
+  };
+
+}]);
+
+app.factory('loginService', ['$http', function($http) {
+  return {
+    login: function( username, password ) {
+      return $http.get('/app/pages/login/example.json').then(function(response) {
+        return response.data;
+      }, function(error) {
+        return error;
+      });
+    }
+  };
+}]);
+app.controller('404Ctrl', ['$scope', function ($scope) {
+  $scope.page.title = '404';
+  $scope.page.id = '404';
+  $scope.page.yourVar = "globalStuff";
+
+  $scope.var2 = "localStuff";
+}]);
+
 app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categories', '$cookies', function ($scope, $http, Foods, FoodDetail, Categories, $cookies) {
   $scope.page.title = 'Food';
   $scope.page.id = 'food';
@@ -352,59 +413,6 @@ app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categorie
 
 }]);
 
-
-app.controller('LoginCtrl', ['$scope', 'loginService', function ($scope, loginService) {
-  $scope.page.title = 'Login';
-  $scope.page.id = 'login';
-  $scope.page.yourVar = "globalStuff";
-
-  $scope.selected = {
-    username: "",
-    password: ""
-  };
-
-  $scope.loginAttempt = {
-    username: "",
-    password: "",
-    attempt: false,
-    login: false
-  };
-
-  $scope.loginService = loginService;
-
-  $scope.login = function( username, password ) {
-    $scope.loginAttempt.username = username;
-    $scope.loginAttempt.password = password;
-    $scope.loginAttempt.attempt = true;
-    // Sanitize? Pre-check?
-    console.log($scope.loginService);
-    $scope.loginService.login( username, password ).then(function(response) {
-      console.log(response);
-      // Mock the fact that this takes longer
-      setTimeout(function() {
-        $scope.$apply(function() {
-          $scope.loginAttempt.login = response.login;
-          $scope.loginAttempt.attempt = false;
-        });
-      }, 1000);
-    }, function(error) {
-      console.error(error);
-    });
-  };
-
-}]);
-
-app.factory('loginService', ['$http', function($http) {
-  return {
-    login: function( username, password ) {
-      return $http.get('/app/pages/login/example.json').then(function(response) {
-        return response.data;
-      }, function(error) {
-        return error;
-      });
-    }
-  };
-}]);
 app.controller('NutrientsCtrl', ['$scope', 'Nutrients', function ($scope, Nutrients) {
   $scope.page.title = 'Nutrients';
   $scope.page.id = 'nutrients';

From d6da00636c1d794fd77ee00e783e5696918e82b9 Mon Sep 17 00:00:00 2001
From: Gabe Rogan <rogangabe@gmail.com>
Date: Wed, 8 Mar 2017 19:39:03 -0500
Subject: [PATCH 13/18] UI tweaks

---
 app/app.js                          |   3 +-
 app/pages/404/style.styl            |   2 +
 app/pages/404/view.html             |   2 +-
 app/pages/categories/anotherCtrl.js |   0
 app/pages/categories/style.styl     |   9 ++
 app/pages/categories/view.html      |  10 +--
 app/pages/food/ctrl.js              |   6 +-
 app/pages/food/style.styl           |  20 ++++-
 app/pages/food/view.html            |  18 ++--
 app/pages/login/anotherCtrl.js      |   0
 app/pages/login/view.html           |   6 +-
 app/root/_footer.kit                |   4 +-
 app/root/_nav.kit                   |   6 +-
 app/root/root.styl                  |   2 +-
 assets/css/main.css                 |  39 ++++++++-
 assets/js/bundle.js                 | 129 ++++++++++++++--------------
 index.html                          |  10 +--
 17 files changed, 160 insertions(+), 106 deletions(-)
 delete mode 100644 app/pages/categories/anotherCtrl.js
 delete mode 100644 app/pages/login/anotherCtrl.js

diff --git a/app/app.js b/app/app.js
index 2164777..d877d41 100644
--- a/app/app.js
+++ b/app/app.js
@@ -6,7 +6,8 @@ var app = angular.module('app', ['ngRoute', 'ngResource', 'ngCookies']);
 // Factories
 
 app.factory('Foods', function($resource) {
-  return $resource('assets/json/foods.json');
+  return $resource('http://foodbank.develop.digitalmediauconn.org/api/food/all');
+  // return $resource('assets/json/foods.json');
 });
 
 app.factory('FoodDetail', function($resource) {
diff --git a/app/pages/404/style.styl b/app/pages/404/style.styl
index e69de29..4182b61 100644
--- a/app/pages/404/style.styl
+++ b/app/pages/404/style.styl
@@ -0,0 +1,2 @@
+.f404
+  text-align center
diff --git a/app/pages/404/view.html b/app/pages/404/view.html
index 640e8c2..98440d6 100644
--- a/app/pages/404/view.html
+++ b/app/pages/404/view.html
@@ -1,2 +1,2 @@
 <div class="spacer"></div>
-<h1>You've reached pages/404/view.html by going to an invalid link.</h1>
+<h1 class="f404">404 Page not found</h1>
diff --git a/app/pages/categories/anotherCtrl.js b/app/pages/categories/anotherCtrl.js
deleted file mode 100644
index e69de29..0000000
diff --git a/app/pages/categories/style.styl b/app/pages/categories/style.styl
index 1a565da..2c7caed 100644
--- a/app/pages/categories/style.styl
+++ b/app/pages/categories/style.styl
@@ -11,3 +11,12 @@
 select {
 	display:block!important;
 }
+
+.row
+	display flex
+.catsWrap
+	max-width 100%
+	min-width 100%
+	+above(700px)
+		min-width: 680px
+	margin 0 auto
diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html
index 5d9511e..76763d3 100644
--- a/app/pages/categories/view.html
+++ b/app/pages/categories/view.html
@@ -1,6 +1,6 @@
 <div class="container">
 	<div class="row">
-		<div class="col s12 m9">
+		<div class="catsWrap">
 			<ul class="collapsible" data-collapsible="expandable">
 				<li ng-repeat="category in categories">
 		      <div class="collapsible-header">{{ category.name }}</div>
@@ -43,14 +43,14 @@
 			              	<div class="col s4">
 			              		<button class="btn red darken-3" ng-click="removeRule(category, rule)">Delete</button>
 			              	</div>
-			              </div>		
+			              </div>
 			            </div>
 			          </div>
 							</div>
 					    <div class="col s12">
-					    	
-													
-												
+
+
+
 								<button ng-click="addRule(category.name)" class="btn">Add Rule</button>
 								<button class="btn green" ng-click="saveData(category)">Save</button>
 					    </div>
diff --git a/app/pages/food/ctrl.js b/app/pages/food/ctrl.js
index ee72c58..ad9b48d 100644
--- a/app/pages/food/ctrl.js
+++ b/app/pages/food/ctrl.js
@@ -3,9 +3,9 @@ app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categorie
   $scope.page.id = 'food';
 
   // Cookie for Table/Card view prefence
-  $scope.tableView = $cookies.get('showTable') === 'true';
-  $scope.$watch('tableView', function () {
-    $cookies.put('showTable', $scope.tableView ? 'true' : 'false');
+  $scope.cardView = $cookies.get('showTable') === 'true';
+  $scope.$watch('cardView', function () {
+    $cookies.put('showTable', $scope.cardView ? 'true' : 'false');
   });
 
   // Initialize Filters
diff --git a/app/pages/food/style.styl b/app/pages/food/style.styl
index 1b07d95..2667f4d 100644
--- a/app/pages/food/style.styl
+++ b/app/pages/food/style.styl
@@ -39,9 +39,9 @@
 
 // Grades
 .grade
-  padding-right: 1em
+  padding-right: 2em
   +above(600px)
-    padding: 0 1em
+    padding: 0 2em 0 0
   nav
     display: flex
     align-items: center
@@ -66,7 +66,11 @@
   padding-left: 26px
 
 
-
+.table-toggle
+  .switch
+    display flex
+  label
+    margin 0 auto
 
 .foods
   display: flex
@@ -154,6 +158,7 @@
     padding: 1em
     border: 1px solid lightgray
     min-width 300px
+    max-width 500px
     my-box-shadow()
     background: white
     [type="radio"]:not(:checked)+label, [type="radio"]:checked+label
@@ -200,6 +205,7 @@
   font-size 1.2em
   align-items center
   margin-right 1em
+  max-width 100%
   padding-right 1em
   background #f5f5f5
   +above(760px)
@@ -212,9 +218,15 @@
   span
     flex-basis 100px
     margin-right 1em
+  .foodCat
+    text-align right
   .name
-    flex-basis 140px
+    flex-grow 1
+    white-space nowrap
+    text-overflow ellipsis
+    overflow-y hidden
   .barcode
+    flex-basis 117px
     color #888
     font-size 1rem
     text-align right
diff --git a/app/pages/food/view.html b/app/pages/food/view.html
index 0384f0f..b5f1855 100644
--- a/app/pages/food/view.html
+++ b/app/pages/food/view.html
@@ -3,7 +3,7 @@
 
   <div class="input-field col s6">
     <input type="text" id="search" ng-model="searchTerm">
-    <label for="search">Search for food by name!</label>
+    <label for="search">Search for food by name or category!</label>
     <i class="material-icons prefix">search</i>
   </div>
 
@@ -15,7 +15,7 @@
 <!-- Filters -->
 <div class="food-filter container">
 
-  <div class="by-category">
+  <!-- <div class="by-category">
     <h5>By Category</h5>
     <nav>
       <div class="nav-wrapper">
@@ -27,10 +27,10 @@ <h5>By Category</h5>
         </ul>
       </div>
     </nav>
-  </div>
+  </div> -->
 
   <div class="grade">
-    <h5>By Grade</h5>
+    <h5>Health Filter</h5>
     <nav>
       <input type="checkbox" class="filled-in green" id="green" ng-model="rankSelection[1]">
       <label for="green"></label>
@@ -47,11 +47,11 @@ <h5>By Grade</h5>
   </div>
 
   <div class="table-toggle">
-    <h5>Table</h5>
+    <h5>Card View</h5>
     <nav>
       <div class="switch">
       <label>
-        <input ng-model="tableView" type="checkbox">
+        <input ng-model="cardView" type="checkbox">
         <span class="lever"></span>
       </label>
       </div>
@@ -65,16 +65,16 @@ <h5>Table</h5>
 
 <!-- Foods List -->
 <div class="foods">
-  <div ng-show="!tableView" ng-click="view(food)" class="card-panel" ng-repeat="food in foods | orderBy : 'name' | filter : searchTerm | filter : categoryFilter | filter : rankFilter">
+  <div ng-show="cardView" ng-click="view(food)" class="card-panel" ng-repeat="food in foods | orderBy : 'name' | filter : searchTerm | filter : categoryFilter | filter : rankFilter">
     <div class="health rank-{{food.rank.id}}"><i class="material-icons">favorite</i></div>
     <h5>{{food.name}}</h5>
   </div>
 
-  <div ng-show="tableView" class="foodTable">
+  <div ng-show="!cardView" class="foodTable">
       <div class="foodTableItem" ng-click="view(food)" ng-repeat="food in foods | filter : categoryFilter | filter : rankFilter | filter : searchTerm | orderBy : 'name'">
         <span class="health rank-{{food.rank.id}}"><i class="material-icons">favorite</i></span>
         <span class="name">{{food.name}}</span>
-        <span>{{food.category.name}}</span>
+        <span class="foodCat">{{food.category.name}}</span>
         <span class="barcode">{{food.barcode}}</span>
       </div>
   </table>
diff --git a/app/pages/login/anotherCtrl.js b/app/pages/login/anotherCtrl.js
deleted file mode 100644
index e69de29..0000000
diff --git a/app/pages/login/view.html b/app/pages/login/view.html
index 4bcccae..b72d7ef 100644
--- a/app/pages/login/view.html
+++ b/app/pages/login/view.html
@@ -53,8 +53,8 @@
       </div>
 
 
-      <pre>{{ selected | json }}</pre>
-      <pre>{{ loginAttempt | json }}</pre>
+      <!-- <pre>{{ selected | json }}</pre>
+      <pre>{{ loginAttempt | json }}</pre> -->
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/root/_footer.kit b/app/root/_footer.kit
index 84777ec..0b2152c 100644
--- a/app/root/_footer.kit
+++ b/app/root/_footer.kit
@@ -1,6 +1,6 @@
 <!-- Footer goes here -->
-<footer>
+<!-- <footer>
   <a href="competitions.html">Contact</a>
   <h4>F2E</h4>
   <a href="community.html">Legal Crap</a>
-</footer>
+</footer> -->
diff --git a/app/root/_nav.kit b/app/root/_nav.kit
index 08b2a75..faf7041 100644
--- a/app/root/_nav.kit
+++ b/app/root/_nav.kit
@@ -12,16 +12,16 @@
   <ul class="tabs tabs-transparent">
     <li class="tab"><a ng-class="{active: page.id==='food'}" ng-click="go('/food')">Food</a></li>
     <li class="tab"><a ng-class="{active: page.id==='cat'}" ng-click="go('/categories')">Categories</a></li>
-    <li class="tab"><a ng-class="{active: page.id==='nutrients'}" ng-click="go('/nutrients')">Nutrients</a></li>
+    <!-- <li class="tab"><a ng-class="{active: page.id==='nutrients'}" ng-click="go('/nutrients')">Nutrients</a></li> -->
   </ul>
   </div>
 
 
   <!-- Sign in/up Buttons -->
-  <div class="sign-in">
+  <!-- <div class="sign-in">
     <a ng-click="go('/login')" ng-show="!signedIn" class="waves-effect waves-light btn blue">Sign in</a>
     <a ng-click="go('/login')" ng-show="signedIn" class="waves-effect waves-light btn">Sign out</a>
-  </div>
+  </div> -->
 
 </div>
 
diff --git a/app/root/root.styl b/app/root/root.styl
index f7a8c6e..c7fa4dc 100644
--- a/app/root/root.styl
+++ b/app/root/root.styl
@@ -27,7 +27,7 @@ Table of Contents:
     padding-right: 2em
     * {display: inline}
     i
-      font-size: 6rem
+      font-size: 4rem
     h4
       font-size: 2.6rem
       font-weight: 500
diff --git a/assets/css/main.css b/assets/css/main.css
index 8219112..8c8f2e4 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -36,6 +36,9 @@ ul.tabs .tab a {
 ul.tabs .tab a:hover {
   color: inherit;
 }
+.f404 {
+  text-align: center;
+}
 .collapsible-body {
   padding: 1em;
   box-sizing: border-box;
@@ -47,6 +50,19 @@ ul.tabs .tab a:hover {
 select {
   display: block !important;
 }
+.row {
+  display: flex;
+}
+.catsWrap {
+  max-width: 100%;
+  min-width: 100%;
+  margin: 0 auto;
+}
+@media all and (min-width: 700px) {
+  .catsWrap {
+    min-width: 680px;
+  }
+}
 .food-search {
   padding-top: 0.5em;
 }
@@ -86,11 +102,11 @@ select {
   background-color: #f5f5f5;
 }
 .grade {
-  padding-right: 1em;
+  padding-right: 2em;
 }
 @media all and (min-width: 600px) {
   .grade {
-    padding: 0 1em;
+    padding: 0 2em 0 0;
   }
 }
 .grade nav {
@@ -121,6 +137,12 @@ select {
 [type="checkbox"]+label {
   padding-left: 26px;
 }
+.table-toggle .switch {
+  display: flex;
+}
+.table-toggle label {
+  margin: 0 auto;
+}
 .foods {
   display: flex;
   padding: 3em;
@@ -220,6 +242,7 @@ select {
   padding: 1em;
   border: 1px solid #f0f0f0;
   min-width: 300px;
+  max-width: 500px;
   box-shadow: 0 2px 5px 0 rgba(0,0,0,0.16), 0 2px 10px 0 rgba(0,0,0,0.12);
   background: #fff;
 }
@@ -273,6 +296,7 @@ select {
   font-size: 1.2em;
   align-items: center;
   margin-right: 1em;
+  max-width: 100%;
   padding-right: 1em;
   background: #f5f5f5;
   transition: all 0.2s;
@@ -291,10 +315,17 @@ select {
   flex-basis: 100px;
   margin-right: 1em;
 }
+.foodTableItem .foodCat {
+  text-align: right;
+}
 .foodTableItem .name {
-  flex-basis: 140px;
+  flex-grow: 1;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow-y: hidden;
 }
 .foodTableItem .barcode {
+  flex-basis: 117px;
   color: #888;
   font-size: 1rem;
   text-align: right;
@@ -388,7 +419,7 @@ h1.nutrientsTitle {
   display: inline;
 }
 .nav-main .logo-area i {
-  font-size: 6rem;
+  font-size: 4rem;
 }
 .nav-main .logo-area h4 {
   font-size: 2.6rem;
diff --git a/assets/js/bundle.js b/assets/js/bundle.js
index f9c58dc..cbf1517 100644
--- a/assets/js/bundle.js
+++ b/assets/js/bundle.js
@@ -6,7 +6,8 @@ var app = angular.module('app', ['ngRoute', 'ngResource', 'ngCookies']);
 // Factories
 
 app.factory('Foods', function($resource) {
-  return $resource('assets/json/foods.json');
+  return $resource('http://foodbank.develop.digitalmediauconn.org/api/food/all');
+  // return $resource('assets/json/foods.json');
 });
 
 app.factory('FoodDetail', function($resource) {
@@ -145,6 +146,13 @@ app.controller('EmailController', ['$scope', function ($scope) {
   $scope.email = "rogangabe@gmail.com";
 }]);
 
+app.controller('404Ctrl', ['$scope', function ($scope) {
+  $scope.page.title = '404';
+  $scope.page.id = '404';
+  $scope.page.yourVar = "globalStuff";
+
+  $scope.var2 = "localStuff";
+}]);
 
 
 function GetRanks() {
@@ -235,75 +243,14 @@ app.controller('CategoryCtrl', ['$scope', '$http', 'Categories', 'Nutrients', fu
 	};
 }]);
 
-
-app.controller('LoginCtrl', ['$scope', 'loginService', function ($scope, loginService) {
-  $scope.page.title = 'Login';
-  $scope.page.id = 'login';
-  $scope.page.yourVar = "globalStuff";
-
-  $scope.selected = {
-    username: "",
-    password: ""
-  };
-
-  $scope.loginAttempt = {
-    username: "",
-    password: "",
-    attempt: false,
-    login: false
-  };
-
-  $scope.loginService = loginService;
-
-  $scope.login = function( username, password ) {
-    $scope.loginAttempt.username = username;
-    $scope.loginAttempt.password = password;
-    $scope.loginAttempt.attempt = true;
-    // Sanitize? Pre-check?
-    console.log($scope.loginService);
-    $scope.loginService.login( username, password ).then(function(response) {
-      console.log(response);
-      // Mock the fact that this takes longer
-      setTimeout(function() {
-        $scope.$apply(function() {
-          $scope.loginAttempt.login = response.login;
-          $scope.loginAttempt.attempt = false;
-        });
-      }, 1000);
-    }, function(error) {
-      console.error(error);
-    });
-  };
-
-}]);
-
-app.factory('loginService', ['$http', function($http) {
-  return {
-    login: function( username, password ) {
-      return $http.get('/app/pages/login/example.json').then(function(response) {
-        return response.data;
-      }, function(error) {
-        return error;
-      });
-    }
-  };
-}]);
-app.controller('404Ctrl', ['$scope', function ($scope) {
-  $scope.page.title = '404';
-  $scope.page.id = '404';
-  $scope.page.yourVar = "globalStuff";
-
-  $scope.var2 = "localStuff";
-}]);
-
 app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categories', '$cookies', function ($scope, $http, Foods, FoodDetail, Categories, $cookies) {
   $scope.page.title = 'Food';
   $scope.page.id = 'food';
 
   // Cookie for Table/Card view prefence
-  $scope.tableView = $cookies.get('showTable') === 'true';
-  $scope.$watch('tableView', function () {
-    $cookies.put('showTable', $scope.tableView ? 'true' : 'false');
+  $scope.cardView = $cookies.get('showTable') === 'true';
+  $scope.$watch('cardView', function () {
+    $cookies.put('showTable', $scope.cardView ? 'true' : 'false');
   });
 
   // Initialize Filters
@@ -413,6 +360,58 @@ app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categorie
 
 }]);
 
+app.controller('LoginCtrl', ['$scope', 'loginService', function ($scope, loginService) {
+  $scope.page.title = 'Login';
+  $scope.page.id = 'login';
+  $scope.page.yourVar = "globalStuff";
+
+  $scope.selected = {
+    username: "",
+    password: ""
+  };
+
+  $scope.loginAttempt = {
+    username: "",
+    password: "",
+    attempt: false,
+    login: false
+  };
+
+  $scope.loginService = loginService;
+
+  $scope.login = function( username, password ) {
+    $scope.loginAttempt.username = username;
+    $scope.loginAttempt.password = password;
+    $scope.loginAttempt.attempt = true;
+    // Sanitize? Pre-check?
+    console.log($scope.loginService);
+    $scope.loginService.login( username, password ).then(function(response) {
+      console.log(response);
+      // Mock the fact that this takes longer
+      setTimeout(function() {
+        $scope.$apply(function() {
+          $scope.loginAttempt.login = response.login;
+          $scope.loginAttempt.attempt = false;
+        });
+      }, 1000);
+    }, function(error) {
+      console.error(error);
+    });
+  };
+
+}]);
+
+app.factory('loginService', ['$http', function($http) {
+  return {
+    login: function( username, password ) {
+      return $http.get('/app/pages/login/example.json').then(function(response) {
+        return response.data;
+      }, function(error) {
+        return error;
+      });
+    }
+  };
+}]);
 app.controller('NutrientsCtrl', ['$scope', 'Nutrients', function ($scope, Nutrients) {
   $scope.page.title = 'Nutrients';
   $scope.page.id = 'nutrients';
diff --git a/index.html b/index.html
index 80e6cfa..1420184 100644
--- a/index.html
+++ b/index.html
@@ -48,16 +48,16 @@ <h4 class="logo">F2E</h4>
   <ul class="tabs tabs-transparent">
     <li class="tab"><a ng-class="{active: page.id==='food'}" ng-click="go('/food')">Food</a></li>
     <li class="tab"><a ng-class="{active: page.id==='cat'}" ng-click="go('/categories')">Categories</a></li>
-    <li class="tab"><a ng-class="{active: page.id==='nutrients'}" ng-click="go('/nutrients')">Nutrients</a></li>
+    <!-- <li class="tab"><a ng-class="{active: page.id==='nutrients'}" ng-click="go('/nutrients')">Nutrients</a></li> -->
   </ul>
   </div>
 
 
   <!-- Sign in/up Buttons -->
-  <div class="sign-in">
+  <!-- <div class="sign-in">
     <a ng-click="go('/login')" ng-show="!signedIn" class="waves-effect waves-light btn blue">Sign in</a>
     <a ng-click="go('/login')" ng-show="signedIn" class="waves-effect waves-light btn">Sign out</a>
-  </div>
+  </div> -->
 
 </div>
 
@@ -110,11 +110,11 @@ <h4 class="logo">F2E</h4>
 </script>
 <ng-view></ng-view>
 <!-- Footer goes here -->
-<footer>
+<!-- <footer>
   <a href="competitions.html">Contact</a>
   <h4>F2E</h4>
   <a href="community.html">Legal Crap</a>
-</footer>
+</footer> -->
 
 
 </body>

From a8083c87668d1f5fb1de970496bcf55bf7f540f7 Mon Sep 17 00:00:00 2001
From: Gabe Rogan <rogangabe@gmail.com>
Date: Wed, 8 Mar 2017 19:39:03 -0500
Subject: [PATCH 14/18] UI tweaks (amended with small fix)

---
 app/app.js                          |   3 +-
 app/pages/404/style.styl            |   2 +
 app/pages/404/view.html             |   2 +-
 app/pages/categories/anotherCtrl.js |   0
 app/pages/categories/style.styl     |   9 ++
 app/pages/categories/view.html      |  10 +--
 app/pages/food/ctrl.js              |   6 +-
 app/pages/food/style.styl           |  20 ++++-
 app/pages/food/view.html            |  22 ++---
 app/pages/login/anotherCtrl.js      |   0
 app/pages/login/view.html           |   6 +-
 app/root/_footer.kit                |   4 +-
 app/root/_nav.kit                   |   6 +-
 app/root/root.styl                  |   2 +-
 assets/css/main.css                 |  39 ++++++++-
 assets/js/bundle.js                 | 129 ++++++++++++++--------------
 index.html                          |  10 +--
 17 files changed, 162 insertions(+), 108 deletions(-)
 delete mode 100644 app/pages/categories/anotherCtrl.js
 delete mode 100644 app/pages/login/anotherCtrl.js

diff --git a/app/app.js b/app/app.js
index 2164777..d877d41 100644
--- a/app/app.js
+++ b/app/app.js
@@ -6,7 +6,8 @@ var app = angular.module('app', ['ngRoute', 'ngResource', 'ngCookies']);
 // Factories
 
 app.factory('Foods', function($resource) {
-  return $resource('assets/json/foods.json');
+  return $resource('http://foodbank.develop.digitalmediauconn.org/api/food/all');
+  // return $resource('assets/json/foods.json');
 });
 
 app.factory('FoodDetail', function($resource) {
diff --git a/app/pages/404/style.styl b/app/pages/404/style.styl
index e69de29..4182b61 100644
--- a/app/pages/404/style.styl
+++ b/app/pages/404/style.styl
@@ -0,0 +1,2 @@
+.f404
+  text-align center
diff --git a/app/pages/404/view.html b/app/pages/404/view.html
index 640e8c2..98440d6 100644
--- a/app/pages/404/view.html
+++ b/app/pages/404/view.html
@@ -1,2 +1,2 @@
 <div class="spacer"></div>
-<h1>You've reached pages/404/view.html by going to an invalid link.</h1>
+<h1 class="f404">404 Page not found</h1>
diff --git a/app/pages/categories/anotherCtrl.js b/app/pages/categories/anotherCtrl.js
deleted file mode 100644
index e69de29..0000000
diff --git a/app/pages/categories/style.styl b/app/pages/categories/style.styl
index 1a565da..2c7caed 100644
--- a/app/pages/categories/style.styl
+++ b/app/pages/categories/style.styl
@@ -11,3 +11,12 @@
 select {
 	display:block!important;
 }
+
+.row
+	display flex
+.catsWrap
+	max-width 100%
+	min-width 100%
+	+above(700px)
+		min-width: 680px
+	margin 0 auto
diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html
index 5d9511e..76763d3 100644
--- a/app/pages/categories/view.html
+++ b/app/pages/categories/view.html
@@ -1,6 +1,6 @@
 <div class="container">
 	<div class="row">
-		<div class="col s12 m9">
+		<div class="catsWrap">
 			<ul class="collapsible" data-collapsible="expandable">
 				<li ng-repeat="category in categories">
 		      <div class="collapsible-header">{{ category.name }}</div>
@@ -43,14 +43,14 @@
 			              	<div class="col s4">
 			              		<button class="btn red darken-3" ng-click="removeRule(category, rule)">Delete</button>
 			              	</div>
-			              </div>		
+			              </div>
 			            </div>
 			          </div>
 							</div>
 					    <div class="col s12">
-					    	
-													
-												
+
+
+
 								<button ng-click="addRule(category.name)" class="btn">Add Rule</button>
 								<button class="btn green" ng-click="saveData(category)">Save</button>
 					    </div>
diff --git a/app/pages/food/ctrl.js b/app/pages/food/ctrl.js
index ee72c58..ad9b48d 100644
--- a/app/pages/food/ctrl.js
+++ b/app/pages/food/ctrl.js
@@ -3,9 +3,9 @@ app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categorie
   $scope.page.id = 'food';
 
   // Cookie for Table/Card view prefence
-  $scope.tableView = $cookies.get('showTable') === 'true';
-  $scope.$watch('tableView', function () {
-    $cookies.put('showTable', $scope.tableView ? 'true' : 'false');
+  $scope.cardView = $cookies.get('showTable') === 'true';
+  $scope.$watch('cardView', function () {
+    $cookies.put('showTable', $scope.cardView ? 'true' : 'false');
   });
 
   // Initialize Filters
diff --git a/app/pages/food/style.styl b/app/pages/food/style.styl
index 1b07d95..2667f4d 100644
--- a/app/pages/food/style.styl
+++ b/app/pages/food/style.styl
@@ -39,9 +39,9 @@
 
 // Grades
 .grade
-  padding-right: 1em
+  padding-right: 2em
   +above(600px)
-    padding: 0 1em
+    padding: 0 2em 0 0
   nav
     display: flex
     align-items: center
@@ -66,7 +66,11 @@
   padding-left: 26px
 
 
-
+.table-toggle
+  .switch
+    display flex
+  label
+    margin 0 auto
 
 .foods
   display: flex
@@ -154,6 +158,7 @@
     padding: 1em
     border: 1px solid lightgray
     min-width 300px
+    max-width 500px
     my-box-shadow()
     background: white
     [type="radio"]:not(:checked)+label, [type="radio"]:checked+label
@@ -200,6 +205,7 @@
   font-size 1.2em
   align-items center
   margin-right 1em
+  max-width 100%
   padding-right 1em
   background #f5f5f5
   +above(760px)
@@ -212,9 +218,15 @@
   span
     flex-basis 100px
     margin-right 1em
+  .foodCat
+    text-align right
   .name
-    flex-basis 140px
+    flex-grow 1
+    white-space nowrap
+    text-overflow ellipsis
+    overflow-y hidden
   .barcode
+    flex-basis 117px
     color #888
     font-size 1rem
     text-align right
diff --git a/app/pages/food/view.html b/app/pages/food/view.html
index 0384f0f..0da331a 100644
--- a/app/pages/food/view.html
+++ b/app/pages/food/view.html
@@ -3,7 +3,7 @@
 
   <div class="input-field col s6">
     <input type="text" id="search" ng-model="searchTerm">
-    <label for="search">Search for food by name!</label>
+    <label for="search">Search for food by name or category!</label>
     <i class="material-icons prefix">search</i>
   </div>
 
@@ -15,7 +15,7 @@
 <!-- Filters -->
 <div class="food-filter container">
 
-  <div class="by-category">
+  <!-- <div class="by-category">
     <h5>By Category</h5>
     <nav>
       <div class="nav-wrapper">
@@ -27,10 +27,10 @@ <h5>By Category</h5>
         </ul>
       </div>
     </nav>
-  </div>
+  </div> -->
 
   <div class="grade">
-    <h5>By Grade</h5>
+    <h5>Health Filter</h5>
     <nav>
       <input type="checkbox" class="filled-in green" id="green" ng-model="rankSelection[1]">
       <label for="green"></label>
@@ -47,11 +47,11 @@ <h5>By Grade</h5>
   </div>
 
   <div class="table-toggle">
-    <h5>Table</h5>
+    <h5>Card View</h5>
     <nav>
       <div class="switch">
       <label>
-        <input ng-model="tableView" type="checkbox">
+        <input ng-model="cardView" type="checkbox">
         <span class="lever"></span>
       </label>
       </div>
@@ -65,16 +65,16 @@ <h5>Table</h5>
 
 <!-- Foods List -->
 <div class="foods">
-  <div ng-show="!tableView" ng-click="view(food)" class="card-panel" ng-repeat="food in foods | orderBy : 'name' | filter : searchTerm | filter : categoryFilter | filter : rankFilter">
+  <div ng-show="cardView" ng-click="view(food)" class="card-panel" ng-repeat="food in foods | orderBy : 'name' | filter : searchTerm | filter : categoryFilter | filter : rankFilter">
     <div class="health rank-{{food.rank.id}}"><i class="material-icons">favorite</i></div>
     <h5>{{food.name}}</h5>
   </div>
 
-  <div ng-show="tableView" class="foodTable">
+  <div ng-show="!cardView" class="foodTable">
       <div class="foodTableItem" ng-click="view(food)" ng-repeat="food in foods | filter : categoryFilter | filter : rankFilter | filter : searchTerm | orderBy : 'name'">
         <span class="health rank-{{food.rank.id}}"><i class="material-icons">favorite</i></span>
         <span class="name">{{food.name}}</span>
-        <span>{{food.category.name}}</span>
+        <span class="foodCat">{{food.category.name}}</span>
         <span class="barcode">{{food.barcode}}</span>
       </div>
   </table>
@@ -90,13 +90,13 @@ <h4>{{foodCRUD.name || "Add New Food"}}</h4>
 <p>Barcode: <span>{{foodCRUD.barcode}}</span></p>
 <p>Grade: <span>{{foodCRUD.rank.name}}</span></p>
 <p>Category: <span>{{foodCRUD.category.name}}</span></p>
-<p>Nutrition Facts:</p>
+<!-- <p>Nutrition Facts:</p>
 <div ng-repeat="nutrient in nutrientDetail">
   {{nutrient.nutrientName}}
   {{nutrient.nutrientId}}
   {{nutrient.units}}
   {{nutrient.rank}}
-</div>
+</div> -->
 
 <!-- NOTE: End of page content -->
 
diff --git a/app/pages/login/anotherCtrl.js b/app/pages/login/anotherCtrl.js
deleted file mode 100644
index e69de29..0000000
diff --git a/app/pages/login/view.html b/app/pages/login/view.html
index 4bcccae..b72d7ef 100644
--- a/app/pages/login/view.html
+++ b/app/pages/login/view.html
@@ -53,8 +53,8 @@
       </div>
 
 
-      <pre>{{ selected | json }}</pre>
-      <pre>{{ loginAttempt | json }}</pre>
+      <!-- <pre>{{ selected | json }}</pre>
+      <pre>{{ loginAttempt | json }}</pre> -->
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/root/_footer.kit b/app/root/_footer.kit
index 84777ec..0b2152c 100644
--- a/app/root/_footer.kit
+++ b/app/root/_footer.kit
@@ -1,6 +1,6 @@
 <!-- Footer goes here -->
-<footer>
+<!-- <footer>
   <a href="competitions.html">Contact</a>
   <h4>F2E</h4>
   <a href="community.html">Legal Crap</a>
-</footer>
+</footer> -->
diff --git a/app/root/_nav.kit b/app/root/_nav.kit
index 08b2a75..faf7041 100644
--- a/app/root/_nav.kit
+++ b/app/root/_nav.kit
@@ -12,16 +12,16 @@
   <ul class="tabs tabs-transparent">
     <li class="tab"><a ng-class="{active: page.id==='food'}" ng-click="go('/food')">Food</a></li>
     <li class="tab"><a ng-class="{active: page.id==='cat'}" ng-click="go('/categories')">Categories</a></li>
-    <li class="tab"><a ng-class="{active: page.id==='nutrients'}" ng-click="go('/nutrients')">Nutrients</a></li>
+    <!-- <li class="tab"><a ng-class="{active: page.id==='nutrients'}" ng-click="go('/nutrients')">Nutrients</a></li> -->
   </ul>
   </div>
 
 
   <!-- Sign in/up Buttons -->
-  <div class="sign-in">
+  <!-- <div class="sign-in">
     <a ng-click="go('/login')" ng-show="!signedIn" class="waves-effect waves-light btn blue">Sign in</a>
     <a ng-click="go('/login')" ng-show="signedIn" class="waves-effect waves-light btn">Sign out</a>
-  </div>
+  </div> -->
 
 </div>
 
diff --git a/app/root/root.styl b/app/root/root.styl
index f7a8c6e..c7fa4dc 100644
--- a/app/root/root.styl
+++ b/app/root/root.styl
@@ -27,7 +27,7 @@ Table of Contents:
     padding-right: 2em
     * {display: inline}
     i
-      font-size: 6rem
+      font-size: 4rem
     h4
       font-size: 2.6rem
       font-weight: 500
diff --git a/assets/css/main.css b/assets/css/main.css
index 8219112..8c8f2e4 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -36,6 +36,9 @@ ul.tabs .tab a {
 ul.tabs .tab a:hover {
   color: inherit;
 }
+.f404 {
+  text-align: center;
+}
 .collapsible-body {
   padding: 1em;
   box-sizing: border-box;
@@ -47,6 +50,19 @@ ul.tabs .tab a:hover {
 select {
   display: block !important;
 }
+.row {
+  display: flex;
+}
+.catsWrap {
+  max-width: 100%;
+  min-width: 100%;
+  margin: 0 auto;
+}
+@media all and (min-width: 700px) {
+  .catsWrap {
+    min-width: 680px;
+  }
+}
 .food-search {
   padding-top: 0.5em;
 }
@@ -86,11 +102,11 @@ select {
   background-color: #f5f5f5;
 }
 .grade {
-  padding-right: 1em;
+  padding-right: 2em;
 }
 @media all and (min-width: 600px) {
   .grade {
-    padding: 0 1em;
+    padding: 0 2em 0 0;
   }
 }
 .grade nav {
@@ -121,6 +137,12 @@ select {
 [type="checkbox"]+label {
   padding-left: 26px;
 }
+.table-toggle .switch {
+  display: flex;
+}
+.table-toggle label {
+  margin: 0 auto;
+}
 .foods {
   display: flex;
   padding: 3em;
@@ -220,6 +242,7 @@ select {
   padding: 1em;
   border: 1px solid #f0f0f0;
   min-width: 300px;
+  max-width: 500px;
   box-shadow: 0 2px 5px 0 rgba(0,0,0,0.16), 0 2px 10px 0 rgba(0,0,0,0.12);
   background: #fff;
 }
@@ -273,6 +296,7 @@ select {
   font-size: 1.2em;
   align-items: center;
   margin-right: 1em;
+  max-width: 100%;
   padding-right: 1em;
   background: #f5f5f5;
   transition: all 0.2s;
@@ -291,10 +315,17 @@ select {
   flex-basis: 100px;
   margin-right: 1em;
 }
+.foodTableItem .foodCat {
+  text-align: right;
+}
 .foodTableItem .name {
-  flex-basis: 140px;
+  flex-grow: 1;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow-y: hidden;
 }
 .foodTableItem .barcode {
+  flex-basis: 117px;
   color: #888;
   font-size: 1rem;
   text-align: right;
@@ -388,7 +419,7 @@ h1.nutrientsTitle {
   display: inline;
 }
 .nav-main .logo-area i {
-  font-size: 6rem;
+  font-size: 4rem;
 }
 .nav-main .logo-area h4 {
   font-size: 2.6rem;
diff --git a/assets/js/bundle.js b/assets/js/bundle.js
index f9c58dc..cbf1517 100644
--- a/assets/js/bundle.js
+++ b/assets/js/bundle.js
@@ -6,7 +6,8 @@ var app = angular.module('app', ['ngRoute', 'ngResource', 'ngCookies']);
 // Factories
 
 app.factory('Foods', function($resource) {
-  return $resource('assets/json/foods.json');
+  return $resource('http://foodbank.develop.digitalmediauconn.org/api/food/all');
+  // return $resource('assets/json/foods.json');
 });
 
 app.factory('FoodDetail', function($resource) {
@@ -145,6 +146,13 @@ app.controller('EmailController', ['$scope', function ($scope) {
   $scope.email = "rogangabe@gmail.com";
 }]);
 
+app.controller('404Ctrl', ['$scope', function ($scope) {
+  $scope.page.title = '404';
+  $scope.page.id = '404';
+  $scope.page.yourVar = "globalStuff";
+
+  $scope.var2 = "localStuff";
+}]);
 
 
 function GetRanks() {
@@ -235,75 +243,14 @@ app.controller('CategoryCtrl', ['$scope', '$http', 'Categories', 'Nutrients', fu
 	};
 }]);
 
-
-app.controller('LoginCtrl', ['$scope', 'loginService', function ($scope, loginService) {
-  $scope.page.title = 'Login';
-  $scope.page.id = 'login';
-  $scope.page.yourVar = "globalStuff";
-
-  $scope.selected = {
-    username: "",
-    password: ""
-  };
-
-  $scope.loginAttempt = {
-    username: "",
-    password: "",
-    attempt: false,
-    login: false
-  };
-
-  $scope.loginService = loginService;
-
-  $scope.login = function( username, password ) {
-    $scope.loginAttempt.username = username;
-    $scope.loginAttempt.password = password;
-    $scope.loginAttempt.attempt = true;
-    // Sanitize? Pre-check?
-    console.log($scope.loginService);
-    $scope.loginService.login( username, password ).then(function(response) {
-      console.log(response);
-      // Mock the fact that this takes longer
-      setTimeout(function() {
-        $scope.$apply(function() {
-          $scope.loginAttempt.login = response.login;
-          $scope.loginAttempt.attempt = false;
-        });
-      }, 1000);
-    }, function(error) {
-      console.error(error);
-    });
-  };
-
-}]);
-
-app.factory('loginService', ['$http', function($http) {
-  return {
-    login: function( username, password ) {
-      return $http.get('/app/pages/login/example.json').then(function(response) {
-        return response.data;
-      }, function(error) {
-        return error;
-      });
-    }
-  };
-}]);
-app.controller('404Ctrl', ['$scope', function ($scope) {
-  $scope.page.title = '404';
-  $scope.page.id = '404';
-  $scope.page.yourVar = "globalStuff";
-
-  $scope.var2 = "localStuff";
-}]);
-
 app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categories', '$cookies', function ($scope, $http, Foods, FoodDetail, Categories, $cookies) {
   $scope.page.title = 'Food';
   $scope.page.id = 'food';
 
   // Cookie for Table/Card view prefence
-  $scope.tableView = $cookies.get('showTable') === 'true';
-  $scope.$watch('tableView', function () {
-    $cookies.put('showTable', $scope.tableView ? 'true' : 'false');
+  $scope.cardView = $cookies.get('showTable') === 'true';
+  $scope.$watch('cardView', function () {
+    $cookies.put('showTable', $scope.cardView ? 'true' : 'false');
   });
 
   // Initialize Filters
@@ -413,6 +360,58 @@ app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categorie
 
 }]);
 
+app.controller('LoginCtrl', ['$scope', 'loginService', function ($scope, loginService) {
+  $scope.page.title = 'Login';
+  $scope.page.id = 'login';
+  $scope.page.yourVar = "globalStuff";
+
+  $scope.selected = {
+    username: "",
+    password: ""
+  };
+
+  $scope.loginAttempt = {
+    username: "",
+    password: "",
+    attempt: false,
+    login: false
+  };
+
+  $scope.loginService = loginService;
+
+  $scope.login = function( username, password ) {
+    $scope.loginAttempt.username = username;
+    $scope.loginAttempt.password = password;
+    $scope.loginAttempt.attempt = true;
+    // Sanitize? Pre-check?
+    console.log($scope.loginService);
+    $scope.loginService.login( username, password ).then(function(response) {
+      console.log(response);
+      // Mock the fact that this takes longer
+      setTimeout(function() {
+        $scope.$apply(function() {
+          $scope.loginAttempt.login = response.login;
+          $scope.loginAttempt.attempt = false;
+        });
+      }, 1000);
+    }, function(error) {
+      console.error(error);
+    });
+  };
+
+}]);
+
+app.factory('loginService', ['$http', function($http) {
+  return {
+    login: function( username, password ) {
+      return $http.get('/app/pages/login/example.json').then(function(response) {
+        return response.data;
+      }, function(error) {
+        return error;
+      });
+    }
+  };
+}]);
 app.controller('NutrientsCtrl', ['$scope', 'Nutrients', function ($scope, Nutrients) {
   $scope.page.title = 'Nutrients';
   $scope.page.id = 'nutrients';
diff --git a/index.html b/index.html
index 80e6cfa..1420184 100644
--- a/index.html
+++ b/index.html
@@ -48,16 +48,16 @@ <h4 class="logo">F2E</h4>
   <ul class="tabs tabs-transparent">
     <li class="tab"><a ng-class="{active: page.id==='food'}" ng-click="go('/food')">Food</a></li>
     <li class="tab"><a ng-class="{active: page.id==='cat'}" ng-click="go('/categories')">Categories</a></li>
-    <li class="tab"><a ng-class="{active: page.id==='nutrients'}" ng-click="go('/nutrients')">Nutrients</a></li>
+    <!-- <li class="tab"><a ng-class="{active: page.id==='nutrients'}" ng-click="go('/nutrients')">Nutrients</a></li> -->
   </ul>
   </div>
 
 
   <!-- Sign in/up Buttons -->
-  <div class="sign-in">
+  <!-- <div class="sign-in">
     <a ng-click="go('/login')" ng-show="!signedIn" class="waves-effect waves-light btn blue">Sign in</a>
     <a ng-click="go('/login')" ng-show="signedIn" class="waves-effect waves-light btn">Sign out</a>
-  </div>
+  </div> -->
 
 </div>
 
@@ -110,11 +110,11 @@ <h4 class="logo">F2E</h4>
 </script>
 <ng-view></ng-view>
 <!-- Footer goes here -->
-<footer>
+<!-- <footer>
   <a href="competitions.html">Contact</a>
   <h4>F2E</h4>
   <a href="community.html">Legal Crap</a>
-</footer>
+</footer> -->
 
 
 </body>

From e37de7e85ddc65dfcf76fe3cca10811154bda321 Mon Sep 17 00:00:00 2001
From: Gabe Rogan <rogangabe@gmail.com>
Date: Wed, 8 Mar 2017 22:24:15 -0500
Subject: [PATCH 15/18] Fixed categories

---
 app/pages/categories/style.styl |  7 +++
 app/pages/categories/view.html  | 89 +++++++++------------------------
 assets/css/main.css             |  9 ++++
 3 files changed, 39 insertions(+), 66 deletions(-)

diff --git a/app/pages/categories/style.styl b/app/pages/categories/style.styl
index 2c7caed..5920623 100644
--- a/app/pages/categories/style.styl
+++ b/app/pages/categories/style.styl
@@ -20,3 +20,10 @@ select {
 	+above(700px)
 		min-width: 680px
 	margin 0 auto
+.rulesWrap
+	display flex
+	flex-wrap wrap
+	.card
+		flex-grow 1
+		margin 1em
+		max-width calc(50% - 2em)
diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html
index 76763d3..1ea9a47 100644
--- a/app/pages/categories/view.html
+++ b/app/pages/categories/view.html
@@ -3,84 +3,41 @@
 		<div class="catsWrap">
 			<ul class="collapsible" data-collapsible="expandable">
 				<li ng-repeat="category in categories">
+
+
+
 		      <div class="collapsible-header">{{ category.name }}</div>
 		      <div class="collapsible-body">
-						<div class="row">
-							<!--<div class="col s12">
-								<div class="input-field col s6">
-				          <input placeholder="Placeholder" id="first_name" type="text" class="validate" ng-model="category.name">
-				          <label for="first_name">Category Name</label>
-				        </div>
-								<button class="btn grey" style="float:right" ng-click="removeCategory(category)">Delete Category</button>
-							</div>-->
-							<div class="col s6" ng-repeat="rule in category.rules[0]">
-								<div class="card">
-			            <div class="card-content">
-			              <div class="row">
-			              	<div class="col s6">
-			              		<select>
-			              			<option ng-repeat="nutrient in nutrients" value="{{nutrient.name}}" ng-selected="nutrient.name==rule.nutrientName">{{nutrient.name}}</option>
-			              		</select>
-			              	</div>
-			              	<div class="col s6">
-			              		<select>
-			              			<option ng-repeat="rank in ranks" value="{{rank.id}}" ng-selected="rule.rank == rank.id">{{ rank.name }}</option>
-			              		</select>
-			              	</div>
-			              	<div class="col s4">
-			              		<select>
-													<option ng-repeat="operation in operations" value="{{operation.name}}" ng-selected="operation.name==rank.operator">{{operation.symbol}}</option>
-												</select>
-			              	</div>
-			              	<div class="col s4">
-			              		<input type="number" ng-model="rule.threshold" value="{{rule.threshold}}">
-			              	</div>
-			              	<div class="col s4">
-			              		<select>
-			              			<option ng-repeat="unit in units" value="{{unit}}" ng-selected="rule.units == unit">{{unit}}</option>
-			              		</select>
-			              	</div>
-			              	<div class="col s4">
-			              		<button class="btn red darken-3" ng-click="removeRule(category, rule)">Delete</button>
-			              	</div>
-			              </div>
-			            </div>
-			          </div>
+
+							<div class="row s12">
+										<button ng-click="addRule(category.name)" class="btn">Add Rule</button>
+										<button class="btn green" ng-click="saveData(category)">Save</button>
+							</div>
+
+							<div class="rulesWrap">
+							<div class="card s6" ng-repeat="rule in category.rules[0]">
+							<div class="card-content">
+	              		<select><option ng-repeat="nutrient in nutrients" value="asdf" ng-selected="nutrient.name==rule.nutrientName">{{nutrient.name}}</option></select>
+	              		<select><option ng-repeat="rank in ranks" value="{{rank.id}}" ng-selected="rule.rank == rank.id">{{ rank.name }}</option></select>
+	              		<select><option ng-repeat="operation in operations" value="{{operation.name}}" ng-selected="operation.name==rank.operator">{{operation.symbol}}</option></select>
+	              		<input type="number" ng-model="rule.threshold" value="{{rule.threshold}}">
+	              		<select><option ng-repeat="unit in units" value="{{unit}}" ng-selected="rule.units == unit">{{unit}}</option></select>
+	              		<button class="btn red darken-3" ng-click="removeRule(category, rule)">Delete</button>
+							</div>
 							</div>
-					    <div class="col s12">
+							</div>
+					</div>
+
 
 
 
-								<button ng-click="addRule(category.name)" class="btn">Add Rule</button>
-								<button class="btn green" ng-click="saveData(category)">Save</button>
-					    </div>
-					  </div>
-					</div>
 		    </li>
 		  </ul>
-			<!--<button class="btn blue" ng-click="addCategory()" onclick="UpdateTextFields()">Add Category</button>-->
 		</div>
-		<!--<div class="col s12 m3">
-			<div class="card grey darken-3">
-				<div class="card-content white-text">
-					<span class="card-title">Filter</span>
-					<div class="row">
-						<div class="col s12">
-				      <div class="row">
-				        <div class="input-field col s12 ">
-				          <input id="by-name" type="text">
-				          <label for="by-name">By Name</label>
-				        </div>
-				      </div>
-
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>-->
 	</div>
 </div>
 
+
 <script>
 function UpdateTextFields() {
 	setTimeout(function() {
diff --git a/assets/css/main.css b/assets/css/main.css
index 8c8f2e4..976b9a1 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -63,6 +63,15 @@ select {
     min-width: 680px;
   }
 }
+.rulesWrap {
+  display: flex;
+  flex-wrap: wrap;
+}
+.rulesWrap .card {
+  flex-grow: 1;
+  margin: 1em;
+  max-width: calc(50% - 2em);
+}
 .food-search {
   padding-top: 0.5em;
 }

From 3714c0a458347018543943e7e7683218d5f59bd2 Mon Sep 17 00:00:00 2001
From: Timothy Morris <timthewebguy@gmail.com>
Date: Thu, 23 Mar 2017 17:09:49 -0400
Subject: [PATCH 16/18] categories fix

---
 app/pages/categories/style.styl | 16 ------
 app/pages/categories/view.html  | 95 ++++++++++++++++++++++++---------
 2 files changed, 69 insertions(+), 42 deletions(-)

diff --git a/app/pages/categories/style.styl b/app/pages/categories/style.styl
index 5920623..1a565da 100644
--- a/app/pages/categories/style.styl
+++ b/app/pages/categories/style.styl
@@ -11,19 +11,3 @@
 select {
 	display:block!important;
 }
-
-.row
-	display flex
-.catsWrap
-	max-width 100%
-	min-width 100%
-	+above(700px)
-		min-width: 680px
-	margin 0 auto
-.rulesWrap
-	display flex
-	flex-wrap wrap
-	.card
-		flex-grow 1
-		margin 1em
-		max-width calc(50% - 2em)
diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html
index 1ea9a47..5d9511e 100644
--- a/app/pages/categories/view.html
+++ b/app/pages/categories/view.html
@@ -1,43 +1,86 @@
 <div class="container">
 	<div class="row">
-		<div class="catsWrap">
+		<div class="col s12 m9">
 			<ul class="collapsible" data-collapsible="expandable">
 				<li ng-repeat="category in categories">
-
-
-
 		      <div class="collapsible-header">{{ category.name }}</div>
 		      <div class="collapsible-body">
-
-							<div class="row s12">
-										<button ng-click="addRule(category.name)" class="btn">Add Rule</button>
-										<button class="btn green" ng-click="saveData(category)">Save</button>
-							</div>
-
-							<div class="rulesWrap">
-							<div class="card s6" ng-repeat="rule in category.rules[0]">
-							<div class="card-content">
-	              		<select><option ng-repeat="nutrient in nutrients" value="asdf" ng-selected="nutrient.name==rule.nutrientName">{{nutrient.name}}</option></select>
-	              		<select><option ng-repeat="rank in ranks" value="{{rank.id}}" ng-selected="rule.rank == rank.id">{{ rank.name }}</option></select>
-	              		<select><option ng-repeat="operation in operations" value="{{operation.name}}" ng-selected="operation.name==rank.operator">{{operation.symbol}}</option></select>
-	              		<input type="number" ng-model="rule.threshold" value="{{rule.threshold}}">
-	              		<select><option ng-repeat="unit in units" value="{{unit}}" ng-selected="rule.units == unit">{{unit}}</option></select>
-	              		<button class="btn red darken-3" ng-click="removeRule(category, rule)">Delete</button>
-							</div>
-							</div>
+						<div class="row">
+							<!--<div class="col s12">
+								<div class="input-field col s6">
+				          <input placeholder="Placeholder" id="first_name" type="text" class="validate" ng-model="category.name">
+				          <label for="first_name">Category Name</label>
+				        </div>
+								<button class="btn grey" style="float:right" ng-click="removeCategory(category)">Delete Category</button>
+							</div>-->
+							<div class="col s6" ng-repeat="rule in category.rules[0]">
+								<div class="card">
+			            <div class="card-content">
+			              <div class="row">
+			              	<div class="col s6">
+			              		<select>
+			              			<option ng-repeat="nutrient in nutrients" value="{{nutrient.name}}" ng-selected="nutrient.name==rule.nutrientName">{{nutrient.name}}</option>
+			              		</select>
+			              	</div>
+			              	<div class="col s6">
+			              		<select>
+			              			<option ng-repeat="rank in ranks" value="{{rank.id}}" ng-selected="rule.rank == rank.id">{{ rank.name }}</option>
+			              		</select>
+			              	</div>
+			              	<div class="col s4">
+			              		<select>
+													<option ng-repeat="operation in operations" value="{{operation.name}}" ng-selected="operation.name==rank.operator">{{operation.symbol}}</option>
+												</select>
+			              	</div>
+			              	<div class="col s4">
+			              		<input type="number" ng-model="rule.threshold" value="{{rule.threshold}}">
+			              	</div>
+			              	<div class="col s4">
+			              		<select>
+			              			<option ng-repeat="unit in units" value="{{unit}}" ng-selected="rule.units == unit">{{unit}}</option>
+			              		</select>
+			              	</div>
+			              	<div class="col s4">
+			              		<button class="btn red darken-3" ng-click="removeRule(category, rule)">Delete</button>
+			              	</div>
+			              </div>		
+			            </div>
+			          </div>
 							</div>
+					    <div class="col s12">
+					    	
+													
+												
+								<button ng-click="addRule(category.name)" class="btn">Add Rule</button>
+								<button class="btn green" ng-click="saveData(category)">Save</button>
+					    </div>
+					  </div>
 					</div>
-
-
-
-
 		    </li>
 		  </ul>
+			<!--<button class="btn blue" ng-click="addCategory()" onclick="UpdateTextFields()">Add Category</button>-->
 		</div>
+		<!--<div class="col s12 m3">
+			<div class="card grey darken-3">
+				<div class="card-content white-text">
+					<span class="card-title">Filter</span>
+					<div class="row">
+						<div class="col s12">
+				      <div class="row">
+				        <div class="input-field col s12 ">
+				          <input id="by-name" type="text">
+				          <label for="by-name">By Name</label>
+				        </div>
+				      </div>
+
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>-->
 	</div>
 </div>
 
-
 <script>
 function UpdateTextFields() {
 	setTimeout(function() {

From 4af500123b54270295cca5e8d319f92575aa0199 Mon Sep 17 00:00:00 2001
From: Timothy Morris <timthewebguy@gmail.com>
Date: Thu, 23 Mar 2017 17:19:56 -0400
Subject: [PATCH 17/18] categories fix II

---
 assets/css/main.css |   22 -
 yarn.lock           | 3065 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3065 insertions(+), 22 deletions(-)
 create mode 100644 yarn.lock

diff --git a/assets/css/main.css b/assets/css/main.css
index 976b9a1..2c77d20 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -50,28 +50,6 @@ ul.tabs .tab a:hover {
 select {
   display: block !important;
 }
-.row {
-  display: flex;
-}
-.catsWrap {
-  max-width: 100%;
-  min-width: 100%;
-  margin: 0 auto;
-}
-@media all and (min-width: 700px) {
-  .catsWrap {
-    min-width: 680px;
-  }
-}
-.rulesWrap {
-  display: flex;
-  flex-wrap: wrap;
-}
-.rulesWrap .card {
-  flex-grow: 1;
-  margin: 1em;
-  max-width: calc(50% - 2em);
-}
 .food-search {
   padding-top: 0.5em;
 }
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 0000000..e0fc914
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,3065 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abbrev@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+
+accepts@1.3.3, accepts@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
+  dependencies:
+    mime-types "~2.1.11"
+    negotiator "0.6.1"
+
+accord@^0.26.3:
+  version "0.26.4"
+  resolved "https://registry.yarnpkg.com/accord/-/accord-0.26.4.tgz#fc4c8d3ebab406a07cb28819b859651c44a92e80"
+  dependencies:
+    convert-source-map "^1.2.0"
+    glob "^7.0.5"
+    indx "^0.2.3"
+    lodash.clone "^4.3.2"
+    lodash.defaults "^4.0.1"
+    lodash.flatten "^4.2.0"
+    lodash.merge "^4.4.0"
+    lodash.partialright "^4.1.4"
+    lodash.pick "^4.2.1"
+    lodash.uniq "^4.3.0"
+    resolve "^1.1.7"
+    semver "^5.3.0"
+    uglify-js "^2.7.0"
+    when "^3.7.7"
+
+acorn-jsx@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  dependencies:
+    acorn "^3.0.4"
+
+acorn-object-spread@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz#48ead0f4a8eb16995a17a0db9ffc6acaada4ba68"
+  dependencies:
+    acorn "^3.1.0"
+
+acorn@^3.0.4, acorn@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+
+after@0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627"
+
+ajv@^4.9.1:
+  version "4.11.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  dependencies:
+    kind-of "^3.0.2"
+    longest "^1.0.1"
+    repeat-string "^1.5.2"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansicolors@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
+
+anymatch@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
+  dependencies:
+    arrify "^1.0.0"
+    micromatch "^2.1.5"
+
+aproba@^1.0.3:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
+
+archy@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz#80e470e95a084794fe1899262c5667c6e88de1b3"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.0 || ^1.1.13"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  dependencies:
+    arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
+
+array-differ@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+
+array-uniq@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+arraybuffer.slice@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
+
+arrify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asn1@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+assert-plus@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
+async-each-series@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432"
+
+async-each@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+
+async@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+autoprefixer-stylus@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer-stylus/-/autoprefixer-stylus-0.11.0.tgz#02064ed88bc7cf0b373f3346bb5e066039b36e02"
+  dependencies:
+    autoprefixer "6.5.0"
+    multi-stage-sourcemap "0.2.1"
+    postcss "5.2.4"
+
+autoprefixer@6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.5.0.tgz#910de0aa0f22af4c7d50367cbc9d4d412945162f"
+  dependencies:
+    browserslist "~1.4.0"
+    caniuse-db "^1.0.30000540"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.2"
+    postcss-value-parser "^3.2.3"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws4@^1.2.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+backo2@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+
+balanced-match@^0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+base64-arraybuffer@0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+
+base64id@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-0.1.0.tgz#02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"
+
+batch@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/batch/-/batch-0.5.3.tgz#3f3414f380321743bfc1042f9a83ff1d5824d464"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  dependencies:
+    tweetnacl "^0.14.3"
+
+beeper@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
+
+better-assert@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  dependencies:
+    callsite "1.0.0"
+
+binary-extensions@^1.0.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
+
+blob@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
+
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  dependencies:
+    inherits "~2.0.0"
+
+boom@2.x.x:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  dependencies:
+    hoek "2.x.x"
+
+brace-expansion@^1.0.0:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
+  dependencies:
+    balanced-match "^0.4.1"
+    concat-map "0.0.1"
+
+braces@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
+browser-sync-client@2.4.5:
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.4.5.tgz#976afab1a54f255baa38fe22ae3c0d3753ad337b"
+  dependencies:
+    etag "^1.7.0"
+    fresh "^0.3.0"
+
+browser-sync-ui@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-0.6.3.tgz#640a537c180689303d5be92bc476b9ebc441c0bc"
+  dependencies:
+    async-each-series "0.1.1"
+    connect-history-api-fallback "^1.1.0"
+    immutable "^3.7.6"
+    server-destroy "1.0.1"
+    stream-throttle "^0.1.3"
+    weinre "^2.0.0-pre-I0Z7U9OV"
+
+browser-sync@^2.17.6:
+  version "2.18.8"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.18.8.tgz#2fb4de253798d7cfb839afb9c2f801968490cec2"
+  dependencies:
+    browser-sync-client "2.4.5"
+    browser-sync-ui "0.6.3"
+    bs-recipes "1.3.4"
+    chokidar "1.6.1"
+    connect "3.5.0"
+    dev-ip "^1.0.1"
+    easy-extender "2.3.2"
+    eazy-logger "3.0.2"
+    emitter-steward "^1.0.0"
+    fs-extra "1.0.0"
+    http-proxy "1.15.2"
+    immutable "3.8.1"
+    localtunnel "1.8.2"
+    micromatch "2.3.11"
+    opn "4.0.2"
+    portscanner "2.1.1"
+    qs "6.2.1"
+    resp-modifier "6.0.2"
+    rx "4.1.0"
+    serve-index "1.8.0"
+    serve-static "1.11.1"
+    server-destroy "1.0.1"
+    socket.io "1.6.0"
+    socket.io-client "1.6.0"
+    ua-parser-js "0.7.12"
+    yargs "6.4.0"
+
+browserslist@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.4.0.tgz#9cfdcf5384d9158f5b70da2aa00b30e8ff019049"
+  dependencies:
+    caniuse-db "^1.0.30000539"
+
+bs-recipes@1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585"
+
+buble@^0.12.0:
+  version "0.12.5"
+  resolved "https://registry.yarnpkg.com/buble/-/buble-0.12.5.tgz#c66ffe92f9f4a3c65d3256079b711e2bd0bc5013"
+  dependencies:
+    acorn "^3.1.0"
+    acorn-jsx "^3.0.1"
+    acorn-object-spread "^1.0.0"
+    chalk "^1.1.3"
+    magic-string "^0.14.0"
+    minimist "^1.2.0"
+    os-homedir "^1.0.1"
+
+bubleify@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/bubleify/-/bubleify-0.5.1.tgz#f65c47cee31b80cad8b9e747bbe187d7fe51e927"
+  dependencies:
+    buble "^0.12.0"
+    object-assign "^4.0.1"
+
+buffer-shims@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+
+builtin-modules@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+callsite@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+
+camelcase@^1.0.2, camelcase@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+
+caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000540:
+  version "1.0.30000640"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000640.tgz#7b7fd3cf13c0d9d41f8754b577b202113e2be7ca"
+
+cardinal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
+  dependencies:
+    ansicolors "~0.2.1"
+    redeyed "~1.0.0"
+
+caseless@~0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+center-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  dependencies:
+    align-text "^0.1.3"
+    lazy-cache "^1.0.3"
+
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chokidar@1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
+  dependencies:
+    anymatch "^1.3.0"
+    async-each "^1.0.0"
+    glob-parent "^2.0.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^2.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
+cli-table@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
+  dependencies:
+    colors "1.0.3"
+
+cli-usage@^0.1.1:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/cli-usage/-/cli-usage-0.1.4.tgz#7c01e0dc706c234b39c933838c8e20b2175776e2"
+  dependencies:
+    marked "^0.3.6"
+    marked-terminal "^1.6.2"
+
+cliui@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  dependencies:
+    center-align "^0.1.1"
+    right-align "^0.1.1"
+    wordwrap "0.0.2"
+
+cliui@^3.0.3, cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
+clone-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+
+clone-stats@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
+
+clone-stats@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
+
+clone@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
+
+clone@^1.0.0, clone@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+
+cloneable-readable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117"
+  dependencies:
+    inherits "^2.0.1"
+    process-nextick-args "^1.0.6"
+    through2 "^2.0.1"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+
+combined-stream@^1.0.5, combined-stream@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@^2.2.0, commander@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+component-bind@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+
+component-emitter@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
+
+component-emitter@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+
+component-inherit@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+concat-with-sourcemaps@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz#f55b3be2aeb47601b10a2d5259ccfb70fd2f1dd6"
+  dependencies:
+    source-map "^0.5.1"
+
+connect-history-api-fallback@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169"
+
+connect@1.x:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-1.9.2.tgz#42880a22e9438ae59a8add74e437f58ae8e52807"
+  dependencies:
+    formidable "1.0.x"
+    mime ">= 0.0.1"
+    qs ">= 0.4.0"
+
+connect@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.5.0.tgz#b357525a0b4c1f50599cd983e1d9efeea9677198"
+  dependencies:
+    debug "~2.2.0"
+    finalhandler "0.5.0"
+    parseurl "~1.3.1"
+    utils-merge "1.0.0"
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+
+convert-source-map@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.4.0.tgz#e3dad195bf61bfe13a7a3c73e9876ec14a0268f3"
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+cryptiles@2.x.x:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  dependencies:
+    boom "2.x.x"
+
+css-parse@1.7.x:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
+dateformat@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
+
+debug@*, debug@^2.2.0:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
+  dependencies:
+    ms "0.7.2"
+
+debug@2.2.0, debug@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  dependencies:
+    ms "0.7.1"
+
+debug@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
+  dependencies:
+    ms "0.7.2"
+
+decamelize@^1.0.0, decamelize@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+deep-extend@~0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.1.tgz#efe4113d08085f4e6f9687759810f807469e2253"
+
+defaults@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  dependencies:
+    clone "^1.0.2"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+depd@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
+
+deprecated@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+
+detect-file@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
+  dependencies:
+    fs-exists-sync "^0.1.0"
+
+dev-ip@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
+
+duplexer2@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  dependencies:
+    readable-stream "~1.1.9"
+
+easy-extender@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/easy-extender/-/easy-extender-2.3.2.tgz#3d3248febe2b159607316d8f9cf491c16648221d"
+  dependencies:
+    lodash "^3.10.1"
+
+eazy-logger@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-3.0.2.tgz#a325aa5e53d13a2225889b2ac4113b2b9636f4fc"
+  dependencies:
+    tfunk "^3.0.1"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  dependencies:
+    jsbn "~0.1.0"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+
+emitter-steward@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/emitter-steward/-/emitter-steward-1.0.0.tgz#f3411ade9758a7565df848b2da0cbbd1b46cbd64"
+
+encodeurl@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+
+end-of-stream@~0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
+  dependencies:
+    once "~1.3.0"
+
+engine.io-client@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.0.tgz#7b730e4127414087596d9be3c88d2bc5fdb6cf5c"
+  dependencies:
+    component-emitter "1.2.1"
+    component-inherit "0.0.3"
+    debug "2.3.3"
+    engine.io-parser "1.3.1"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parsejson "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    ws "1.1.1"
+    xmlhttprequest-ssl "1.5.3"
+    yeast "0.1.2"
+
+engine.io-parser@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.1.tgz#9554f1ae33107d6fbd170ca5466d2f833f6a07cf"
+  dependencies:
+    after "0.8.1"
+    arraybuffer.slice "0.0.6"
+    base64-arraybuffer "0.1.5"
+    blob "0.0.4"
+    has-binary "0.1.6"
+    wtf-8 "1.0.0"
+
+engine.io@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.0.tgz#3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa"
+  dependencies:
+    accepts "1.3.3"
+    base64id "0.1.0"
+    cookie "0.3.1"
+    debug "2.3.3"
+    engine.io-parser "1.3.1"
+    ws "1.1.1"
+
+error-ex@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  dependencies:
+    is-arrayish "^0.2.1"
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+
+escape-string-regexp@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+esprima@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
+
+etag@^1.7.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051"
+
+etag@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8"
+
+eventemitter3@1.x.x:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
+
+expand-brackets@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  dependencies:
+    fill-range "^2.1.0"
+
+expand-tilde@^1.2.1, expand-tilde@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
+  dependencies:
+    os-homedir "^1.0.1"
+
+express@2.5.x:
+  version "2.5.11"
+  resolved "https://registry.yarnpkg.com/express/-/express-2.5.11.tgz#4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"
+  dependencies:
+    connect "1.x"
+    mime "1.2.4"
+    mkdirp "0.3.0"
+    qs "0.4.x"
+
+extend@^3.0.0, extend@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  dependencies:
+    is-extglob "^1.0.0"
+
+extsprintf@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+
+fancy-log@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
+  dependencies:
+    chalk "^1.1.1"
+    time-stamp "^1.0.0"
+
+filename-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
+
+fill-range@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  dependencies:
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^1.1.3"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
+finalhandler@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.0.tgz#e9508abece9b6dba871a6942a1d7911b91911ac7"
+  dependencies:
+    debug "~2.2.0"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    statuses "~1.3.0"
+    unpipe "~1.0.0"
+
+find-index@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+findup-sync@^0.4.2:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
+  dependencies:
+    detect-file "^0.1.0"
+    is-glob "^2.0.1"
+    micromatch "^2.3.7"
+    resolve-dir "^0.1.0"
+
+fined@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/fined/-/fined-1.0.2.tgz#5b28424b760d7598960b7ef8480dff8ad3660e97"
+  dependencies:
+    expand-tilde "^1.2.1"
+    lodash.assignwith "^4.0.7"
+    lodash.isempty "^4.2.1"
+    lodash.isplainobject "^4.0.4"
+    lodash.isstring "^4.0.1"
+    lodash.pick "^4.2.1"
+    parse-filepath "^1.0.1"
+
+first-chunk-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
+
+flagged-respawn@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
+
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  dependencies:
+    for-in "^1.0.1"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+formidable@1.0.x:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.0.17.tgz#ef5491490f9433b705faa77249c99029ae348559"
+
+fresh@0.3.0, fresh@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f"
+
+fs-exists-sync@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+
+fs-extra@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    klaw "^1.0.0"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+fsevents@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
+  dependencies:
+    nan "^2.3.0"
+    node-pre-gyp "^0.6.29"
+
+fstream-ignore@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+  dependencies:
+    fstream "^1.0.0"
+    inherits "2"
+    minimatch "^3.0.0"
+
+fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
+gauge@~2.7.1:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09"
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+gaze@^0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
+  dependencies:
+    globule "~0.1.0"
+
+generate-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+
+generate-object-property@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  dependencies:
+    is-property "^1.0.0"
+
+get-caller-file@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+
+getpass@^0.1.1:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
+  dependencies:
+    assert-plus "^1.0.0"
+
+glob-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  dependencies:
+    is-glob "^2.0.0"
+
+glob-stream@^3.1.5:
+  version "3.1.18"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
+  dependencies:
+    glob "^4.3.1"
+    glob2base "^0.0.12"
+    minimatch "^2.0.1"
+    ordered-read-streams "^0.1.0"
+    through2 "^0.6.1"
+    unique-stream "^1.0.0"
+
+glob-watcher@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
+  dependencies:
+    gaze "^0.5.1"
+
+glob2base@^0.0.12:
+  version "0.0.12"
+  resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
+  dependencies:
+    find-index "^0.1.1"
+
+glob@7.0.x:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^4.3.1:
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^2.0.1"
+    once "^1.3.0"
+
+glob@^7.0.5:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@~3.1.21:
+  version "3.1.21"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
+  dependencies:
+    graceful-fs "~1.2.0"
+    inherits "1"
+    minimatch "~0.2.11"
+
+global-modules@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
+  dependencies:
+    global-prefix "^0.1.4"
+    is-windows "^0.2.0"
+
+global-prefix@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
+  dependencies:
+    homedir-polyfill "^1.0.0"
+    ini "^1.3.4"
+    is-windows "^0.2.0"
+    which "^1.2.12"
+
+globule@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
+  dependencies:
+    glob "~3.1.21"
+    lodash "~1.0.1"
+    minimatch "~0.2.11"
+
+glogg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
+  dependencies:
+    sparkles "^1.0.0"
+
+graceful-fs@^3.0.0:
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
+  dependencies:
+    natives "^1.1.0"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+graceful-fs@~1.2.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+
+growly@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+
+gulp-concat@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353"
+  dependencies:
+    concat-with-sourcemaps "^1.0.0"
+    through2 "^2.0.0"
+    vinyl "^2.0.0"
+
+gulp-kit@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/gulp-kit/-/gulp-kit-0.3.0.tgz#a1ef968d17ddfdd7f98a59f0c8f8e3e44563b446"
+  dependencies:
+    gulp-util "~3.0.1"
+    node-kit "0.9.0"
+    through2 "~0.6.1"
+
+gulp-notify@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/gulp-notify/-/gulp-notify-2.2.0.tgz#046c8285c292e97eed4e15a009c26cbbe5cef135"
+  dependencies:
+    gulp-util "^3.0.2"
+    lodash.template "^3.0.0"
+    node-notifier "^4.1.0"
+    node.extend "^1.1.3"
+    through2 "^0.6.3"
+
+gulp-plumber@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/gulp-plumber/-/gulp-plumber-1.1.0.tgz#f12176c2d0422f60306c242fff6a01a394faba09"
+  dependencies:
+    gulp-util "^3"
+    through2 "^2"
+
+gulp-stylus@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/gulp-stylus/-/gulp-stylus-2.6.0.tgz#b0b7fa4db844e6ee82b1075ca9740564696083a1"
+  dependencies:
+    accord "^0.26.3"
+    gulp-util "^3.0.6"
+    lodash.assign "^3.2.0"
+    replace-ext "0.0.1"
+    stylus "^0.54.0"
+    through2 "^2.0.0"
+    vinyl-sourcemaps-apply "^0.2.0"
+
+gulp-util@^3, gulp-util@^3.0.0, gulp-util@^3.0.2, gulp-util@^3.0.6, gulp-util@~3.0.1:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
+  dependencies:
+    array-differ "^1.0.0"
+    array-uniq "^1.0.2"
+    beeper "^1.0.0"
+    chalk "^1.0.0"
+    dateformat "^2.0.0"
+    fancy-log "^1.1.0"
+    gulplog "^1.0.0"
+    has-gulplog "^0.1.0"
+    lodash._reescape "^3.0.0"
+    lodash._reevaluate "^3.0.0"
+    lodash._reinterpolate "^3.0.0"
+    lodash.template "^3.0.0"
+    minimist "^1.1.0"
+    multipipe "^0.1.2"
+    object-assign "^3.0.0"
+    replace-ext "0.0.1"
+    through2 "^2.0.0"
+    vinyl "^0.5.0"
+
+gulp@^3.9.1:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
+  dependencies:
+    archy "^1.0.0"
+    chalk "^1.0.0"
+    deprecated "^0.0.1"
+    gulp-util "^3.0.0"
+    interpret "^1.0.0"
+    liftoff "^2.1.0"
+    minimist "^1.1.0"
+    orchestrator "^0.3.0"
+    pretty-hrtime "^1.0.0"
+    semver "^4.1.0"
+    tildify "^1.0.0"
+    v8flags "^2.0.2"
+    vinyl-fs "^0.3.0"
+
+gulplog@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
+  dependencies:
+    glogg "^1.0.0"
+
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
+har-validator@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+  dependencies:
+    chalk "^1.1.1"
+    commander "^2.9.0"
+    is-my-json-valid "^2.12.4"
+    pinkie-promise "^2.0.0"
+
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  dependencies:
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-binary@0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.6.tgz#25326f39cfa4f616ad8787894e3af2cfbc7b6e10"
+  dependencies:
+    isarray "0.0.1"
+
+has-binary@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.7.tgz#68e61eb16210c9545a0a5cce06a873912fe1e68c"
+  dependencies:
+    isarray "0.0.1"
+
+has-cors@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+
+has-gulplog@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
+  dependencies:
+    sparkles "^1.0.0"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
+hawk@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  dependencies:
+    boom "2.x.x"
+    cryptiles "2.x.x"
+    hoek "2.x.x"
+    sntp "1.x.x"
+
+hoek@2.x.x:
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+
+homedir-polyfill@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
+  dependencies:
+    parse-passwd "^1.0.0"
+
+hosted-git-info@^2.1.4:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.1.tgz#4b0445e41c004a8bd1337773a4ff790ca40318c8"
+
+http-errors@~1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750"
+  dependencies:
+    inherits "2.0.3"
+    setprototypeof "1.0.2"
+    statuses ">= 1.3.1 < 2"
+
+http-proxy@1.15.2:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.15.2.tgz#642fdcaffe52d3448d2bda3b0079e9409064da31"
+  dependencies:
+    eventemitter3 "1.x.x"
+    requires-port "1.x.x"
+
+http-signature@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  dependencies:
+    assert-plus "^0.2.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+immutable@3.8.1, immutable@^3.7.6:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.1.tgz#200807f11ab0f72710ea485542de088075f68cd2"
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+
+indx@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/indx/-/indx-0.2.3.tgz#15dcf56ee9cf65c0234c513c27fbd580e70fbc50"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
+
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+ini@^1.3.4, ini@~1.3.0:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+
+interpret@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
+
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+
+is-absolute@^0.2.3:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
+  dependencies:
+    is-relative "^0.2.1"
+    is-windows "^0.2.0"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-buffer@^1.0.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-dotfile@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  dependencies:
+    is-primitive "^2.0.0"
+
+is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  dependencies:
+    is-extglob "^1.0.0"
+
+is-my-json-valid@^2.12.4:
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
+  dependencies:
+    generate-function "^2.0.0"
+    generate-object-property "^1.1.0"
+    jsonpointer "^4.0.0"
+    xtend "^4.0.0"
+
+is-number-like@^1.0.3:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-number-like/-/is-number-like-1.0.7.tgz#a38d6b0fd2cd4282449128859eed86c03fd23552"
+  dependencies:
+    bubleify "^0.5.1"
+    lodash.isfinite "^3.3.2"
+
+is-number@^2.0.2, is-number@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+
+is-property@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+
+is-relative@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
+  dependencies:
+    is-unc-path "^0.1.1"
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+is-unc-path@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9"
+  dependencies:
+    unc-path-regex "^0.1.0"
+
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
+is-windows@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
+
+is@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/is/-/is-3.2.1.tgz#d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5"
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+
+isarray@1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+jodid25519@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
+  dependencies:
+    jsbn "~0.1.0"
+
+js-base64@^2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+json3@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+
+jsonpointer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+
+jsprim@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.0.2"
+    json-schema "0.2.3"
+    verror "1.3.6"
+
+kind-of@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
+  dependencies:
+    is-buffer "^1.0.2"
+
+klaw@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+  optionalDependencies:
+    graceful-fs "^4.1.9"
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  dependencies:
+    invert-kv "^1.0.0"
+
+liftoff@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
+  dependencies:
+    extend "^3.0.0"
+    findup-sync "^0.4.2"
+    fined "^1.0.1"
+    flagged-respawn "^0.3.2"
+    lodash.isplainobject "^4.0.4"
+    lodash.isstring "^4.0.1"
+    lodash.mapvalues "^4.4.0"
+    rechoir "^0.6.2"
+    resolve "^1.1.7"
+
+limiter@^1.0.5:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.0.tgz#6e2bd12ca3fcdaa11f224e2e53c896df3f08d913"
+
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
+localtunnel@1.8.2:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-1.8.2.tgz#913051e8328b51f75ad8a22ad1f5c5b8c599a359"
+  dependencies:
+    debug "2.2.0"
+    openurl "1.1.0"
+    request "2.78.0"
+    yargs "3.29.0"
+
+lodash._arraycopy@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
+
+lodash._arrayeach@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz#bab156b2a90d3f1bbd5c653403349e5e5933ef9e"
+
+lodash._baseassign@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._baseclone@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz#303519bf6393fe7e42f34d8b630ef7794e3542b7"
+  dependencies:
+    lodash._arraycopy "^3.0.0"
+    lodash._arrayeach "^3.0.0"
+    lodash._baseassign "^3.0.0"
+    lodash._basefor "^3.0.0"
+    lodash.isarray "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._basecopy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+
+lodash._basefor@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2"
+
+lodash._basetostring@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
+
+lodash._basevalues@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
+
+lodash._bindcallback@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
+
+lodash._createassigner@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
+  dependencies:
+    lodash._bindcallback "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+    lodash.restparam "^3.0.0"
+
+lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+
+lodash._isiterateecall@^3.0.0:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+
+lodash._reescape@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
+
+lodash._reevaluate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
+
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+
+lodash._root@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
+
+lodash.assign@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
+  dependencies:
+    lodash._baseassign "^3.0.0"
+    lodash._createassigner "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash.assign@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+
+lodash.assignwith@^4.0.7:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb"
+
+lodash.clone@^4.3.2:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
+
+lodash.clonedeep@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz#a0a1e40d82a5ea89ff5b147b8444ed63d92827db"
+  dependencies:
+    lodash._baseclone "^3.0.0"
+    lodash._bindcallback "^3.0.0"
+
+lodash.defaults@^4.0.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+
+lodash.escape@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
+  dependencies:
+    lodash._root "^3.0.0"
+
+lodash.flatten@^4.2.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+
+lodash.isarguments@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+
+lodash.isarray@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+
+lodash.isempty@^4.2.1:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
+
+lodash.isfinite@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
+
+lodash.isplainobject@^4.0.4:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+
+lodash.isstring@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+
+lodash.keys@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  dependencies:
+    lodash._getnative "^3.0.0"
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash.mapvalues@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
+
+lodash.merge@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
+
+lodash.partialright@^4.1.4:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/lodash.partialright/-/lodash.partialright-4.2.1.tgz#0130d80e83363264d40074f329b8a3e7a8a1cc4b"
+
+lodash.pick@^4.2.1:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+
+lodash.restparam@^3.0.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+
+lodash.template@^3.0.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash._basetostring "^3.0.0"
+    lodash._basevalues "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+    lodash._reinterpolate "^3.0.0"
+    lodash.escape "^3.0.0"
+    lodash.keys "^3.0.0"
+    lodash.restparam "^3.0.0"
+    lodash.templatesettings "^3.0.0"
+
+lodash.templatesettings@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.escape "^3.0.0"
+
+lodash.uniq@^4.3.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+
+lodash@^3.10.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+
+lodash@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
+
+longest@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+
+lru-cache@2:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+
+magic-string@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.14.0.tgz#57224aef1701caeed273b17a39a956e72b172462"
+  dependencies:
+    vlq "^0.2.1"
+
+map-cache@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+
+marked-terminal@^1.6.2:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/marked-terminal/-/marked-terminal-1.7.0.tgz#c8c460881c772c7604b64367007ee5f77f125904"
+  dependencies:
+    cardinal "^1.0.0"
+    chalk "^1.1.3"
+    cli-table "^0.3.1"
+    lodash.assign "^4.2.0"
+    node-emoji "^1.4.1"
+
+marked@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
+
+micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.7:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
+mime-db@~1.26.0:
+  version "1.26.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.26.0.tgz#eaffcd0e4fc6935cf8134da246e2e6c35305adff"
+
+mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.7:
+  version "2.1.14"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.14.tgz#f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"
+  dependencies:
+    mime-db "~1.26.0"
+
+mime@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.4.tgz#11b5fdaf29c2509255176b80ad520294f5de92b7"
+
+mime@1.3.4, "mime@>= 0.0.1":
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
+
+minimatch@^2.0.1:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
+  dependencies:
+    brace-expansion "^1.0.0"
+
+minimatch@^3.0.0, minimatch@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
+  dependencies:
+    brace-expansion "^1.0.0"
+
+minimatch@~0.2.11:
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
+  dependencies:
+    lru-cache "2"
+    sigmund "~1.0.0"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+mkdirp@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
+
+mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+ms@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
+
+ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
+multi-stage-sourcemap@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz#b09fc8586eaa17f81d575c4ad02e0f7a3f6b1105"
+  dependencies:
+    source-map "^0.1.34"
+
+multipipe@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
+  dependencies:
+    duplexer2 "0.0.2"
+
+nan@^2.3.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
+
+natives@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
+
+negotiator@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+
+node-emoji@^1.4.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.5.1.tgz#fd918e412769bf8c448051238233840b2aff16a1"
+  dependencies:
+    string.prototype.codepointat "^0.2.0"
+
+node-kit@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/node-kit/-/node-kit-0.9.0.tgz#efcb082148404dd707d6f2b56ccbcc39a4d62beb"
+
+node-notifier@^4.1.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-4.6.1.tgz#056d14244f3dcc1ceadfe68af9cff0c5473a33f3"
+  dependencies:
+    cli-usage "^0.1.1"
+    growly "^1.2.0"
+    lodash.clonedeep "^3.0.0"
+    minimist "^1.1.1"
+    semver "^5.1.0"
+    shellwords "^0.1.0"
+    which "^1.0.5"
+
+node-pre-gyp@^0.6.29:
+  version "0.6.34"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7"
+  dependencies:
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    request "^2.81.0"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^2.2.1"
+    tar-pack "^3.4.0"
+
+node-uuid@~1.4.7:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
+
+node.extend@^1.1.3:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-1.1.6.tgz#a7b882c82d6c93a4863a5504bd5de8ec86258b96"
+  dependencies:
+    is "^3.1.0"
+
+nopt@3.0.x:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-package-data@^2.3.2:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+
+npmlog@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.1"
+    set-blocking "~2.0.0"
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+
+oauth-sign@~0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+
+object-assign@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
+
+object-assign@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
+
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object-component@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+
+object-path@^0.9.0:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.9.2.tgz#0fd9a74fc5fad1ae3968b586bda5c632bd6c05a5"
+
+object.omit@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  dependencies:
+    ee-first "1.1.1"
+
+once@^1.3.0, once@^1.3.3, once@~1.3.0:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
+  dependencies:
+    wrappy "1"
+
+openurl@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.0.tgz#e2f2189d999c04823201f083f0f1a7cd8903187a"
+
+opn@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
+  dependencies:
+    object-assign "^4.0.1"
+    pinkie-promise "^2.0.0"
+
+options@>=0.0.5:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
+
+orchestrator@^0.3.0:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
+  dependencies:
+    end-of-stream "~0.1.5"
+    sequencify "~0.0.7"
+    stream-consume "~0.1.0"
+
+ordered-read-streams@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
+
+os-homedir@^1.0.0, os-homedir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  dependencies:
+    lcid "^1.0.0"
+
+os-tmpdir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+osenv@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+parse-filepath@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
+  dependencies:
+    is-absolute "^0.2.3"
+    map-cache "^0.2.0"
+    path-root "^0.1.1"
+
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  dependencies:
+    error-ex "^1.2.0"
+
+parse-passwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+
+parsejson@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
+  dependencies:
+    better-assert "~1.0.0"
+
+parseqs@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  dependencies:
+    better-assert "~1.0.0"
+
+parseuri@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  dependencies:
+    better-assert "~1.0.0"
+
+parseurl@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+path-root-regex@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+
+path-root@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  dependencies:
+    path-root-regex "^0.1.0"
+
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+portscanner@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96"
+  dependencies:
+    async "1.5.2"
+    is-number-like "^1.0.3"
+
+postcss-value-parser@^3.2.3:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+
+postcss@5.2.4, postcss@^5.2.2:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.4.tgz#8eb4bee3e5c4e091585b116df32d8db24a535f21"
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.1.2"
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
+pretty-hrtime@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
+
+process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+qs@0.4.x:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-0.4.2.tgz#3cac4c861e371a8c9c4770ac23cda8de639b8e5f"
+
+qs@6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"
+
+"qs@>= 0.4.0", qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
+qs@~6.3.0:
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
+
+randomatic@^1.1.3:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  dependencies:
+    is-number "^2.0.2"
+    kind-of "^3.0.2"
+
+range-parser@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+
+rc@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea"
+  dependencies:
+    deep-extend "~0.4.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
+"readable-stream@>=1.0.33-1 <1.1.0-0":
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.1.4, readable-stream@^2.1.5:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816"
+  dependencies:
+    buffer-shims "^1.0.0"
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~0.10.x"
+    util-deprecate "~1.0.1"
+
+readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readdirp@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  dependencies:
+    graceful-fs "^4.1.2"
+    minimatch "^3.0.2"
+    readable-stream "^2.0.2"
+    set-immediate-shim "^1.0.1"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
+redeyed@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
+  dependencies:
+    esprima "~3.0.0"
+
+regex-cache@^0.4.2:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  dependencies:
+    is-equal-shallow "^0.1.3"
+    is-primitive "^2.0.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+
+repeat-element@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+
+repeat-string@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
+replace-ext@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
+
+replace-ext@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
+
+request@2.78.0:
+  version "2.78.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.78.0.tgz#e1c8dec346e1c81923b24acdb337f11decabe9cc"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~2.0.6"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    node-uuid "~1.4.7"
+    oauth-sign "~0.8.1"
+    qs "~6.3.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+
+request@^2.81.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.0.0"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
+requires-port@1.x.x:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+
+resolve-dir@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
+  dependencies:
+    expand-tilde "^1.2.2"
+    global-modules "^0.2.3"
+
+resolve@^1.1.6, resolve@^1.1.7:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
+  dependencies:
+    path-parse "^1.0.5"
+
+resp-modifier@6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f"
+  dependencies:
+    debug "^2.2.0"
+    minimatch "^3.0.2"
+
+right-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  dependencies:
+    align-text "^0.1.1"
+
+rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
+  dependencies:
+    glob "^7.0.5"
+
+rx@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
+
+safe-buffer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
+
+sax@0.5.x:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
+semver@^4.1.0:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+
+send@0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.14.1.tgz#a954984325392f51532a7760760e459598c89f7a"
+  dependencies:
+    debug "~2.2.0"
+    depd "~1.1.0"
+    destroy "~1.0.4"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    etag "~1.7.0"
+    fresh "0.3.0"
+    http-errors "~1.5.0"
+    mime "1.3.4"
+    ms "0.7.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.3.0"
+
+sequencify@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
+
+serve-index@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.8.0.tgz#7c5d96c13fb131101f93c1c5774f8516a1e78d3b"
+  dependencies:
+    accepts "~1.3.3"
+    batch "0.5.3"
+    debug "~2.2.0"
+    escape-html "~1.0.3"
+    http-errors "~1.5.0"
+    mime-types "~2.1.11"
+    parseurl "~1.3.1"
+
+serve-static@1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.11.1.tgz#d6cce7693505f733c759de57befc1af76c0f0805"
+  dependencies:
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    parseurl "~1.3.1"
+    send "0.14.1"
+
+server-destroy@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
+
+set-blocking@^2.0.0, set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+set-immediate-shim@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+
+setprototypeof@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08"
+
+shellwords@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.0.tgz#66afd47b6a12932d9071cbfd98a52e785cd0ba14"
+
+sigmund@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+
+signal-exit@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+sntp@1.x.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  dependencies:
+    hoek "2.x.x"
+
+socket.io-adapter@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b"
+  dependencies:
+    debug "2.3.3"
+    socket.io-parser "2.3.1"
+
+socket.io-client@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.6.0.tgz#5b668f4f771304dfeed179064708386fa6717853"
+  dependencies:
+    backo2 "1.0.2"
+    component-bind "1.0.0"
+    component-emitter "1.2.1"
+    debug "2.3.3"
+    engine.io-client "1.8.0"
+    has-binary "0.1.7"
+    indexof "0.0.1"
+    object-component "0.0.3"
+    parseuri "0.0.5"
+    socket.io-parser "2.3.1"
+    to-array "0.1.4"
+
+socket.io-parser@2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0"
+  dependencies:
+    component-emitter "1.1.2"
+    debug "2.2.0"
+    isarray "0.0.1"
+    json3 "3.3.2"
+
+socket.io@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.6.0.tgz#3e40d932637e6bd923981b25caf7c53e83b6e2e1"
+  dependencies:
+    debug "2.3.3"
+    engine.io "1.8.0"
+    has-binary "0.1.7"
+    object-assign "4.1.0"
+    socket.io-adapter "0.5.0"
+    socket.io-client "1.6.0"
+    socket.io-parser "2.3.1"
+
+source-map@0.1.x, source-map@^0.1.34:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@^0.5.1, source-map@^0.5.6, source-map@~0.5.1:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
+sparkles@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
+
+spdx-correct@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  dependencies:
+    spdx-license-ids "^1.0.2"
+
+spdx-expression-parse@~1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+
+spdx-license-ids@^1.0.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+
+sshpk@^1.7.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jodid25519 "^1.0.0"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+"statuses@>= 1.3.1 < 2", statuses@~1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+
+stream-consume@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
+
+stream-throttle@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"
+  dependencies:
+    commander "^2.2.0"
+    limiter "^1.0.5"
+
+string-width@^1.0.1, string-width@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string.prototype.codepointat@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz#6b26e9bd3afcaa7be3b4269b526de1b82000ac78"
+
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+stringstream@~0.0.4:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-bom@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
+  dependencies:
+    first-chunk-stream "^1.0.0"
+    is-utf8 "^0.2.0"
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  dependencies:
+    is-utf8 "^0.2.0"
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
+stylus@^0.54.0:
+  version "0.54.5"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  dependencies:
+    css-parse "1.7.x"
+    debug "*"
+    glob "7.0.x"
+    mkdirp "0.5.x"
+    sax "0.5.x"
+    source-map "0.1.x"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+supports-color@^3.1.2:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  dependencies:
+    has-flag "^1.0.0"
+
+tar-pack@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  dependencies:
+    debug "^2.2.0"
+    fstream "^1.0.10"
+    fstream-ignore "^1.0.5"
+    once "^1.3.3"
+    readable-stream "^2.1.4"
+    rimraf "^2.5.1"
+    tar "^2.2.1"
+    uid-number "^0.0.6"
+
+tar@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
+
+tfunk@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/tfunk/-/tfunk-3.1.0.tgz#38e4414fc64977d87afdaa72facb6d29f82f7b5b"
+  dependencies:
+    chalk "^1.1.1"
+    object-path "^0.9.0"
+
+through2@^0.6.1, through2@^0.6.3, through2@~0.6.1:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
+  dependencies:
+    readable-stream ">=1.0.33-1 <1.1.0-0"
+    xtend ">=4.0.0 <4.1.0-0"
+
+through2@^2, through2@^2.0.0, through2@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  dependencies:
+    readable-stream "^2.1.5"
+    xtend "~4.0.1"
+
+tildify@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
+  dependencies:
+    os-homedir "^1.0.0"
+
+time-stamp@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
+
+to-array@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+
+tough-cookie@~2.3.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
+  dependencies:
+    punycode "^1.4.1"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tunnel-agent@~0.4.1:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+ua-parser-js@0.7.12:
+  version "0.7.12"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
+
+uglify-js@^2.7.0:
+  version "2.8.15"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.15.tgz#835dd4cd5872554756e6874508d0d0561704d94d"
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
+uglify-to-browserify@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+
+uid-number@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+
+ultron@1.0.x:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
+
+unc-path-regex@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+
+underscore@1.7.x:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
+
+unique-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
+
+unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+
+user-home@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+utils-merge@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
+
+uuid@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
+
+v8flags@^2.0.2:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.0.11.tgz#bca8f30f0d6d60612cc2c00641e6962d42ae6881"
+  dependencies:
+    user-home "^1.1.1"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  dependencies:
+    spdx-correct "~1.0.0"
+    spdx-expression-parse "~1.0.0"
+
+verror@1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
+  dependencies:
+    extsprintf "1.0.2"
+
+vinyl-fs@^0.3.0:
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
+  dependencies:
+    defaults "^1.0.0"
+    glob-stream "^3.1.5"
+    glob-watcher "^0.0.6"
+    graceful-fs "^3.0.0"
+    mkdirp "^0.5.0"
+    strip-bom "^1.0.0"
+    through2 "^0.6.1"
+    vinyl "^0.4.0"
+
+vinyl-sourcemaps-apply@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
+  dependencies:
+    source-map "^0.5.1"
+
+vinyl@^0.4.0:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
+  dependencies:
+    clone "^0.2.0"
+    clone-stats "^0.0.1"
+
+vinyl@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
+  dependencies:
+    clone "^1.0.0"
+    clone-stats "^0.0.1"
+    replace-ext "0.0.1"
+
+vinyl@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.1.tgz#1c3b4931e7ac4c1efee743f3b91a74c094407bb6"
+  dependencies:
+    clone "^1.0.0"
+    clone-buffer "^1.0.0"
+    clone-stats "^1.0.0"
+    cloneable-readable "^1.0.0"
+    is-stream "^1.1.0"
+    remove-trailing-separator "^1.0.1"
+    replace-ext "^1.0.0"
+
+vlq@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.1.tgz#14439d711891e682535467f8587c5630e4222a6c"
+
+weinre@^2.0.0-pre-I0Z7U9OV:
+  version "2.0.0-pre-I0Z7U9OV"
+  resolved "https://registry.yarnpkg.com/weinre/-/weinre-2.0.0-pre-I0Z7U9OV.tgz#fef8aa223921f7b40bbbbd4c3ed4302f6fd0a813"
+  dependencies:
+    express "2.5.x"
+    nopt "3.0.x"
+    underscore "1.7.x"
+
+when@^3.7.7:
+  version "3.7.8"
+  resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
+
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+
+which@^1.0.5, which@^1.2.12:
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"
+  dependencies:
+    string-width "^1.0.1"
+
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+
+window-size@^0.1.2:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
+
+window-size@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
+
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+ws@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.1.tgz#082ddb6c641e85d4bb451f03d52f06eabdb1f018"
+  dependencies:
+    options ">=0.0.5"
+    ultron "1.0.x"
+
+wtf-8@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"
+
+xmlhttprequest-ssl@1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
+
+"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+
+y18n@^3.2.0, y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+
+yargs-parser@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  dependencies:
+    camelcase "^3.0.0"
+
+yargs@3.29.0:
+  version "3.29.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.29.0.tgz#1aab9660eae79d8b8f675bcaeeab6ee34c2cf69c"
+  dependencies:
+    camelcase "^1.2.1"
+    cliui "^3.0.3"
+    decamelize "^1.0.0"
+    os-locale "^1.4.0"
+    window-size "^0.1.2"
+    y18n "^3.2.0"
+
+yargs@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.4.0.tgz#816e1a866d5598ccf34e5596ddce22d92da490d4"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    window-size "^0.2.0"
+    y18n "^3.2.1"
+    yargs-parser "^4.1.0"
+
+yargs@~3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  dependencies:
+    camelcase "^1.0.2"
+    cliui "^2.1.0"
+    decamelize "^1.0.0"
+    window-size "0.1.0"
+
+yeast@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"

From 28fc295d67325102a484ed79038321cb8ebe242d Mon Sep 17 00:00:00 2001
From: Timothy Morris <timthewebguy@gmail.com>
Date: Thu, 23 Mar 2017 17:22:21 -0400
Subject: [PATCH 18/18] categories styling

---
 app/pages/categories/view.html |   4 +-
 assets/js/bundle.js            | 178 ++++++++++++++++-----------------
 2 files changed, 92 insertions(+), 90 deletions(-)

diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html
index 5d9511e..a2bacdb 100644
--- a/app/pages/categories/view.html
+++ b/app/pages/categories/view.html
@@ -1,6 +1,6 @@
 <div class="container">
 	<div class="row">
-		<div class="col s12 m9">
+		<div class="col s12">
 			<ul class="collapsible" data-collapsible="expandable">
 				<li ng-repeat="category in categories">
 		      <div class="collapsible-header">{{ category.name }}</div>
@@ -40,6 +40,8 @@
 			              			<option ng-repeat="unit in units" value="{{unit}}" ng-selected="rule.units == unit">{{unit}}</option>
 			              		</select>
 			              	</div>
+			              </div>
+			              <div class="row">
 			              	<div class="col s4">
 			              		<button class="btn red darken-3" ng-click="removeRule(category, rule)">Delete</button>
 			              	</div>
diff --git a/assets/js/bundle.js b/assets/js/bundle.js
index cbf1517..ab81d6b 100644
--- a/assets/js/bundle.js
+++ b/assets/js/bundle.js
@@ -154,95 +154,6 @@ app.controller('404Ctrl', ['$scope', function ($scope) {
   $scope.var2 = "localStuff";
 }]);
 
-
-function GetRanks() {
-	return [{name: 'green', id: 1}, {name: 'yellow', id: 2}];
-}
-
-function GetNutrients() {
-	return ['sodium', 'sugar', 'satfat'];
-}
-
-function GetOperations() {
-	return [{name: 'lt', symbol: 'Less Than'},
-					{name: 'lte', symbol: 'Less Than or Equal'},
-					{name: 'gt', symbol: 'Greater Than'},
-					{name: 'gte', symbol: 'Greater Than or Equal'},
-					{name: 'e', symbol: 'Equal To'}];
-}
-
-app.controller('CategoryCtrl', ['$scope', '$http', 'Categories', 'Nutrients', function ($scope, $http, Categories, Nutrients) {
-  $scope.page.title = 'Categories';
-  $scope.page.id = 'cat';
-
-
-	// GET list of categories
-  Categories.get({}, function (data) {
-    $scope.categories = data.data;
-  });
-
-	$scope.ranks = GetRanks();
-
-	$scope.units = ['mg', 'g'];
-
-	Nutrients.get({}, function(data) {
-		$scope.nutrients = data.data;
-	});
-
-	$scope.operations = GetOperations();
-
-
-	$scope.getCategoryIndexFromName = function(categoryName) {
-		for(var i = 0; i < $scope.categories.length; i++) {
-			if($scope.categories[i].name == categoryName) {
-				return i;
-			}
-		}
-		return -1;
-	};
-
-	$scope.addRule = function(categoryName) {
-		var categoryIndex = $scope.getCategoryIndexFromName(categoryName);
-		if(categoryIndex != -1) {
-			$scope.categories[categoryIndex].rules[0].push({
-            ruleId: 0,
-           	nutrientName: $scope.nutrients[0].name,
-            nutrientId: $scope.nutrients[0].id,
-            operator: "lte",
-            threshold: 10,
-            units: "mg",
-            rank: 1,
-            categoryId: categoryIndex
-          });
-		}
-
-	};
-
-	$scope.removeRule = function(category, rule) {
-		for(var i = 0; i < category.rules[0].length; i++) {
-			if(category.rules[0][i] == rule) {
-				category.rules[0].splice(i, 1);
-			}
-		}
-	};
-
-	$scope.addCategory = function() {
-		//$scope.categories.push({name: 'New Category', rules: []})
-	};
-
-	$scope.removeCategory = function(category) {
-		for(var i = 0; i < $scope.categories.length; i++) {
-			if($scope.categories[i] == category) {
-				$scope.categories.splice(i, 1);
-			}
-		}
-	};
-
-	$scope.saveData = function(category) {
-		$http.post('http://foodbank.develop.digitalmediauconn.org/api/index.php/rules/saveBatch/' + category.id, category.rules[0]);
-	};
-}]);
-
 app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categories', '$cookies', function ($scope, $http, Foods, FoodDetail, Categories, $cookies) {
   $scope.page.title = 'Food';
   $scope.page.id = 'food';
@@ -360,6 +271,95 @@ app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categorie
 
 }]);
 
+
+function GetRanks() {
+	return [{name: 'green', id: 1}, {name: 'yellow', id: 2}];
+}
+
+function GetNutrients() {
+	return ['sodium', 'sugar', 'satfat'];
+}
+
+function GetOperations() {
+	return [{name: 'lt', symbol: 'Less Than'},
+					{name: 'lte', symbol: 'Less Than or Equal'},
+					{name: 'gt', symbol: 'Greater Than'},
+					{name: 'gte', symbol: 'Greater Than or Equal'},
+					{name: 'e', symbol: 'Equal To'}];
+}
+
+app.controller('CategoryCtrl', ['$scope', '$http', 'Categories', 'Nutrients', function ($scope, $http, Categories, Nutrients) {
+  $scope.page.title = 'Categories';
+  $scope.page.id = 'cat';
+
+
+	// GET list of categories
+  Categories.get({}, function (data) {
+    $scope.categories = data.data;
+  });
+
+	$scope.ranks = GetRanks();
+
+	$scope.units = ['mg', 'g'];
+
+	Nutrients.get({}, function(data) {
+		$scope.nutrients = data.data;
+	});
+
+	$scope.operations = GetOperations();
+
+
+	$scope.getCategoryIndexFromName = function(categoryName) {
+		for(var i = 0; i < $scope.categories.length; i++) {
+			if($scope.categories[i].name == categoryName) {
+				return i;
+			}
+		}
+		return -1;
+	};
+
+	$scope.addRule = function(categoryName) {
+		var categoryIndex = $scope.getCategoryIndexFromName(categoryName);
+		if(categoryIndex != -1) {
+			$scope.categories[categoryIndex].rules[0].push({
+            ruleId: 0,
+           	nutrientName: $scope.nutrients[0].name,
+            nutrientId: $scope.nutrients[0].id,
+            operator: "lte",
+            threshold: 10,
+            units: "mg",
+            rank: 1,
+            categoryId: categoryIndex
+          });
+		}
+
+	};
+
+	$scope.removeRule = function(category, rule) {
+		for(var i = 0; i < category.rules[0].length; i++) {
+			if(category.rules[0][i] == rule) {
+				category.rules[0].splice(i, 1);
+			}
+		}
+	};
+
+	$scope.addCategory = function() {
+		//$scope.categories.push({name: 'New Category', rules: []})
+	};
+
+	$scope.removeCategory = function(category) {
+		for(var i = 0; i < $scope.categories.length; i++) {
+			if($scope.categories[i] == category) {
+				$scope.categories.splice(i, 1);
+			}
+		}
+	};
+
+	$scope.saveData = function(category) {
+		$http.post('http://foodbank.develop.digitalmediauconn.org/api/index.php/rules/saveBatch/' + category.id, category.rules[0]);
+	};
+}]);
+
 app.controller('LoginCtrl', ['$scope', 'loginService', function ($scope, loginService) {
   $scope.page.title = 'Login';
   $scope.page.id = 'login';