resolve merge conflicts

.gitignore

@@ -4,3 +4,4 @@ templates.js
 .tmp/
 coverage/
 node_modules/
+app/panoptes-client.js

app/index.html

@@ -176,8 +176,7 @@ <h4 ng-bind="category.category"></h4>
         <script src="bower_components/svg-pan-zoom/dist/svg-pan-zoom.js"></script>
         <script src="bower_components/packery/dist/packery.pkgd.js"></script>
 
-        <!-- <script src="bower_components/panoptes-javascript-lib/dist/panoptes-javascript-lib.js"></script> -->
-        <script src ="bower_components/panoptes-client/index_built.js"></script>
+        <script src="panoptes-client.js"></script>
 
         <script src="modules/app/scripts/init.js"></script>
         <script src="modules/app/scripts/home-controller.js"></script>
@@ -228,6 +227,8 @@ <h4 ng-bind="category.category"></h4>
 
         <script src="modules/zooniverse/scripts/init.js"></script>
         <script src="modules/zooniverse/scripts/zooniverse-footer.factory.js"></script>
+        <script src="modules/zooniverse/scripts/zooniverse-footer.directive.js"></script>
+
         <script src="modules/zooniverse/scripts/zooniverse-footer.directive.js"></script>
         <!-- endbuild -->
 

app/modules/zoo-api/scripts/project-service.js

@@ -1,6 +1,9 @@
 (function (angular, _) {
     'use strict';
 
+    // use to determine if in production or staging
+    var isProd = window.location.hostname === 'www.oldweather.org' || window.location.hostname === 'oldweather.org';
+
     var module = angular.module('zooAPI');
 
     var upsert = function (arr, key, newVal) {
@@ -15,19 +18,19 @@
 
     module.constant('zooAPIConfig', {
         display_name: 'oldweather',
-        app_id: '0cee9a29027e78cc7f9df99a3d6b0d00aaf3bbfad014a4bb73bf29f30b46575f' // panoptes staging
-        // app_id: '2b10a14e8f11eefb130a275f01898c8406600834bff1063bb1b7938795acc8a3' // panoptes production
+        app_id: isProd ?
+          '2b10a14e8f11eefb130a275f01898c8406600834bff1063bb1b7938795acc8a3' : // production
+          '0cee9a29027e78cc7f9df99a3d6b0d00aaf3bbfad014a4bb73bf29f30b46575f',  // staging
+        url: isProd ?
+          'https://panoptes.zooniverse.org/api' :
+          'https://panoptes-staging.zooniverse.org/api'
     });
 
     module.factory('zooAPI', function ($window, zooAPIConfig) {
-        // Set API root depending on environment
-        var isProd = window.location.hostname === 'www.oldweather.org' || window.location.hostname === 'oldweather.org';
-        $window.zooAPI.root = isProd ? 'https://panoptes.zooniverse.org/api' : 'https://panoptes-staging.zooniverse.org/api';
-        // Send Old Weather app id when in production
-        if (isProd) {
-            $window.zooAPI.appID = zooAPIConfig.app_id;
-        }
-        return $window.zooAPI;
+      console.log('zooAPIConfig = ', zooAPIConfig);
+      $window.zooAPI.root = zooAPIConfig.url;
+      $window.zooAPI.appID = zooAPIConfig.app_id;
+      return $window.zooAPI;
     });
 
     module.filter('removeCircularDeps', function () {

bower.json

@@ -19,7 +19,6 @@
     "angular-spinner": "0.6.1",
     "spin.js": "2.3.0",
     "animate.css": "3.3.0",
-    "panoptes-javascript-lib": "0.0.3",
     "angular-local-storage": "0.2.2",
     "masonry": "3.3.1",
     "packery": "1.4.1",

package.json

@@ -7,7 +7,7 @@
     "doc": "docs"
   },
   "scripts": {
-    "postinstall": "gulp hookmeup",
+    "postinstall": "bower install && browserify panoptes-client-wrapper/index.js > app/panoptes-client.js && gulp hookmeup",
     "test": "gulp test-ci"
   },
   "repository": {
@@ -21,6 +21,8 @@
   },
   "homepage": "https://github.com/zooniverse/old-weather",
   "devDependencies": {
+    "bower": "^1.7.9",
+    "browserify": "^13.0.1",
     "gulp": "^3.8.11",
     "gulp-angular-templatecache": "^1.6.0",
     "gulp-chmod": "1.2.0",
@@ -45,7 +47,9 @@
     "karma-firefox-launcher": "^0.1.6",
     "karma-jasmine": "0.3.5",
     "nib": "1.1.0",
+    "panoptes-client": "^2.5.1",
     "run-sequence": "^1.1.0",
     "stylus": "^0.51.1"
-  }
+  },
+  "dependencies": {}
 }

panoptes-client-wrapper/index.js

@@ -0,0 +1,2 @@
+window.zooAPI = require('panoptes-client/lib/api-client');
+window.zooAuth = require('panoptes-client/lib/auth');