panda-cms 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c002856b3c2b19f78b45a5fd2bb58287bd8b49cfc305f4e400c52e41c38fa9b
-  data.tar.gz: df33fb1880dab8f2361d36859a2c0a556710d2c5879f3a0ae052b4ea7a4e0d78
+  metadata.gz: 74ac7b8103cc0535b6bbfce15e834b7b7e6dfe033fc168ca5d31bb8615b02ede
+  data.tar.gz: e9c66a7a385abdbb7a6c52418c754b93d8a2fcc8afaf337fc69379c8a4c2e365
 SHA512:
-  metadata.gz: db39a72f704c8aebd0b1049b6efba4c41ab5fb09dc8320de6693848829ef2b4ce3e4a90d081a38ce5a44ec6a7e21cae4edf1ce122a678d2d1e4aa85be28de757
-  data.tar.gz: 1b3260d6ca7bffbfa794894f90f5db94fb71a47510bf3eeef599264883baee32d52e1527e06492d372c30f790920d6688d02644d2d186cfe59c9bbd380fad431
+  metadata.gz: fdececd7daec565b2cb6d2ba5a0ca27c84b518a0b1178ca664c848b9078f45ca4045d749a3816e5f0cb2bbeef4af88b516fcd14f5e7617a2eff53288af86db0a
+  data.tar.gz: 05ddb0a8850ceb30f4bd52b596e5e6ec237d1d03c70cdc6c12d1f01dd07d83ddfa1968f6db660fe7f00bbb60e41680095c6eeb993071c727f917be3d7a39e059

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

@@ -835,56 +835,6 @@ a.block-link:after {
   }
 }
 
-.form-input,.form-textarea,.form-select,.form-multiselect {
-  -webkit-appearance: none;
-     -moz-appearance: none;
-          appearance: none;
-  background-color: #fff;
-  border-color: #6b7280;
-  border-width: 1px;
-  border-radius: 0px;
-  padding-top: 0.5rem;
-  padding-right: 0.75rem;
-  padding-bottom: 0.5rem;
-  padding-left: 0.75rem;
-  font-size: 1rem;
-  line-height: 1.5rem;
-  --tw-shadow: 0 0 #0000;
-}
-
-.form-input:focus, .form-textarea:focus, .form-select:focus, .form-multiselect:focus {
-  outline: 2px solid transparent;
-  outline-offset: 2px;
-  --tw-ring-inset: var(--tw-empty,/*!*/ /*!*/);
-  --tw-ring-offset-width: 0px;
-  --tw-ring-offset-color: #fff;
-  --tw-ring-color: #2563eb;
-  --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
-  --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);
-  box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
-  border-color: #2563eb;
-}
-
-.form-select {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");
-  background-position: right 0.5rem center;
-  background-repeat: no-repeat;
-  background-size: 1.5em 1.5em;
-  padding-right: 2.5rem;
-  -webkit-print-color-adjust: exact;
-          print-color-adjust: exact;
-}
-
-.form-select:where([size]:not([size="1"])) {
-  background-image: initial;
-  background-position: initial;
-  background-repeat: unset;
-  background-size: initial;
-  padding-right: 0.75rem;
-  -webkit-print-color-adjust: unset;
-          print-color-adjust: unset;
-}
-
 .aspect-h-7 {
   --tw-aspect-h: 7;
 }

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

@@ -10,12 +10,15 @@
   <% if @rows.any? %>
   <div class="table-row-group">
     <% @rows.each do |row| %>
-      <div class="table-row relative bg-mid/5 hover:bg-mid/20">
+      <div class="table-row relative bg-mid/5 hover:bg-mid/20" data-post-id="<%= row.id %>">
         <% @columns.each do |column| %>
           <div class="table-cell py-5 px-3 h-20 text-sm align-middle whitespace-nowrap border-b border-mid/20">
             <%= view_context.capture(row, &column.cell) %>
           </div>
         <% end %>
+        <div class="table-cell py-5 px-3 h-20 text-sm align-middle whitespace-nowrap border-b border-mid/20">
+          <%= button_to "Delete", view_context.admin_post_path(row), method: :delete, class: "btn btn-danger", data: { confirm: "Are you sure?" } %>
+        </div>
       </div>
     <% end %>
   </div>

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

@@ -39,10 +39,11 @@ module Panda
             "editable-page-id": Current.page.id,
             "editable-block-content-id": block_content&.id
           }
-          @options[:class] = "block bg-yellow-50 font-mono p-2 border-2 border-yellow-700"
+          @options[:class] = "block bg-yellow-50 font-mono text-xs p-2 border-2 border-yellow-700"
           @options[:style] = "white-space: pre-wrap;"
 
           @options[:id] = "editor-#{block_content&.id}"
+
           # TODO: Switch between the HTML and the preview?
           content_tag(:div, code_content, @options, true)
         else

data/app/components/panda/cms/rich_text_component.html.erb

@@ -1,6 +1,90 @@
+<%
+  editor_data = if @editable
+    begin
+      content = if @content.is_a?(String)
+        if @content.start_with?("{")
+          JSON.parse(@content)
+        else
+          # If it's HTML content, convert it to EditorJS format
+          {
+            "time" => Time.current.to_i * 1000,
+            "blocks" => [
+              {
+                "type" => "paragraph",
+                "data" => {
+                  "text" => @content.to_s
+                }
+              }
+            ],
+            "version" => "2.28.2"
+          }
+        end
+      else
+        @content
+      end
+
+      content = content.deep_transform_keys(&:to_s)
+      content["blocks"] = (content["blocks"] || []).map do |block|
+        case block["type"]
+        when "paragraph"
+          block["data"] = block["data"].merge(
+            "text" => block["data"]["text"].to_s.presence || ""
+          )
+        when "header"
+          block["data"] = block["data"].merge(
+            "text" => block["data"]["text"].to_s.presence || "",
+            "level" => block["data"]["level"].to_i
+          )
+        when "list"
+          block["data"] = block["data"].merge(
+            "items" => (block["data"]["items"] || []).map { |item| item.to_s.presence || "" }
+          )
+        end
+        block
+      end
+
+      content["version"] ||= "2.28.2"
+      content["time"] ||= Time.current.to_i * 1000
+
+      Base64.strict_encode64(content.to_json)
+    rescue StandardError => e
+      Rails.logger.error("Error encoding editor data: #{e.message}")
+      Rails.logger.error("Original content: #{@content.inspect}")
+      # Fall back to a simple paragraph with the original content
+      fallback_content = {
+        "time" => Time.current.to_i * 1000,
+        "blocks" => [
+          {
+            "type" => "paragraph",
+            "data" => {
+              "text" => @content.to_s
+            }
+          }
+        ],
+        "version" => "2.28.2"
+      }
+      Base64.strict_encode64(fallback_content.to_json)
+    end
+  end
+%>
 <% if @editable %>
-  <div class="panda-cms-content" data-editable-previous-data="<%= @content.to_json %>" id="editor-<%= @options[:id] %>" data-editable-kind="rich_text" data-editable-block-content-id="<%= @options[:id] %>" data-editable-page-id="<%= @options[:data][:page_id] %>" style="border: 1px dashed #ccc; outline: none; cursor: pointer; transition: background 500ms linear; background-color: inherit;">
+  <div class="panda-cms-content"
+       data-editable-previous-data="<%= editor_data %>"
+       data-editable-content="<%= editor_data %>"
+       data-editable-initialized="false"
+       data-editable-version="2.28.2"
+       data-editable-autosave="false"
+       data-editable-tools='{"paragraph":true,"header":true,"list":true,"quote":true,"table":true}'
+       id="editor-<%= @options[:id] %>"
+       data-editable-kind="rich_text"
+       data-editable-block-content-id="<%= @options[:id] %>"
+       data-editable-page-id="<%= @options[:data][:page_id] %>"
+       data-controller="editor-js"
+       data-editor-js-initialized-value="false"
+       data-editor-js-content-value="<%= editor_data %>">
   </div>
 <% else %>
-  <div class="panda-cms-content"><%= @content %></div>
+  <div class="panda-cms-content">
+    <%= @content.presence || "<p></p>".html_safe %>
+  </div>
 <% end %>

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

@@ -35,49 +35,160 @@ module Panda
           block_content = Panda::CMS::BlockContent.create!(
             block: block,
             panda_cms_page_id: Current.page.id,
-            content: ""
+            content: empty_editor_js_content
           )
         end
 
-        @content = block_content.cached_content || block_content.content
-        raise ComponentError, "No content found for block: #{block.id}" if @content.nil?
-
+        raw_content = block_content.cached_content || block_content.content
+        @content = raw_content.presence || empty_editor_js_content
         @options[:id] = block_content.id
 
+        # Debug log the content
+        Rails.logger.debug("RichTextComponent content before processing: #{@content.inspect}")
+
         if @editable
           @options[:data] = {
             page_id: Current.page.id,
             mode: "rich_text"
           }
 
-          # Convert HTML content to EditorJS format if needed
-          begin
-            editor_content = Panda::CMS::HtmlToEditorJsConverter.convert(@content)
-            @content = editor_content
-          rescue Panda::CMS::HtmlToEditorJsConverter::ConversionError => e
-            raise ComponentError, "Failed to convert content: #{e.message}"
-          end
-        elsif @content.is_a?(Hash)
-          begin
-            renderer = Panda::CMS::EditorJs::Renderer.new(@content)
-            @content = renderer.render
-          rescue => e
-            raise ComponentError, "Failed to render content: #{e.message}"
+          # For editable mode, always ensure we have a valid EditorJS structure
+          @content = if @content.blank? || @content == "{}"
+            empty_editor_js_content
+          else
+            begin
+              if @content.is_a?(String)
+                # Try to parse as JSON first
+                begin
+                  parsed = JSON.parse(@content)
+                  if valid_editor_js_content?(parsed)
+                    # Ensure the content is properly structured
+                    {
+                      "time" => parsed["time"] || Time.current.to_i * 1000,
+                      "blocks" => parsed["blocks"].map { |block|
+                        {
+                          "type" => block["type"],
+                          "data" => block["data"].merge(
+                            "text" => block["data"]["text"].to_s.presence || ""
+                          ),
+                          "tunes" => block["tunes"]
+                        }.compact
+                      },
+                      "version" => parsed["version"] || "2.28.2"
+                    }
+                  else
+                    # If not valid EditorJS, try to convert from HTML
+                    begin
+                      editor_content = Panda::CMS::HtmlToEditorJsConverter.convert(@content)
+                      if valid_editor_js_content?(editor_content)
+                        editor_content
+                      else
+                        empty_editor_js_content
+                      end
+                    rescue Panda::CMS::HtmlToEditorJsConverter::ConversionError => e
+                      Rails.logger.error("HTML conversion error: #{e.message}")
+                      empty_editor_js_content
+                    end
+                  end
+                rescue JSON::ParserError => e
+                  Rails.logger.error("JSON parse error: #{e.message}")
+                  # Try to convert from HTML
+                  begin
+                    editor_content = Panda::CMS::HtmlToEditorJsConverter.convert(@content)
+                    if valid_editor_js_content?(editor_content)
+                      editor_content
+                    else
+                      empty_editor_js_content
+                    end
+                  rescue Panda::CMS::HtmlToEditorJsConverter::ConversionError => e
+                    Rails.logger.error("HTML conversion error: #{e.message}")
+                    empty_editor_js_content
+                  end
+                end
+              else
+                # If it's not a string, assume it's already in the correct format
+                valid_editor_js_content?(@content) ? @content : empty_editor_js_content
+              end
+            rescue => e
+              Rails.logger.error("Content processing error: #{e.message}\nContent: #{@content.inspect}")
+              empty_editor_js_content
+            end
           end
         else
-          @content = @content.html_safe
+          # For non-editable mode, handle content display
+          @content = if @content.blank? || @content == "{}"
+            "<p></p>".html_safe
+          else
+            begin
+              # Try to parse as JSON if it looks like EditorJS format
+              if @content.is_a?(String) && @content.strip.match?(/^\{.*"blocks":\s*\[.*\].*\}$/m)
+                parsed_content = JSON.parse(@content)
+                if valid_editor_js_content?(parsed_content)
+                  # Check if it's just an empty paragraph
+                  if parsed_content["blocks"].length == 1 &&
+                      parsed_content["blocks"][0]["type"] == "paragraph" &&
+                      parsed_content["blocks"][0]["data"]["text"].blank?
+                    "<p></p>".html_safe
+                  else
+                    renderer = Panda::CMS::EditorJs::Renderer.new(parsed_content)
+                    rendered = renderer.render
+                    rendered.presence&.html_safe || "<p></p>".html_safe
+                  end
+                else
+                  process_html(@content)
+                end
+              else
+                process_html(@content)
+              end
+            rescue JSON::ParserError
+              process_html(@content)
+            rescue => e
+              Rails.logger.error("RichTextComponent render error: #{e.message}\nContent: #{@content.inspect}")
+              "<p></p>".html_safe
+            end
+          end
         end
       rescue ActiveRecord::RecordNotFound => e
         raise ComponentError, "Database record not found: #{e.message}"
       rescue ActiveRecord::RecordInvalid => e
         raise ComponentError, "Invalid record: #{e.message}"
       rescue => e
-        raise ComponentError, "Component error: #{e.message}"
+        Rails.logger.error("RichTextComponent error: #{e.message}\nContent: #{@content.inspect}")
+        @content = @editable ? empty_editor_js_content : "<p></p>".html_safe
+        nil
+      end
+
+      private
+
+      def empty_editor_js_content
+        {
+          time: Time.current.to_i * 1000,
+          blocks: [{type: "paragraph", data: {text: ""}}],
+          version: "2.28.2"
+        }
+      end
+
+      def valid_editor_js_content?(content)
+        content.is_a?(Hash) && content["blocks"].is_a?(Array) && content["version"].present?
+      rescue
+        false
+      end
+
+      def process_html(content)
+        return "<p></p>".html_safe if content.blank?
+
+        # If it's already HTML, just return it
+        if content.match?(/<[^>]+>/)
+          content.html_safe
+        else
+          # Wrap plain text in paragraph tags
+          "<p>#{content}</p>".html_safe
+        end
       end
 
       # Only render the component if there is some content set, or if the component is editable
       def render?
-        @content.present? || @editable
+        true # Always render, we'll show empty content if needed
       end
     end
   end

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

@@ -15,15 +15,26 @@ module Panda
           Rails.logger.debug "Content params: #{params.inspect}"
           Rails.logger.debug "Raw content: #{request.raw_post}"
 
-          if @block_content.update!(content: params.dig(:content))
-            @block_content.page.touch
-            render json: @block_content, status: :ok
+          # Ensure content isn't HTML escaped before saving
+          if params[:content].present?
+            # Convert ActionController::Parameters to a string if needed
+            content_str = params[:content].is_a?(ActionController::Parameters) ? params[:content].to_json : params[:content].to_s
+            content = CGI.unescapeHTML(content_str)
           else
-            render json: @block_content.errors, status: :unprocessable_entity
+            content = nil
+          end
+
+          begin
+            if content && @block_content.update!(content: content)
+              @block_content.page.touch
+              render json: @block_content, status: :ok
+            else
+              render json: @block_content.errors, status: :unprocessable_entity
+            end
+          rescue => e
+            Rails.logger.error "Error updating block content: #{e.message}"
+            render json: {error: e.message}, status: :unprocessable_entity
           end
-        rescue => e
-          Rails.logger.error "Error updating block content: #{e.message}"
-          render json: {error: e.message}, status: :unprocessable_entity
         end
 
         private

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

@@ -1,20 +1,30 @@
+# frozen_string_literal: true
+
 module Panda
   module CMS
-    class Admin::FilesController < ApplicationController
-      before_action :set_initial_breadcrumb, only: %i[index show]
-      before_action :authenticate_admin_user!
-
-      def index
-        redirect_to admin_dashboard_path
-      end
+    module Admin
+      class FilesController < ApplicationController
+        before_action :authenticate_admin_user!
 
-      def show
-      end
+        def create
+          file = params[:image]
+          return render json: {success: 0} unless file
 
-      private
+          blob = ActiveStorage::Blob.create_and_upload!(
+            io: file,
+            filename: file.original_filename,
+            content_type: file.content_type
+          )
 
-      def set_initial_breadcrumb
-        add_breadcrumb "Media", admin_files_path
+          render json: {
+            success: true,
+            file: {
+              url: Rails.application.routes.url_helpers.rails_blob_url(blob, only_path: true),
+              name: blob.filename.to_s,
+              size: blob.byte_size
+            }
+          }
+        end
       end
     end
   end

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

@@ -14,7 +14,7 @@ module Panda
         # @type GET
         # @return ActiveRecord::Collection A list of all posts
         def index
-          posts = Panda::CMS::Post.with_user.ordered
+          posts = Panda::CMS::Post.with_author.ordered
           render :index, locals: {posts: posts}
         end
 
@@ -48,16 +48,12 @@ module Panda
         # POST /admin/posts
         def create
           @post = Panda::CMS::Post.new(post_params)
-
-          begin
-            @post.content = JSON.parse(post_params[:content])
-          rescue
-            @post.content = post_params[:content]
-          end
+          @post.user_id = current_user.id
+          @post.content = parse_content(post_params[:content]) # Parse the content before saving
 
           if @post.save
             Rails.logger.debug "Post saved successfully"
-            redirect_to edit_admin_post_path(@post.admin_param), notice: "Post was successfully created."
+            redirect_to edit_admin_post_path(@post.admin_param), success: "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(", ")
@@ -69,11 +65,14 @@ module Panda
         # @type PATCH/PUT
         # @return
         def update
-          Rails.logger.debug "Updating post with params: #{post_params.inspect}"
           Rails.logger.debug "Current content: #{post.content.inspect}"
           Rails.logger.debug "New content from params: #{post_params[:content].inspect}"
 
-          if post.update(post_params)
+          # Parse the content before updating
+          update_params = post_params
+          update_params[:content] = parse_content(post_params[:content])
+          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)
             redirect_to edit_admin_post_path(post.admin_param),
@@ -136,10 +135,33 @@ module Panda
             :slug,
             :status,
             :published_at,
-            :user_id,
+            :author_id,
             :content
           )
         end
+
+        def parse_content(content)
+          return {} if content.blank?
+
+          begin
+            # If content is already a hash, return it
+            return content if content.is_a?(Hash)
+
+            # If it's a string, try to parse it as JSON
+            parsed = JSON.parse(content)
+
+            # Ensure we have a hash with expected structure
+            if parsed.is_a?(Hash) && parsed["blocks"].is_a?(Array)
+              parsed
+            else
+              # If structure is invalid, return empty blocks structure
+              {"blocks" => []}
+            end
+          rescue JSON::ParserError => e
+            Rails.logger.error "Failed to parse post content: #{e.message}"
+            {"blocks" => []}
+          end
+        end
       end
     end
   end

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

@@ -4,6 +4,7 @@ module Panda
       include ActionView::Helpers::TagHelper
 
       before_action :check_login_required, only: [:root, :show]
+      before_action :handle_redirects, only: [:root, :show]
       after_action :record_visit, only: [:root, :show], unless: :ignore_visit?
 
       def root
@@ -40,6 +41,24 @@ module Panda
 
       private
 
+      def handle_redirects
+        current_path = "/" + params[:path].to_s
+        redirect = Panda::CMS::Redirect.find_by(origin_path: current_path)
+
+        if redirect
+          redirect.increment!(:visits)
+
+          # Check if the destination is also a redirect
+          next_redirect = Panda::CMS::Redirect.find_by(origin_path: redirect.destination_path)
+          if next_redirect
+            next_redirect.increment!(:visits)
+            redirect_to next_redirect.destination_path, status: redirect.status_code and return
+          end
+
+          redirect_to redirect.destination_path, status: redirect.status_code and return
+        end
+      end
+
       def check_login_required
         if Panda::CMS.config.require_login_to_view && !user_signed_in?
           redirect_to panda_cms_maintenance_path and return
@@ -67,6 +86,16 @@ module Panda
           visited_at: Time.zone.now
         )
       end
+
+      def create_redirect_if_path_changed
+        if path_changed? && path_was.present?
+          Panda::CMS::Redirect.create!(
+            origin_path: path_was,
+            destination_path: path,
+            status_code: 301
+          )
+        end
+      end
     end
   end
 end

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

@@ -1,12 +1,34 @@
 module Panda
   module CMS
     class PostsController < ApplicationController
+      # TODO: Change from layout rendering to standard template rendering
+      # inside a /panda/cms/posts/... structure in the application
+      def index
+        @posts = Panda::CMS::Post.includes(:author).order(published_at: :desc)
+        render inline: "", layout: Panda::CMS.config.posts[:layouts][:index]
+      end
+
       def show
-        @posts_index_page = Panda::CMS::Page.find_by(path: "/#{Panda::CMS.config.posts[:prefix]}")
-        @post = Panda::CMS::Post.find_by!(slug: "/#{params[:slug]}")
-        @title = @post.title
+        @post = if params[:year] && params[:month]
+          # For date-based URLs
+          slug = "/#{params[:year]}/#{params[:month]}/#{params[:slug]}"
+          Panda::CMS::Post.find_by!(slug: slug)
+        else
+          # For non-date URLs
+          Panda::CMS::Post.find_by!(slug: "/#{params[:slug]}")
+        end
+        render inline: "", layout: Panda::CMS.config.posts[:layouts][:show]
+      end
+
+      def by_month
+        @month = Date.new(params[:year].to_i, params[:month].to_i, 1)
+        @posts = Panda::CMS::Post
+          .where(status: :active)
+          .where("DATE_TRUNC('month', published_at) = ?", @month)
+          .includes(:author)
+          .ordered
 
-        render inline: "", status: :ok, layout: "layouts/post"
+        render inline: "", layout: Panda::CMS.config.posts[:layouts][:by_month]
       end
     end
   end