Added omniauth Facebook and actiontext to activeadmin

Author: vb-cmd

.rubocop.yml

@@ -139,7 +139,7 @@ Style/EnvHome: # new in 1.29
 Style/ExactRegexpMatch: # new in 1.51
   Enabled: true
 Style/FetchEnvVar: # new in 1.28
-  Enabled: true
+  Enabled: false
 Style/FileEmpty: # new in 1.48
   Enabled: true
 Style/FileRead: # new in 1.24

Gemfile

@@ -80,3 +80,11 @@ gem 'faker'
 gem 'bootstrap'
 
 gem "importmap-rails", "~> 1.2"
+
+gem "omniauth", "~> 2.1"
+
+gem "omniauth-google-oauth2", "~> 1.1"
+
+gem "omniauth-rails_csrf_protection", "~> 1.0"
+
+gem "omniauth-facebook", "~> 9.0"

Gemfile.lock

@@ -119,6 +119,10 @@ GEM
     execjs (2.8.1)
     faker (3.2.1)
       i18n (>= 1.8.11, < 2)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
     ffi (1.15.5)
     formtastic (4.0.0)
       actionpack (>= 5.2.0)
@@ -128,6 +132,7 @@ GEM
     has_scope (0.8.1)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
+    hashie (5.0.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
@@ -152,6 +157,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.6.3)
+    jwt (2.7.1)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -182,6 +188,7 @@ GEM
     mini_mime (1.1.5)
     minitest (5.19.0)
     msgpack (1.7.2)
+    multi_xml (0.6.0)
     net-imap (0.3.7)
       date
       net-protocol
@@ -196,6 +203,30 @@ GEM
       racc (~> 1.4)
     nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.0)
+      jwt (>= 1.0, < 3.0)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    omniauth (2.1.1)
+      hashie (>= 3.4.6)
+      rack (>= 2.2.3)
+      rack-protection
+    omniauth-facebook (9.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-google-oauth2 (1.1.1)
+      jwt (>= 2.0)
+      oauth2 (~> 2.0.6)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.8.0)
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
+      omniauth (~> 2.0)
+    omniauth-rails_csrf_protection (1.0.1)
+      actionpack (>= 4.2)
+      omniauth (~> 2.0)
     orm_adapter (0.5.0)
     parallel (1.23.0)
     parser (3.2.2.3)
@@ -208,6 +239,8 @@ GEM
       nio4r (~> 2.0)
     racc (1.7.1)
     rack (2.2.8)
+    rack-protection (3.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.7)
@@ -284,6 +317,9 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -297,6 +333,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
+    version_gem (1.1.3)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.0)
@@ -335,6 +372,10 @@ DEPENDENCIES
   json
   kaminari
   meta-tags
+  omniauth (~> 2.1)
+  omniauth-facebook (~> 9.0)
+  omniauth-google-oauth2 (~> 1.1)
+  omniauth-rails_csrf_protection (~> 1.0)
   pg
   puma
   rails (~> 7.0.6)

app/admin/comments.rb

@@ -27,15 +27,15 @@
   filter :published
   filter :body
   filter :post
-  filter :user, collection: User.all.map { |u| [u.email, u.id] }
+  filter :user#, collection: User.all.map { |u| [u.email, u.id] }
   filter :updated_at
   filter :created_at
 
   form do |f|
     f.inputs 'Attached' do
       f.semantic_errors
       f.input :post
-      f.input :user, collection: User.all.map { |u| [u.email, u.id] }
+      f.input :user#, collection: User.all.map { |u| [u.email, u.id] }
     end
 
     f.inputs 'Content' do

app/admin/likes.rb

@@ -9,15 +9,15 @@
     actions
   end
 
-  filter :user, collection: User.all.map { |u| [u.email, u.id] }
+  filter :user#, collection: User.all.map { |u| [u.email, u.id] }
   filter :record_type
   filter :created_at
   filter :updated_at
 
   form do |f|
     f.inputs do
       f.semantic_errors
-      f.input :user, collection: User.all.map { |u| [u.email, u.id] }
+      f.input :user#, collection: User.all.map { |u| [u.email, u.id] }
       f.input :record_type, as: :hidden, input_html: { value: 'Post' }
       f.input :record, collection: Post.all.map { |u| [u.title, u.id] }
     end

app/assets/stylesheets/application.scss

@@ -13,8 +13,13 @@
  *= require_self
  */
 
-@import "bootstrap";
+ 
+ @import "bootstrap";
+ 
+ .bg-body-tertiary {
+      background-color: #fff !important; 
+ }
 
 p img {
     width: 100%;
-}
+}

app/controllers/blog/authors_controller.rb

@@ -0,0 +1,7 @@
+module Blog
+  class AuthorsController < BaseController
+    def show
+      @author = AdminUser.find_by_name(params[:id])
+    end
+  end
+end

app/controllers/blog/user_profiles_controller.rb

@@ -5,8 +5,15 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   # devise :omniauthable, omniauth_providers: [:twitter]
 
   # You should also create an action method in this controller like this:
-  # def twitter
-  # end
+  def google_oauth2
+    @user = User.form_google_oauth2(request.env['omniauth.auth'])
+    sign_in_and_redirect @user
+  end
+
+  def facebook
+    @user = User.form_facebook(request.env['omniauth.auth'])
+    sign_in_and_redirect @user
+  end
 
   # More info at:
   # https://github.com/heartcombo/devise#omniauth

app/controllers/users/omniauth_callbacks_controller.rb

@@ -0,0 +1,2 @@
+module Blog::AuthorsHelper
+end

app/helpers/blog/authors_helper.rb

@@ -8,7 +8,9 @@ class User < ApplicationRecord
          :rememberable,
          :validatable,
          :recoverable,
-         :registerable
+         :registerable,
+         :omniauthable,
+         omniauth_providers: %i[google_oauth2 facebook]
 
   validates :name, presence: true
 
@@ -20,5 +22,21 @@ def ransackable_attributes(_auth_object = nil)
     def ransackable_associations(_auth_object = nil)
       %w[comments likes]
     end
+
+    def form_facebook(auth)
+      find_or_create_by(email: auth.info.email) do |user|
+        user.name = auth.info.name
+        user.email = auth.info.email
+        user.password = Devise.friendly_token
+      end
+    end
+
+    def form_google_oauth2(auth)
+      find_or_create_by(email: auth.info.email) do |user|
+        user.name = auth.info.name
+        user.email = auth.info.email
+        user.password = Devise.friendly_token
+      end
+    end
   end
 end

app/helpers/blog/user_profiles_helper.rb

@@ -1,17 +1,17 @@
 <% set_meta_tags(
-  title: t('.meta.title', name: @profile.name),
-  description: t('.meta.description', name: @profile.name, site_name: t('site.name')),
-  keywords: t('.meta.keywords', name: @profile.name),
-  canonical: user_profile_url(@profile.name),
+  title: t('.meta.title', name: @author.name),
+  description: t('.meta.description', name: @author.name, site_name: t('site.name')),
+  keywords: t('.meta.keywords', name: @author.name),
+  canonical: author_url(@author.name),
 ) %>
 <div class="card" style="margin-bottom: 10px">
-  <h1 class="card-header"><%= @profile.name %></h1>
+  <h1 class="card-header"><%= @author.name %></h1>
   <div class="card-body">
     <div class="container text-center">
       <div class="row">
         <div class="col-2">
-          <% if @profile.avatar.attached? %>
-              <%= image_tag @profile.avatar, size: "250x250" %>
+          <% if @author.avatar.attached? %>
+              <%= image_tag @author.avatar, size: "250x250" %>
           <% else %>
             <svg class="bd-placeholder-img" height="250" width="250" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Placeholder: Image cap" preserveAspectRatio="xMidYMid slice" focusable="false">
               <rect width="100%" height="100%" fill="#868e96"></rect>
@@ -20,7 +20,7 @@
           <% end %>
         </div>
         <div class="col-10">
-          <%= @profile.body %>
+          <%= @author.body %>
         </div>
       </div>
     </div>

app/models/user.rb

@@ -7,6 +7,6 @@
   </div>
   <ul class="list-group list-group-flush">
     <li class="list-group-item"><%= t('blog.posts.show.category') %> <%= link_to post.category.title, category_path(post.category), class: 'card-link' %></li>
-    <li class="list-group-item"><%= t('blog.posts.show.author') %> <%= link_to post.admin_user.name, user_profile_path(post.admin_user.name), class: 'card-link' %></li>
+    <li class="list-group-item"><%= t('blog.posts.show.author') %> <%= link_to post.admin_user.name, author_path(post.admin_user.name), class: 'card-link' %></li>
   </ul>
 </div>

app/views/blog/user_profiles/show.html.erb renamed to app/views/blog/authors/show.html.erb

@@ -12,7 +12,7 @@
   <ul class="list-group list-group-flush">
     <li class="list-group-item"><%= t('.category') %> <%= link_to @post.category.title, category_path(@post.category), class: "card-link" %></li>
     <li class="list-group-item"><%= t('.added') %> <%= @post.date_created %></li>
-    <li class="list-group-item"><%= t('.author') %> <%= link_to @post.admin_user.name, user_profile_path(@post.admin_user.name), class: 'card-link' %></li>
+    <li class="list-group-item"><%= t('.author') %> <%= link_to @post.admin_user.name, author_path(@post.admin_user.name), class: 'card-link' %></li>
     <li class="list-group-item">
       <div id="likes"><%= render 'blog/likes/update' %></div>
     </li>

app/views/blog/posts/_post.html.erb

@@ -1,7 +1,11 @@
+<% set_meta_tags(
+  title: 'Resend confirmation instructions',
+  canonical: '',
+) %>
 <h2>Resend confirmation instructions</h2>
 
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= render "users/shared/error_messages", resource: resource %>
 
   <div class="field">
     <%= f.label :email %><br />
@@ -13,4 +17,4 @@
   </div>
 <% end %>
 
-<%= render "devise/shared/links" %>
+<%= render "users/shared/links" %>

app/views/blog/posts/show.html.erb

@@ -1,6 +1,11 @@
+<% set_meta_tags(
+  title: 'Change your password',
+  canonical: edit_user_password_url,
+) %>
+
 <h2>Change your password</h2>
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= render "users/shared/error_messages", resource: resource %>
   <%= f.hidden_field :reset_password_token %>
   <div class="mb-3">
     <%= f.label :password, "New password", class: "form-label" %>
@@ -15,4 +20,4 @@
   </div>
   <%= f.submit "Change my password", class: "btn btn-primary" %>
 <% end %>
-<%= render "devise/shared/links" %>
+<%= render "users/shared/links" %>

app/views/users/confirmations/new.html.erb

@@ -1,10 +1,15 @@
+<% set_meta_tags(
+  title: 'Forgot your password?',
+  canonical: new_user_password_url,
+) %>
+
 <h2>Forgot your password?</h2>
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= render "users/shared/error_messages", resource: resource %>
   <div class="mb-3">
     <%= f.label :email, class: "form-label" %>
     <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control" %>
   </div>
   <%= f.submit "Send me reset password instructions",  class: "btn btn-primary" %>
 <% end %>
-<%= render "devise/shared/links" %>
+<%= render "users/shared/links" %>

app/views/users/passwords/edit.html.erb

@@ -1,6 +1,11 @@
+<% set_meta_tags(
+  title: "Edit #{resource_name.to_s.humanize}",
+  canonical: edit_user_registration_url,
+) %>
+
 <h3>Edit <%= resource_name.to_s.humanize %></h3>
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= render "users/shared/error_messages", resource: resource %>
   <div class="mb-3">
     <%= f.label :email, class: "form-label" %>
     <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control" %>

app/views/users/passwords/new.html.erb

@@ -1,6 +1,11 @@
+<% set_meta_tags(
+  title: "Sign up",
+  canonical: new_user_registration_url,
+) %>
+
 <h2>Sign up</h2>
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= render "users/shared/error_messages", resource: resource %>
   <div class="mb-3">
     <%= f.label :email, class: "form-label" %>
     <%= f.email_field :email, autofocus: true, autocomplete: "email",  class: "form-control" %>
@@ -24,4 +29,4 @@
     <%= f.submit "Sign up", class: "btn btn-primary" %>
   </div>
 <% end %>
-<%= render "devise/shared/links" %>
+<%= render "users/shared/links" %>