Use restangular to get data from api

Victor Costa
1 parent f338d0b4
Showing 7 changed files with 20 additions and 19 deletions Show diff stats
bower.json
src/app/components/noosfero/noosfero.service.js
src/app/content-viewer/content-viewer.controller.js
src/app/index.config.js
src/app/index.module.js
src/app/index.route.js
src/app/profile/profile.controller.js
@@ -8,7 +8,7 @@
     "angular-sanitize": "~1.4.2",
     "angular-messages": "~1.4.2",
     "angular-aria": "~1.4.2",
-    "angular-resource": "~1.4.2",
+    "restangular": "~1.5.1",
     "angular-ui-router": "~0.2.15",
     "bootstrap-sass": "~3.3.5",
     "angular-bootstrap": "~0.13.4",
@@ -3,14 +3,14 @@
   angular.module('angular').service('noosfero', noosfero);
-  function noosfero($resource) {
+  function noosfero() {
     this.communities = communities;
     this.articles = articles;
     function communities() {
-      return $resource('/api/v1/communities/:id');
+      // return $resource('/api/v1/communities/:id');
     }
     function articles() {
-      return $resource('/api/v1/articles/:id');
+      // return $resource('/api/v1/articles/:id');
     }
   }
 })();
@@ -7,17 +7,15 @@
   /** @ngInject */
-  function ContentViewerController(noosfero, $log, $stateParams) {
+  function ContentViewerController(noosfero, $log, $stateParams, Restangular, $state) {
     var vm = this;
     vm.article = null;
     activate();
     function activate() {
-      $log.log($stateParams.page);
-      noosfero.articles().get({path: $stateParams.page, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (article) {
-        //FIXME
-        vm.content = article.articles[0];
-        console.log(vm.content);
+      Restangular.one('communities', $state.current.data.profile.id).one('articles').get({path: $stateParams.page}).then(function(articles) {
+        $log.log(articles);
+        vm.content = articles.article;
       });
     }
   }
@@ -6,11 +6,10 @@
     .config(config);
   /** @ngInject */
-  function config($logProvider, $locationProvider) {
-    // Enable log
+  function config($logProvider, $locationProvider, RestangularProvider) {
     $logProvider.debugEnabled(true);
-
     $locationProvider.html5Mode({enabled: true});
+    RestangularProvider.setBaseUrl('/api/v1');
   }
 })();
@@ -2,6 +2,6 @@
   'use strict';
   angular
-    .module('angular', ['ngAnimate', 'ngCookies', 'ngTouch', 'ngSanitize', 'ngMessages', 'ngAria', 'ngResource', 'ui.router', 'ui.bootstrap', 'toastr']);
+    .module('angular', ['ngAnimate', 'ngCookies', 'ngTouch', 'ngSanitize', 'ngMessages', 'ngAria', 'restangular', 'ui.router', 'ui.bootstrap', 'toastr']);
 })();
@@ -13,7 +13,10 @@
         url: '/:profile',
         templateUrl: 'app/profile/profile.html',
         controller: 'ProfileController',
-        controllerAs: 'vm'
+        controllerAs: 'vm',
+        data: {
+          profile: null
+        }
       })
       .state('profile.page', {
         url: '/{page:.*}',
@@ -7,15 +7,16 @@
   /** @ngInject */
-  function ProfileController(noosfero, $log, $stateParams) {
+  function ProfileController(noosfero, $log, $stateParams, $state, Restangular) {
     var vm = this;
     vm.boxes = [];
     activate();
     function activate() {
-      noosfero.communities().get({identifier: $stateParams.profile, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (profile) {
-        $log.log(profile);
-        vm.owner = profile.communities[0];
+      Restangular.one('communities').get({private_token: '1b00325e5f769a0c38550bd35b3f1d64', identifier: $stateParams.profile}).then(function(communities) {
+        $log.log(communities);
+        vm.owner = communities.communities[0];
+        $state.current.data.profile = vm.owner;
       });
     }
	@@ -8,7 +8,7 @@		@@ -8,7 +8,7 @@
8	"angular-sanitize": "~1.4.2",	8	"angular-sanitize": "~1.4.2",
9	"angular-messages": "~1.4.2",	9	"angular-messages": "~1.4.2",
10	"angular-aria": "~1.4.2",	10	"angular-aria": "~1.4.2",
11	- "angular-resource": "~1.4.2",	11	+ "restangular": "~1.5.1",
12	"angular-ui-router": "~0.2.15",	12	"angular-ui-router": "~0.2.15",
13	"bootstrap-sass": "~3.3.5",	13	"bootstrap-sass": "~3.3.5",
14	"angular-bootstrap": "~0.13.4",	14	"angular-bootstrap": "~0.13.4",
	@@ -3,14 +3,14 @@		@@ -3,14 +3,14 @@
3		3
4	angular.module('angular').service('noosfero', noosfero);	4	angular.module('angular').service('noosfero', noosfero);
5		5
6	- function noosfero($resource) {	6	+ function noosfero() {
7	this.communities = communities;	7	this.communities = communities;
8	this.articles = articles;	8	this.articles = articles;
9	function communities() {	9	function communities() {
10	- return $resource('/api/v1/communities/:id');	10	+ // return $resource('/api/v1/communities/:id');
11	}	11	}
12	function articles() {	12	function articles() {
13	- return $resource('/api/v1/articles/:id');	13	+ // return $resource('/api/v1/articles/:id');
14	}	14	}
15	}	15	}
16	})();	16	})();
	@@ -2,6 +2,6 @@		@@ -2,6 +2,6 @@
2	'use strict';	2	'use strict';
3		3
4	angular	4	angular
5	- .module('angular', ['ngAnimate', 'ngCookies', 'ngTouch', 'ngSanitize', 'ngMessages', 'ngAria', 'ngResource', 'ui.router', 'ui.bootstrap', 'toastr']);	5	+ .module('angular', ['ngAnimate', 'ngCookies', 'ngTouch', 'ngSanitize', 'ngMessages', 'ngAria', 'restangular', 'ui.router', 'ui.bootstrap', 'toastr']);
6		6
7	})();	7	})();