Merge pull request #127 from BillionOysterProject/protocol-refactor

Misc fixes
BillionOysterProject · Jun 14, 2016 · 99d6851 · 99d6851
2 parents c70d7f8 + 179340a
commit 99d6851
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/config/env/production.js b/config/env/production.js
@@ -43,7 +43,8 @@ module.exports = {
     }
   },
   app: {
-    title: 'Billion Oyster Project'
+    title: 'Billion Oyster Project',
+    googleAnalyticsTrackingID: process.env.GOOGLE_ANALYTICS_TRACKING_ID || 'GOOGLE_ANALYTICS_TRACKING_ID'
   },
   facebook: {
     clientID: process.env.FACEBOOK_ID || 'APP_ID',

diff --git a/config/env/staging.js b/config/env/staging.js
@@ -44,7 +44,8 @@ module.exports = {
     }
   },
   app: {
-    title: 'Billion Oyster Project - Staging Environment'
+    title: 'Billion Oyster Project - Staging Environment',
+    googleAnalyticsTrackingID: process.env.GOOGLE_ANALYTICS_TRACKING_ID || 'GOOGLE_ANALYTICS_TRACKING_ID'
   },
   facebook: {
     clientID: process.env.FACEBOOK_ID || 'APP_ID',

diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html
@@ -53,6 +53,17 @@
   <!--Load The Socket.io File-->
   <script type="text/javascript" src="/socket.io/socket.io.js"></script>
 
+  <!--Google Analytics-->
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', '{{googleAnalyticsTrackingID}}', 'auto');
+    ga('send', 'pageview');
+  </script>
+
   <!--Application JavaScript Files-->
   {% for jsFile in jsFiles %}<script type="text/javascript" src="{{jsFile}}"></script>{% endfor %}
 

diff --git a/modules/expeditions/client/controllers/expeditions.client.controller.js b/modules/expeditions/client/controllers/expeditions.client.controller.js
@@ -39,7 +39,7 @@
     }
 
     vm.dateTime = {
-      min: moment().subtract(7, 'days').toDate(),
+      min: moment().subtract(1, 'days').toDate(),
       max: moment().add(1, 'year').toDate()
     };
 

diff --git a/modules/teams/client/controllers/owner-teams.client.controller.js b/modules/teams/client/controllers/owner-teams.client.controller.js
@@ -16,8 +16,8 @@
       byOwner: true,
       teamId: '',
       searchString: '',
-      page: 1,
-      limit: 8
+      //page: 1,
+      //limit: 8
     };
 
     vm.fieldChanged = function($event) {
@@ -37,8 +37,8 @@
         byOwner: true,
         teamId: vm.filter.teamId,
         searchString: vm.filter.searchString,
-        page: vm.filter.page,
-        limit: vm.filter.limit
+        //page: vm.filter.page,
+        //limit: vm.filter.limit
       }, function(data) {
         vm.members = data;
         vm.buildPager();

diff --git a/modules/users/client/controllers/admin/list-users.client.controller.js b/modules/users/client/controllers/admin/list-users.client.controller.js
@@ -6,9 +6,9 @@ angular.module('users.admin').controller('UserListController', ['$scope', '$filt
       organizationId: '',
       role: '',
       searchString: '',
-      sort: '',
-      limit: 20,
-      page: 1
+      sort: 'lastName',
+      //limit: 20,
+      //page: 1
     };
 
     $scope.organizations = SchoolOrganizationsService.query();
@@ -31,8 +31,8 @@ angular.module('users.admin').controller('UserListController', ['$scope', '$filt
         role: $scope.filter.role,
         searchString: $scope.filter.searchString,
         sort: $scope.filter.sort,
-        limit: $scope.filter.limit,
-        page: $scope.filter.page,
+        //limit: $scope.filter.limit,
+        //page: $scope.filter.page,
         showTeams: true
       }, function (data) {
         $scope.users = data;