From 1f152e0eca4c43b984f698dc237a4fb1bd6462ba Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Mon, 25 Aug 2025 14:46:29 +0300 Subject: [PATCH] Combine auth button helpers --- app/helpers/user_helper.rb | 27 ++++++------------- .../application/_auth_providers.html.erb | 2 +- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index a46ea5ad0..b31238218 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -52,28 +52,17 @@ module UserHelper # External authentication support - def auth_button(provider) + def auth_button(provider, preferred: false) + body = image_tag("auth_providers/#{provider}.svg", + :alt => t("application.auth_providers.#{provider}.alt"), + :class => "rounded-1", + :size => "36") + body += t("application.auth_providers.#{provider}.title") if preferred link_to( - image_tag("auth_providers/#{provider}.svg", - :alt => t("application.auth_providers.#{provider}.alt"), - :class => "rounded-1", - :size => "36"), + body, auth_path(:provider => provider), :method => :post, - :class => "auth_button btn btn-outline-secondary border p-2", - :title => t("application.auth_providers.#{provider}.title") - ) - end - - def auth_button_preferred(provider) - link_to( - image_tag("auth_providers/#{provider}.svg", - :alt => t("application.auth_providers.#{provider}.alt"), - :class => "rounded-1", - :size => "36") + t("application.auth_providers.#{provider}.title"), - auth_path(:provider => provider), - :method => :post, - :class => "auth_button btn btn-outline-secondary border py-2 px-4 d-flex gap-3 justify-content-center align-items-center", + :class => ["auth_button btn btn-outline-secondary border p-2", { "px-4 d-flex gap-3 justify-content-center align-items-center" => preferred }], :title => t("application.auth_providers.#{provider}.title") ) end diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb index 9fe0223a0..4e04107fb 100644 --- a/app/views/application/_auth_providers.html.erb +++ b/app/views/application/_auth_providers.html.erb @@ -6,7 +6,7 @@ <% if prefered_auth_button_available %>
- <%= auth_button_preferred @preferred_auth_provider %> + <%= auth_button @preferred_auth_provider, :preferred => true %>
<% end %> -- 2.39.5