Merge branch 'master' into feature/ldap_services

app/assets/stylesheets/application.tailwind.css

@@ -7,4 +7,5 @@
 @import "components/forms";
 @import "components/links";
 @import "components/notifications";
+@import "components/pagination";
 @import "components/tables";

app/assets/stylesheets/components/pagination.css

@@ -0,0 +1,45 @@
+@layer components {
+  .pagy-nav.pagination {
+    @apply isolate inline-flex -space-x-px rounded-md shadow-sm;
+  }
+
+  .pagy-nav .page:not(.prev):not(.next) {
+    @apply hidden sm:inline-block;
+  }
+
+  .pagy-nav .page.next a {
+    @apply relative inline-flex items-center rounded-r-md border
+           border-gray-300 bg-white px-3 py-2 text-sm font-medium
+           text-gray-500 hover:bg-gray-100 focus:z-20;
+  }
+
+  .pagy-nav .page.prev a {
+    @apply relative inline-flex items-center rounded-l-md border
+           border-gray-300 bg-white px-3 py-2 text-sm font-medium
+           text-gray-500 hover:bg-gray-100 focus:z-20;
+  }
+
+  .pagy-nav .page.next.disabled {
+    @apply relative inline-flex items-center rounded-r-md border
+           border-gray-300 bg-gray-100 px-3 py-2 text-sm font-medium
+           text-gray-400 focus:z-20;
+  }
+
+  .pagy-nav .page.prev.disabled {
+    @apply relative inline-flex items-center rounded-l-md border
+           border-gray-300 bg-gray-100 px-3 py-2 text-sm font-medium
+           text-gray-400 focus:z-20;
+  }
+
+  .pagy-nav .page a, .page.gap {
+    @apply bg-white border-gray-300 text-gray-500 hover:bg-gray-100 relative
+           inline-flex items-center border px-4 py-2 text-sm font-medium
+           focus:z-20;
+  }
+
+  .pagy-nav .page.active {
+    @apply z-10 border-indigo-500 bg-indigo-50 text-indigo-600 relative
+           inline-flex items-center border px-4 py-2 text-sm font-medium
+           focus:z-20;
+  }
+}

app/controllers/admin/base_controller.rb

@@ -1,4 +1,5 @@
 class Admin::BaseController < ApplicationController
+  include Pagy::Backend
 
   before_action :authenticate_user!
   before_action :authorize_admin
@@ -7,5 +8,4 @@ class Admin::BaseController < ApplicationController
   def set_context
     @context = :admin
   end
-
 end

app/controllers/admin/donations_controller.rb

@@ -5,7 +5,8 @@ class Admin::DonationsController < Admin::BaseController
   # GET /donations
   # GET /donations.json
   def index
-    @donations = Donation.all.order('created_at desc')
+    @pagy, @donations = pagy(Donation.all.order('created_at desc'))
+
     @stats = {
       overall_sats: @donations.all.sum("amount_sats"),
       donor_count: Donation.distinct.count(:user_id)

app/controllers/admin/invitations_controller.rb

@@ -1,7 +1,8 @@
 class Admin::InvitationsController < Admin::BaseController
   def index
     @current_section = :invitations
-    @invitations_used = Invitation.used.order('used_at desc')
+    @pagy, @invitations_used = pagy(Invitation.used.order('used_at desc'))
+
     @stats = {
       available: Invitation.unused.count,
       accepted: @invitations_used.length,

app/controllers/admin/users_controller.rb

@@ -6,7 +6,7 @@ class Admin::UsersController < Admin::BaseController
     ldap   = LdapService.new
     @ou    = params[:ou] || "kosmos.org"
     @orgs  = ldap.fetch_organizations
-    @users = User.where(ou: @ou).order(cn: :asc).to_a
+    @pagy, @users = pagy(User.where(ou: @ou).order(cn: :asc))
 
     @stats = {
       users_confirmed: User.where(ou: @ou).confirmed.count,

app/helpers/application_helper.rb

@@ -1,4 +1,6 @@
 module ApplicationHelper
+  include Pagy::Frontend
+
   def sats_to_btc(sats)
     sats.to_f / 100000000
   end
@@ -16,6 +18,4 @@ module ApplicationHelper
   def badge(text, color)
     tag.span text, class: "inline-flex items-center rounded-full bg-#{color}-100 px-2.5 py-0.5 text-xs font-medium text-#{color}-800"
   end
-
 end
-

app/views/admin/donations/index.html.erb

@@ -21,7 +21,7 @@
   <section>
   <% if @donations.any? %>
     <h3>Recent Donations</h3>
-    <table class="divided">
+    <table class="divided mb-8">
       <thead>
         <tr>
           <th>User</th>
@@ -52,6 +52,7 @@
         <% end %>
       </tbody>
     </table>
+    <%== pagy_nav @pagy %>
   <% else %>
     <p>
       No donations yet.

app/views/admin/invitations/index.html.erb

@@ -24,7 +24,7 @@
   <% if @invitations_used.any? %>
     <section>
       <h3>Recently Accepted</h3>
-      <table class="divided">
+      <table class="divided mb-8">
         <thead>
           <tr>
             <th>Token</th>
@@ -44,6 +44,7 @@
           <% end %>
         </tbody>
       </table>
+      <%== pagy_nav @pagy %>
     </section>
   <% end %>
 <% end %>

app/views/admin/users/index.html.erb

@@ -30,7 +30,7 @@
   <% end %>
 
   <section>
-    <table class="divided">
+    <table class="divided mb-8">
       <thead>
         <tr>
           <th>UID</th>
@@ -49,5 +49,6 @@
         <% end %>
       </tbody>
     </table>
+    <%== pagy_nav @pagy %>
   </section>
 <% end %>