Merge pull request #10 from zendtech/revert-1-master

Revert "Update README.md - bower section"

Author: jguittard

README.md

@@ -24,16 +24,6 @@ Importing the project in Zend Studio
 9. Click Finish to clone the repository.
 10. Switch back to the PHP perspective, you will find the on-the-go-mobile project in the PHP Explorer view.
 
-Installing the front-end dependencies with Zend Studio and Bower
-----------------------------------------------------------------
-(You must have configured Zend Studio to use Bower.)
-
-1. Right-click on the mobile project in the PHP Explorer view.
-2. Select Bower > Install Dependencies from the context menu.
-3. Refresh the project.
-
-Dependencies are installed into the www/lib directory.
-
 Running the application
 -----------------------
 The easiest way to run the mobile application from Zend Studio is by using the CordovaSim emulator. It's a light-weight and fast web-based emulator that allows testing of Cordova-based mobile applications.

www/index.html

@@ -19,6 +19,7 @@
 
     <script src="lib/ngCordova/dist/ng-cordova.js"></script>
 
+
     <!-- your app's script -->
     <script src="lib/lodash/dist/lodash.js"></script>
     <script src="lib/highcharts/highcharts-all.js"></script>
@@ -27,7 +28,6 @@
     <script src="lib/Toast.js"></script>
     <script src="js/main.js"></script>
     <script src="js/app.js"></script>
-    <script src="js/services/config.js"></script>
     <script src="js/controllers/app.js"></script>
     <script src="js/controllers/home.js"></script>
     <script src="js/controllers/monitor.js"></script>

www/js/controllers/login.js

@@ -1,15 +1,19 @@
 angular.module('onthego.controllers')
 
-.controller('LoginController', function($rootScope, $scope, $http, $state, $ionicLoading, AuthenticationService, Config) {
+.controller('LoginController', function($rootScope, $scope, $http, $state, $ionicLoading, AuthenticationService) {
 	$rootScope.data = {};
 	$scope.data = {
-		'server': Config.server,
+		'server': 'http://onthego.zend.com/on-the-go-api',
 		//'server': 'http://54.209.165.66/on-the-go-api',
-		'user': Config.user
+		'user': {
+			'username': 'demo',  
+			'password': 'zend'
+		}
 	}
-	
+
 	$scope.login = function() {
-		AuthenticationService.login(Config.user);
+		window.localStorage.setItem('server', $scope.data.server);
+		AuthenticationService.login($scope.data.user);
 	};
 
 	$scope.logout = function() {

www/js/services/authentication.js

@@ -1,13 +1,13 @@
 angular.module('onthego.services')
-  .factory('AuthenticationService', function($rootScope, $http, authService, Config) {
+  .factory('AuthenticationService', function($rootScope, $http, authService) {
     var service = {
       login: function(user) {
         var payload = {};
         payload.username = user.username;
         payload.password = user.password;
         payload.grant_type = 'password';
         payload.client_id = 'on-the-go';
-        var basePath = Config.server;
+        var basePath = window.localStorage.getItem('server');
         var config = {
           url: basePath + '/oauth',
           method: 'POST',

www/js/services/config.js

@@ -1,13 +1,13 @@
 angular.module('onthego.services')
 
-  .factory('IssueResource', function ($rootScope, $http, $q, $window, Hal, Config) {
+  .factory('IssueResource', function ($rootScope, $http, $q, Hal) {
 
     return {
       getList: function() {
-    	if (Config.server == null) { 
+    	if (window.localStorage.getItem('server') == null) {
     		$rootScope.$broadcast('event:auth-loginRequired');
     	}
-    	var issuePath = Config.server + '/api/monitor-issues';
+    	var issuePath = window.localStorage.getItem('server') + '/api/monitor-issues';
     	var issues;
         var config = {
           method: 'GET',
@@ -22,7 +22,7 @@ angular.module('onthego.services')
         );
       },
       get: function(issueId) {
-    	var issuePath = Config.server + '/api/monitor-issues';
+    	var issuePath = window.localStorage.getItem('server') + '/api/monitor-issues';
         var config = {
           method: 'GET',
           url: issuePath + '/' + issueId
@@ -34,7 +34,7 @@ angular.module('onthego.services')
         );
       },
       share: function(id) {
-    	  var issuePath = Config.server + '/api/monitor-issues';
+    	  var issuePath = window.localStorage.getItem('server') + '/api/monitor-issues';
     	  var config = {
 	          method: 'POST',
 	          url: issuePath + '/' + issueId,

www/js/services/issue.js

@@ -1,13 +1,13 @@
 angular.module('onthego.services')
 
-  .factory('StatResource', function ($rootScope, $http, $q, Hal, Config) {
+  .factory('StatResource', function ($rootScope, $http, $q, Hal) {
 
 	  return {
       getList: function(type, from, to) {
-      	if (Config.server == null) {
+      	if (window.localStorage.getItem('server') == null) {
       		$rootScope.$broadcast('event:auth-loginRequired');
       	}
-      	var statPath = Config.server + '/api/statistics';
+      	var statPath = window.localStorage.getItem('server') + '/api/statistics';
       	var stats;
       	var url = statPath + "?type=" + type + "&from=" + from + '&to=' + to + '&' + makeid();
       	/*if (! [500, 503, 504, 505].contains(type)) {