paginated developer pages and added them to browser history (#486)

rcos · Sep 28, 2016 · c69faaf · c69faaf
1 parent 5b7d4f2
commit c69faaf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/client/app/user/user.controller.js b/client/app/user/user.controller.js
@@ -1,13 +1,16 @@
 'use strict';
 
 angular.module('observatory3App')
-  .controller('UserCtrl', function ($scope, $stateParams, $location, User) {
+  .controller('UserCtrl', function ($scope, $stateParams, $location, $rootScope, User) {
     $scope.currentUsers = User.query();
     $scope.pastUsers = User.past();
     $scope.users = $scope.currentUsers;
     $scope.searchString = {name:""};
     $scope.currentPage = 0;
-    $scope.defaultPageSize = 48;
+    if ($stateParams.page) {
+      $scope.currentPage = parseInt($stateParams.page);
+    }
+    $scope.defaultPageSize = 36;
     $scope.pageSize = $scope.defaultPageSize;
 
     $scope.past = false;
@@ -27,12 +30,14 @@ angular.module('observatory3App')
     $scope.increment = function(){
         if ($scope.currentPage < $scope.numberOfPages()-1){
             $scope.currentPage += 1;
+            $location.search("page", $scope.currentPage);
         }
     };
 
     $scope.decrement = function(){
         if ($scope.currentPage > 0){
             $scope.currentPage -= 1;
+            $location.search("page", $scope.currentPage);
         }
     };
 
@@ -56,6 +61,13 @@ angular.module('observatory3App')
         }
         $scope.currentPage = 0;
     };
+
+    $rootScope.$on('$locationChangeEnd', function() {
+      if ($stateParams.page) {
+        $scope.currentPage = parseInt($stateParams.page);
+      }
+    })
+
     })
   .filter('startFrom', function() {
     return function(input, start) {

diff --git a/client/app/user/user.js b/client/app/user/user.js
@@ -4,9 +4,10 @@ angular.module('observatory3App')
   .config(function ($stateProvider, $urlRouterProvider) {
     $stateProvider
       .state('user', {
-        url: '/users/:state',
+        url: '/users/:state?page',
         templateUrl: 'app/user/user.html',
-        controller: 'UserCtrl'
+        controller: 'UserCtrl',
+        reloadOnSearch: false
       });
 
     // If the user navigates to /me, redirect them to their profile page