From e941028e87df5782afde5c5203501408a61e4e8f Mon Sep 17 00:00:00 2001 From: Tim Morris Date: Mon, 21 Nov 2016 08:02:49 -0500 Subject: [PATCH 1/2] git flow init commit --- assets/js/bundle.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/js/bundle.js b/assets/js/bundle.js index 0622fee..bb2b71b 100644 --- a/assets/js/bundle.js +++ b/assets/js/bundle.js @@ -100,20 +100,20 @@ app.controller('404Ctrl', ['$scope', function ($scope) { }]); -app.controller('CategoryCtrl', ['$scope', function ($scope) { - $scope.page.title = 'Categories'; - $scope.page.id = 'cat'; +app.controller('FoodCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Food'; + $scope.page.id = 'food'; $scope.page.yourVar = "globalStuff"; - + $scope.var2 = "localStuff"; }]); -app.controller('FoodCtrl', ['$scope', function ($scope) { - $scope.page.title = 'Food'; - $scope.page.id = 'food'; +app.controller('CategoryCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Categories'; + $scope.page.id = 'cat'; $scope.page.yourVar = "globalStuff"; - + $scope.var2 = "localStuff"; }]); From 1e01f9c51ac37b6221dbd042b921e1b5eb9f471f Mon Sep 17 00:00:00 2001 From: Tim Morris Date: Mon, 21 Nov 2016 22:26:23 -0500 Subject: [PATCH 2/2] mockup v1 --- app/pages/categories/view.html | 179 ++++++++++++++++++++++++++++++++- assets/js/bundle.js | 18 ++-- 2 files changed, 186 insertions(+), 11 deletions(-) diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html index 0481886..143b85a 100644 --- a/app/pages/categories/view.html +++ b/app/pages/categories/view.html @@ -1,2 +1,177 @@ -
-

You've reached pages/categories/view.html.

+
+
+
+
    +
  • +
    CATEGORY NAME
    +
    +
    +
    + +
    +
    +
    +
    +

    Nutrients

    +
    +
    +
    +
    +
    +
    +

    Sugar

    +
    + + +
    +
    + + +
    +
    +
    +

    Sodium

    +
    + + +
    +
    + + +
    +
    +
    +

    Saturated Fat

    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +

    Sugar

    +
    + + +
    +
    + + +
    +
    +
    +

    Sodium

    +
    + + +
    +
    + + +
    +
    +
    +

    Saturated Fat

    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    • +
+

I'd put more, but then I'd have to change lots of ID's... you get the idea #lazydev

+
+
+
+
+ Filter +
+
+
+
+ + +
+
+
+
+ + +
+
+ +
+
+
+
+
+
+
+ + diff --git a/assets/js/bundle.js b/assets/js/bundle.js index bb2b71b..abfe063 100644 --- a/assets/js/bundle.js +++ b/assets/js/bundle.js @@ -100,6 +100,15 @@ app.controller('404Ctrl', ['$scope', function ($scope) { }]); +app.controller('LoginCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Login'; + $scope.page.id = 'login'; + $scope.page.yourVar = "globalStuff"; + + $scope.var2 = "localStuff"; +}]); + + app.controller('FoodCtrl', ['$scope', function ($scope) { $scope.page.title = 'Food'; $scope.page.id = 'food'; @@ -116,12 +125,3 @@ app.controller('CategoryCtrl', ['$scope', function ($scope) { $scope.var2 = "localStuff"; }]); - - -app.controller('LoginCtrl', ['$scope', function ($scope) { - $scope.page.title = 'Login'; - $scope.page.id = 'login'; - $scope.page.yourVar = "globalStuff"; - - $scope.var2 = "localStuff"; -}]);