panda-cms 0.7.5 → 0.8.0

data/app/views/panda/cms/admin/dashboard/show.html.erb

@@ -1,7 +1,7 @@
 <div class="" data-controller="dashboard">
-  <%= render Panda::CMS::Admin::ContainerComponent.new do |container| %>
+  <%= render Panda::Core::Admin::ContainerComponent.new do |container| %>
     <% container.with_heading(text: "Dashboard", level: 1) do |heading| %>
-      <% heading.with_button(action: :add, text: "Add Page", link: new_admin_page_path) %>
+      <% heading.with_button(action: :add, text: "Add Page", link: new_admin_cms_page_path) %>
     <% end %>
     <dl class="grid grid-cols-1 gap-5 mt-5 sm:grid-cols-3">
       <%= render Panda::CMS::Admin::StatisticsComponent.new(metric: "Views Today", value: Panda::CMS::Visit.group_by_day(:visited_at, last: 1).count.values.first) %>

data/app/views/panda/cms/admin/files/index.html.erb

@@ -1,4 +1,4 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: "Files", level: 1) %>
 
   <% component.with_slideover(title: "File Details") do %>

data/app/views/panda/cms/admin/forms/index.html.erb

@@ -1,10 +1,10 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: "Forms", level: 1) do |heading| %>
   <% end %>
 
-  <%= render Panda::CMS::Admin::TableComponent.new(term: "form", rows: forms) do |table| %>
-    <% table.column("Name") { |form| block_link_to form.name, admin_form_path(form) } %>
-    <% table.column("Status") { |form| render Panda::CMS::Admin::TagComponent.new(status: :active) } %>
+  <%= render Panda::Core::Admin::TableComponent.new(term: "form", rows: forms) do |table| %>
+    <% table.column("Name") { |form| block_link_to form.name, admin_cms_form_path(form) } %>
+    <% table.column("Status") { |form| render Panda::Core::Admin::TagComponent.new(status: :active) } %>
     <% table.column("Last Submission") do |form| %>
       <%= "#{time_ago_in_words(form.form_submissions&.last&.created_at)} ago" if form.form_submissions&.last %>
     <% end %>

data/app/views/panda/cms/admin/forms/new.html.erb

@@ -1,7 +1,7 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: "Add Page", level: 1) do |heading| %>
   <% end %>
-  <%= panda_cms_form_with model: page, url: admin_pages_path, method: :post do |f| %>
+  <%= panda_cms_form_with model: page, url: admin_cms_pages_path, method: :post do |f| %>
     <% options = nested_set_options(Panda::CMS::Page, page) { |i| "#{"-" * i.level} #{i.title} (#{i.path})" } %>
     <div data-controller="slug">
       <input type="hidden" value="<%= Panda::CMS::Current.root %>" data-slug-target="existing_root">

data/app/views/panda/cms/admin/forms/show.html.erb

@@ -1,4 +1,4 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: form.name, level: 1) do |heading| %>
   <% end %>
 

data/app/views/panda/cms/admin/menus/index.html.erb

@@ -1,8 +1,8 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: "Menus", level: 1) do |heading| %>
   <% end %>
-  <%= render Panda::CMS::Admin::TableComponent.new(term: "menu", rows: menus) do |table| %>
-    <% table.column("Name") { |menu| link_to menu.name, edit_admin_menu_path(menu) } %>
-    <% table.column("Kind") { |menu| render Panda::CMS::Admin::TagComponent.new(status: :active, text: menu.kind.titleize) } %>
+  <%= render Panda::Core::Admin::TableComponent.new(term: "menu", rows: menus) do |table| %>
+    <% table.column("Name") { |menu| link_to menu.name, edit_admin_cms_menu_path(menu) } %>
+    <% table.column("Kind") { |menu| render Panda::Core::Admin::TagComponent.new(status: :active, text: menu.kind.titleize) } %>
   <% end %>
 <% end %>

data/app/views/panda/cms/admin/pages/edit.html.erb

@@ -1,7 +1,7 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: "#{page.title}", level: 1) %>
   <% component.with_slideover(title: "Page Details") do %>
-    <%= panda_cms_form_with model: page, url: admin_page_path, method: :put do |f| %>
+    <%= panda_cms_form_with model: page, url: admin_cms_page_path, method: :put do |f| %>
       <%= f.text_field :title, class: "block w-full rounded-md border-0 p-2 text-gray-900 ring-1 ring-inset ring-mid placeholder:text-gray-300 focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
       <%= f.text_field :template, value: template.name,  readonly: true, class: "read-only:bg-gray-100 block w-full rounded-md border-0 p-2 text-gray-900 ring-1 ring-inset ring-mid placeholder:text-gray-300 focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
       <%= f.select :status, options_for_select([["Active", "active"], ["Draft", "draft"], ["Hidden", "hidden"], ["Archived", "archived"]], selected: page.status), {}, class: "block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-mid focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
@@ -9,17 +9,17 @@
     <% end %>
   <% end %>
   <div id="successMessage" class="hidden">
-    <%= render Panda::CMS::Admin::FlashMessageComponent.new(kind: "success", message: "This page was successfully updated!", temporary: false) %>
+    <%= render Panda::Core::Admin::FlashMessageComponent.new(kind: "success", message: "This page was successfully updated!", temporary: false) %>
   </div>
   <div id="errorMessage" class="hidden">
-    <%= render Panda::CMS::Admin::FlashMessageComponent.new(kind: "error", message: "There was an error updating this page.", temporary: false) %>
+    <%= render Panda::Core::Admin::FlashMessageComponent.new(kind: "error", message: "There was an error updating this page.", temporary: false) %>
   </div>
   <div class="grid grid-cols-2 mb-4 -mt-5">
     <div>
       <a class="inline-block mb-2 text-sm text-black/60" target="_blank" href="<%= @page.path %>"><%= @page.path %> <i class="ml-2 fa-solid fa-arrow-up-right-from-square"></i></a>
     </div>
     <div class="relative -mt-5">
-      <span class="absolute right-0"><%= render Panda::CMS::Admin::ButtonComponent.new(text: "Save Changes", action: :save_inactive, icon: "check", link: "#", size: :regular, id: "saveEditableButton") %></span>
+      <span class="absolute right-0"><%= render Panda::Core::Admin::ButtonComponent.new(text: "Save Changes", action: :save_inactive, icon: "check", link: "#", size: :regular, id: "saveEditableButton") %></span>
     </div>
   </div>
   <%= content_tag :iframe, nil,
@@ -30,7 +30,7 @@
       data: {
         controller: "editor-iframe",
         editor_iframe_page_id_value: @page.id,
-        editor_iframe_admin_path_value: "#{admin_dashboard_url}",
+        editor_iframe_admin_path_value: "#{admin_cms_dashboard_url}",
         editor_iframe_autosave_value: false
       } %>
 <% end %>

data/app/views/panda/cms/admin/pages/index.html.erb

@@ -1,17 +1,17 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: "Pages", level: 1) do |heading| %>
-    <% heading.with_button(action: :add, text: "Add Page", link: new_admin_page_path) %>
+    <% heading.with_button(action: :add, text: "Add Page", link: new_admin_cms_page_path) %>
   <% end %>
 
   <% if root_page %>
-    <%= render Panda::CMS::Admin::TableComponent.new(term: "page", rows: root_page.self_and_descendants) do |table| %>
+    <%= render Panda::Core::Admin::TableComponent.new(term: "page", rows: root_page.self_and_descendants) do |table| %>
       <% table.column("Name") do |page| %>
         <div class="<%= table_indent(page) %>">
-          <%= link_to page.title, edit_admin_page_path(page), class: "block h-full w-full" %>
+          <%= link_to page.title, edit_admin_cms_page_path(page), class: "block h-full w-full" %>
           <span class="block text-xs text-black/60"><%= page.path %></span>
         </div>
       <% end %>
-      <% table.column("Status") { |page| render Panda::CMS::Admin::TagComponent.new(status: page.status) } %>
+      <% table.column("Status") { |page| render Panda::Core::Admin::TagComponent.new(status: page.status) } %>
       <% table.column("Last Updated") { |page| render Panda::CMS::Admin::UserActivityComponent.new(model: page) } %>
     <% end %>
   <% else %>

data/app/views/panda/cms/admin/pages/new.html.erb

@@ -1,7 +1,7 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: "Add Page", level: 1) do |heading| %>
   <% end %>
-  <%= panda_cms_form_with model: page, url: admin_pages_path, method: :post do |f| %>
+  <%= panda_cms_form_with model: page, url: admin_cms_pages_path, method: :post do |f| %>
     <% if page.errors.any? %>
       <div class="mb-4 p-4 bg-red-50 border border-red-200 rounded-md">
         <div class="text-sm text-red-600">

data/app/views/panda/cms/admin/posts/_form.html.erb

@@ -22,7 +22,7 @@
           "slug-target": "output_text"
         } %>
   </div>
-  <%= f.select :author_id, Panda::CMS::User.admin.map { |u| [u.name, u.id] }, {}, class: "block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-mid focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
+  <%= f.select :author_id, Panda::Core::User.admin.map { |u| [u.name, u.id] }, {}, class: "block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-mid focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
   <%= f.datetime_field :published_at, class: "block w-full rounded-md border-0 p-2 text-gray-900 ring-1 ring-inset ring-mid placeholder:text-gray-300 focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
   <%= f.select :status, options_for_select([["Active", "active"], ["Draft", "draft"], ["Hidden", "hidden"], ["Archived", "archived"]], selected: post.status), {}, class: "block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-mid focus:ring-1 focus:ring-inset focus:ring-dark sm:leading-6 hover:pointer" %>
 

data/app/views/panda/cms/admin/posts/edit.html.erb

@@ -1,7 +1,7 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: post.title, level: 1) do |heading| %>
     <% heading.with_button(action: :view, text: "View Post", link: post_path(post.admin_param)) %>
   <% end %>
 
-  <%= render "form", post: post, url: admin_post_path(post.admin_param), method: :patch %>
+  <%= render "form", post: post, url: admin_cms_post_path(post.admin_param), method: :patch %>
 <% end %>

data/app/views/panda/cms/admin/posts/index.html.erb

@@ -1,18 +1,18 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: "Posts", level: 1) do |heading| %>
-    <% heading.with_button(action: :add, text: "Add Post", link: new_admin_post_path) %>
+    <% heading.with_button(action: :add, text: "Add Post", link: new_admin_cms_post_path) %>
   <% end %>
 
-  <%= render Panda::CMS::Admin::TableComponent.new(term: "post", rows: posts) do |table| %>
+  <%= render Panda::Core::Admin::TableComponent.new(term: "post", rows: posts) do |table| %>
     <% table.column("Title") do |post| %>
       <div>
-        <%= link_to post.title, edit_admin_post_path(post.admin_param), class: "block h-full w-full" %>
+        <%= link_to post.title, edit_admin_cms_post_path(post.admin_param), class: "block h-full w-full" %>
         <span class="block text-xs text-black/60">
           <%= CGI.unescape("#{Panda::CMS.config.posts[:prefix]}#{post.slug}") %>
         </span>
       </div>
     <% end %>
-    <% table.column("Status") { |post| render Panda::CMS::Admin::TagComponent.new(status: post.status) } %>
+    <% table.column("Status") { |post| render Panda::Core::Admin::TagComponent.new(status: post.status) } %>
     <% table.column("Published") { |post| render Panda::CMS::Admin::UserActivityComponent.new(at: post.published_at, user: post.author)} %>
     <% table.column("Last Updated") { |post| render Panda::CMS::Admin::UserActivityComponent.new(at: post.updated_at)} %>
   <% end %>

data/app/views/panda/cms/admin/posts/new.html.erb

@@ -1,4 +1,4 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: "Add Post", level: 1) do |heading| %>
   <% end %>
 

data/app/views/panda/cms/admin/settings/bulk_editor/new.html.erb

@@ -1,4 +1,4 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: "Bulk Editor", level: 1) %>
 
   <% if @debug && @debug[:error].any? %>

data/app/views/panda/cms/admin/settings/index.html.erb

@@ -1,7 +1,7 @@
-<%= render Panda::CMS::Admin::ContainerComponent.new do |component| %>
+<%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.with_heading(text: "Settings", level: 1) %>
 
-  <%= render Panda::CMS::Admin::PanelComponent.new do |panel| %>
+  <%= render Panda::Core::Admin::PanelComponent.new do |panel| %>
     <% panel.with_heading(text: "System Status") %>
 
     <p class="text-base leading-loose"><i class="mr-2 text-active fa fa-check-circle"></i> <span class="font-medium">Panda CMS:</span> v<%= Panda::CMS::VERSION %></p>
@@ -10,7 +10,7 @@
     <p class="text-base leading-loose"><i class="mr-2 text-active fa fa-check-circle"></i> <span class="font-medium">Environment:</span> <%= Rails.env.titleize %></p>
   <% end %>
 
-  <%= render Panda::CMS::Admin::PanelComponent.new do |panel| %>
+  <%= render Panda::Core::Admin::PanelComponent.new do |panel| %>
     <% panel.with_heading(text: "Integrations") %>
 
     <p class="text-base leading-loose"><i class="mr-2 text-active fa-brands fa-instagram"></i> <span class="font-medium">Instagram:</span> <%= Panda::CMS.config.instagram[:enabled] ? "Connected (@#{Panda::CMS.config.instagram[:username]})" : "Not Connected" %></p>

data/app/views/panda/cms/admin/shared/_breadcrumbs.html.erb

@@ -19,10 +19,10 @@
   </nav>
 
   <% if content_for :sidebar %>
-    <div class="pt-4 pr-8 text-black/80" tabindex="-1">
-      <a href="#" id="slideover-toggle" data-action="click->toggle#toggle touch->toggle#toggle" class="text-sm font-light">
+    <div class="pt-4 pr-8 text-black/80" tabindex="-1" data-controller="toggle">
+      <button type="button" id="slideover-toggle" data-action="click->toggle#toggle touch->toggle#toggle" class="text-sm font-light">
         <i class="mr-1 fa-light fa-gear"></i> <%= yield :sidebar_title %>
-      </a>
+      </button>
     </div>
   <% end %>
 </div>

data/app/views/panda/cms/admin/shared/_flash.html.erb

@@ -1,5 +1,5 @@
 <% if flash.any? %>
   <% flash.each do |kind, message| %>
-    <%= render Panda::CMS::Admin::FlashMessageComponent.new(kind: kind, message: message) %>
+    <%= render Panda::Core::Admin::FlashMessageComponent.new(kind: kind, message: message) %>
   <% end %>
 <% end %>

data/app/views/panda/cms/admin/shared/_sidebar.html.erb

@@ -2,12 +2,12 @@
   <ul role="list" class="flex flex-col flex-1">
     <a class="block p-0 mt-4 mb-4 ml-2 text-xl font-medium text-white"><%= Panda::CMS.config.title %></a>
     <% [
-      { path: admin_dashboard_path, text: "Dashboard", icon: "fa-house", matcher: :exact },
-      { path: admin_pages_path, text: "Pages", icon: "fa-page", matcher: :starts_with },
-      { path: admin_posts_path, text: "Posts", icon: "fa-notebook", matcher: :starts_with },
-      { path: admin_forms_path, text: "Forms", icon: "fa-cabinet-filing", matcher: :starts_with },
-      { path: admin_menus_path, text: "Menus", icon: "fa-list-dropdown", matcher: :starts_with },
-      { path: admin_settings_path, text: "Settings", icon: "fa-cog", matcher: :starts_with },
+      { path: admin_cms_dashboard_path, text: "Dashboard", icon: "fa-house", matcher: :exact },
+      { path: admin_cms_pages_path, text: "Pages", icon: "fa-page", matcher: :starts_with },
+      { path: admin_cms_posts_path, text: "Posts", icon: "fa-notebook", matcher: :starts_with },
+      { path: admin_cms_forms_path, text: "Forms", icon: "fa-cabinet-filing", matcher: :starts_with },
+      { path: admin_cms_menus_path, text: "Menus", icon: "fa-list-dropdown", matcher: :starts_with },
+      { path: admin_cms_settings_path, text: "Settings", icon: "fa-cog", matcher: :starts_with },
     ].each do |link| %>
       <li>
         <%= link_to link[:path], class: "#{active_link?(link[:path], match: link[:matcher]) ? selected_nav_highlight_colour_classes(request) : nav_highlight_colour_classes(request)}" do %>
@@ -17,13 +17,13 @@
       </li>
     <% end %>
     <li>
-      <%= button_to admin_logout_path, method: :delete, id: "logout-link", data: { turbo: false }, class: nav_highlight_colour_classes(request) + " w-full" do %>
+      <%= button_to panda_core.admin_logout_path, method: :delete, id: "logout-link", data: { turbo: false }, class: nav_highlight_colour_classes(request) + " w-full" do %>
         <span class="text-center"><i class="text-xl fa-regular fa-door-open fa-fw"></i></span>
         <span class="mt-1">Logout</span>
       <% end %>
     </li>
     <li class="mt-auto">
-      <%= link_to edit_admin_my_profile_path, class: nav_highlight_colour_classes(request) + " w-full", title: "Edit my Profile" do %>
+      <%= link_to panda_core.edit_admin_my_profile_path, class: nav_highlight_colour_classes(request) + " w-full", title: "Edit my Profile" do %>
         <% if !current_user.image_url.to_s.empty? %>
           <span class="text-center"><img src="<%= current_user.image_url %>" class="w-auto h-7 rounded-full"></span>
         <% else %>

data/config/initializers/panda/cms.rb

@@ -4,9 +4,12 @@ Panda::CMS.configure do |config|
   # The main title of your website
   config.title = "Demo Site"
 
-  # The path to the administration panel
-  config.admin_path = "/admin"
-
   # Site access control
   config.require_login_to_view = false
 end
+
+# Admin path is now configured via Panda::Core
+Panda::Core.configure do |config|
+  # The path to the administration panel
+  config.admin_path = "/admin"
+end

data/config/routes.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "../app/constraints/panda/cms/admin_constraint"
-
 Panda::CMS::Engine.routes.draw do
-  constraints Panda::CMS::AdminConstraint.new(&:present?) do
-    namespace Panda::CMS.route_namespace, as: :admin, module: :admin do
+  constraints Panda::Core::AdminConstraint.new(&:present?) do
+    # CMS-specific dashboard (using Core's admin_path)
+    admin_path = Panda::Core.configuration.admin_path
+    get "#{admin_path}/cms", to: "admin/dashboard#show", as: :admin_cms_dashboard
+
+    namespace admin_path.delete_prefix("/").to_sym, path: "#{admin_path}/cms", as: :admin_cms, module: :admin do
       resources :files
       resources :forms, only: %i[index show]
       resources :menus
@@ -15,28 +17,18 @@ Panda::CMS::Engine.routes.draw do
 
       get "settings", to: "settings#index"
 
-      resource :my_profile, only: %i[edit update], controller: :my_profile
+      # Profile management moved to panda-core at /admin/my_profile
 
       namespace :settings, as: :settings do
         get "bulk_editor", to: "bulk_editor#new"
         post "bulk_editor", to: "bulk_editor#create"
       end
     end
-
-    get Panda::CMS.route_namespace, to: "admin/dashboard#show", as: :admin_dashboard
   end
 
   ### PUBLIC ROUTES ###
 
-  # Authentication routes
-  get Panda::CMS.route_namespace, to: "admin/sessions#new", as: :admin_login
-  # Get and post options here are for OmniAuth coming back in, not going out
-  match "#{Panda::CMS.route_namespace}/auth/:provider/callback", to: "admin/sessions#create",
-    as: :admin_login_callback, via: %i[get post]
-  match "#{Panda::CMS.route_namespace}/auth/failure", to: "admin/sessions#failure", as: :admin_login_failure,
-    via: %i[get post]
-  # OmniAuth additionally adds a GET route for "#{Panda::CMS.route_namespace}/auth/:provider" but doesn't name it
-  delete Panda::CMS.route_namespace, to: "admin/sessions#destroy", as: :admin_logout
+  # Authentication routes are now handled by Panda::Core
 
   ### APPENDED ROUTES ###
 

data/db/migrate/20250106223303_add_author_id_to_panda_cms_posts.rb

@@ -2,6 +2,8 @@
 
 class AddAuthorIdToPandaCMSPosts < ActiveRecord::Migration[8.0]
   def change
-    add_reference :panda_cms_posts, :author, type: :uuid, foreign_key: {to_table: :panda_cms_users}
+    unless column_exists?(:panda_cms_posts, :author_id)
+      add_reference :panda_cms_posts, :author, type: :uuid, foreign_key: {to_table: :panda_core_users}
+    end
   end
 end

data/db/migrate/20250126234001_create_panda_social_instagram_posts.rb

@@ -2,6 +2,8 @@
 
 class CreatePandaSocialInstagramPosts < ActiveRecord::Migration[7.1]
   def change
+    return if table_exists?(:panda_social_instagram_posts)
+
     create_table :panda_social_instagram_posts, id: :uuid do |t|
       t.string :instagram_id, null: false
       t.text :caption

data/db/migrate/20250809231125_migrate_users_to_panda_core.rb

@@ -0,0 +1,111 @@
+class MigrateUsersToPandaCore < ActiveRecord::Migration[8.0]
+  def up
+    # First ensure panda_core_users table exists (from Core engine)
+    # It should already exist from the Core migration
+
+    # Migrate data from panda_cms_users to panda_core_users if needed
+    if table_exists?(:panda_cms_users) && table_exists?(:panda_core_users)
+      # Check if there's any data to migrate
+      cms_user_count = ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM panda_cms_users")
+      return if cms_user_count == 0
+      # Copy all user data
+      execute <<-SQL
+        INSERT INTO panda_core_users (
+          id, name, email, image_url, is_admin, created_at, updated_at
+        )
+        SELECT 
+          id,
+          COALESCE(name, CONCAT(firstname, ' ', lastname), 'Unknown User'),
+          email,
+          image_url,
+          COALESCE(admin, false),
+          created_at,
+          updated_at
+        FROM panda_cms_users
+        WHERE NOT EXISTS (
+          SELECT 1 FROM panda_core_users WHERE panda_core_users.id = panda_cms_users.id
+        )
+      SQL
+
+      # Update foreign key references in other tables
+
+      # Posts author_id
+      if column_exists?(:panda_cms_posts, :author_id)
+        remove_foreign_key :panda_cms_posts, column: :author_id if foreign_key_exists?(:panda_cms_posts, :panda_cms_users, column: :author_id)
+        add_foreign_key :panda_cms_posts, :panda_core_users, column: :author_id, primary_key: :id
+      end
+
+      # Posts user_id (legacy column)
+      if column_exists?(:panda_cms_posts, :user_id)
+        remove_foreign_key :panda_cms_posts, column: :user_id if foreign_key_exists?(:panda_cms_posts, :panda_cms_users, column: :user_id)
+        add_foreign_key :panda_cms_posts, :panda_core_users, column: :user_id, primary_key: :id
+      end
+
+      # Visits user_id
+      if column_exists?(:panda_cms_visits, :user_id)
+        remove_foreign_key :panda_cms_visits, column: :user_id if foreign_key_exists?(:panda_cms_visits, :panda_cms_users, column: :user_id)
+        add_foreign_key :panda_cms_visits, :panda_core_users, column: :user_id, primary_key: :id
+      end
+
+      # Drop the old table
+      drop_table :panda_cms_users
+    end
+  end
+
+  def down
+    # Recreate panda_cms_users table
+    create_table :panda_cms_users, id: :uuid do |t|
+      t.string :name
+      t.string :firstname
+      t.string :lastname
+      t.string :email, null: false
+      t.string :image_url
+      t.boolean :admin, default: false
+      t.string :current_theme, default: "default"
+      t.timestamps
+    end
+
+    add_index :panda_cms_users, :email, unique: true
+
+    # Migrate data back
+    if table_exists?(:panda_core_users) && table_exists?(:panda_cms_users)
+      execute <<-SQL
+        INSERT INTO panda_cms_users (
+          id, firstname, lastname, name, email, image_url, admin, current_theme, created_at, updated_at
+        )
+        SELECT 
+          id,
+          split_part(name, ' ', 1),
+          CASE 
+            WHEN position(' ' IN name) > 0 
+            THEN substring(name FROM position(' ' IN name) + 1)
+            ELSE ''
+          END,
+          name,
+          email,
+          image_url,
+          is_admin,
+          'default',
+          created_at,
+          updated_at
+        FROM panda_core_users
+      SQL
+
+      # Restore foreign keys to panda_cms_users
+      if column_exists?(:panda_cms_posts, :author_id)
+        remove_foreign_key :panda_cms_posts, column: :author_id if foreign_key_exists?(:panda_cms_posts, column: :author_id)
+        add_foreign_key :panda_cms_posts, :panda_cms_users, column: :author_id, primary_key: :id
+      end
+
+      if column_exists?(:panda_cms_posts, :user_id)
+        remove_foreign_key :panda_cms_posts, column: :user_id if foreign_key_exists?(:panda_cms_posts, column: :user_id)
+        add_foreign_key :panda_cms_posts, :panda_cms_users, column: :user_id, primary_key: :id
+      end
+
+      if column_exists?(:panda_cms_visits, :user_id)
+        remove_foreign_key :panda_cms_visits, column: :user_id if foreign_key_exists?(:panda_cms_visits, column: :user_id)
+        add_foreign_key :panda_cms_visits, :panda_cms_users, column: :user_id, primary_key: :id
+      end
+    end
+  end
+end

data/db/migrate/20250811111000_make_post_user_references_nullable.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class MakePostUserReferencesNullable < ActiveRecord::Migration[8.0]
+  def change
+    # Make user_id and author_id nullable for posts
+    # This is needed because fixtures can't reference users from another gem
+    # Tests that need users will set them programmatically
+    change_column_null :panda_cms_posts, :user_id, true
+    change_column_null :panda_cms_posts, :author_id, true
+  end
+end

data/lib/panda/cms/asset_loader.rb

@@ -111,15 +111,15 @@ module Panda
             version = asset_version
             js_url = "/panda-cms-assets/panda-cms-#{version}.js"
             css_url = "/panda-cms-assets/panda-cms-#{version}.css"
-            
+
             tags = []
-            
+
             # JavaScript tag
             tags << content_tag(:script, "", {
               src: js_url,
               defer: true
             })
-            
+
             # CSS tag if exists
             if cached_asset_exists?(css_url)
               tags << tag(:link, {
@@ -127,7 +127,7 @@ module Panda
                 href: css_url
               })
             end
-            
+
             tags.join("\n").html_safe
           else
             # In development, just use a simple script tag