From 955a7677c2a316ecfdba1eb6602de818c1ec11f8 Mon Sep 17 00:00:00 2001 From: Christos Polychronis Date: Sun, 24 Apr 2016 18:40:58 +0300 Subject: [PATCH 1/3] initialization of project --- app/scripts/firebase/firebase.service.js | 2 ++ install.bat | 6 +++--- package.json | 13 ++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/scripts/firebase/firebase.service.js b/app/scripts/firebase/firebase.service.js index 2a68427..4ba9046 100644 --- a/app/scripts/firebase/firebase.service.js +++ b/app/scripts/firebase/firebase.service.js @@ -31,6 +31,8 @@ function getArticle(articleId) { // TODO: Fetch and display a particular article var article = {}; + //var query = db.child('news'); + //return $firebaseArray(query).$loaded().then(initArray); return article; } diff --git a/install.bat b/install.bat index f28410b..0c3dadf 100755 --- a/install.bat +++ b/install.bat @@ -33,9 +33,9 @@ ionic state restore :: Add target platform :: :: Comment out the platform(s) your system supports -:: -grunt platform:add:ios -:: grunt platform:add:android +::grunt platform:add:ios +:: +grunt platform:add:android :: :: Build the project and generate the cordova directory (www) diff --git a/package.json b/package.json index b147e8c..e1e42ed 100755 --- a/package.json +++ b/package.json @@ -50,11 +50,9 @@ }, "scripts": { "test": "grunt test", - "//": "Post installation.", - "//": "Uncomment the next line to enable post install script.", - "//": "There is always the option to run it manually.", - "//": { "postinstall": "./install.sh" }, - "//": { "postinstall": "./install.bat" } + "//": { + "postinstall": "./install.bat" + } }, "cordovaPlatforms": [], "cordovaPlugins": [ @@ -73,6 +71,7 @@ }, "cordova-plugin-network-information", "cordova-plugin-whitelist", - "cordova-plugin-transport-security" + "cordova-plugin-transport-security", + "cordova-plugin-inappbrowser" ] -} +} \ No newline at end of file From 1a0a030f03120d82431faa66eae05238a9333e3d Mon Sep 17 00:00:00 2001 From: Christos Polychronis Date: Mon, 25 Apr 2016 15:48:31 +0300 Subject: [PATCH 2/3] feat firebase-service single article aquisition --- app/scripts/app.js | 1 + .../firebase/firebase-article.controller.js | 28 +++++++------- .../firebase/firebase-articles.controller.js | 24 ++++++------ app/scripts/firebase/firebase-articles.html | 2 +- app/scripts/firebase/firebase.service.js | 38 +++++++++---------- app/scripts/home/menu-items.service.js | 6 ++- 6 files changed, 52 insertions(+), 47 deletions(-) diff --git a/app/scripts/app.js b/app/scripts/app.js index 428aa59..b95783e 100755 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -15,6 +15,7 @@ angular.module('starter', [ 'supermodular.home', 'supermodular.map', 'supermodular.wordpress', + 'supermodular.firebase', 'supermodular.menu', 'supermodular.elements', 'supermodular.popover-menu', diff --git a/app/scripts/firebase/firebase-article.controller.js b/app/scripts/firebase/firebase-article.controller.js index c601ba5..3ef25f9 100644 --- a/app/scripts/firebase/firebase-article.controller.js +++ b/app/scripts/firebase/firebase-article.controller.js @@ -1,32 +1,32 @@ (function() { 'use strict'; - + angular - .module('supermodular.firebase') - .controller('FirebaseArticleController', FirebaseArticleController); - + .module('supermodular.firebase') + .controller('FirebaseArticleController', FirebaseArticleController); + FirebaseArticleController.$inject = ['$stateParams', 'firebaseService']; - + /* @ngInject */ function FirebaseArticleController($stateParams, firebaseService) { - var articleId = parseInt($stateParams.articleId, 10); - + var articleId = $stateParams.articleId; + var vm = angular.extend(this, { article: null, }); - + function activate() { loadArticle(); } activate(); - + // ******************************************************************** - + function loadArticle() { - // firebaseService.getArticle(articleId) - // .then(function(article) { - // vm.article = article; - // }); + firebaseService.getArticle(articleId) + .then(function(article) { + vm.article = article; + }); } } })(); diff --git a/app/scripts/firebase/firebase-articles.controller.js b/app/scripts/firebase/firebase-articles.controller.js index f85db4e..d1e3d7b 100644 --- a/app/scripts/firebase/firebase-articles.controller.js +++ b/app/scripts/firebase/firebase-articles.controller.js @@ -1,33 +1,33 @@ (function() { 'use strict'; - + angular - .module('supermodular.firebase') - .controller('FirebaseArticlesController', FirebaseArticlesController); - + .module('supermodular.firebase') + .controller('FirebaseArticlesController', FirebaseArticlesController); + FirebaseArticlesController.$inject = ['$state', 'firebaseService']; - + /* @ngInject */ function FirebaseArticlesController($state, firebaseService) { var vm = angular.extend(this, { articles: [], navigate: navigate }); - + function activate() { getArticles(); } activate(); - + // ******************************************************************** - + function getArticles() { firebaseService.getArticles() - .then(function(articles) { - vm.articles = articles; - }); + .then(function(articles) { + vm.articles = articles; + }); } - + function navigate(articleId) { $state.go('app.firebase-article', { articleId: articleId }); } diff --git a/app/scripts/firebase/firebase-articles.html b/app/scripts/firebase/firebase-articles.html index 9ed336c..0f1501e 100644 --- a/app/scripts/firebase/firebase-articles.html +++ b/app/scripts/firebase/firebase-articles.html @@ -2,7 +2,7 @@
-
+

{{article.title}}

diff --git a/app/scripts/firebase/firebase.service.js b/app/scripts/firebase/firebase.service.js index 4ba9046..354c251 100644 --- a/app/scripts/firebase/firebase.service.js +++ b/app/scripts/firebase/firebase.service.js @@ -1,47 +1,47 @@ (function() { 'use strict'; - + angular - .module('supermodular.firebase') - // DB service - .factory('db', [function() { - return new Firebase('https://business-directory.firebaseio.com/') - }]) - // Firebase service - .factory('firebaseService', firebaseService); - + .module('supermodular.firebase') + // DB service + .factory('db', [function() { + return new Firebase('https://business-directory.firebaseio.com/'); + }]) + // Firebase service + .factory('firebaseService', firebaseService); + firebaseService.$inject = ['db', '$firebaseArray', '$firebaseObject']; - + /* @ngInject */ function firebaseService(db, $firebaseArray, $firebaseObject) { - + var service = { getArticles: getArticles, getArticle: getArticle }; return service; - + //////////////// - + function getArticles() { var query = db.child('news'); return $firebaseArray(query).$loaded().then(initArray); } - + function getArticle(articleId) { // TODO: Fetch and display a particular article var article = {}; - //var query = db.child('news'); - //return $firebaseArray(query).$loaded().then(initArray); - return article; + console.log('artice id is '+articleId); + var query = db.child('news/'+articleId); + return $firebaseObject(query).$loaded(); } - + function initItem(item) { return angular.extend({}, item, { guid: item.$id }); } - + function initArray(array) { return _.map(array, initItem); } diff --git a/app/scripts/home/menu-items.service.js b/app/scripts/home/menu-items.service.js index 007f331..2c12cbd 100755 --- a/app/scripts/home/menu-items.service.js +++ b/app/scripts/home/menu-items.service.js @@ -17,7 +17,11 @@ title: 'Wordpress', path: 'wordpress-articles', icon: 'ion-social-wordpress' - }, { + },{ + title: 'Firebase', + path: 'firebase-articles', + icon: 'ion-social-firebase' + },{ title: 'Elements', path: 'elements', icon: 'ion-android-checkbox-outline' From 9d8b74c85208baa67dd0361e113eff8bfb4049ba Mon Sep 17 00:00:00 2001 From: Christos Polychronis Date: Tue, 26 Apr 2016 11:03:56 +0300 Subject: [PATCH 3/3] fix firebase article-controller refactoring and new icon --- app/scripts/firebase/firebase-article.controller.js | 4 ++-- app/scripts/firebase/firebase-articles.controller.js | 4 ++-- app/scripts/firebase/firebase.module.js | 2 +- app/scripts/firebase/firebase.service.js | 5 ++--- app/scripts/home/menu-items.service.js | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/scripts/firebase/firebase-article.controller.js b/app/scripts/firebase/firebase-article.controller.js index 3ef25f9..b94b0a0 100644 --- a/app/scripts/firebase/firebase-article.controller.js +++ b/app/scripts/firebase/firebase-article.controller.js @@ -9,7 +9,7 @@ /* @ngInject */ function FirebaseArticleController($stateParams, firebaseService) { - var articleId = $stateParams.articleId; + var guid = $stateParams.guid; var vm = angular.extend(this, { article: null, @@ -23,7 +23,7 @@ // ******************************************************************** function loadArticle() { - firebaseService.getArticle(articleId) + firebaseService.getArticle(guid) .then(function(article) { vm.article = article; }); diff --git a/app/scripts/firebase/firebase-articles.controller.js b/app/scripts/firebase/firebase-articles.controller.js index d1e3d7b..9963f67 100644 --- a/app/scripts/firebase/firebase-articles.controller.js +++ b/app/scripts/firebase/firebase-articles.controller.js @@ -28,8 +28,8 @@ }); } - function navigate(articleId) { - $state.go('app.firebase-article', { articleId: articleId }); + function navigate(guid) { + $state.go('app.firebase-article', { guid: guid }); } } })(); diff --git a/app/scripts/firebase/firebase.module.js b/app/scripts/firebase/firebase.module.js index eaba47a..b389606 100644 --- a/app/scripts/firebase/firebase.module.js +++ b/app/scripts/firebase/firebase.module.js @@ -18,7 +18,7 @@ } }) .state('app.firebase-article', { - url: '/firebase-articles/:articleId', + url: '/firebase-articles/:guid', views: { 'menuContent': { templateUrl: 'scripts/firebase/firebase-article.html', diff --git a/app/scripts/firebase/firebase.service.js b/app/scripts/firebase/firebase.service.js index 354c251..34219a6 100644 --- a/app/scripts/firebase/firebase.service.js +++ b/app/scripts/firebase/firebase.service.js @@ -28,11 +28,10 @@ return $firebaseArray(query).$loaded().then(initArray); } - function getArticle(articleId) { + function getArticle(guid) { // TODO: Fetch and display a particular article var article = {}; - console.log('artice id is '+articleId); - var query = db.child('news/'+articleId); + var query = db.child('news/'+guid); return $firebaseObject(query).$loaded(); } diff --git a/app/scripts/home/menu-items.service.js b/app/scripts/home/menu-items.service.js index 2c12cbd..94a020a 100755 --- a/app/scripts/home/menu-items.service.js +++ b/app/scripts/home/menu-items.service.js @@ -20,7 +20,7 @@ },{ title: 'Firebase', path: 'firebase-articles', - icon: 'ion-social-firebase' + icon: 'ion-android-globe' },{ title: 'Elements', path: 'elements',