ProjectSegfault/invidious-experimenting
4
0
Fork 0
forked from midou/invidious
Code Pull Requests Activity

HTML: Use the new pagination component for search results

Browse Source
This commit is contained in:
Samantaz Fox 2023-04-18 00:12:56 +02:00
parent c4ef3bed95
commit efaf7cb09c
No known key found for this signature in database
GPG Key ID: F42821059186176E
3 changed files with 16 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/invidious/routes/search.cr
View File

@ -59,17 +59,21 @@ module Invidious::Routes::Search
return error_template(500, ex) return error_template(500, ex)
end end
params = query.to_http_params
url_prev_page = "/search?#{params}&page=#{query.page - 1}"
url_next_page = "/search?#{params}&page=#{query.page + 1}"
redirect_url = Invidious::Frontend::Misc.redirect_url(env) redirect_url = Invidious::Frontend::Misc.redirect_url(env)
# Pagination
page_nav_html = Frontend::Pagination.nav_numeric(locale,
base_url: "/search?#{query.to_http_params}",
current_page: query.page,
show_next: (videos.size >= 20)
)
if query.type == Invidious::Search::Query::Type::Channel if query.type == Invidious::Search::Query::Type::Channel
env.set "search", "channel:#{query.channel} #{query.text}" env.set "search", "channel:#{query.channel} #{query.text}"
else else
env.set "search", query.text env.set "search", query.text
end end
templated "search" templated "search"
end end
end end
@ -96,11 +100,13 @@ module Invidious::Routes::Search
return error_template(500, ex) return error_template(500, ex)
end end
params = env.params.query.empty? ? "" : "&#{env.params.query}" # Pagination
hashtag_encoded = URI.encode_www_form(hashtag, space_to_plus: false) hashtag_encoded = URI.encode_www_form(hashtag, space_to_plus: false)
url_prev_page = "/hashtag/#{hashtag_encoded}?page=#{page - 1}#{params}" page_nav_html = Frontend::Pagination.nav_numeric(locale,
url_next_page = "/hashtag/#{hashtag_encoded}?page=#{page + 1}#{params}" base_url: "/hashtag/#{hashtag_encoded}",
current_page: page,
show_next: (videos.size >= 60)
)
templated "hashtag" templated "hashtag"
end end

35
src/invidious/views/hashtag.ecr
View File

@ -4,38 +4,5 @@
<hr/> <hr/>
<div class="pure-g h-box v-box">
<div class="pure-u-1 pure-u-lg-1-5">
<%- if page > 1 -%>
<a href="<%= url_prev_page %>"><%= translate(locale, "Previous page") %></a>
<%- end -%>
</div>
<div class="pure-u-1 pure-u-lg-3-5"></div>
<div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
<%- if videos.size >= 60 -%>
<a href="<%= url_next_page %>"><%= translate(locale, "Next page") %></a>
<%- end -%>
</div>
</div>
<div class="pure-g"> <%= rendered "components/items_paginated" %>
<%- videos.each do |item| -%>
<%= rendered "components/item" %>
<%- end -%>
</div>
<script src="/js/watched_indicator.js"></script>
<div class="pure-g h-box">
<div class="pure-u-1 pure-u-lg-1-5">
<%- if page > 1 -%>
<a href="<%= url_prev_page %>"><%= translate(locale, "Previous page") %></a>
<%- end -%>
</div>
<div class="pure-u-1 pure-u-lg-3-5"></div>
<div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
<%- if videos.size >= 60 -%>
<a href="<%= url_next_page %>"><%= translate(locale, "Next page") %></a>
<%- end -%>
</div>
</div>

35
src/invidious/views/search.ecr
View File

@ -7,19 +7,6 @@
<%= Invidious::Frontend::SearchFilters.generate(query.filters, query.text, query.page, locale) %> <%= Invidious::Frontend::SearchFilters.generate(query.filters, query.text, query.page, locale) %>
<hr/> <hr/>
<div class="pure-g h-box v-box">
<div class="pure-u-1 pure-u-lg-1-5">
<%- if query.page > 1 -%>
<a href="<%= url_prev_page %>"><%= translate(locale, "Previous page") %></a>
<%- end -%>
</div>
<div class="pure-u-1 pure-u-lg-3-5"></div>
<div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
<%- if videos.size >= 20 -%>
<a href="<%= url_next_page %>"><%= translate(locale, "Next page") %></a>
<%- end -%>
</div>
</div>
<%- if videos.empty? -%> <%- if videos.empty? -%>
<div class="h-box no-results-error"> <div class="h-box no-results-error">
@ -30,25 +17,5 @@
</div> </div>
</div> </div>
<%- else -%> <%- else -%>
<div class="pure-g"> <%= rendered "components/items_paginated" %>
<%- videos.each do |item| -%>
<%= rendered "components/item" %>
<%- end -%> <%- end -%>
</div>
<%- end -%>
<script src="/js/watched_indicator.js"></script>
<div class="pure-g h-box">
<div class="pure-u-1 pure-u-lg-1-5">
<%- if query.page > 1 -%>
<a href="<%= url_prev_page %>"><%= translate(locale, "Previous page") %></a>
<%- end -%>
</div>
<div class="pure-u-1 pure-u-lg-3-5"></div>
<div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
<%- if videos.size >= 20 -%>
<a href="<%= url_next_page %>"><%= translate(locale, "Next page") %></a>
<%- end -%>
</div>
</div>