macron-cms 1.0.0 → 2.0.0

data/app/helpers/macron/cms/content_helper.rb

@@ -22,10 +22,41 @@ module Macron
         end
 
         render widget_class.new(
+          article_content: article_content,
           payload: article_content.payload,
           fields: article_content.content.normalized_fields
         )
       end
+
+      def cms_article_background_style(article)
+        return "" if article.nil?
+
+        styles = []
+        if article.background_color.present?
+          styles << "background-color: #{article.background_color};"
+        end
+
+        if article.respond_to?(:text_color) && article.text_color.present?
+          styles << "color: #{article.text_color};"
+        end
+
+        if article.respond_to?(:background_image) && article.background_image.attached?
+          image_path = if respond_to?(:rails_blob_path)
+                         rails_blob_path(article.background_image, only_path: true)
+          elsif respond_to?(:url_for)
+                         url_for(article.background_image)
+          else
+                         Rails.application.routes.url_helpers.rails_blob_path(article.background_image, only_path: true)
+          end
+          styles << "background-image: url('#{image_path}');"
+          styles << "background-repeat: #{article.background_repeat};"
+          styles << "background-size: #{article.background_size};"
+          styles << "background-position: #{article.background_position};"
+          styles << "background-attachment: #{article.background_attachment};"
+        end
+
+        styles.join(" ")
+      end
     end
   end
 end

data/app/helpers/macron/cms/fields_helper.rb

@@ -1,7 +1,17 @@
+require "kramdown"
+require "kramdown-parser-gfm"
+
 module Macron
   module Cms
     module FieldsHelper
-      SUPPORTED_KINDS = %w[string text].freeze
+      SUPPORTED_KINDS = %w[string text dropdown file color markdown json].freeze
+
+      def cms_render_markdown(text)
+        return "".html_safe if text.blank?
+
+        raw_html = Kramdown::Document.new(text.to_s, input: "GFM").to_html
+        sanitize(raw_html)
+      end
 
       def cms_render_field(field_def, value: nil, input_name: nil, input_id: nil)
         field_hash = field_def.stringify_keys

data/app/models/macron/cms/article.rb

@@ -1,6 +1,16 @@
 module Macron
   module Cms
     class Article < ApplicationRecord
+      VALID_BACKGROUND_REPEATS = %w[no-repeat repeat repeat-x repeat-y].freeze
+      VALID_BACKGROUND_SIZES = %w[cover contain auto].freeze
+      VALID_BACKGROUND_POSITIONS = %w[center top bottom left right].freeze
+      VALID_BACKGROUND_ATTACHMENTS = %w[scroll fixed].freeze
+
+      DEFAULT_BACKGROUND_REPEAT = "no-repeat"
+      DEFAULT_BACKGROUND_SIZE = "cover"
+      DEFAULT_BACKGROUND_POSITION = "center"
+      DEFAULT_BACKGROUND_ATTACHMENT = "scroll"
+
       before_validation :derive_name_from_title
 
       extend FriendlyId
@@ -12,6 +22,8 @@ module Macron
       has_many :article_contents, -> { order(:sort_order) }, class_name: "Macron::Cms::ArticleContent", dependent: :destroy
       has_many :contents, through: :article_contents
 
+      has_one_attached :background_image
+
       def seo_title
         meta_title.presence || title
       end
@@ -20,6 +32,30 @@ module Macron
         meta_description.presence
       end
 
+      def normalized_background_options
+        (background_options || {}).to_h.stringify_keys
+      end
+
+      def background_repeat
+        val = normalized_background_options["repeat"].to_s.strip.presence
+        VALID_BACKGROUND_REPEATS.include?(val) ? val : DEFAULT_BACKGROUND_REPEAT
+      end
+
+      def background_size
+        val = normalized_background_options["size"].to_s.strip.presence
+        VALID_BACKGROUND_SIZES.include?(val) ? val : DEFAULT_BACKGROUND_SIZE
+      end
+
+      def background_position
+        val = normalized_background_options["position"].to_s.strip.presence
+        VALID_BACKGROUND_POSITIONS.include?(val) ? val : DEFAULT_BACKGROUND_POSITION
+      end
+
+      def background_attachment
+        val = normalized_background_options["attachment"].to_s.strip.presence
+        VALID_BACKGROUND_ATTACHMENTS.include?(val) ? val : DEFAULT_BACKGROUND_ATTACHMENT
+      end
+
       private
 
       def derive_name_from_title

data/app/models/macron/cms/article_content.rb

@@ -4,17 +4,49 @@ module Macron
       belongs_to :article, class_name: "Macron::Cms::Article"
       belongs_to :content, class_name: "Macron::Cms::Content"
 
+      has_many_attached :files
+
       before_validation :assign_default_sort_order, on: :create
 
       validates :sort_order, numericality: { only_integer: true }
 
       default_scope -> { order(:sort_order, :id) }
 
+      def upload
+        files.first
+      end
+
+      def file
+        files.first
+      end
+
+      def uploads
+        files
+      end
+
+      def attach_upload(uploaded, replace: false)
+        return unless uploaded.present?
+
+        if replace && files.attached?
+          files.purge
+        end
+
+        files.attach(uploaded)
+      end
+
       def filter_payload(raw_payload)
         return {} unless content && raw_payload.respond_to?(:to_h)
 
         allowed = content.field_names
-        raw_payload.to_h.stringify_keys.slice(*allowed)
+        raw_payload.to_h.stringify_keys.slice(*allowed).transform_values do |val|
+          if val.respond_to?(:original_filename)
+            val.original_filename
+          elsif val.is_a?(Array) && val.any? { |v| v.respond_to?(:original_filename) }
+            val.filter_map { |v| v.respond_to?(:original_filename) ? v.original_filename : v }
+          else
+            val
+          end
+        end
       end
 
       private

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

@@ -7,6 +7,10 @@
   <%= csp_meta_tag %>
 
   <%= stylesheet_link_tag "macron/cms/application", media: "all" %>
+  <%= stylesheet_link_tag "macron/cms/codemirror", media: "all" %>
+  <%= turbo_include_tags %>
+  <%= javascript_include_tag "macron/cms/codemirror", defer: true %>
+  <%= javascript_include_tag "macron/cms/editor", defer: true %>
   <%= yield :head %>
 </head>
 <body class="min-h-screen text-zinc-900 antialiased flex bg-zinc-50">
@@ -100,24 +104,8 @@
     </header>
 
     <!-- Flash Notifications -->
-    <div class="max-w-7xl w-full mx-auto px-6 sm:px-8 pt-6">
-      <% if notice.present? %>
-        <div class="p-4 mb-4 rounded-xl bg-emerald-50 border border-emerald-200 text-emerald-800 text-sm flex items-center gap-3">
-          <svg class="w-5 h-5 text-emerald-600 shrink-0" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-            <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
-          </svg>
-          <span class="font-medium"><%= notice %></span>
-        </div>
-      <% end %>
-
-      <% if alert.present? %>
-        <div class="p-4 mb-4 rounded-xl bg-rose-50 border border-rose-200 text-rose-800 text-sm flex items-center gap-3">
-          <svg class="w-5 h-5 text-rose-600 shrink-0" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-            <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m9-.75a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9 3.75h.008v.008H12v-.008Z" />
-          </svg>
-          <span class="font-medium"><%= alert %></span>
-        </div>
-      <% end %>
+    <div id="flash-messages" class="max-w-7xl w-full mx-auto px-6 sm:px-8 pt-6">
+      <%= render "macron/cms/shared/flash" %>
     </div>
 
     <!-- Main Content Canvas -->