panda-cms 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a11a8249369ac564953d025d4887020ced356b6357a5d8c823580c27e39394cb
-  data.tar.gz: 04d6f8dab1ae48f77414ea10b515739f36a54c0f37b79e82f7d9282305af03a1
+  metadata.gz: 9a439141e4b2fd9c4167ea0bd872096a648fe1a9fcfc237e6a1c20e16d2a2562
+  data.tar.gz: fa28c3d1d698b9725140618603505a0120c0e58430ff4c923ccd986f3e27daa5
 SHA512:
-  metadata.gz: eb71f7f01ba585e142738e5d28510c5a0508b69843aab7c5b60fbf5cbaa7bb89419a916df923d0282cd2311a61614d836002635e67b9d6dfadd4bd6dba4e3f81
-  data.tar.gz: a795545501c2633b3e911b93ccd5c302adbb7d9c9f5a0ab6c363196ae4e0d18089a2b99cc3ada4b66e44902c8a5828212251b331e1b8b4d4762dfafef74dfe0f
+  metadata.gz: 1923aea63bd5a266487a4a25e852df4cc96e0cba408fd9cb9351a5a302a20ad7e07ef22254dbe01ef7751ca3b35d0a9cdfb941a821e56730455fc73f0223083b
+  data.tar.gz: 54291d3de7b95047412a2c6c9e50b94f187457803bfd1609f0f9a947348de612c2ca6480f33e8e5df5f0305c131d638e025f1d6e04cc30c2997ce4ccb2a9c56e

data/app/components/panda/cms/admin/user_activity_component.html.erb

@@ -1,6 +1,6 @@
-<% if user.is_a?(Panda::CMS::User) && time %>
+<% if user.is_a?(Panda::Core::User) && time %>
   <%= render Panda::CMS::Admin::UserDisplayComponent.new(user: user, metadata: "#{time_ago_in_words(time)} ago") %>
-<% elsif user.is_a?(Panda::CMS::User) %>
+<% elsif user.is_a?(Panda::Core::User) %>
   <%= render Panda::CMS::Admin::UserDisplayComponent.new(user: user, metadata: "Not published") %>
 <% elsif time %>
   <div class="text-black/60"><%= time_ago_in_words(time) %> ago</div>

data/app/components/panda/cms/admin/user_activity_component.rb

@@ -8,10 +8,10 @@ module Panda
 
         # @param model [ActiveRecord::Base] Model instance to which the user activity is related
         # @param at [ActiveSupport::TimeWithZone] Time of the activity
-        # @param user [Panda::CMS::User] User who performed the activity
+        # @param user [Panda::Core::User] User who performed the activity
         def initialize(model: nil, at: nil, user: nil)
           @model = model
-          @user = user if user.is_a?(::Panda::CMS::User)
+          @user = user if user.is_a?(::Panda::Core::User)
           @time = at if at.is_a?(::ActiveSupport::TimeWithZone)
         end
       end

data/app/components/panda/cms/admin/user_display_component.html.erb

@@ -10,7 +10,7 @@
     </div>
     <% end %>
     <div class="ml-3">
-      <p class="text-sm text-black"><%= user.firstname %> <%= user.lastname %></p>
+      <p class="text-sm text-black"><%= user.name %></p>
       <% if metadata %><p class="text-sm text-black/60"><%= metadata %></p><% end %>
     </div>
   </div>

data/app/components/panda/cms/admin/user_display_component.rb

@@ -7,8 +7,8 @@ module Panda
         attr_accessor :user_id, :user, :metadata
 
         def initialize(user_id: nil, user: nil, metadata: "")
-          @user = if user.nil? && user_id.present? && Panda::CMS::User.find(user_id)
-            Panda::CMS::User.find(user_id)
+          @user = if user.nil? && user_id.present? && Panda::Core::User.find(user_id)
+            Panda::Core::User.find(user_id)
           else
             user
           end

data/app/components/panda/cms/rich_text_component.rb

@@ -78,13 +78,13 @@ module Panda
                   else
                     # If not valid EditorJS, try to convert from HTML
                     begin
-                      editor_content = Panda::CMS::HtmlToEditorJsConverter.convert(@content)
+                      editor_content = Panda::Editor::HtmlToEditorJsConverter.convert(@content)
                       if valid_editor_js_content?(editor_content)
                         editor_content
                       else
                         empty_editor_js_content
                       end
-                    rescue Panda::CMS::HtmlToEditorJsConverter::ConversionError => e
+                    rescue Panda::Editor::HtmlToEditorJsConverter::ConversionError => e
                       Rails.logger.error("HTML conversion error: #{e.message}")
                       empty_editor_js_content
                     end
@@ -93,13 +93,13 @@ module Panda
                   Rails.logger.error("JSON parse error: #{e.message}")
                   # Try to convert from HTML
                   begin
-                    editor_content = Panda::CMS::HtmlToEditorJsConverter.convert(@content)
+                    editor_content = Panda::Editor::HtmlToEditorJsConverter.convert(@content)
                     if valid_editor_js_content?(editor_content)
                       editor_content
                     else
                       empty_editor_js_content
                     end
-                  rescue Panda::CMS::HtmlToEditorJsConverter::ConversionError => e
+                  rescue Panda::Editor::HtmlToEditorJsConverter::ConversionError => e
                     Rails.logger.error("HTML conversion error: #{e.message}")
                     empty_editor_js_content
                   end
@@ -129,7 +129,7 @@ module Panda
                       parsed_content["blocks"][0]["data"]["text"].blank?
                     "<p></p>".html_safe
                   else
-                    renderer = Panda::CMS::EditorJs::Renderer.new(parsed_content)
+                    renderer = Panda::Editor::Renderer.new(parsed_content)
                     rendered = renderer.render
                     rendered.presence&.html_safe || "<p></p>".html_safe
                   end

data/app/controllers/panda/cms/admin/base_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Panda
+  module CMS
+    module Admin
+      # Base controller for all CMS admin controllers
+      # Inherits from Core AdminController for authentication
+      # Adds CMS-specific helpers and functionality
+      class BaseController < ::Panda::Core::AdminController
+        # Include CMS helpers so views have access to panda_cms_form_with, etc.
+        helper Panda::CMS::ApplicationHelper
+
+        # Include the helper methods in the controller as well
+        include Panda::CMS::ApplicationHelper
+      end
+    end
+  end
+end

data/app/controllers/panda/cms/admin/block_contents_controller.rb

@@ -3,10 +3,9 @@
 module Panda
   module CMS
     module Admin
-      class BlockContentsController < ApplicationController
+      class BlockContentsController < ::Panda::CMS::Admin::BaseController
         before_action :set_page, only: %i[update]
         before_action :set_block_content, only: %i[update]
-        before_action :authenticate_admin_user!
 
         # @type PATCH/PUT
         # @return

data/app/controllers/panda/cms/admin/dashboard_controller.rb

@@ -5,18 +5,19 @@ require "groupdate"
 module Panda
   module CMS
     module Admin
-      class DashboardController < ApplicationController
+      class DashboardController < ::Panda::Core::Admin::DashboardController
         before_action :set_initial_breadcrumb, only: %i[show]
-        before_action :authenticate_admin_user!
 
-        # GET /admin
+        # Override the panda-core dashboard with CMS-specific dashboard
         def show
+          # Render the CMS dashboard view
+          render "panda/cms/admin/dashboard/show"
         end
 
         private
 
         def set_initial_breadcrumb
-          add_breadcrumb "Dashboard", Panda::CMS.route_namespace
+          add_breadcrumb "Dashboard", admin_cms_dashboard_path
         end
       end
     end

data/app/controllers/panda/cms/admin/files_controller.rb

@@ -3,9 +3,7 @@
 module Panda
   module CMS
     module Admin
-      class FilesController < ApplicationController
-        before_action :authenticate_admin_user!
-
+      class FilesController < ::Panda::CMS::Admin::BaseController
         def create
           file = params[:image]
           return render json: {success: 0} unless file

data/app/controllers/panda/cms/admin/forms_controller.rb

@@ -3,9 +3,8 @@
 module Panda
   module CMS
     module Admin
-      class FormsController < ApplicationController
+      class FormsController < ::Panda::CMS::Admin::BaseController
         before_action :set_initial_breadcrumb, only: %i[index show]
-        before_action :authenticate_admin_user!
 
         # Lists all forms
         # @type GET
@@ -18,7 +17,7 @@ module Panda
         def show
           form = Panda::CMS::Form.find(params[:id])
 
-          add_breadcrumb form.name, admin_form_path(form)
+          add_breadcrumb form.name, admin_cms_form_path(form)
           submissions = form.form_submissions.order(created_at: :desc)
           # TODO: Set a whitelist of fields we allow to be submitted for the form, shown in this view
           # and a formatting array of how to display them... eventually?
@@ -35,7 +34,7 @@ module Panda
         private
 
         def set_initial_breadcrumb
-          add_breadcrumb "Forms", admin_forms_path
+          add_breadcrumb "Forms", admin_cms_forms_path
         end
 
         # Only allow a list of trusted parameters through

data/app/controllers/panda/cms/admin/menus_controller.rb

@@ -3,9 +3,8 @@
 module Panda
   module CMS
     module Admin
-      class MenusController < ApplicationController
+      class MenusController < ::Panda::CMS::Admin::BaseController
         before_action :set_initial_breadcrumb, only: %i[index]
-        before_action :authenticate_admin_user!
 
         # Lists all menus which can be managed by the administrator
         # @type GET
@@ -22,7 +21,7 @@ module Panda
         end
 
         def set_initial_breadcrumb
-          add_breadcrumb "Menus", admin_menus_path
+          add_breadcrumb "Menus", admin_cms_menus_path
         end
       end
     end

data/app/controllers/panda/cms/admin/pages_controller.rb

@@ -3,9 +3,9 @@
 module Panda
   module CMS
     module Admin
-      class PagesController < ApplicationController
+      class PagesController < ::Panda::CMS::Admin::BaseController
         before_action :set_initial_breadcrumb, only: %i[index edit new create update]
-        before_action :authenticate_admin_user!
+        # Authentication is automatically enforced by AdminController
 
         # Lists all pages which can be managed by the administrator
         # @type GET
@@ -25,7 +25,7 @@ module Panda
         # Loads the page editor
         # @type GET
         def edit
-          add_breadcrumb page.title, edit_admin_page_path(page)
+          add_breadcrumb page.title, edit_admin_cms_page_path(page)
 
           render :edit, locals: {page: page, template: page.template}
         end
@@ -44,7 +44,7 @@ module Panda
           end
 
           if page.save
-            redirect_to edit_admin_page_path(page), notice: "The page was successfully created."
+            redirect_to edit_admin_cms_page_path(page), notice: "The page was successfully created."
           else
             flash.now[:error] = page.errors.full_messages.to_sentence
             locals = setup_new_page_form(page: page)
@@ -56,7 +56,7 @@ module Panda
         # @return
         def update
           if page.update(page_params)
-            redirect_to edit_admin_page_path(page),
+            redirect_to edit_admin_cms_page_path(page),
               status: :see_other,
               flash: {success: "This page was successfully updated!"}
           else
@@ -79,11 +79,11 @@ module Panda
         end
 
         def set_initial_breadcrumb
-          add_breadcrumb "Pages", admin_pages_path
+          add_breadcrumb "Pages", admin_cms_pages_path
         end
 
         def setup_new_page_form(page:)
-          add_breadcrumb "Add Page", new_admin_page_path
+          add_breadcrumb "Add Page", new_admin_cms_page_path
           {
             page: page,
             available_templates: Panda::CMS::Template.available

data/app/controllers/panda/cms/admin/posts_controller.rb

@@ -5,9 +5,8 @@ require "json"
 module Panda
   module CMS
     module Admin
-      class PostsController < ApplicationController
+      class PostsController < ::Panda::CMS::Admin::BaseController
         before_action :set_initial_breadcrumb, only: %i[index edit new create update]
-        before_action :authenticate_admin_user!
 
         # Get all posts
         # @type GET
@@ -27,7 +26,7 @@ module Panda
         # Loads the post editor
         # @type GET
         def edit
-          add_breadcrumb post.title, edit_admin_post_path(post.admin_param)
+          add_breadcrumb post.title, edit_admin_cms_post_path(post.admin_param)
           render :edit, locals: {post: post}
         end
 
@@ -39,7 +38,7 @@ module Panda
 
           if @post.save
             Rails.logger.debug "Post saved successfully"
-            redirect_to edit_admin_post_path(@post.admin_param), notice: "The post was successfully created!"
+            redirect_to edit_admin_cms_post_path(@post.admin_param), notice: "The post was successfully created!"
           else
             Rails.logger.debug "Post save failed: #{@post.errors.full_messages.inspect}"
             flash.now[:error] = @post.errors.full_messages.join(", ")
@@ -60,13 +59,13 @@ module Panda
           update_params[:user_id] = current_user.id
           if post.update(update_params)
             Rails.logger.debug "Post updated successfully"
-            add_breadcrumb post.title, edit_admin_post_path(post.admin_param)
+            add_breadcrumb post.title, edit_admin_cms_post_path(post.admin_param)
             flash[:success] = "The post was successfully updated"
-            redirect_to edit_admin_post_path(post.admin_param), status: :see_other
+            redirect_to edit_admin_cms_post_path(post.admin_param), status: :see_other
           else
             Rails.logger.debug "Post update failed: #{post.errors.full_messages.inspect}"
             Rails.logger.debug "Preserving content: #{post_params[:content].inspect}"
-            add_breadcrumb post.title.presence || "Edit Post", edit_admin_post_path(post.admin_param)
+            add_breadcrumb post.title.presence || "Edit Post", edit_admin_cms_post_path(post.admin_param)
             flash.now[:error] = post.errors.full_messages.join(", ")
             render :edit, locals: {
               post: post,
@@ -92,11 +91,11 @@ module Panda
         end
 
         def set_initial_breadcrumb
-          add_breadcrumb "Posts", admin_posts_path
+          add_breadcrumb "Posts", admin_cms_posts_path
         end
 
         def setup_new_post_form(post: nil, preserved_content: nil)
-          add_breadcrumb "Add Post", new_admin_post_path
+          add_breadcrumb "Add Post", new_admin_cms_post_path
 
           post ||= Panda::CMS::Post.new(
             status: "active",
@@ -105,7 +104,7 @@ module Panda
 
           {
             post: post,
-            url: admin_posts_path,
+            url: admin_cms_posts_path,
             preserved_content: preserved_content
           }
         end

data/app/controllers/panda/cms/admin/settings/bulk_editor_controller.rb

@@ -4,7 +4,7 @@ module Panda
   module CMS
     module Admin
       module Settings
-        class BulkEditorController < ApplicationController
+        class BulkEditorController < ::Panda::CMS::Admin::BaseController
           before_action :set_initial_breadcrumb, only: %i[new]
 
           def new
@@ -15,7 +15,7 @@ module Panda
             begin
               debug_output = BulkEditor.import(params[:site_content])
             rescue JSON::ParserError
-              redirect_to admin_settings_bulk_editor_path,
+              redirect_to admin_cms_settings_bulk_editor_path,
                 flash: {error: "Error parsing content; are you sure this update is valid? Reverting..."}
               return
             end
@@ -24,7 +24,7 @@ module Panda
             @json_data = BulkEditor.export
 
             if debug_output[:error].empty? && debug_output[:warning].empty? && debug_output[:success].empty?
-              redirect_to admin_settings_bulk_editor_path, flash: {success: "No changes were found!"}
+              redirect_to admin_cms_settings_bulk_editor_path, flash: {success: "No changes were found!"}
             else
               @debug = debug_output
               render :new, flash: {warning: "Please review the output below for more information."}
@@ -34,7 +34,7 @@ module Panda
           private
 
           def set_initial_breadcrumb
-            add_breadcrumb "Settings", admin_settings_path
+            add_breadcrumb "Settings", admin_cms_settings_path
             add_breadcrumb "Bulk Editor", "#"
           end
         end

data/app/controllers/panda/cms/admin/settings_controller.rb

@@ -3,9 +3,8 @@
 module Panda
   module CMS
     module Admin
-      class SettingsController < ApplicationController
+      class SettingsController < ::Panda::CMS::Admin::BaseController
         before_action :set_initial_breadcrumb, only: %i[index show]
-        before_action :authenticate_admin_user!
 
         def index
         end
@@ -16,7 +15,7 @@ module Panda
         private
 
         def set_initial_breadcrumb
-          add_breadcrumb "Settings", admin_settings_path
+          add_breadcrumb "Settings", admin_cms_settings_path
         end
       end
     end

data/app/controllers/panda/cms/application_controller.rb

@@ -28,14 +28,22 @@ module Panda
       # Set the current request details
       # @return [void]
       def set_current_request_details
+        # Set Core current attributes
+        Panda::Core::Current.request_id = request.uuid
+        Panda::Core::Current.user_agent = request.user_agent
+        Panda::Core::Current.ip_address = request.ip
+        Panda::Core::Current.root = request.base_url
+        Panda::Core::Current.user ||= Panda::Core::User.find_by(id: session[:user_id]) if session[:user_id]
+
+        # Set CMS current attributes (inherits from Core so has access to all Core attributes)
         Panda::CMS::Current.request_id = request.uuid
         Panda::CMS::Current.user_agent = request.user_agent
         Panda::CMS::Current.ip_address = request.ip
         Panda::CMS::Current.root = request.base_url
+        Panda::CMS::Current.user = Panda::Core::Current.user
         Panda::CMS::Current.page = nil
-        Panda::CMS::Current.user ||= User.find_by(id: session[:user_id]) if session[:user_id]
 
-        Panda::CMS.config.url ||= Panda::CMS::Current.root
+        Panda::CMS.config.url ||= Panda::Core::Current.root
       end
 
       def authenticate_user!
@@ -45,17 +53,17 @@ module Panda
       def authenticate_admin_user!
         return if user_signed_in? && current_user.admin?
 
-        redirect_to admin_login_path,
+        redirect_to panda_core.admin_login_path,
           flash: {error: "Please login to view this!"}
       end
 
       # Required for paper_trail and seems as good as convention these days
       def current_user
-        Panda::CMS::Current.user
+        Panda::Core::Current.user
       end
 
       def user_signed_in?
-        !!Panda::CMS::Current.user
+        !!Panda::Core::Current.user
       end
     end
   end

data/app/controllers/panda/cms/pages_controller.rb

@@ -82,9 +82,9 @@ module Panda
       def record_visit
         RecordVisitJob.perform_later(
           path: request.path,
-          user_id: Current.user&.id,
+          user_id: Panda::Core::Current.user&.id,
           redirect_id: @redirect&.id,
-          page_id: Current.page&.id,
+          page_id: Panda::CMS::Current.page&.id,
           user_agent: request.user_agent,
           ip_address: request.remote_ip,
           referer: request.referer, # TODO: Fix the naming of this column

data/app/helpers/panda/cms/application_helper.rb

@@ -24,8 +24,8 @@ module Panda
       end
 
       def panda_cms_editor
-        if Current.user&.admin
-          content_tag(:a, "🐼", href: edit_admin_page_url(Current.page), class: "text-3xl inline absolute right-2 top-2")
+        if Panda::Core::Current.user&.admin
+          content_tag(:a, "🐼", href: edit_admin_cms_page_url(Panda::CMS::Current.page), class: "text-3xl inline absolute right-2 top-2")
         end
       end
 
@@ -45,7 +45,7 @@ module Panda
       end
 
       def panda_cms_form_with(**options, &)
-        options[:builder] = Panda::CMS::FormBuilder
+        options[:builder] = Panda::Core::FormBuilder
         options[:class] = ["block visible p-6 bg-mid/5 rounded-lg border-mid border", options[:class]].compact.join(" ")
         form_with(**options, &)
       end

data/app/helpers/panda/cms/asset_helper.rb

@@ -1,13 +1,26 @@
 # frozen_string_literal: true
 
+require "panda/core"
+
 module Panda
   module CMS
     module AssetHelper
+      include Panda::Core::AssetHelper if defined?(Panda::Core::AssetHelper)
       # Include Panda CMS JavaScript and CSS assets
       # Automatically chooses between GitHub-hosted assets (production)
       # and local development assets
       def panda_cms_assets
-        Panda::CMS::AssetLoader.asset_tags.html_safe
+        tags = []
+
+        # Include Core assets first (if Core is available)
+        if defined?(Panda::Core::AssetHelper)
+          tags << panda_core_assets
+        end
+
+        # Then include CMS-specific assets
+        tags << Panda::CMS::AssetLoader.asset_tags
+
+        tags.join("\n").html_safe
       end
 
       # Include only Panda CMS JavaScript

data/app/javascript/panda/cms/application_panda_cms.js

@@ -3,37 +3,5 @@ console.debug("[Panda CMS] Controllers loading...");
 import "controllers"
 console.debug("[Panda CMS] Controllers loaded...");
 
-// Import editor resources
-import { EDITOR_JS_RESOURCES, EDITOR_JS_CSS } from "panda/cms/editor/editor_js_config"
-import { ResourceLoader } from "panda/cms/editor/resource_loader"
-
-// Function to load editor resources
-async function loadEditorResources() {
-  console.debug("[Panda CMS] Loading editor resources...");
-  try {
-    // First load EditorJS core
-    const editorCore = EDITOR_JS_RESOURCES[0]
-    await ResourceLoader.loadScript(document, document.head, editorCore)
-
-    // Then load all tools in parallel
-    const toolLoads = EDITOR_JS_RESOURCES.slice(1).map(async (resource) => {
-      await ResourceLoader.loadScript(document, document.head, resource)
-    })
-
-    // Load CSS directly since it's a string, not an array
-    await ResourceLoader.embedCSS(document, document.head, EDITOR_JS_CSS)
-
-    // Wait for all resources to load
-    await Promise.all(toolLoads)
-    console.debug("[Panda CMS] Editor resources loaded");
-
-    // Dispatch a custom event when resources are loaded
-    document.dispatchEvent(new CustomEvent('editorjs:loaded'))
-  } catch (error) {
-    console.error("[Panda CMS] Error loading editor resources:", error);
-  }
-}
-
-// Load resources on both initial page load and Turbo cache restore
-document.addEventListener('turbo:load', loadEditorResources);
-document.addEventListener('turbo:render', loadEditorResources);
+// Editor resources are now handled by panda-editor gem
+// The panda-editor gem will load its own resources when needed

data/app/javascript/panda/cms/controllers/index.js

@@ -21,21 +21,11 @@ pandaCmsApplication.register("slug", SlugController)
 import EditorIframeController from "panda/cms/controllers/editor_iframe_controller"
 pandaCmsApplication.register("editor-iframe", EditorIframeController)
 
-console.debug("[Panda CMS] Registering components...")
-import ThemeFormController from "panda/cms/controllers/theme_form_controller";
-pandaCmsApplication.register("theme-form", ThemeFormController);
-
-// Import and register all TailwindCSS Components or just the ones you need
-import { Alert, Autosave, ColorPreview, Dropdown, Modal, Tabs, Popover, Toggle, Slideover } from "tailwindcss-stimulus-components"
-pandaCmsApplication.register('alert', Alert)
-pandaCmsApplication.register('autosave', Autosave)
-pandaCmsApplication.register('color-preview', ColorPreview)
-pandaCmsApplication.register('dropdown', Dropdown)
-pandaCmsApplication.register('modal', Modal)
-pandaCmsApplication.register('popover', Popover)
-pandaCmsApplication.register('slideover', Slideover)
-pandaCmsApplication.register('tabs', Tabs)
-pandaCmsApplication.register('toggle', Toggle)
+// Import and register TailwindCSS Stimulus Components needed by CMS
+import { Toggle } from "tailwindcss-stimulus-components"
+pandaCmsApplication.register("toggle", Toggle)
+
+console.debug("[Panda CMS] Registered Toggle controller for slideover functionality")
 
 console.debug("[Panda CMS] Components registered...")
 

data/app/models/panda/cms/block_content.rb

@@ -3,7 +3,7 @@
 module Panda
   module CMS
     class BlockContent < ApplicationRecord
-      include EditorJsContent
+      include ::Panda::Editor::Content
 
       self.table_name = "panda_cms_block_contents"
 

data/app/models/panda/cms/current.rb

@@ -2,18 +2,9 @@
 
 module Panda
   module CMS
-    class Current < ActiveSupport::CurrentAttributes
-      attribute :root, :page
-      attribute :user
-      attribute :request_id, :user_agent, :ip_address
-
-      # resets { Time.zone = nil }
-
-      # def user=(user)
-      # super
-      # self.account = user.account
-      # Time.zone = user.time_zone
-      # end
+    class Current < Panda::Core::Current
+      # CMS-specific attributes
+      attribute :page
     end
   end
 end

data/app/models/panda/cms/post.rb

@@ -5,15 +5,15 @@ require "awesome_nested_set"
 module Panda
   module CMS
     class Post < ApplicationRecord
-      include ::Panda::CMS::EditorJsContent
+      include ::Panda::Editor::Content
 
       after_commit :clear_menu_cache
       before_validation :format_slug
 
       self.table_name = "panda_cms_posts"
 
-      belongs_to :user, class_name: "Panda::CMS::User"
-      belongs_to :author, class_name: "Panda::CMS::User", optional: true
+      belongs_to :user, class_name: "Panda::Core::User"
+      belongs_to :author, class_name: "Panda::Core::User", optional: true
       has_many :block_contents, as: :blockable, dependent: :destroy
       has_many :blocks, through: :block_contents
 

data/app/models/panda/cms/visit.rb

@@ -4,7 +4,7 @@ module Panda
   module CMS
     class Visit < ApplicationRecord
       belongs_to :page, class_name: "Panda::CMS::Page", foreign_key: :panda_cms_page_id, optional: true
-      belongs_to :user, class_name: "Panda::CMS::User", foreign_key: :user_id, optional: true
+      belongs_to :user, class_name: "Panda::Core::User", foreign_key: :user_id, optional: true
       belongs_to :redirect, class_name: "Panda::CMS::Redirect", foreign_key: :redirect_id, optional: true
     end
   end

data/app/views/layouts/panda/cms/application.html.erb

@@ -25,7 +25,7 @@
           <div class="py-3 px-4 mb-4 bg-black">
             <div class="flex justify-between items-center">
               <h2 class="text-base font-semibold leading-6 text-white" id="slideover-title"><i class="mr-2 fa-light fa-gear"></i> <%= yield :sidebar_title %> </h2>
-              <a href="#" data-action="click->toggle#toggle touch->toggle#toggle"><i class="font-bold text-white fa-regular fa-xmark right"></i></a>
+              <button type="button" data-action="click->toggle#toggle touch->toggle#toggle"><i class="font-bold text-white fa-regular fa-xmark right"></i></button>
             </div>
           </div>
           <div class="flex flex-col flex-1 justify-between">