From 322b8e2ce5beb313306a2f9220cc426979e846d2 Mon Sep 17 00:00:00 2001
From: Michal Tuleja <michal@lightcurve.io>
Date: Tue, 11 Dec 2018 16:21:04 +0100
Subject: [PATCH 1/5] Add URL-based pagination to transaction page

---
 .../transactions/transactions.component.js    | 24 +++++++++++--------
 .../transactions-list/transactions-list.html  |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/transactions/transactions.component.js b/src/components/transactions/transactions.component.js
index 0b90bcd7a..2cd6de4bb 100644
--- a/src/components/transactions/transactions.component.js
+++ b/src/components/transactions/transactions.component.js
@@ -16,15 +16,12 @@
 import AppTransactions from './transactions.module';
 import template from './transactions.html';
 
-const TransactionsConstructor = function ($rootScope, $stateParams, $location, $http, $interval) {
+const TransactionsConstructor = function ($rootScope, $stateParams, $state, $http, $interval) {
 	const vm = this;
 	vm.getLastTransactions = (n) => {
 		const limit = 20 + 1;
 		let offset = 0;
-
-		if (n) {
-			offset = (n - 1) * limit;
-		}
+		if (n) offset = (n - 1) * limit;
 
 		$http.get(`/api/getTransactions?limit=${limit}&offset=${offset}`).then((resp) => {
 			if (resp.data.success) {
@@ -33,18 +30,25 @@ const TransactionsConstructor = function ($rootScope, $stateParams, $location, $
 				vm.txs = { results: resp.data.transactions };
 				vm.txs.hasPrev = !!offset;
 				vm.txs.hasNext = !!removedTx;
+				vm.txs.page = $stateParams.page || 0;
+				vm.txs.loadPageOffset = vm.loadPageOffset;
+				vm.txs.loadPage = vm.loadPage;
 			} else {
 				vm.txs = {};
 			}
 		});
 	};
 
+	vm.loadPageOffset = (offset) => {
+		$state.go($state.current.component, { page: Number(vm.txs.page || 1) + offset });
+	};
+
+	vm.loadPage = (pageNumber) => {
+		$state.go($state.current.component, { page: Number(vm.txs.page || 1) + pageNumber });
+	};
+
 	const update = () => {
-		if ($stateParams.page) {
-			vm.getLastTransactions($stateParams.page);
-		} else {
-			vm.getLastTransactions();
-		}
+		vm.getLastTransactions($stateParams.page || 1);
 	};
 
 	update();
diff --git a/src/shared/transactions-list/transactions-list.html b/src/shared/transactions-list/transactions-list.html
index 1fa7a2aac..9dd070696 100644
--- a/src/shared/transactions-list/transactions-list.html
+++ b/src/shared/transactions-list/transactions-list.html
@@ -62,13 +62,13 @@ <h2>No transactions</h2>
 
 	<nav>
 		<ul class="nav nav-pills nav-justified">
-			<li role="presentation" data-ng-disabled="!txs.hasPrev" data-ng-click="txs.loadPrev()">
+			<li role="presentation" data-ng-disabled="!txs.hasPrev" data-ng-click="txs.loadPageOffset(-1)">
 				<button class="btn btn-default less-button bordered-button" data-ng-disabled="!txs.hasPrev" data-ng-click="txs.loadPrev()">Prev</button>
 			</li>
 			<li role="presentation">
 				<button class="btn btn-default more-button bordered-button">Pagination</button>
 			</li>
-			<li role="presentation" data-ng-disabled="!txs.hasNext" data-ng-click="txs.loadNext()">
+			<li role="presentation" data-ng-disabled="!txs.hasNext" data-ng-click="txs.loadPageOffset(1)">
 				<button class="btn btn-default more-button bordered-button" data-ng-disabled="!txs.hasNext" data-ng-click="txs.loadNext()">Next</button>
 			</li>
 		</ul>

From 5c8816ab74e871bc16817897bcb52293c89e7ae8 Mon Sep 17 00:00:00 2001
From: Michal Tuleja <michal@lightcurve.io>
Date: Tue, 11 Dec 2018 16:36:14 +0100
Subject: [PATCH 2/5] Pagination logic fix

---
 src/shared/transactions-list/transactions-list.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/shared/transactions-list/transactions-list.html b/src/shared/transactions-list/transactions-list.html
index 9dd070696..8f2794560 100644
--- a/src/shared/transactions-list/transactions-list.html
+++ b/src/shared/transactions-list/transactions-list.html
@@ -62,14 +62,14 @@ <h2>No transactions</h2>
 
 	<nav>
 		<ul class="nav nav-pills nav-justified">
-			<li role="presentation" data-ng-disabled="!txs.hasPrev" data-ng-click="txs.loadPageOffset(-1)">
-				<button class="btn btn-default less-button bordered-button" data-ng-disabled="!txs.hasPrev" data-ng-click="txs.loadPrev()">Prev</button>
+			<li role="presentation" data-ng-disabled="!txs.hasPrev">
+				<button class="btn btn-default less-button bordered-button" data-ng-disabled="!txs.hasPrev" data-ng-click="txs.loadPageOffset(-1)">Prev</button>
 			</li>
 			<li role="presentation">
 				<button class="btn btn-default more-button bordered-button">Pagination</button>
 			</li>
-			<li role="presentation" data-ng-disabled="!txs.hasNext" data-ng-click="txs.loadPageOffset(1)">
-				<button class="btn btn-default more-button bordered-button" data-ng-disabled="!txs.hasNext" data-ng-click="txs.loadNext()">Next</button>
+			<li role="presentation" data-ng-disabled="!txs.hasNext">
+				<button class="btn btn-default more-button bordered-button" data-ng-disabled="!txs.hasNext" data-ng-click="txs.loadPageOffset(1)">Next</button>
 			</li>
 		</ul>
 	</nav>

From f563b7fc9e321d507890db6fda5224918985162c Mon Sep 17 00:00:00 2001
From: Michal Tuleja <michal@lightcurve.io>
Date: Tue, 11 Dec 2018 16:37:37 +0100
Subject: [PATCH 3/5] Pagination support for new offset param

---
 src/services/pagination.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/services/pagination.js b/src/services/pagination.js
index ad58e0874..acd44e913 100644
--- a/src/services/pagination.js
+++ b/src/services/pagination.js
@@ -15,6 +15,7 @@
  */
 import angular from 'angular';
 import AppServices from './services.module';
+import { identity } from 'ui-router-core';
 
 const Pagination = function ($http, $q, params) {
 	this.$http = $http;
@@ -98,13 +99,19 @@ Pagination.prototype.loadPrev = function () {
 	this.loadData();
 };
 
-Pagination.prototype.nextOffset = function () {
-	this.currentPage += 1;
+Pagination.prototype.loadPageOffset = function (offset) {
+	if (offset > 0) this.nextOffset(offset);
+	if (offset < 0) this.prevOffset(offset);
+	this.loadData();
+};
+
+Pagination.prototype.nextOffset = function (offset) {
+	this.currentPage += offset || 1;
 	return this.offset += this.limit;
 };
 
-Pagination.prototype.prevOffset = function () {
-	this.currentPage -= 1;
+Pagination.prototype.prevOffset = function (offset) {
+	this.currentPage -= offset || 1;
 	return this.offset -= this.limit;
 };
 

From d4ba7f9d646be7768d40c932b33c36da2f7ae604 Mon Sep 17 00:00:00 2001
From: Michal Tuleja <michal@lightcurve.io>
Date: Tue, 11 Dec 2018 17:38:38 +0100
Subject: [PATCH 4/5] Remove not needed deps

---
 src/services/pagination.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/services/pagination.js b/src/services/pagination.js
index acd44e913..cce960d37 100644
--- a/src/services/pagination.js
+++ b/src/services/pagination.js
@@ -15,7 +15,6 @@
  */
 import angular from 'angular';
 import AppServices from './services.module';
-import { identity } from 'ui-router-core';
 
 const Pagination = function ($http, $q, params) {
 	this.$http = $http;

From 2deb494fada485f816db6b7bde0e2b0892e0f6f9 Mon Sep 17 00:00:00 2001
From: Michal Tuleja <michal@lightcurve.io>
Date: Wed, 12 Dec 2018 10:01:04 +0100
Subject: [PATCH 5/5] Transactions component loadPage() fix

---
 src/components/transactions/transactions.component.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/transactions/transactions.component.js b/src/components/transactions/transactions.component.js
index 2cd6de4bb..81770db12 100644
--- a/src/components/transactions/transactions.component.js
+++ b/src/components/transactions/transactions.component.js
@@ -44,7 +44,7 @@ const TransactionsConstructor = function ($rootScope, $stateParams, $state, $htt
 	};
 
 	vm.loadPage = (pageNumber) => {
-		$state.go($state.current.component, { page: Number(vm.txs.page || 1) + pageNumber });
+		$state.go($state.current.component, { page: pageNumber });
 	};
 
 	const update = () => {