Add pages

dragynfruit · Nov 1, 2024 · ec336eb · ec336eb
1 parent 47be1e0
commit ec336eb
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 11 deletions.
diff --git a/plugins/providers.toml b/plugins/providers.toml
@@ -36,7 +36,7 @@ kinds = ["sear"]
 	pagination = "1"
 
 	[wiby.extra]
-	url = "https://wiby.me/json?q={query}&page={page}"
+	url = "https://wiby.me/json?q={query}&p={page}"
 	url_key = "URL"
 	title_key = "Title"
 	snippet_key = "Snippet"
@@ -157,5 +157,5 @@ name = "Yahoo"
 description = "A search engine"
 kinds = ["sear"]
 	[yahoo.features]
-	pagination = "0"
+	pagination = "1"
 	safe_search = "multilevel"
diff --git a/views/components/search_bar.html b/views/components/search_bar.html
@@ -43,7 +43,6 @@
         transition: all 0.2s ease;
         margin-left: 4px;
         vertical-align: middle;
-        /* horizontal align content */
         display: inline-block;
         text-align: center;
     }

diff --git a/views/index.html b/views/index.html
@@ -60,9 +60,6 @@
 {% endblock head %}
 
 {% block content %}
-<div>
-
-</div>
 <table id="lead" cellspacing="0">
 	<tr>
 		<td rowspan="2">

diff --git a/views/results.html b/views/results.html
@@ -33,7 +33,7 @@
 		margin-right: 10px;
 	}
 
-	#kinds a#current {
+	#kinds a#current-category {
 		color: #98db7c;
 		font-weight: bold;
 	}
@@ -77,8 +77,19 @@
 		vertical-align: middle;
 	}
 
-	#bottom {
-		padding: 10px;
+	.page-button {
+		padding: 5px 10px;
+		margin-right: 5px;
+		border-radius: 5px;
+		background-color: #363636;
+		color: #CDCDCD;
+		text-decoration: none;
+		transition: all 0.3s;
+	}
+
+	.page-button#current-page {
+		background-color: #98db7c;
+		color: #363636;
 	}
 
 	#ferris {
@@ -157,7 +168,8 @@ <h3>Searched</h3>
 		<tr>
 			<td colspan="3" id="kinds">
 				{% for i in range(end=kind_ids | length) %}
-				<a href="?q={{ query.query }}&k={{ kind_ids[i] }}" id="{% if kind == kind_ids[i] %}current{% endif %}">{{
+				<a href="?q={{ query.query }}&p={{ query.page }}&k={{ kind_ids[i] }}"
+					id="{% if kind == kind_ids[i] %}current-category{% endif %}">{{
 					kind_names[i] }}</a>
 				{% endfor %}
 			</td>
@@ -173,6 +185,29 @@ <h3>Searched</h3>
 	{{ result_view::generate_content(result=result) }}
 	{% endfor %}
 	<div id="bottom">
+		<!-- {% set page_start = query.page - 5 %}
+		{% set page_end = query.page + 5 %}
+		{% if page_start < 0 %}
+			{% set diff = 0 - page_start %}
+			{% set page_start = 0 %}
+			{% set page_end = page_end + diff %}
+		{% endif %} -->
+		<!-- query.page first page is 1 -->
+		{% set page_start = query.page - 5 %}
+		{% set page_end = query.page + 5 %}
+		{% if page_start < 1 %}
+			{% set page_end = page_end + (1 - page_start) %}
+			{% set page_start = 1 %}
+		{% endif %}
+
+		{% if query.page > 1 %}
+			<a href="?q={{ query.query }}&k={{ kind }}&p={{ query.page - 1 }}" class="page-button">&#x276E;&#xFE0E;</a>
+		{% endif %}
+		{% for i in range(start=page_start, end=page_end) %}
+			<a href="?q={{ query.query }}&k={{ kind }}&p={{ i }}" class="page-button" id="{% if i == query.page %}current-page{% endif %}">{{ i }}</a>
+		{% endfor %}
+		<a href="?q={{ query.query }}&k={{ kind }}&p={{ query.page + 1 }}" class="page-button">&#x276F;&#xFE0E;</a>
+
 		<p>Found {{ results | length }} results in {{ search_time }} ms</p>
 	</div>
 	{% else %}
@@ -204,4 +239,4 @@ <h1>No results found</h1>
 		}, 3000);
 	});
 </script>
-{% endblock body %}
+{% endblock body %}