Merge pull request #952 from ita-social-projects/935-sign-in-via-google

935 sign in via google
ita-social-projects · Dec 1, 2024 · c2f816b · c2f816b
2 parents 4cf826e + 841c008
commit c2f816b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -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>

diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
@@ -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 %>
diff --git a/config/routes.rb b/config/routes.rb
@@ -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
 
@@ -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