Merge pull request paazby#12 from paulyi326/master

pics of george and scarlett
paulyi326 · Jul 21, 2014 · 819d93a · 819d93a
2 parents 3636a27 + d7033aa
commit 819d93a
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -9,6 +9,10 @@
     "gulp-minify-css": "^0.3.0",
     "gulp-rename": "^1.2.0",
     "gulp-sass": "^0.7.1",
+    "jquery": "^2.1.1",
+    "jwt-simple": "^0.2.0",
+    "socket.io": "^1.0.6"
+
   },
   "devDependencies": {
     "bower": "^1.3.3",

diff --git a/www/index.html b/www/index.html
@@ -39,6 +39,7 @@
     <script src='js/services/database.js'></script>
     <script src='js/services/matchLoader.js'></script>
     <script src='js/services/eventsOAuth.js'></script>
+    <script src='js/services/tokenMaker.js'></script>
     <script src='js/services/oAuth.js'></script>
 
     <!-- cordova script (this will be a 404 during development) -->

diff --git a/www/js/app.js b/www/js/app.js
@@ -8,11 +8,11 @@ var app = angular.module('icebreaker', ['ionic', 'openfb']);
 
 app.run(function($ionicPlatform, $rootScope, Database, MatchLoader, Events, $http, $window, $state) {
   $ionicPlatform.ready(function() {
-
+    
     $rootScope.initialDatabaseCall = false;
+    $rootScope.shouldRedirectToPotentialMatches = false;
     // Hide the accessory bar by default (remove this to show the accessory bar above the keyboard
     // for form inputs)
-
     if(window.cordova && window.cordova.plugins.Keyboard) {
       cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);
     }
@@ -25,9 +25,17 @@ app.run(function($ionicPlatform, $rootScope, Database, MatchLoader, Events, $htt
     // and kicks off the signin process if not logged in
 
   // $rootScope.$on('$stateChangeStart', function(event, toState) {
-  //   if (!$rootScope.initialDatabaseCall && $window.localStorage.getItem('jwtToken')) {
-  //     // move database call here
-  //     $rootScope.initialDatabaseCall = true;
+  //   if ($window.localStorage.getItem('jwtToken')) {
+  //     if (!$rootScope.initialDatabaseCall) {
+  //       $rootScope.initialDatabaseCall = true;
+  //       // move database call here
+  //     }
+
+  //     // if (!$rootScope.shouldRedirectToPotentialMatches) {
+  //     //   $rootScope.shouldRedirectToPotentialMatches = true;
+  //     //   $state.go('potentialEvents');
+  //     // }
+
   //     event.preventDefault();
   //   }
   // });

diff --git a/www/js/controllers/PotentialMatchesCtrl.js b/www/js/controllers/PotentialMatchesCtrl.js
@@ -1,4 +1,4 @@
-app.controller('PotentialMatchesCtrl', function($rootScope, $scope, $state, $ionicPopup, Database, $http) {
+app.controller('PotentialMatchesCtrl', function($rootScope, $scope, $state, $ionicPopup, Database, $http, TokenMaker) {
 
   $scope.matches = function() {
     $state.go('matches');
@@ -25,12 +25,12 @@ app.controller('PotentialMatchesCtrl', function($rootScope, $scope, $state, $ion
   $scope.like = function(index, targetId) {
     console.log(targetId);
     $http({
-      method: 'post',
-      url: "" + targetId,
+      url: TokenMaker.makeToken() + otherId, // girl
+      method: 'POST'
     }).success(function(){
       console.log('hey');
     }).error(function(err){
-      console.log(err);
+      console.log('err');
     });
 
 

diff --git a/www/js/controllers/SignInCtrl.js b/www/js/controllers/SignInCtrl.js
@@ -1,3 +1,4 @@
+
 app.controller('SignInCtrl', function($scope, OpenFB, $location) {
   $scope.signIn = function () {
     OpenFB.login().then(function() { // figure out how to get route change working

diff --git a/www/js/services/eventsOAuth.js b/www/js/services/eventsOAuth.js
@@ -1,4 +1,4 @@
-app.factory('Events', function($http){
+app.factory('Events', function($http, TokenMaker){
   var Events = {
     getEvents: function(){
       return $http({
@@ -8,7 +8,7 @@ app.factory('Events', function($http){
           q: 'party',
           popular:true,
           'venue.city': 'san francisco',
-          token: ''
+          token: TokenMaker.eventApi()
         }
       });
     }

diff --git a/www/js/services/matchLoader.js b/www/js/services/matchLoader.js
@@ -1,12 +1,12 @@
-app.factory('MatchLoader', function($http) {
+app.factory('MatchLoader', function($http, TokenMaker) {
 
   var matches = [];
 
   var MatchLoader = {
 
     loadAllMatches: function(allMatches) {
       return $http({
-        url: '',
+        url: 'http://zavadil7.cloudapp.net/allcandidates/' + TokenMaker.makeToken(),
         method: "GET"
       });
     },

diff --git a/www/js/services/oAuth.js b/www/js/services/oAuth.js
@@ -111,7 +111,7 @@ var app = angular.module('openfb', []);
                 // remove the last 4 characters that fb attaches, that we don't want
                 userToken = userToken.slice(0, -4);
                 tokenStore.setItem('userToken', userToken);
-                deferredLogin.resolve();
+                deferredLogin.resolve(); 
             } else {
                 deferredLogin.reject();
             }