From fb625a65a351fee79c400010ebd44b585a96d250 Mon Sep 17 00:00:00 2001 From: Leonardo Merlin Date: Thu, 6 Aug 2015 16:32:37 -0300 Subject: [PATCH] Remove restangular --- bower.json | 1 - src/app/index.config.js | 7 ------- src/app/index.module.js | 2 +- src/app/partials/article/article.service.js | 13 ++++++++----- src/app/partials/inicio/inicio.controller.js | 6 +++--- src/app/partials/inicio/inicio.html | 2 +- src/assets/images/youtube-background.png | Bin 0 -> 65606 bytes 7 files changed, 13 insertions(+), 18 deletions(-) create mode 100644 src/assets/images/youtube-background.png diff --git a/bower.json b/bower.json index 5cce9b5..1e90a94 100644 --- a/bower.json +++ b/bower.json @@ -8,7 +8,6 @@ "angular-sanitize": "~1.4.0", "angular-ui-router": "~0.2.15", "jquery": "~2.1.4", - "restangular": "~1.5.1", "bootstrap-sass-official": "~3.3.4", "animate.css": "~3.3.0", "angular": "~1.4.0", diff --git a/src/app/index.config.js b/src/app/index.config.js index e9cc5ec..2fb0c76 100644 --- a/src/app/index.config.js +++ b/src/app/index.config.js @@ -3,16 +3,9 @@ angular .module('dialoga') - .config(configRestangular) .config(config); /** @ngInject */ - function configRestangular(RestangularProvider, api) { - RestangularProvider.setBaseUrl(api.host); - RestangularProvider.setDefaultRequestParams({ apiKey: api.token }); - } - - /** @ngInject */ function config($logProvider) { // Enable log $logProvider.debugEnabled(true); diff --git a/src/app/index.module.js b/src/app/index.module.js index ad96e04..aad26af 100644 --- a/src/app/index.module.js +++ b/src/app/index.module.js @@ -2,6 +2,6 @@ 'use strict'; angular - .module('dialoga', ['ngAnimate', 'ngCookies', 'ngTouch', 'ngSanitize', 'restangular', 'ui.router']); + .module('dialoga', ['ngAnimate', 'ngCookies', 'ngTouch', 'ngSanitize', 'ui.router']); })(); diff --git a/src/app/partials/article/article.service.js b/src/app/partials/article/article.service.js index 9a21f47..c71ad4d 100644 --- a/src/app/partials/article/article.service.js +++ b/src/app/partials/article/article.service.js @@ -6,15 +6,14 @@ .factory('ArticleService', ArticleService); /** @ngInject */ - function ArticleService(Restangular, api, $log) { + function ArticleService($http, $q, api, $log) { $log.debug('ArticleService'); - var articlesRest = Restangular.all('articles'); - + var idArticleHome = '103358'; var _savedAbstract = null; var service = { - getList: articlesRest.getList, + apiArticles: api.host + 'articles/', getHome: getHome, setHomeAbstract: setHomeAbstract, getHomeAbstract: getHomeAbstract @@ -23,7 +22,11 @@ return service; function getHome () { - return articlesRest.get(api.articleId.home, { + return getArticleById(idArticleHome); + } + + function getArticleById (articleId) { + return $http.get(service.apiArticles + articleId, { private_token: api.token, fields: 'id,children,categories,abstract,title,image,url,setting,position' }); diff --git a/src/app/partials/inicio/inicio.controller.js b/src/app/partials/inicio/inicio.controller.js index 9581c62..d078180 100644 --- a/src/app/partials/inicio/inicio.controller.js +++ b/src/app/partials/inicio/inicio.controller.js @@ -32,10 +32,10 @@ hideBackground(2000); } - vm.ArticleService.getHome().then(function(homeArticle) { - vm.article = homeArticle.article; + vm.ArticleService.getHome().then(function(result) { + vm.article = result.data.article; }, function(error) { - vm.$log.error(error); + vm.$log.error('Error on getHome article.', error); }); }; diff --git a/src/app/partials/inicio/inicio.html b/src/app/partials/inicio/inicio.html index b41068b..ab0b0d0 100644 --- a/src/app/partials/inicio/inicio.html +++ b/src/app/partials/inicio/inicio.html @@ -3,7 +3,7 @@
-
+
diff --git a/src/assets/images/youtube-background.png b/src/assets/images/youtube-background.png new file mode 100644 index 0000000..736c942 Binary files /dev/null and b/src/assets/images/youtube-background.png differ -- libgit2 0.21.2