panda-cms 0.7.5 → 0.8.0

data/lib/panda/cms/engine.rb

@@ -3,6 +3,8 @@
 require "rubygems"
 require "panda/core"
 require "panda/core/engine"
+require "panda/editor"
+require "panda/editor/engine"
 require "panda/cms/railtie"
 
 require "invisible_captcha"
@@ -18,7 +20,7 @@ module Panda
       ]
 
       # Basic session setup only
-      initializer "panda_cms.session", before: :load_config_initializers do |app|
+      initializer "panda.cms.session", before: :load_config_initializers do |app|
         app.config.middleware = app.config.middleware.dup if app.config.middleware.frozen?
 
         app.config.session_store :cookie_store, key: "_panda_cms_session"
@@ -50,7 +52,7 @@ module Panda
       # Custom error handling
       # config.exceptions_app = Panda::CMS::ExceptionsApp.new(exceptions_app: routes)
 
-      initializer "panda_cms.assets" do |app|
+      initializer "panda.cms.assets" do |app|
         if Rails.configuration.respond_to?(:assets)
           # Add JavaScript paths
           app.config.assets.paths << root.join("app/javascript")
@@ -68,7 +70,7 @@ module Panda
       end
 
       # Add importmap paths from the engine
-      initializer "panda_cms.importmap", before: "importmap" do |app|
+      initializer "panda.cms.importmap", before: "importmap" do |app|
         if app.config.respond_to?(:importmap)
           # Create a new array if frozen
           app.config.importmap.paths = app.config.importmap.paths.dup if app.config.importmap.paths.frozen?
@@ -124,111 +126,53 @@ module Panda
       end
 
       # Set up ViewComponent
-      initializer "panda_cms.view_component" do |app|
+      initializer "panda.cms.view_component" do |app|
         app.config.view_component.preview_paths ||= []
         app.config.view_component.preview_paths << root.join("spec/components/previews")
         app.config.view_component.generate.sidecar = true
         app.config.view_component.generate.preview = true
       end
 
-      # Set up authentication
-      initializer "panda_cms.omniauth", before: "omniauth" do |app|
-        app.config.session_store :cookie_store, key: "_panda_cms_session"
-        app.config.middleware.use ActionDispatch::Cookies
-        app.config.middleware.use ActionDispatch::Session::CookieStore, app.config.session_options
-
-        OmniAuth.config.logger = Rails.logger
-
-        # TODO: Move this to somewhere more sensible?
-        # Define the mapping of our provider "names" to the OmniAuth strategies and configuration
-        auth_path = "#{Panda::CMS.route_namespace}/auth"
-        callback_path = "/callback"
-        available_providers = {
-          microsoft: {
-            strategy: :microsoft_graph,
-            defaults: {
-              name: "microsoft",
-              # Setup at the following URL:
-              # https://portal.azure.com/#view/Microsoft_AAD_RegisteredApps/ApplicationsListBlade
-              client_id: Rails.application.credentials.dig(:microsoft, :client_id),
-              client_secret: Rails.application.credentials.dig(:microsoft, :client_secret),
-              # Don't change this or the sky will fall on your head
-              # https://github.com/synth/omniauth-microsoft_graph/tree/main?tab=readme-ov-file#domain-verification
-              skip_domain_verification: false,
-              # If your application is single-tenanted, replace "common" with your tenant (directory) ID
-              # from https://portal.azure.com/#settings/directory, otherwise you'll likely want to leave
-              # these settings unchanged
-              client_options: {
-                site: "https://login.microsoftonline.com/",
-                token_url: "common/oauth2/v2.0/token",
-                authorize_url: "common/oauth2/v2.0/authorize"
-              },
-              # If you assign specific users or groups, you will likely want to set this to
-              # true to enable auto-provisioning
-              create_account_on_first_login: false,
-              create_admin_account_on_first_login: false,
-              # Don't hide this provider from the login page
-              hidden: false
-            }
-          },
-          google: {
-            strategy: :google_oauth2,
-            defaults: {
-              name: "google",
-              # Setup at the following URL: https://console.developers.google.com/
-              client_id: Rails.application.credentials.dig(:google, :client_id),
-              client_secret: Rails.application.credentials.dig(:google, :client_secret),
-              # If you assign specific users or groups, you will likely want to set this to
-              # true to enable auto-provisioning
-              create_account_on_first_login: false,
-              create_admin_account_on_first_login: false,
-              # Options we need
-              scope: "email, profile",
-              image_aspect_ratio: "square",
-              image_size: 150,
-              # Worth setting select_account as default, as many people have multiple Google accounts now:
-              prompt: "select_account",
-              # You should probably also set the 'hd' option, huh?,
-              # Don't hide this provider from the login page
-              hidden: false
-            }
-          },
-          github: {
-            strategy: :github,
-            defaults: {
-              name: "github",
-              # Setup at the following URL: https://github.com/settings/applications/new
-              # with a callback of
-              # In the meantime, as long as you're set to /admin as your login path, and on
-              # http://localhost:3000, you can use these for a first login :)
-              client_id: Rails.application.credentials.dig(:github, :client_id),
-              client_secret: Rails.application.credentials.dig(:github, :client_secret),
-              scope: "user:email,read:user",
-              create_account_on_first_login: false,
-              create_admin_account_on_first_login: false,
-              # Don't hide this provider from the login page
-              hidden: false
-            }
-          }
-        }
+      # Authentication is now handled by Panda::Core::Engine
 
-        available_providers.each do |provider, options|
-          next unless Panda::CMS.config.authentication.dig(provider, :enabled)
+      # Configure Core for CMS
+      initializer "panda.cms.configure_core" do |app|
+        Panda::Core.configure do |config|
+          # Customize login page
+          config.login_logo_path = "/panda-cms-assets/panda-nav.png"
+          config.login_page_title = "Panda CMS Admin"
 
-          auth_path = auth_path.starts_with?("/") ? auth_path : "/#{auth_path}"
-          options[:defaults][:path_prefix] = auth_path
+          # Set dashboard redirect path to CMS dashboard (using Core's admin_path)
+          config.dashboard_redirect_path = "#{Panda::Core.configuration.admin_path}/cms"
 
-          options[:defaults][:redirect_uri] = if Rails.env.test?
-            "#{Capybara.app_host}#{auth_path}/#{provider}#{callback_path}"
-          else
-            "#{Panda::CMS.config.url}#{auth_path}/#{provider}#{callback_path}"
-          end
-
-          provider_config = options[:defaults].merge(Panda::CMS.config.authentication[provider])
+          # Customize initial breadcrumb
+          config.initial_admin_breadcrumb = ->(controller) {
+            # Use CMS dashboard path - just use the string path
+            ["Admin", "#{Panda::Core.configuration.admin_path}/cms"]
+          }
 
-          app.config.middleware.use OmniAuth::Builder do
-            provider options[:strategy], provider_config
-          end
+          # Dashboard widgets
+          config.admin_dashboard_widgets = ->(user) {
+            widgets = []
+
+            # Add CMS statistics widgets if CMS is available
+            if defined?(Panda::CMS)
+              widgets << Panda::CMS::Admin::StatisticsComponent.new(
+                metric: "Views Today",
+                value: Panda::CMS::Visit.group_by_day(:visited_at, last: 1).count.values.first || 0
+              )
+              widgets << Panda::CMS::Admin::StatisticsComponent.new(
+                metric: "Views Last Week",
+                value: Panda::CMS::Visit.group_by_week(:visited_at, last: 1).count.values.first || 0
+              )
+              widgets << Panda::CMS::Admin::StatisticsComponent.new(
+                metric: "Views Last Month",
+                value: Panda::CMS::Visit.group_by_month(:visited_at, last: 1).count.values.first || 0
+              )
+            end
+
+            widgets
+          }
         end
       end
 

data/lib/panda-cms/version.rb

@@ -2,6 +2,6 @@
 
 module Panda
   module CMS
-    VERSION = "0.7.5"
+    VERSION = "0.8.0"
   end
 end

data/lib/panda-cms.rb

@@ -7,44 +7,64 @@ require "view_component"
 
 module Panda
   module CMS
-    extend Dry::Configurable
-
-    setting :title, default: "Demo Site"
-    setting :admin_path, default: "/admin"
-    setting :require_login_to_view, default: false
-    setting :authentication, default: {}
-    setting :posts, default: {enabled: true, prefix: "blog"}
-    setting :route_namespace, default: "/admin"
-    setting :url
-    setting :editor_js_tools, default: []
-    setting :editor_js_tool_config, default: {}
-
-    setting :instagram, default: {
-      enabled: false,
-      username: nil,
-      access_token: nil
-    }
-
-    setting :analytics, default: {
-      google_analytics: {
-        enabled: false,
-        tracking_id: nil
-      }
-    }
+    class Configuration
+      attr_accessor :title, :require_login_to_view, :authentication,
+        :posts, :url, :editor_js_tools,
+        :editor_js_tool_config, :instagram, :analytics
+
+      def initialize
+        @title = "Demo Site"
+        @require_login_to_view = false
+        @authentication = {}
+        @posts = {enabled: true, prefix: "blog"}
+        @url = nil
+        @editor_js_tools = []
+        @editor_js_tool_config = {}
+        @instagram = {
+          enabled: false,
+          username: nil,
+          access_token: nil
+        }
+        @analytics = {
+          google_analytics: {
+            enabled: false,
+            tracking_id: nil
+          }
+        }
+      end
+    end
+
+    class << self
+      attr_writer :configuration
+
+      def configuration
+        @configuration ||= Configuration.new
+      end
+
+      def config
+        configuration
+      end
+
+      def configure
+        yield configuration if block_given?
+      end
+
+      def reset_configuration!
+        @configuration = Configuration.new
+      end
+    end
 
     def self.root_path
-      config.admin_path
+      # Delegate to Panda::Core's admin_path configuration
+      Panda::Core.configuration.admin_path
     end
 
     class << self
       attr_accessor :loader
 
       def route_namespace
-        config.admin_path
-      end
-
-      def configure
-        yield config if block_given?
+        # Delegate to Panda::Core's admin_path configuration
+        Panda::Core.configuration.admin_path
       end
     end
   end
@@ -75,16 +95,6 @@ require_relative "panda/cms/exceptions_app"
 require_relative "panda/cms/engine"
 require_relative "panda/cms/demo_site_generator"
 require_relative "panda/cms/asset_loader"
-require_relative "panda/cms/editor_js"
-require_relative "panda/cms/editor_js_content"
-require_relative "panda/cms/editor_js/renderer"
-require_relative "panda/cms/editor_js/blocks/alert"
-require_relative "panda/cms/editor_js/blocks/header"
-require_relative "panda/cms/editor_js/blocks/image"
-require_relative "panda/cms/editor_js/blocks/list"
-require_relative "panda/cms/editor_js/blocks/paragraph"
-require_relative "panda/cms/editor_js/blocks/quote"
-require_relative "panda/cms/editor_js/blocks/table"
 require_relative "panda/cms/slug"
 
 Panda::CMS.loader.setup

data/lib/tasks/assets.rake

@@ -1,154 +1,156 @@
 # frozen_string_literal: true
 
-namespace :panda_cms do
-  namespace :assets do
-    desc "Compile Panda CMS assets for GitHub release distribution"
-    task :compile do
-      puts "🐼 Compiling Panda CMS assets..."
-      puts "Rails.root: #{Rails.root}"
-      puts "Working directory: #{Dir.pwd}"
-
-      # Create output directory
-      output_dir = Rails.root.join("tmp", "panda_cms_assets")
-      FileUtils.mkdir_p(output_dir)
-
-      version = Panda::CMS::VERSION
-      puts "Version: #{version}"
-      puts "Output directory: #{output_dir}"
-
-      # Compile JavaScript bundle
-      js_bundle = compile_javascript_bundle(version)
-      js_file = output_dir.join("panda-cms-#{version}.js")
-      File.write(js_file, js_bundle)
-      puts "✅ JavaScript compiled: #{js_file} (#{File.size(js_file)} bytes)"
-
-      # Compile CSS bundle (if any CSS files exist)
-      css_bundle = compile_css_bundle(version)
-      if css_bundle && !css_bundle.strip.empty?
-        css_file = output_dir.join("panda-cms-#{version}.css")
-        File.write(css_file, css_bundle)
-        puts "✅ CSS compiled: #{css_file} (#{File.size(css_file)} bytes)"
-      end
+namespace :panda do
+  namespace :cms do
+    namespace :assets do
+      desc "Compile Panda CMS assets for GitHub release distribution"
+      task :compile do
+        puts "🐼 Compiling Panda CMS assets..."
+        puts "Rails.root: #{Rails.root}"
+        puts "Working directory: #{Dir.pwd}"
+
+        # Create output directory
+        output_dir = Rails.root.join("tmp", "panda_cms_assets")
+        FileUtils.mkdir_p(output_dir)
+
+        version = Panda::CMS::VERSION
+        puts "Version: #{version}"
+        puts "Output directory: #{output_dir}"
+
+        # Compile JavaScript bundle
+        js_bundle = compile_javascript_bundle(version)
+        js_file = output_dir.join("panda-cms-#{version}.js")
+        File.write(js_file, js_bundle)
+        puts "✅ JavaScript compiled: #{js_file} (#{File.size(js_file)} bytes)"
+
+        # Compile CSS bundle (if any CSS files exist)
+        css_bundle = compile_css_bundle(version)
+        if css_bundle && !css_bundle.strip.empty?
+          css_file = output_dir.join("panda-cms-#{version}.css")
+          File.write(css_file, css_bundle)
+          puts "✅ CSS compiled: #{css_file} (#{File.size(css_file)} bytes)"
+        end
 
-      # Create manifest file
-      manifest = create_asset_manifest(version)
-      manifest_file = output_dir.join("manifest.json")
-      File.write(manifest_file, JSON.pretty_generate(manifest))
-      puts "✅ Manifest created: #{manifest_file}"
+        # Create manifest file
+        manifest = create_asset_manifest(version)
+        manifest_file = output_dir.join("manifest.json")
+        File.write(manifest_file, JSON.pretty_generate(manifest))
+        puts "✅ Manifest created: #{manifest_file}"
 
-      # Copy assets to test environment location for consistent testing
-      # Rails.root is the dummy app, so we need to go to its public directory
-      test_asset_dir = Rails.root.join("public", "panda-cms-assets")
-      FileUtils.mkdir_p(test_asset_dir)
+        # Copy assets to test environment location for consistent testing
+        # Rails.root is the dummy app, so we need to go to its public directory
+        test_asset_dir = Rails.root.join("public", "panda-cms-assets")
+        FileUtils.mkdir_p(test_asset_dir)
 
-      js_file_name = "panda-cms-#{version}.js"
-      css_file_name = "panda-cms-#{version}.css"
+        js_file_name = "panda-cms-#{version}.js"
+        css_file_name = "panda-cms-#{version}.css"
 
-      # Copy JavaScript file
-      if File.exist?(output_dir.join(js_file_name))
-        FileUtils.cp(output_dir.join(js_file_name), test_asset_dir.join(js_file_name))
-        puts "✅ Copied JavaScript to test location: #{test_asset_dir.join(js_file_name)}"
-      end
+        # Copy JavaScript file
+        if File.exist?(output_dir.join(js_file_name))
+          FileUtils.cp(output_dir.join(js_file_name), test_asset_dir.join(js_file_name))
+          puts "✅ Copied JavaScript to test location: #{test_asset_dir.join(js_file_name)}"
+        end
 
-      # Copy CSS file
-      if File.exist?(output_dir.join(css_file_name))
-        FileUtils.cp(output_dir.join(css_file_name), test_asset_dir.join(css_file_name))
-        puts "✅ Copied CSS to test location: #{test_asset_dir.join(css_file_name)}"
-      end
+        # Copy CSS file
+        if File.exist?(output_dir.join(css_file_name))
+          FileUtils.cp(output_dir.join(css_file_name), test_asset_dir.join(css_file_name))
+          puts "✅ Copied CSS to test location: #{test_asset_dir.join(css_file_name)}"
+        end
 
-      # Copy manifest
-      if File.exist?(output_dir.join("manifest.json"))
-        FileUtils.cp(output_dir.join("manifest.json"), test_asset_dir.join("manifest.json"))
-        puts "✅ Copied manifest to test location: #{test_asset_dir.join("manifest.json")}"
-      end
+        # Copy manifest
+        if File.exist?(output_dir.join("manifest.json"))
+          FileUtils.cp(output_dir.join("manifest.json"), test_asset_dir.join("manifest.json"))
+          puts "✅ Copied manifest to test location: #{test_asset_dir.join("manifest.json")}"
+        end
 
-      puts "🎉 Asset compilation complete!"
-      puts "📁 Output directory: #{output_dir}"
-      puts "📁 Test assets directory: #{test_asset_dir}"
-    end
+        puts "🎉 Asset compilation complete!"
+        puts "📁 Output directory: #{output_dir}"
+        puts "📁 Test assets directory: #{test_asset_dir}"
+      end
 
-    desc "Upload compiled assets to GitHub release"
-    task upload: :compile do
-      version = Panda::CMS::VERSION
-      output_dir = Rails.root.join("tmp", "panda_cms_assets")
+      desc "Upload compiled assets to GitHub release"
+      task upload: :compile do
+        version = Panda::CMS::VERSION
+        output_dir = Rails.root.join("tmp", "panda_cms_assets")
 
-      puts "📤 Uploading assets to GitHub release v#{version}..."
+        puts "📤 Uploading assets to GitHub release v#{version}..."
 
-      # Check if gh CLI is available
-      unless system("gh --version > /dev/null 2>&1")
-        puts "❌ GitHub CLI (gh) not found. Please install: https://cli.github.com/"
-        exit 1
-      end
+        # Check if gh CLI is available
+        unless system("gh --version > /dev/null 2>&1")
+          puts "❌ GitHub CLI (gh) not found. Please install: https://cli.github.com/"
+          exit 1
+        end
 
-      # Check if release exists
-      unless system("gh release view v#{version} > /dev/null 2>&1")
-        puts "❌ Release v#{version} not found. Create it first with: gh release create v#{version}"
-        exit 1
-      end
+        # Check if release exists
+        unless system("gh release view v#{version} > /dev/null 2>&1")
+          puts "❌ Release v#{version} not found. Create it first with: gh release create v#{version}"
+          exit 1
+        end
 
-      # Upload each asset file
-      Dir.glob(output_dir.join("*")).each do |file|
-        filename = File.basename(file)
-        puts "Uploading #{filename}..."
+        # Upload each asset file
+        Dir.glob(output_dir.join("*")).each do |file|
+          filename = File.basename(file)
+          puts "Uploading #{filename}..."
 
-        if system("gh release upload v#{version} #{file} --clobber")
-          puts "✅ Uploaded: #{filename}"
-        else
-          puts "❌ Failed to upload: #{filename}"
-          exit 1
+          if system("gh release upload v#{version} #{file} --clobber")
+            puts "✅ Uploaded: #{filename}"
+          else
+            puts "❌ Failed to upload: #{filename}"
+            exit 1
+          end
         end
-      end
 
-      puts "🎉 All assets uploaded successfully!"
-    end
+        puts "🎉 All assets uploaded successfully!"
+      end
 
-    desc "Download assets from GitHub release for local development"
-    task :download do
-      version = Panda::CMS::VERSION
-      output_dir = Rails.root.join("public", "panda-cms-assets", version)
-      FileUtils.mkdir_p(output_dir)
+      desc "Download assets from GitHub release for local development"
+      task :download do
+        version = Panda::CMS::VERSION
+        output_dir = Rails.root.join("public", "panda-cms-assets", version)
+        FileUtils.mkdir_p(output_dir)
 
-      puts "📥 Downloading assets from GitHub release v#{version}..."
+        puts "📥 Downloading assets from GitHub release v#{version}..."
 
-      # Download manifest first to know what files to get
-      manifest_url = "https://github.com/pandacms/panda-cms/releases/download/v#{version}/manifest.json"
+        # Download manifest first to know what files to get
+        manifest_url = "https://github.com/pandacms/panda-cms/releases/download/v#{version}/manifest.json"
 
-      begin
-        require "net/http"
-        require "uri"
+        begin
+          require "net/http"
+          require "uri"
 
-        uri = URI(manifest_url)
-        response = Net::HTTP.get_response(uri)
+          uri = URI(manifest_url)
+          response = Net::HTTP.get_response(uri)
 
-        if response.code == "200"
-          manifest = JSON.parse(response.body)
-          puts "✅ Downloaded manifest"
+          if response.code == "200"
+            manifest = JSON.parse(response.body)
+            puts "✅ Downloaded manifest"
 
-          # Download each file listed in manifest
-          manifest["files"].each do |file_info|
-            filename = file_info["filename"]
-            file_url = "https://github.com/pandacms/panda-cms/releases/download/v#{version}/#{filename}"
+            # Download each file listed in manifest
+            manifest["files"].each do |file_info|
+              filename = file_info["filename"]
+              file_url = "https://github.com/pandacms/panda-cms/releases/download/v#{version}/#{filename}"
 
-            puts "Downloading #{filename}..."
-            file_uri = URI(file_url)
-            file_response = Net::HTTP.get_response(file_uri)
+              puts "Downloading #{filename}..."
+              file_uri = URI(file_url)
+              file_response = Net::HTTP.get_response(file_uri)
 
-            if file_response.code == "200"
-              File.write(output_dir.join(filename), file_response.body)
-              puts "✅ Downloaded: #{filename}"
-            else
-              puts "❌ Failed to download: #{filename}"
+              if file_response.code == "200"
+                File.write(output_dir.join(filename), file_response.body)
+                puts "✅ Downloaded: #{filename}"
+              else
+                puts "❌ Failed to download: #{filename}"
+              end
             end
-          end
 
-          puts "🎉 Assets downloaded to: #{output_dir}"
-        else
-          puts "❌ Failed to download manifest from: #{manifest_url}"
-          puts "Response: #{response.code} #{response.message}"
+            puts "🎉 Assets downloaded to: #{output_dir}"
+          else
+            puts "❌ Failed to download manifest from: #{manifest_url}"
+            puts "Response: #{response.code} #{response.message}"
+          end
+        rescue => e
+          puts "❌ Error downloading assets: #{e.message}"
+          puts "Falling back to local development mode..."
         end
-      rescue => e
-        puts "❌ Error downloading assets: #{e.message}"
-        puts "Falling back to local development mode..."
       end
     end
   end
@@ -307,10 +309,48 @@ def create_tailwind_components
     "  }",
     "};",
     "",
+    "const Toggle = {",
+    "  static: {",
+    "    values: { open: { type: Boolean, default: false } },",
+    "    targets: ['toggleable']",
+    "  },",
+    "  connect() {",
+    "    console.log('[Panda CMS] Toggle controller connected');",
+    "    this.openValue = false;",
+    "    // Find toggleable elements",
+    "    this.toggleableTargets = Array.from(this.element.querySelectorAll('[data-toggle-target=\"toggleable\"]'));",
+    "    if (this.toggleableTargets.length === 0) {",
+    "      // For slideover, the toggleable element might be a sibling",
+    "      const slideover = document.querySelector('#slideover');",
+    "      if (slideover) {",
+    "        this.toggleableTargets = [slideover];",
+    "      }",
+    "    }",
+    "  },",
+    "  toggle(event) {",
+    "    event.preventDefault();",
+    "    console.log('[Panda CMS] Toggle action triggered');",
+    "    this.openValue = !this.openValue;",
+    "    this.animate();",
+    "  },",
+    "  animate() {",
+    "    this.toggleableTargets.forEach(element => {",
+    "      if (this.openValue) {",
+    "        element.classList.remove('hidden');",
+    "        element.style.display = 'block';",
+    "      } else {",
+    "        element.classList.add('hidden');",
+    "        element.style.display = 'none';",
+    "      }",
+    "    });",
+    "  }",
+    "};",
+    "",
     "// Register TailwindCSS components",
     "Stimulus.register('alert', Alert);",
     "Stimulus.register('dropdown', Dropdown);",
     "Stimulus.register('modal', Modal);",
+    "Stimulus.register('toggle', Toggle);",
     ""
   ].join("\n")
 end

data/lib/tasks/panda/cms/migrations.rake

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+namespace :panda do
+  namespace :cms do
+    namespace :install do
+      desc "Copy migrations from panda_cms to application"
+      task :migrations do
+        # Delegate to the auto-generated task
+        Rake::Task["panda_cms:install:migrations"].invoke
+      end
+    end
+  end
+end