diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index aa0bd5d5..7118ee77 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,6 +2,7 @@ class ApplicationController < ActionController::Base include ActiveStorage::SetCurrent + include Pagy::Backend before_action :maybe_redirect_to_setup, unless: :signed_in? before_action :authenticate_user!, unless: :devise_controller? diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 4ecbef8b..04bdda1e 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -6,6 +6,6 @@ class DashboardController < ApplicationController def index return render 'pages/landing' unless signed_in? - @templates = current_account.templates.active + @pagy, @templates = pagy(current_account.templates.active, items: 12) end end diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb index 45dc072f..6722b1e2 100644 --- a/app/controllers/submissions_controller.rb +++ b/app/controllers/submissions_controller.rb @@ -4,7 +4,7 @@ class SubmissionsController < ApplicationController before_action :load_template, only: %i[index new create] def index - @submissions = @template.submissions.active + @pagy, @submissions = pagy(@template.submissions.active) end def show diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 601f2594..c5ad45bd 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4,7 +4,7 @@ class UsersController < ApplicationController before_action :load_user, only: %i[edit update destroy] def index - @users = current_account.users.active.order(id: :desc) + @pagy, @users = pagy(current_account.users.active.order(id: :desc)) end def new diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 59e3ce78..c8f45b40 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -25,6 +25,7 @@ <% end %> + <%= render 'shared/pagination', pagy: @pagy %> <% else %>