separate helper for page and query strings

helpers/pagequeryconverter.js

@@ -0,0 +1,18 @@
+'use strict';
+
+module.exports = (query, limit) => {
+	const nopage = { ...query };
+	delete nopage.page;
+	const queryString = new URLSearchParams(nopage).toString();
+	let page;
+	if (query.page && Number.isSafeInteger(parseInt(query.page))) {
+		page = parseInt(query.page);
+		if (page <= 0) {
+			page = 1;
+		}
+	} else {
+		page = 1;
+	}
+	const offset = (page-1) * limit;
+	return { queryString, page, offset };
+}

views/includes/boardlistpages.pug

@@ -1,9 +0,0 @@
-| Page: 
-if maxPage === 0
-	a.bold(href=`?${queryString ? queryString+'&' : ''}page=1`) [1]
-- for(let i = 1; i <= maxPage; i++)
-	if page === i
-		a.bold(href=`?${queryString ? queryString+'&' : ''}page=${i}`) [#{i}]
-	else
-		a(href=`?${queryString ? queryString+'&' : ''}page=${i}`) [#{i}]
-	|  

views/includes/pages.pug

@@ -0,0 +1,20 @@
+| Page: 
+if maxPage === 0
+	a.bold(href=`?${queryString ? queryString+'&' : ''}page=1`) [1]
+else if maxPage > 0
+	- for(let i = 1; i <= maxPage; i++)
+		if page === i
+			a.bold(href=`?${queryString ? queryString+'&' : ''}page=${i}`) [#{i}]
+		else
+			a(href=`?${queryString ? queryString+'&' : ''}page=${i}`) [#{i}]
+		|  
+else
+	if page > 1
+		if page > 2
+			a(href=`?page=1`) [<<]
+			|  
+		a(href=`?page=${page-1}`) [<]
+		|  
+	a.bold(href=`?page=${page}`) [#{page}]
+	|  
+	a(href=`?page=${page+1}`) [>]