Added cancancan and actiontext. Changed some controllers and models

Author: vb-cmd

.solargraph.yml

@@ -19,5 +19,5 @@ formatter:
     extra_args: []
 require_paths: []
 plugins:
-- solargraph-rails
+  - solargraph-rails
 max_files: 5000

Gemfile

@@ -73,8 +73,10 @@ gem 'meta-tags'
 
 gem 'cancancan'
 
-gem "activeadmin", "~> 3.0"
+gem 'activeadmin'
 
-gem "faker", "~> 3.2"
+gem 'faker'
 
-gem "bootstrap", "~> 5.2"
+gem 'bootstrap'
+
+gem "importmap-rails", "~> 1.2"

Gemfile.lock

@@ -88,9 +88,9 @@ GEM
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
-    bootstrap (5.2.3)
+    bootstrap (5.3.1)
       autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 2.11.6, < 3)
+      popper_js (>= 2.11.8, < 3)
       sassc-rails (>= 2.0.0)
     builder (3.2.4)
     cancancan (3.5.0)
@@ -133,6 +133,9 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    importmap-rails (1.2.1)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
     inherited_resources (1.13.1)
       actionpack (>= 5.2, < 7.1)
       has_scope (~> 0.6)
@@ -191,13 +194,15 @@ GEM
     nio4r (2.5.9)
     nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
     pg (1.5.3)
-    popper_js (2.11.7)
+    popper_js (2.11.8)
     public_suffix (5.0.3)
     puma (6.3.0)
       nio4r (~> 2.0)
@@ -316,15 +321,16 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  activeadmin (~> 3.0)
+  activeadmin
   bootsnap
-  bootstrap (~> 5.2)
+  bootstrap
   cancancan
   capybara
   debug
   devise
-  faker (~> 3.2)
+  faker
   image_processing (~> 1.2)
+  importmap-rails (~> 1.2)
   jbuilder
   json
   kaminari

app/admin/admin_users.rb

@@ -1,17 +1,26 @@
 ActiveAdmin.register AdminUser do
-  permit_params :email,
+  permit_params :avatar,
+                :email,
                 :name,
                 :body,
+                :role,
                 :posts_count,
                 :pages_count,
                 :password,
                 :password_confirmation
 
   index do
     selectable_column
-    id_column
+    column 'Avatar' do |admin_user|
+      if admin_user.avatar.attached?
+        image_tag admin_user.avatar, size: '50x50'
+      else
+        para 'No avatar'
+      end
+    end
     column :email
     column :name
+    column :role
     column :posts_count
     column :pages_count
     column :current_sign_in_at
@@ -23,7 +32,7 @@
   show do |admin_user|
     panel 'Avatar' do
       if admin_user.avatar.attached?
-        image_tag admin_user.avatar
+        image_tag admin_user.avatar, size: '500x500'
       else
         para 'No avatar'
       end
@@ -36,6 +45,7 @@
     attributes_table do
       row :name
       row :email
+      row :role
       row :posts_count
       row :pages_count
       row :reset_password_token
@@ -52,6 +62,7 @@
 
   filter :email
   filter :name
+  filter :role
   filter :posts_count
   filter :pages_count
   filter :current_sign_in_at
@@ -65,6 +76,7 @@
       f.input :email
       f.input :name
       f.input :body
+      f.input :role
       f.input :avatar, as: :file
       f.input :password
       f.input :password_confirmation

app/admin/categories.rb

@@ -2,15 +2,14 @@
   permit_params :meta_title,
                 :meta_description,
                 :meta_keywords,
+                :description,
                 :title,
                 :posts_count
 
   index do
     selectable_column
-    id_column
     column :title
     column :posts_count
-    column :updated_at
     column :created_at
     actions
   end
@@ -36,11 +35,21 @@
   filter :created_at
 
   form do |f|
+    div do
+      javascript_importmap_tags
+    end
     f.inputs 'Content' do
       f.semantic_errors
       f.input :title
-      f.input :description
     end
+
+    f.inputs 'Body' do
+      f.semantic_errors
+      li style: 'margin: 10px;' do
+        f.rich_text_area :description
+      end
+    end
+
     f.inputs 'Meta data' do
       f.semantic_errors
       f.input :meta_title

app/admin/comments.rb

@@ -4,23 +4,18 @@
                 :post_id,
                 :user_id
 
-  batch_action :published do |ids|
-    batch_action_collection.find(ids).each do |comment|
-      comment.update(published: true)
-    end
+  batch_action :publish do |ids|
+    Comment.where(id: ids).update_all(published: true)
     redirect_to admin_comments_path, notice: 'Comment(s) was published'
   end
 
-  batch_action :not_published do |ids|
-    batch_action_collection.find(ids).each do |comment|
-      comment.update(published: false)
-    end
+  batch_action :not_publish do |ids|
+    Comment.where(id: ids).update_all(published: false)
     redirect_to admin_comments_path, notice: 'Comment(s) was not published'
   end
 
   index do
     selectable_column
-    id_column
     column :user
     column :body
     column :post
@@ -32,7 +27,7 @@
   filter :published
   filter :body
   filter :post
-  filter :user, as: :select, 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
 

app/admin/likes.rb

@@ -3,14 +3,13 @@
 
   index do
     selectable_column
-    id_column
     column :user
     column :record
     column :created_at
     actions
   end
 
-  filter :user, as: :select, 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

app/admin/pages.rb

@@ -7,23 +7,18 @@
                 :published,
                 :admin_user_id
 
-  batch_action :published do |ids|
-    batch_action_collection.find(ids).each do |page|
-      page.update(published: true)
-    end
+  batch_action :publish do |ids|
+    Page.where(id: ids).update_all(published: true)
     redirect_to admin_pages_path, notice: 'Page(s) was published'
   end
 
-  batch_action :not_published do |ids|
-    batch_action_collection.find(ids).each do |page|
-      page.update(published: false)
-    end
+  batch_action :not_publish do |ids|
+    Page.where(id: ids).update_all(published: false)
     redirect_to admin_pages_path, notice: 'Page(s) was not published'
   end
 
   index do
     selectable_column
-    id_column
     column :title
     column :admin_user
     column :published
@@ -55,6 +50,10 @@
   filter :updated_at
 
   form do |f|
+    div do
+      javascript_importmap_tags
+    end
+
     f.inputs 'Attached' do
       f.semantic_errors
       f.input :admin_user
@@ -63,10 +62,16 @@
     f.inputs 'Content' do
       f.semantic_errors
       f.input :title
-      f.input :body
       f.input :published
     end
 
+    f.inputs 'Body' do
+      f.semantic_errors
+      li style: 'margin: 10px' do
+        f.rich_text_area :body
+      end
+    end
+
     f.inputs 'Meta data' do
       f.semantic_errors
       f.input :meta_title

app/admin/posts.rb

@@ -3,44 +3,37 @@
                 :meta_description,
                 :meta_keywords,
                 :title,
+                :description,
+                :body,
                 :published,
                 :comments_enabled,
                 :category_id,
                 :likes_count,
                 :comments_count,
                 :admin_user_id
 
-  batch_action :published do |ids|
-    batch_action_collection.find(ids).each do |post|
-      post.update(published: true)
-    end
+  batch_action :publish do |ids|
+    Post.where(id: ids).update_all(published: true)
     redirect_to admin_posts_path, notice: 'Post(s) was published'
   end
 
-  batch_action :not_published do |ids|
-    batch_action_collection.find(ids).each do |post|
-      post.update(published: false)
-    end
+  batch_action :not_publish do |ids|
+    Post.where(id: ids).update_all(published: false)
     redirect_to admin_posts_path, notice: 'Post(s) was not published'
   end
 
-  batch_action :comments_enabled do |ids|
-    batch_action_collection.find(ids).each do |post|
-      post.update(comments_enabled: true)
-    end
+  batch_action :comments_enable do |ids|
+    Post.where(id: ids).update_all(comments_enabled: true)
     redirect_to admin_posts_path, notice: 'Comment(s) were enabled'
   end
 
-  batch_action :comments_disabled do |ids|
-    batch_action_collection.find(ids).each do |post|
-      post.update(comments_enabled: false)
-    end
+  batch_action :comments_disable do |ids|
+    Post.where(id: ids).update_all(comments_enabled: false)
     redirect_to admin_posts_path, notice: 'Comment(s) were disabled'
   end
 
   index do
     selectable_column
-    id_column
     column :title
     column :published
     column :comments_enabled
@@ -88,21 +81,37 @@
   filter :updated_at
 
   form do |f|
+    div do
+      javascript_importmap_tags
+    end
+
     f.inputs 'Attached' do
       f.semantic_errors
       f.input :category
       f.input :admin_user
     end
 
-    f.inputs 'Content' do
+    f.inputs 'Settings' do
       f.semantic_errors
       f.input :title
-      f.input :body
-      f.input :description
       f.input :published
       f.input :comments_enabled
     end
 
+    f.inputs 'Description' do
+      f.semantic_errors
+      li style: 'margin: 10px' do
+        f.rich_text_area :description
+      end
+    end
+
+    f.inputs 'Body' do
+      f.semantic_errors
+      li style: 'margin: 10px' do
+        f.rich_text_area :body
+      end
+    end
+
     f.inputs 'Meta data' do
       f.semantic_errors
       f.input :meta_title