panda-cms 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e27fb8ea71f2ea75ce8b82dc1a572e9fc6c55ee7d0e1df48b3af93228881bc0e
-  data.tar.gz: a58147bb5374e6bfdc70aed581c9b98048b0e3937a4037c2daae7e5b6c70ae57
+  metadata.gz: 07d84fd0b6bd17f5e5f253a570bae55270227bec0196037960aa3358d09903bd
+  data.tar.gz: c6bc6d0173f89d965a23132bc016bfd3a44e6bd0b2533960cca495fa28e645e3
 SHA512:
-  metadata.gz: e6494d67893174959b47efe2276c1fe1ae27606cc268e62d1bf77566bcbf95c37cc935f2a62c0bdc0db24f62b42d2ca44cc36c8a9a2a328bee634d5e079374c1
-  data.tar.gz: 2d263e8ca147f3c0bc9061f5f9c7149d4705a7b16fbc1d02a7072a71884292574677a588b9dc9dbbae30d90da6e2495f6b43f319fe674b98da2076fe97a64cc7
+  metadata.gz: 63b30314a40563ab4cb8f99d516cd30edc3aed7ffe8d1841d4b8760ea6c80c8b253a983ca7cadd473caba240a7b18132cda903b23ed35da845833aef4880b2d4
+  data.tar.gz: 820e1b606f088e8bacd7e03d997812f5a2255941e399e8fe863076a0a1196935c66c6a2aca34d50f9dd69563280cda9d795692ccba6df5af565aefd2b38439e2

data/README.md

@@ -44,8 +44,8 @@ For initial setup, run:
 
 ```shell
 bundle install
-rails generate panda-cms:install
-rails panda-cms:install:migrations
+rails generate panda_cms:install
+rails panda_cms:install:migrations
 rails db:seed
 ```
 
@@ -57,7 +57,7 @@ If you don't want to use GitHub to login (or are at a URL other than http://loca
 
 This is a non-exhuastive list (there will be many more):
 
-* To date, this has only been tested with Rails 7.1 and 7.2.
+* To date, this has only been tested with Rails 7.1, 7.2 and 8.0
 * There may be conflicts if you're not using Tailwind CSS on the frontend. Please report this.
 
 ## Contributing
@@ -70,4 +70,4 @@ See our [Contributing Guidelines](https://docs.pandacms.io/developers/contributi
 
 The gem is available as open source under the terms of the [BSD-3-Clause License](https://opensource.org/licenses/bsd-3-clause).
 
-Copyright © 2024, Panda Software Limited.
+Copyright © 2024 - 2025, Panda Software Limited.

data/app/assets/builds/panda.cms.css

@@ -1182,10 +1182,6 @@ a.block-link:after {
   pointer-events: none;
 }
 
-.pointer-events-auto {
-  pointer-events: auto;
-}
-
 .visible {
   visibility: visible;
 }
@@ -1250,8 +1246,8 @@ a.block-link:after {
   z-index: 10;
 }
 
-.z-50 {
-  z-index: 50;
+.z-\[9999\] {
+  z-index: 9999;
 }
 
 .col-span-3 {

data/app/assets/tailwind/application.css

@@ -0,0 +1,178 @@
+@import "tailwindcss";
+
+@config "tailwind.config.js";
+
+@theme {
+  --color-white: var(--color-white);
+  --color-black: var(--color-black);
+  --color-light: var(--color-light);
+  --color-mid: var(--color-mid);
+  --color-dark: var(--color-dark);
+  --color-highlight: var(--color-highlight);
+  --color-active: var(--color-active);
+  --color-inactive: var(--color-active);
+  --color-warning: var(--color-warning);
+  --color-error: var(--color-error);
+}
+
+@plugin "tailwindcss/typography";
+@plugin "tailwindcss/forms";
+
+@layer base {
+  html[data-theme="default"] {
+    --color-white: 249 249 249; /* #F9F9F9 */
+    --color-black: 26 22 29; /* #1A161D */
+
+    --color-light: 238 206 230; /* #EECEE6 */
+    --color-mid: 141 94 183; /* #8D5EB7 */
+    --color-dark: 33 29 73; /* #211D49 */
+
+    --color-highlight: 208 64 20; /* #D04014 */
+
+    --color-active: 0 135 85; /* #008755 */
+    --color-warning: 250 207 142; /* #FACF8E */
+    --color-inactive: 216 247 245; /* #d6e4f7 */
+    --color-error: 245 129 129; /* #F58181 */
+  }
+
+  html[data-theme="sky"] {
+    --color-white: 249 249 249; /* #F9F9F9 */
+    --color-black: 26 22 29; /* #1A161D */
+    --color-light: 204 238 242; /* #CCEEF2 */
+    --color-mid: 42 102 159; /* #2A669F */
+    --color-dark: 20 32 74; /* #14204A */
+    --color-highlight: 208 64 20; /* #D04014 */
+
+    --color-active: 69 154 89; /* #459A59 - darker green with better contrast */
+    --color-warning: 244 190 102; /* #F4BE66 */
+    --color-inactive: 216 247 245; /* #d6e4f7 */
+    --color-error: 208 64 20; /* #D04014 */
+  }
+
+  a.block-link:after {
+    position: absolute;
+    content: "";
+    inset: 0;
+  }
+}
+
+/* Default editor styles */
+@layer components {
+  .codex-editor__redactor .ce-block .ce-block__content {
+    @apply text-base font-normal font-sans text-dark leading-[1.6] space-y-[1.6rem];
+
+    h1.ce-header {
+      @apply text-3xl md:text-4xl font-semibold font-sans leading-[1.2];
+    }
+
+    h2.ce-header {
+      @apply text-2xl font-medium font-sans leading-[1.3] mb-4 mt-8;
+    }
+
+    h3.ce-header {
+      @apply text-xl font-normal font-sans leading-[1.3] mb-4 mt-6;
+    }
+
+    p,
+    li {
+      @apply leading-[1.6] tracking-wide max-w-[85ch];
+
+      a {
+        @apply text-[#1A9597] underline underline-offset-2 hover:text-[#158486] focus:outline-2 focus:outline-offset-2 focus:outline-[#1A9597];
+      }
+
+      strong,
+      b {
+        @apply font-semibold;
+      }
+    }
+
+    p {
+      @apply mb-4;
+    }
+
+    .cdx-quote {
+      @apply bg-[#eef0f3] border-l-inactive border-l-8 p-6 mb-4;
+
+      .cdx-quote__caption {
+        @apply block ml-6 mt-2 text-sm text-dark;
+      }
+
+      .cdx-quote__text {
+        quotes: "\201C" "\201D" "\2018" "\2019";
+        @apply pl-6;
+
+        &:before {
+          @apply -ml-8 mr-2 text-dark text-6xl leading-4 align-text-bottom font-serif;
+          content: open-quote;
+        }
+
+        p {
+          @apply inline italic text-lg;
+        }
+      }
+    }
+
+    .cdx-list {
+      @apply mb-4 pl-6;
+
+      &--ordered {
+        @apply list-decimal;
+      }
+
+      &--unordered {
+        @apply list-disc;
+      }
+
+      .cdx-list {
+        @apply mt-2 mb-0;
+      }
+
+      .cdx-list__item {
+        @apply mb-2 pl-2;
+      }
+    }
+
+    .cdx-nested-list {
+      @apply mb-4 pl-6;
+
+      &--ordered {
+        @apply list-decimal;
+      }
+
+      &--unordered {
+        @apply list-disc;
+      }
+
+      .cdx-nested-list {
+        @apply mt-2 mb-0;
+      }
+
+      .cdx-nested-list__item {
+        @apply mb-2 pl-2;
+      }
+    }
+
+    .cdx-table {
+      @apply w-full border-collapse border-2 border-dark my-6;
+
+      &__head {
+        @apply font-semibold border-dark border-r-2 p-3 bg-light;
+      }
+
+      &__row {
+        @apply border-dark border-b-2;
+      }
+
+      &__cell {
+        @apply border-dark border-r-2 p-3;
+      }
+    }
+
+    .cdx-embed {
+      iframe {
+        @apply w-full border-none;
+      }
+    }
+  }
+}

data/app/assets/tailwind/tailwind.config.js

@@ -0,0 +1,15 @@
+module.exports = {
+  content: {
+    relative: true,
+    files: [
+      "../../public/*.html",
+      "../../app/views/**/*.html.erb",
+      "../../app/builders/panda/cms/**/*.rb",
+      "../../app/components/panda/cms/**/*.html.erb",
+      "../../app/components/panda/cms/**/*.rb",
+      "../../app/helpers/panda/cms/**/*.rb",
+      "../../app/javascript/panda/cms/**/*.js",
+      "../../vendor/javascript/**/*.js",
+    ],
+  },
+};

data/app/builders/panda/cms/form_builder.rb

@@ -1,5 +1,3 @@
-require "ostruct"
-
 module Panda
   module CMS
     class FormBuilder < ActionView::Helpers::FormBuilder
@@ -17,48 +15,48 @@ module Panda
               content_tag(:div, class: "flex flex-grow") do
                 content_tag(:span, class: "inline-flex items-center px-3 text-base border border-r-none rounded-s-md whitespace-nowrap break-keep") { options.dig(:data, :prefix) } +
                   super(attribute, options.reverse_merge(class: input_styles_prefix + " input-prefix rounded-l-none border-l-none"))
-              end
+              end + error_message(attribute)
           end
         else
           content_tag :div, class: container_styles do
-            label(attribute) + meta_text(options) + super(attribute, options.reverse_merge(class: input_styles))
+            label(attribute) + meta_text(options) + super(attribute, options.reverse_merge(class: input_styles)) + error_message(attribute)
           end
         end
       end
 
       def email_field(method, options = {})
         content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles))
+          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles)) + error_message(method)
         end
       end
 
       def datetime_field(method, options = {})
         content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles))
+          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles)) + error_message(method)
         end
       end
 
       def text_area(method, options = {})
         content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles))
+          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles)) + error_message(method)
         end
       end
 
       def password_field(attribute, options = {})
         content_tag :div, class: container_styles do
-          label(attribute) + meta_text(options) + super(attribute, options.reverse_merge(class: input_styles))
+          label(attribute) + meta_text(options) + super(attribute, options.reverse_merge(class: input_styles)) + error_message(attribute)
         end
       end
 
       def select(method, choices = nil, options = {}, html_options = {}, &block)
         content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, choices, options, html_options.reverse_merge(class: select_styles)) + select_svg
+          label(method) + meta_text(options) + super(method, choices, options, html_options.reverse_merge(class: select_styles)) + select_svg + error_message(method)
         end
       end
 
       def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
         content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, collection, value_method, text_method, options, html_options.reverse_merge(class: input_styles))
+          label(method) + meta_text(options) + super(method, collection, value_method, text_method, options, html_options.reverse_merge(class: input_styles)) + error_message(method)
         end
       end
 
@@ -147,28 +145,6 @@ module Panda
         end
       end
 
-      def rich_text_area(method, options = {})
-        content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, options.reverse_merge(class: textarea_styles))
-        end
-      end
-
-      def rich_text_field(method, options = {})
-        wrap_field(method, options) do
-          if defined?(ActionText)
-            # For test environment
-            if Rails.env.test?
-              # Just render a textarea for testing
-              text_area(method, options.reverse_merge(class: textarea_styles))
-            else
-              rich_text_area(method, options.reverse_merge(class: textarea_styles))
-            end
-          else
-            text_area(method, options.reverse_merge(class: textarea_styles))
-          end
-        end
-      end
-
       def meta_text(options)
         return unless options[:meta]
         @template.content_tag(:p, options[:meta], class: "block text-black/60 text-sm mb-2")
@@ -229,6 +205,13 @@ module Panda
       def field_wrapper_styles
         "mt-1"
       end
+
+      def error_message(attribute)
+        return unless object.respond_to?(:errors) && object.errors[attribute]&.any?
+        content_tag(:p, class: "mt-2 text-sm text-red-600") do
+          object.errors[attribute].join(", ")
+        end
+      end
     end
   end
 end

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

@@ -1,4 +1,4 @@
-<div class="fixed top-2 right-2 z-50 p-2 space-y-4 w-full max-w-sm pointer-events-none sm:items-end"
+<div class="fixed top-2 right-2 z-[9999] p-2 space-y-4 w-full max-w-sm sm:items-end"
      data-controller="alert"
      <% if @temporary %> data-alert-dismiss-after-value="3000"<% end %>
      data-transition-enter="ease-in-out duration-500"
@@ -7,7 +7,7 @@
      data-transition-leave="ease-in-out duration-500"
      data-transition-leave-from="translate-x-0 opacity-100"
      data-transition-leave-to="translate-x-full opacity-0">
-  <div class="overflow-hidden w-full max-w-sm bg-white rounded-lg ring-1 ring-black ring-opacity-5 shadow-lg pointer-events-auto">
+  <div class="overflow-hidden w-full max-w-sm bg-white rounded-lg ring-1 ring-black ring-opacity-5 shadow-lg">
     <div class="p-4">
       <div class="flex items-start">
         <div class="flex-shrink-0">

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

@@ -8,24 +8,13 @@ module Panda
         attr_accessor :time
         attr_accessor :user
 
-        # @param whodunnit_to [ActiveRecord::Base] Model instance to which the user activity is related
-        def initialize(whodunnit_to: nil, at: nil, user: nil)
-          if whodunnit_to
-            @model = whodunnit_to
-            whodunnit_id = @model.versions&.last&.whodunnit
-            if whodunnit_id
-              @user = User.find(whodunnit_id)
-              @time = @model.updated_at
-            end
-          elsif user.is_a?(::Panda::CMS::User) && at.is_a?(::ActiveSupport::TimeWithZone)
-            @user = user
-            @time = at
-          end
-
-          if !@time
-            @user = nil
-            @time = nil
-          end
+        # @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
+        def initialize(model: nil, at: nil, user: nil)
+          @model = model
+          @user = user if user.is_a?(::Panda::CMS::User)
+          @time = at if at.is_a?(::ActiveSupport::TimeWithZone)
         end
       end
     end

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

@@ -6,7 +6,6 @@ module Panda
       class BlockContentsController < ApplicationController
         before_action :set_page, only: %i[update]
         before_action :set_block_content, only: %i[update]
-        before_action :set_paper_trail_whodunnit, only: %i[update]
         before_action :authenticate_admin_user!
 
         # @type PATCH/PUT

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

@@ -5,7 +5,6 @@ module Panda
     module Admin
       class FormsController < ApplicationController
         before_action :set_initial_breadcrumb, only: %i[index show]
-        # before_action :set_paper_trail_whodunnit, only: %i[create update]
         before_action :authenticate_admin_user!
 
         # Lists all forms

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Panda
+  module CMS
+    module Admin
+      class MyProfileController < ApplicationController
+        before_action :set_initial_breadcrumb, only: %i[edit update]
+        before_action :authenticate_admin_user!
+
+        # Shows the edit form for the current user's profile
+        # @type GET
+        # @return void
+        def edit
+          render :edit, locals: {user: current_user}
+        end
+
+        # Updates the current user's profile
+        # @type PATCH/PUT
+        # @return void
+        def update
+          if current_user.update(user_params)
+            redirect_to edit_admin_my_profile_path, flash: {success: "Your profile has been updated successfully."}
+          else
+            render :edit, locals: {user: current_user}, status: :unprocessable_entity
+          end
+        end
+
+        private
+
+        def set_initial_breadcrumb
+          add_breadcrumb "My Profile", edit_admin_my_profile_path
+        end
+
+        # Only allow a list of trusted parameters through
+        # @type private
+        # @return ActionController::StrongParameters
+        def user_params
+          params.require(:user).permit(:firstname, :lastname, :email, :current_theme)
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,6 @@ module Panda
     module Admin
       class PagesController < ApplicationController
         before_action :set_initial_breadcrumb, only: %i[index edit new create update]
-        before_action :set_paper_trail_whodunnit, only: %i[create update]
         before_action :authenticate_admin_user!
 
         # Lists all pages which can be managed by the administrator
@@ -34,11 +33,19 @@ module Panda
         # POST /admin/pages
         def create
           page = Panda::CMS::Page.new(page_params)
+
+          # Normalize empty path to nil so presence validation triggers
+          page.path = nil if page.path.blank?
+
+          # Set the full path before validation if we have a parent
+          if page.parent && page.parent.path != "/" && page.path.present?
+            page.path = page.parent.path + page.path
+          end
+
           if page.save
-            page.update(path: page.parent.path + page.path) unless page.parent.path == "/"
             redirect_to edit_admin_page_path(page), notice: "The page was successfully created."
           else
-            flash[:error] = "There was an error creating the page."
+            flash.now[:error] = page.errors.full_messages.to_sentence
             locals = setup_new_page_form(page: page)
             render :new, locals: locals, status: :unprocessable_entity
           end
@@ -76,7 +83,10 @@ module Panda
 
         def setup_new_page_form(page:)
           add_breadcrumb "Add Page", new_admin_page_path
-          {page: page}
+          {
+            page: page,
+            available_templates: Panda::CMS::Template.available
+          }
         end
 
         # Only allow a list of trusted parameters through.

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

@@ -6,8 +6,7 @@ module Panda
   module CMS
     module Admin
       class PostsController < ApplicationController
-        before_action :set_initial_breadcrumb, only: %i[index new edit create update]
-        before_action :set_paper_trail_whodunnit, only: %i[create update]
+        before_action :set_initial_breadcrumb, only: %i[index edit new create update]
         before_action :authenticate_admin_user!
 
         # Get all posts
@@ -29,20 +28,7 @@ module Panda
         # @type GET
         def edit
           add_breadcrumb post.title, edit_admin_post_path(post.admin_param)
-
-          # Get the latest version's content or fall back to post's content
-          preserved_content = if post.versions.exists?
-            reified_post = post.versions.last.reify
-            reified_post&.content || post.content
-          else
-            post.content
-          end
-
-          render :edit, locals: {
-            post: post,
-            url: admin_post_path(post.admin_param),
-            preserved_content: preserved_content
-          }
+          render :edit, locals: {post: post}
         end
 
         # POST /admin/posts
@@ -53,7 +39,8 @@ module Panda
 
           if @post.save
             Rails.logger.debug "Post saved successfully"
-            redirect_to edit_admin_post_path(@post.admin_param), success: "The post was successfully created!"
+            flash[:success] = "The post was successfully created!"
+            redirect_to edit_admin_post_path(@post.admin_param), status: :see_other
           else
             Rails.logger.debug "Post save failed: #{@post.errors.full_messages.inspect}"
             flash.now[:error] = @post.errors.full_messages.join(", ")
@@ -75,17 +62,15 @@ module Panda
           if post.update(update_params)
             Rails.logger.debug "Post updated successfully"
             add_breadcrumb post.title, edit_admin_post_path(post.admin_param)
-            redirect_to edit_admin_post_path(post.admin_param),
-              status: :see_other,
-              flash: {success: "The post was successfully updated!"}
+            flash[:success] = "The post was successfully updated"
+            redirect_to edit_admin_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}"
-            flash[:error] = post.errors.full_messages.join(", ")
             add_breadcrumb post.title.presence || "Edit Post", edit_admin_post_path(post.admin_param)
+            flash.now[:error] = post.errors.full_messages.join(", ")
             render :edit, locals: {
               post: post,
-              url: admin_post_path(post.admin_param),
               preserved_content: post_params[:content]
             }, status: :unprocessable_entity
           end

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

@@ -1,6 +1,8 @@
 module Panda
   module CMS
     class FormSubmissionsController < ApplicationController
+      invisible_captcha only: [:create]
+
       def create
         vars = params.except(:authenticity_token, :controller, :action, :id)
 

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

@@ -69,21 +69,23 @@ module Panda
         # Ignore visits from bots (TODO: make this configurable)
         return true if /bot/i.match?(request.user_agent)
         # Ignore visits from Honeybadger
-        return true if request.headers.to_h.key? "Honeybadger-Token"
-
+        return true if request.headers.to_h.key?("Honeybadger-Token") || request.user_agent == "Honeybadger Uptime Check"
+        # Ignore visits where we're asking for PHP files
+        return true if request.path.ends_with?(".php")
+        # Otherwise, record the visit
         false
       end
 
       def record_visit
         RecordVisitJob.perform_later(
-          url: request.url,
+          path: request.path,
+          user_id: Current.user&.id,
+          redirect_id: @redirect&.id,
+          page_id: Current.page&.id,
           user_agent: request.user_agent,
-          referrer: request.referrer,
           ip_address: request.remote_ip,
-          page_id: Panda::CMS::Current.page&.id,
-          current_user_id: current_user&.id,
-          params: params.to_unsafe_h.except(:controller, :action, :path),
-          visited_at: Time.zone.now
+          referer: request.referer, # TODO: Fix the naming of this column
+          params: request.parameters
         )
       end
 

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

@@ -7,8 +7,8 @@ const pandaCmsApplication = PandaCMSApplication.start()
 console.debug("[Panda CMS] Application started...")
 
 // Configure Stimulus development experience
-pandaCmsApplication.debug = false
-window.pandaCmsStimulus = pandaCmsApplication
+const railsEnv = document.body?.dataset?.environment || "production";
+pandaCmsApplication.debug = railsEnv === "development";
 
 console.debug("[Panda CMS] window.pandaCmsStimulus available...")
 
@@ -28,6 +28,8 @@ import EditorIframeController from "panda/cms/controllers/editor_iframe_controll
 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"