Prefix modules with Mixins namespace

GrottoPress · Jul 22, 2024 · 0acd54c · 0acd54c
1 parent 53fce2a
commit 0acd54c
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/src/operations/mixins/save_user_name.cr b/src/operations/mixins/save_user_name.cr
@@ -1,4 +1,4 @@
-module SaveUserName
+module Mixins::SaveUserName
   macro included
     before_save do
       validate_first_name_required

diff --git a/src/operations/mixins/validate_not_pwned.cr b/src/operations/mixins/validate_not_pwned.cr
@@ -1,4 +1,4 @@
-module ValidateNotPwned
+module Mixins::ValidateNotPwned
   macro included
     before_save do
       validate_not_pwned

diff --git a/src/operations/register_current_user.cr b/src/operations/register_current_user.cr
@@ -5,8 +5,8 @@ class RegisterCurrentUser < User::SaveOperation
     set_level
   end
 
-  include SaveUserName
-  include ValidateNotPwned
+  include Mixins::SaveUserName
+  include Mixins::ValidateNotPwned
   include Shield::SendWelcomeEmail
 
   private def set_level

diff --git a/src/operations/register_user.cr b/src/operations/register_user.cr
@@ -5,6 +5,6 @@ class RegisterUser < User::SaveOperation
     validate_required level
   end
 
-  include ValidateNotPwned
-  include SaveUserName
+  include Mixins::ValidateNotPwned
+  include Mixins::SaveUserName
 end
diff --git a/src/operations/update_current_user.cr b/src/operations/update_current_user.cr
@@ -1,6 +1,6 @@
 class UpdateCurrentUser < User::SaveOperation
   permit_columns :first_name, :last_name
 
-  include ValidateNotPwned
-  include SaveUserName
+  include Mixins::ValidateNotPwned
+  include Mixins::SaveUserName
 end
diff --git a/src/operations/update_user.cr b/src/operations/update_user.cr
@@ -7,8 +7,8 @@ class UpdateUser < User::SaveOperation
     reset_level
   end
 
-  include ValidateNotPwned
-  include SaveUserName
+  include Mixins::ValidateNotPwned
+  include Mixins::SaveUserName
 
   # Ensure current admin cannot change their own level,
   # lest they get locked out

diff --git a/src/pages/auth_layout.cr b/src/pages/auth_layout.cr
@@ -1,6 +1,6 @@
 abstract struct AuthLayout
   include Lucky::HTMLPage
-  include LinkTextHelpers
+  include Mixins::LinkTextHelpers
 
   # The default page title. It is passed to `Shared::LayoutHead`.
   #

diff --git a/src/pages/current_user/bearer_logins/new_page.cr b/src/pages/current_user/bearer_logins/new_page.cr
@@ -1,7 +1,7 @@
 struct CurrentUser::BearerLogins::NewPage < MainLayout
   needs operation : CreateBearerLogin
 
-  include PageParamKey
+  include Mixins::PageParamKey
 
   def page_title
     Rex.t(:"page.current_user.bearer_login.new.page_title")

diff --git a/src/pages/current_user/new_page.cr b/src/pages/current_user/new_page.cr
@@ -1,7 +1,7 @@
 struct CurrentUser::NewPage < AuthLayout
   needs operation : RegisterCurrentUser
 
-  include PageParamKey
+  include Mixins::PageParamKey
 
   def page_title
     Rex.t(:"page.current_user.new.page_title")

diff --git a/src/pages/main_layout.cr b/src/pages/main_layout.cr
@@ -1,6 +1,6 @@
 abstract struct MainLayout
   include Lucky::HTMLPage
-  include LinkTextHelpers
+  include Mixins::LinkTextHelpers
 
   # The default page title. It is passed to `Shared::LayoutHead`.
   #

diff --git a/src/pages/mixins/link_text_helpers.cr b/src/pages/mixins/link_text_helpers.cr
@@ -1,4 +1,4 @@
-module LinkTextHelpers
+module Mixins::LinkTextHelpers
   macro included
     private def delete_text
       Rex.t(:"page.link.delete")

diff --git a/src/pages/mixins/page_param_key.cr b/src/pages/mixins/page_param_key.cr
@@ -1,4 +1,4 @@
-module PageParamKey
+module Mixins::PageParamKey
   macro included
     private def param_key
       operation.class.param_key