diff --git a/app/app.js b/app/app.js index d877d41..2d93e56 100644 --- a/app/app.js +++ b/app/app.js @@ -6,7 +6,7 @@ var app = angular.module('app', ['ngRoute', 'ngResource', 'ngCookies']); // Factories app.factory('Foods', function($resource) { - return $resource('http://foodbank.develop.digitalmediauconn.org/api/food/all'); + return $resource('api/food/all'); // return $resource('assets/json/foods.json'); }); @@ -17,11 +17,11 @@ app.factory('FoodDetail', function($resource) { }); app.factory('Categories', function($resource) { - return $resource('http://foodbank.develop.digitalmediauconn.org/api/index.php/category/all'); + return $resource('api/index.php/category/all'); }); app.factory('Nutrients', function($resource) { - return $resource('http://foodbank.develop.digitalmediauconn.org/api/index.php/nutrient/all'); + return $resource('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 ab64be8..285e35c 100644 --- a/app/pages/categories/ctrl.js +++ b/app/pages/categories/ctrl.js @@ -21,18 +21,21 @@ app.controller('CategoryCtrl', ['$scope', '$http', 'Categories', 'Nutrients', fu // GET list of categories - Categories.get({}, function (data) { - $scope.categories = data.data; + Categories.get().$promise.then(function(response){ + $scope.categories = response.data; + ; }); $scope.ranks = GetRanks(); $scope.units = ['mg', 'g']; - Nutrients.get({}, function(data) { - $scope.nutrients = data.data; - }); + Nutrients.get().$promise.then(function(response){ + + $scope.nutrients = response.data; + + }); $scope.operations = GetOperations(); diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html index 68ab6cc..955b406 100644 --- a/app/pages/categories/view.html +++ b/app/pages/categories/view.html @@ -11,13 +11,13 @@