fix: pagy + delete_at prop (#255)

NeonGamerBot-QK · web-flow · commit 08a0ae196ca3 · 2025-12-05T19:09:20.000-05:00
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
@@ -33,7 +33,7 @@ def create
     SyncSlackDisplayNameJob.perform_later(user)
 
     session[:user_id] = user.id
-    current_user.complete_tutorial_step! :first_login
+    user.complete_tutorial_step! :first_login
     redirect_to(user.setup_complete? ? projects_path : kitchen_path, notice: "Signed in with Hack Club")
   end
 
diff --git a/app/models/concerns/soft_deletable.rb b/app/models/concerns/soft_deletable.rb
diff --git a/app/models/post.rb b/app/models/post.rb
@@ -23,8 +23,6 @@
 #  fk_rails_...  (user_id => users.id)
 #
 class Post < ApplicationRecord
-    include SoftDeletable
-
     belongs_to :project
     # optional because it can be a system post – achievements, milestones, well-done/magic happening, etc –
     # integeration – git remotes – or a user post
diff --git a/app/models/project.rb b/app/models/project.rb
@@ -13,8 +13,6 @@
 #  updated_at        :datetime         not null
 #
 class Project < ApplicationRecord
-    include SoftDeletable
-
     # TODO: reflect the allowed content types in the html accept
     ACCEPTED_CONTENT_TYPES = %w[image/jpeg image/png image/webp image/heic image/heif].freeze
     MAX_BANNER_SIZE = 10.megabytes
diff --git a/app/views/admin/fulfillment_dashboard/index.html.erb b/app/views/admin/fulfillment_dashboard/index.html.erb
@@ -118,9 +118,9 @@
 
 <% if @pagy.pages > 1 %>
   <div class="pagination">
-    <%== @pagy.nav %>
+    <%== pagy_nav(@pagy) %>
   </div>
-  <%== @pagy.info %>
+  <%== pagy_info(@pagy) %>
 <% end %>
 
 <%= link_to "← Back", admin_root_path, class: "btn-secondary" %>
diff --git a/app/views/admin/projects/index.html.erb b/app/views/admin/projects/index.html.erb
@@ -38,7 +38,7 @@
 
 <% if @pagy.pages > 1 %>
   <div class="pagination">
-    <%== @pagy.nav %>
+    <%== pagy_nav(@pagy) %>
   </div>
 <% end %>
 
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
@@ -41,7 +41,7 @@
 
 <% if @pagy.pages > 1 %>
   <div class="pagination">
-    <%== @pagy.nav %>
+    <%== pagy_nav(@pagy) %>
   </div>
 <% end %>
 
diff --git a/app/views/votes/index.html.erb b/app/views/votes/index.html.erb
@@ -16,7 +16,7 @@
     </div>
 
     <% if @pagy.pages > 1 %>
-      <%== @pagy.series_nav %>
+      <%== pagy_nav(@pagy) %>
     <% end %>
   <% end %>
 </div>
diff --git a/db/migrate/20251205135728_add_deleted_at_to_posts.rb b/db/migrate/20251205135728_add_deleted_at_to_posts.rb

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`	`# fk_rails_... (user_id => users.id)`
`24`	`24`	`#`
`25`	`25`	`class Post < ApplicationRecord`
`26`		`- include SoftDeletable`
`27`		`-`
`28`	`26`	`belongs_to :project`
`29`	`27`	`# optional because it can be a system post – achievements, milestones, well-done/magic happening, etc –`
`30`	`28`	`# integeration – git remotes – or a user post`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`	`# updated_at :datetime not null`
`14`	`14`	`#`
`15`	`15`	`class Project < ApplicationRecord`
`16`		`- include SoftDeletable`
`17`		`-`
`18`	`16`	`# TODO: reflect the allowed content types in the html accept`
`19`	`17`	`ACCEPTED_CONTENT_TYPES = %w[image/jpeg image/png image/webp image/heic image/heif].freeze`
`20`	`18`	`MAX_BANNER_SIZE = 10.megabytes`