fix order queries

app/views/shared/_pagination.html.erb

@@ -5,7 +5,7 @@
       <%= @pagy.from %>-<%= local_assigns.fetch(:to, @pagy.to) %> of <%= local_assigns.fetch(:count, @pagy.count) %> <%= local_assigns[:items_name] || 'items' %>
       <%= local_assigns[:left_additional_html] %>
     </div>
-    <div class="flex items-center gap-1">
+    <div class="flex items-center space-x-1.5">
       <%= local_assigns[:right_additional_html] %>
       <div class="join">
         <% if @pagy.prev %>
@@ -13,7 +13,7 @@
         <% else %>
           <span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">«</span>
         <% end %>
-        <span class="join-item btn uppercase min-h-full h-10">
+        <span class="join-item btn font-medium uppercase min-h-full h-10">
           <%= t('page_number', number: @pagy.page) %>
         </span>
         <% if @pagy.next %>

app/views/shared/_templates_order_select.html.erb

@@ -1,9 +1,25 @@
-<% dashboard_templates_order = cookies.permanent[:dashboard_templates_order] || 'creation_date' %>
-<form action="<%= root_path %>" method="get" class="dropdown dropdown-top">
+<% dashboard_templates_order = cookies.permanent[:dashboard_templates_order] || 'created_at' %>
+<form action="<%= url_for %>" method="get" class="dropdown dropdown-top">
   <label tabindex="0" class="btn btn-sm h-10">
     <%= svg_icon('arrow_sort', class: 'w-5 h-5') %>
   </label>
   <ul tabindex="0" class="dropdown-content z-[10] menu p-2 shadow bg-base-100 rounded-box mb-1 min-w-48">
+    <toggle-cookies data-value="created_at" data-key="dashboard_templates_order">
+      <li>
+        <button class="<%= 'bg-base-200' if dashboard_templates_order == 'created_at' %>">
+          <%= svg_icon('sort_descending_numbers', class: 'w-4 h-4') %>
+          <span class="whitespace-nowrap"><%= t('newest_first') %></span>
+        </button>
+      </li>
+    </toggle-cookies>
+    <toggle-cookies data-value="used_at" data-key="dashboard_templates_order">
+      <li>
+        <button class="<%= 'bg-base-200' if dashboard_templates_order == 'used_at' %>">
+          <%= svg_icon('sort_descending_small_big', class: 'w-4 h-4') %>
+          <span class="whitespace-nowrap"><%= t('recently_used') %></span>
+        </button>
+      </li>
+    </toggle-cookies>
     <toggle-cookies data-value="name" data-key="dashboard_templates_order">
       <li>
         <button class="<%= 'bg-base-200' if dashboard_templates_order == 'name' %>">
@@ -12,21 +28,5 @@
         </button>
       </li>
     </toggle-cookies>
-    <toggle-cookies data-value="recently_used" data-key="dashboard_templates_order">
-      <li>
-        <button class="<%= 'bg-base-200' if dashboard_templates_order == 'recently_used' %>">
-          <%= svg_icon('sort_descending_small_big', class: 'w-4 h-4') %>
-          <span class="whitespace-nowrap"><%= t('recently_used') %></span>
-        </button>
-      </li>
-    </toggle-cookies>
-    <toggle-cookies data-value="creation_date" data-key="dashboard_templates_order">
-      <li>
-        <button class="<%= 'bg-base-200' if dashboard_templates_order == 'creation_date' %>">
-          <%= svg_icon('sort_descending_numbers', class: 'w-4 h-4') %>
-          <span class="whitespace-nowrap"><%= t('creation_date') %></span>
-        </button>
-      </li>
-    </toggle-cookies>
   </ul>
 </form>

app/views/template_folders/show.html.erb

@@ -35,7 +35,12 @@
   <div class="grid gap-4 md:grid-cols-3">
     <%= render partial: 'templates/template', collection: @templates %>
   </div>
-  <%= render 'shared/pagination', pagy: @pagy, items_name: 'templates' %>
+  <% templates_order_select_html = capture do %>
+    <% if params[:q].blank? && @pagy.pages > 1 %>
+      <%= render('shared/templates_order_select') %>
+    <% end %>
+  <% end %>
+  <%= render 'shared/pagination', pagy: @pagy, items_name: 'templates', right_additional_html: templates_order_select_html %>
 <% elsif params[:q].present? %>
   <div class="text-center">
     <div class="mt-16 text-3xl font-semibold">