Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

935 sign in via google #952

Merged
merged 2 commits into from
Dec 1, 2024
Merged

935 sign in via google #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52dd954
add omniauth
NVMakarenko Nov 2, 2024
841c008
fix rubocop
NVMakarenko Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/devise/sessions/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="flex flex-row-reverse flex-wrap content-center gap-3">
<%= f.submit t(".log_in"), class: "btn w-full font-bold text-center btn-green" %>

<%#= render "devise/shared/links" %>
<%= render "devise/shared/links" %>
</div>
<% end %>
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/views/devise/shared/_links.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<fieldset class="auth-login-links">
<legend class="float-none w-auto text-sm px-2.5 mx-auto"><%= t("devise.omniauth_callbacks.continue_with") %></legend>

<%#= link_to user_google_oauth2_omniauth_authorize_path do %>
<%#= image_tag("icons/google.svg", alt: "Google Sign In", class: "w-14") %>
<%# end %>
<%= link_to user_google_oauth2_omniauth_authorize_path do %>
<%= image_tag("icons/google.svg", alt: "Google Sign In", class: "w-14") %>
<% end %>
</fieldset>
</div>
<% end %>
8 changes: 4 additions & 4 deletions config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
# end
mount Sidekiq::Web => "/sidekiq"

# devise_for :users, only: :omniauth_callbacks,
# controllers: { omniauth_callbacks:
# "users/omniauth_callbacks" }
devise_for :users, only: :omniauth_callbacks,
controllers: { omniauth_callbacks:
"users/omniauth_callbacks" }

get "/", to: "application#redirection", as: :root_redirection

Expand All @@ -19,7 +19,7 @@
end

scope "/(:locale)", locale: /uk|en/ do
devise_for :users, only: [:session]
devise_for :users, only: [:session], skip: [:omniauth_callbacks, :registration]
# devise_for :users, skip: [:omniauth_callbacks, :registration]

# as :user do
Expand Down
Loading