panda-cms 0.10.0 → 0.10.3

data/app/models/panda/cms/menu.rb

@@ -6,6 +6,7 @@ module Panda
       self.table_name = "panda_cms_menus"
 
       after_save :generate_auto_menu_items, if: -> { kind == "auto" }
+      after_commit :clear_menu_cache
 
       has_many :menu_items, lambda {
         order(lft: :asc)
@@ -50,6 +51,17 @@ module Panda
 
         errors.add(:start_page, "can't be blank")
       end
+
+      #
+      # Clear fragment cache when menu is updated
+      # This ensures menu changes appear immediately on the front-end
+      #
+      # @return nil
+      # @visibility private
+      #
+      def clear_menu_cache
+        Rails.cache.delete("panda_cms_menu/#{name}/#{id}")
+      end
     end
   end
 end

data/app/models/panda/cms/page.rb

@@ -51,6 +51,31 @@ module Panda
         code: "code"
       }, prefix: :type
 
+      enum :seo_index_mode, {
+        visible: "visible",
+        invisible: "invisible"
+      }, prefix: :seo
+
+      enum :og_type, {
+        website: "website",
+        article: "article",
+        profile: "profile",
+        video: "video",
+        book: "book"
+      }, prefix: :og
+
+      # Active Storage attachment for Open Graph image
+      has_one_attached :og_image do |attachable|
+        attachable.variant :og_share, resize_to_limit: [1200, 630]
+      end
+
+      # SEO validations
+      validates :seo_title, length: {maximum: 70}, allow_blank: true
+      validates :seo_description, length: {maximum: 160}, allow_blank: true
+      validates :og_title, length: {maximum: 60}, allow_blank: true
+      validates :og_description, length: {maximum: 200}, allow_blank: true
+      validates :canonical_url, format: {with: URI::DEFAULT_PARSER.make_regexp(%w[http https])}, allow_blank: true
+
       # Callbacks
       after_save :handle_after_save
       before_save :update_cached_last_updated_at
@@ -91,6 +116,85 @@ module Panda
         new_timestamp
       end
 
+      #
+      # Returns the effective SEO title for this page
+      # Falls back to page title if not set, with optional inheritance
+      #
+      # @return [String] The SEO title to use
+      # @visibility public
+      #
+      def effective_seo_title
+        return seo_title if seo_title.present?
+        return title unless inherit_seo
+
+        # Traverse up tree to find inherited value
+        self_and_ancestors.reverse.find { |p| p.seo_title.present? }&.seo_title || title
+      end
+
+      #
+      # Returns the effective SEO description for this page
+      # With optional inheritance from parent pages
+      #
+      # @return [String, nil] The SEO description to use
+      # @visibility public
+      #
+      def effective_seo_description
+        return seo_description if seo_description.present?
+        return nil unless inherit_seo
+
+        self_and_ancestors.reverse.find { |p| p.seo_description.present? }&.seo_description
+      end
+
+      #
+      # Returns the effective Open Graph title
+      # Falls back to SEO title, then page title
+      #
+      # @return [String] The OG title to use
+      # @visibility public
+      #
+      def effective_og_title
+        og_title.presence || effective_seo_title
+      end
+
+      #
+      # Returns the effective Open Graph description
+      # Falls back to SEO description
+      #
+      # @return [String, nil] The OG description to use
+      # @visibility public
+      #
+      def effective_og_description
+        og_description.presence || effective_seo_description
+      end
+
+      #
+      # Returns the effective canonical URL for this page
+      # Falls back to the page's own URL if not explicitly set
+      #
+      # @return [String] The canonical URL to use
+      # @visibility public
+      #
+      def effective_canonical_url
+        canonical_url.presence || path
+      end
+
+      #
+      # Generates the robots meta tag content based on seo_index_mode
+      #
+      # @return [String] The robots meta tag content (e.g., "index, follow")
+      # @visibility public
+      #
+      def robots_meta_content
+        case seo_index_mode
+        when "visible"
+          "index, follow"
+        when "invisible"
+          "noindex, nofollow"
+        else
+          "index, follow" # Default fallback
+        end
+      end
+
       private
 
       def validate_unique_path_in_scope
@@ -163,6 +267,8 @@ module Panda
       def update_cached_last_updated_at
         # Will be set to updated_at automatically during save
         # Block content updates will call refresh_last_updated_at! separately
+        # Only update if column exists (for backwards compatibility with older schemas)
+        return unless self.class.column_names.include?("cached_last_updated_at")
         self.cached_last_updated_at = Time.current
       end
     end

data/app/models/panda/cms/post.rb

@@ -38,6 +38,31 @@ module Panda
         archived: "archived"
       }
 
+      enum :seo_index_mode, {
+        visible: "visible",
+        invisible: "invisible"
+      }, prefix: :seo
+
+      enum :og_type, {
+        website: "website",
+        article: "article",
+        profile: "profile",
+        video: "video",
+        book: "book"
+      }, prefix: :og
+
+      # Active Storage attachment for Open Graph image
+      has_one_attached :og_image do |attachable|
+        attachable.variant :og_share, resize_to_limit: [1200, 630]
+      end
+
+      # SEO validations
+      validates :seo_title, length: {maximum: 70}, allow_blank: true
+      validates :seo_description, length: {maximum: 160}, allow_blank: true
+      validates :og_title, length: {maximum: 60}, allow_blank: true
+      validates :og_description, length: {maximum: 200}, allow_blank: true
+      validates :canonical_url, format: {with: URI::DEFAULT_PARSER.make_regexp(%w[http https])}, allow_blank: true
+
       def to_param
         # For date-based URLs, return just the slug portion
         parts = CGI.unescape(slug).delete_prefix("/").split("/")
@@ -88,6 +113,78 @@ module Panda
         text.truncate(length).html_safe
       end
 
+      #
+      # Returns the effective SEO title for this post
+      # Falls back to post title if not set
+      #
+      # @return [String] The SEO title to use
+      # @visibility public
+      #
+      def effective_seo_title
+        seo_title.presence || title
+      end
+
+      #
+      # Returns the effective SEO description for this post
+      # Falls back to excerpt if not set
+      #
+      # @return [String, nil] The SEO description to use
+      # @visibility public
+      #
+      def effective_seo_description
+        seo_description.presence || excerpt(160, squish: true)
+      end
+
+      #
+      # Returns the effective Open Graph title
+      # Falls back to SEO title, then post title
+      #
+      # @return [String] The OG title to use
+      # @visibility public
+      #
+      def effective_og_title
+        og_title.presence || effective_seo_title
+      end
+
+      #
+      # Returns the effective Open Graph description
+      # Falls back to SEO description or excerpt
+      #
+      # @return [String, nil] The OG description to use
+      # @visibility public
+      #
+      def effective_og_description
+        og_description.presence || effective_seo_description
+      end
+
+      #
+      # Returns the effective canonical URL for this post
+      # Falls back to the post's own URL if not explicitly set
+      #
+      # @return [String] The canonical URL to use
+      # @visibility public
+      #
+      def effective_canonical_url
+        canonical_url.presence || slug
+      end
+
+      #
+      # Generates the robots meta tag content based on seo_index_mode
+      #
+      # @return [String] The robots meta tag content (e.g., "index, follow")
+      # @visibility public
+      #
+      def robots_meta_content
+        case seo_index_mode
+        when "visible"
+          "index, follow"
+        when "invisible"
+          "noindex, nofollow"
+        else
+          "index, follow" # Default fallback
+        end
+      end
+
       private
 
       def clear_menu_cache

data/app/models/panda/cms/visit.rb

@@ -3,9 +3,24 @@
 module Panda
   module CMS
     class Visit < ApplicationRecord
-      belongs_to :page, class_name: "Panda::CMS::Page", foreign_key: :panda_cms_page_id, optional: true
+      belongs_to :page, class_name: "Panda::CMS::Page", foreign_key: :page_id, optional: true
       belongs_to :user, class_name: "Panda::Core::User", foreign_key: :user_id, optional: true
       belongs_to :redirect, class_name: "Panda::CMS::Redirect", foreign_key: :redirect_id, optional: true
+
+      # Returns the most popular pages by visit count
+      # @param limit [Integer] Number of pages to return (default: 10)
+      # @param period [ActiveSupport::Duration] Time period to consider (default: all time)
+      # @return [Array<Hash>] Array of hashes with page and visit_count
+      def self.popular_pages(limit: 10, period: nil)
+        scope = joins(:page).where.not(page_id: nil)
+        scope = scope.where("visited_at >= ?", period.ago) if period
+
+        scope
+          .group("panda_cms_pages.id", "panda_cms_pages.title", "panda_cms_pages.path")
+          .select("panda_cms_pages.id, panda_cms_pages.title, panda_cms_pages.path, COUNT(*) as visit_count")
+          .order("visit_count DESC")
+          .limit(limit)
+      end
     end
   end
 end

data/app/services/panda/social/instagram_feed_service.rb

@@ -1,63 +1,63 @@
 # frozen_string_literal: true
 
-require "http"
-require "down"
+# require "http"
+# require "down"
 
 module Panda
   module Social
     class InstagramFeedService
-      GRAPH_API_VERSION = "v19.0"
-      GRAPH_API_BASE_URL = "https://graph.instagram.com/#{GRAPH_API_VERSION}".freeze
-
-      def initialize(access_token)
-        @access_token = access_token
-      end
-
-      def sync_recent_posts
-        fetch_media.each do |post_data|
-          process_post(post_data)
-        end
-      end
-
-      private
-
-      def fetch_media
-        response = HTTP.get("#{GRAPH_API_BASE_URL}/me/media", params: {
-          access_token: @access_token,
-          fields: "id,caption,media_type,media_url,permalink,timestamp"
-        })
-
-        return [] unless response.status.success?
-
-        JSON.parse(response.body.to_s)["data"]
-      end
-
-      def process_post(post_data)
-        return unless post_data["media_type"] == "IMAGE"
-
-        instagram_post = InstagramPost.find_or_initialize_by(instagram_id: post_data["id"])
-
-        instagram_post.assign_attributes(
-          caption: post_data["caption"],
-          posted_at: Time.zone.parse(post_data["timestamp"]),
-          permalink: post_data["permalink"]
-        )
-
-        if instagram_post.new_record? || instagram_post.changed?
-          # Download and attach image
-          tempfile = Down.download(post_data["media_url"])
-          instagram_post.image.attach(
-            io: tempfile,
-            filename: File.basename(post_data["media_url"])
-          )
-
-          instagram_post.save!
-        end
-      rescue Down::Error => e
-        Rails.logger.error "Failed to download Instagram image: #{e.message}"
-      rescue => e
-        Rails.logger.error "Error processing Instagram post #{post_data["id"]}: #{e.message}"
-      end
+      #       GRAPH_API_VERSION = "v19.0"
+      #       GRAPH_API_BASE_URL = "https://graph.instagram.com/#{GRAPH_API_VERSION}".freeze
+
+      #       def initialize(access_token)
+      #         @access_token = access_token
+      #       end
+
+      #       def sync_recent_posts
+      #         fetch_media.each do |post_data|
+      #           process_post(post_data)
+      #         end
+      #       end
+
+      #       private
+
+      #       def fetch_media
+      #         response = HTTP.get("#{GRAPH_API_BASE_URL}/me/media", params: {
+      #           access_token: @access_token,
+      #           fields: "id,caption,media_type,media_url,permalink,timestamp"
+      #         })
+
+      #         return [] unless response.status.success?
+
+      #         JSON.parse(response.body.to_s)["data"]
+      #       end
+
+      #       def process_post(post_data)
+      #         return unless post_data["media_type"] == "IMAGE"
+
+      #         instagram_post = InstagramPost.find_or_initialize_by(instagram_id: post_data["id"])
+
+      #         instagram_post.assign_attributes(
+      #           caption: post_data["caption"],
+      #           posted_at: Time.zone.parse(post_data["timestamp"]),
+      #           permalink: post_data["permalink"]
+      #         )
+
+      #         if instagram_post.new_record? || instagram_post.changed?
+      #           # Download and attach image
+      #           tempfile = Down.download(post_data["media_url"])
+      #           instagram_post.image.attach(
+      #             io: tempfile,
+      #             filename: File.basename(post_data["media_url"])
+      #           )
+
+      #           instagram_post.save!
+      #         end
+      #       rescue Down::Error => e
+      #         Rails.logger.error "Failed to download Instagram image: #{e.message}"
+      #       rescue => e
+      #         Rails.logger.error "Error processing Instagram post #{post_data["id"]}: #{e.message}"
+      #       end
     end
   end
 end

data/app/views/layouts/homepage.html.erb

@@ -2,10 +2,7 @@
 <html>
 <head>
   <title>Test Homepage</title>
-  <% if params[:embed_id].present? %>
-    <!-- Include Panda CMS assets for editor functionality when in edit mode -->
-    <%= panda_cms_complete_assets %>
-  <% end %>
+  <!-- CMS assets are automatically injected by editor_iframe_controller when in edit mode -->
 </head>
 <body>
   <h1><%= @page.title %></h1>

data/app/views/layouts/page.html.erb

@@ -2,10 +2,7 @@
 <html>
 <head>
   <title>Test Page</title>
-  <% if params[:embed_id].present? %>
-    <!-- Include Panda CMS assets for editor functionality when in edit mode -->
-    <%= panda_cms_complete_assets %>
-  <% end %>
+  <!-- CMS assets are automatically injected by editor_iframe_controller when in edit mode -->
 </head>
 <body>
   <h1><%= @page.title %></h1>

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

@@ -1,12 +1,19 @@
 <div class="" data-controller="dashboard">
   <%= render Panda::Core::Admin::ContainerComponent.new do |container| %>
     <% container.heading(text: "Dashboard", level: 1) do |heading| %>
-      <% heading.button(action: :add, text: "Add Page", link: new_admin_cms_page_path) %>
+      <% heading.button(action: :add, text: "Add Page", href: new_admin_cms_page_path) %>
     <% end %>
     <dl class="grid grid-cols-1 gap-5 mt-5 sm:grid-cols-3">
-      <%= render Panda::Core::Admin::StatisticsComponent.new(metric: "Views Today", value: Panda::CMS::Visit.group_by_day(:visited_at, last: 1).count.values.first) %>
-      <%= render Panda::Core::Admin::StatisticsComponent.new(metric: "Views Last Week", value: Panda::CMS::Visit.group_by_week(:visited_at, last: 1).count.values.first) %>
-      <%= render Panda::Core::Admin::StatisticsComponent.new(metric: "Views Last Month", value: Panda::CMS::Visit.group_by_month(:visited_at, last: 1).count.values.first) %>
+      <%= render Panda::Core::Admin::StatisticsComponent.new(metric: "Views Today", value: Panda::CMS::Visit.group_by_day(:visited_at, last: 1).count.values.first || 0) %>
+      <%= render Panda::Core::Admin::StatisticsComponent.new(metric: "Views Last Week", value: Panda::CMS::Visit.group_by_week(:visited_at, last: 1).count.values.first || 0) %>
+      <%= render Panda::Core::Admin::StatisticsComponent.new(metric: "Views Last Month", value: Panda::CMS::Visit.group_by_month(:visited_at, last: 1).count.values.first || 0) %>
     </dl>
+
+    <div class="grid grid-cols-1 gap-5 mt-8">
+      <%= render Panda::CMS::Admin::PopularPagesComponent.new(
+        popular_pages: Panda::CMS::Visit.popular_pages(limit: 10),
+        period_name: "All Time"
+      ) %>
+    </div>
   <% end %>
 </div>

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

@@ -12,6 +12,6 @@
   <% end %>
 
   <div data-controller="file-gallery" class="pb-24">
-    <%= render Panda::Core::Admin::FileGalleryComponent.new(files: @files, selected_file: @selected_file) %>
+    <%= Panda::Core::Admin::FileGalleryComponent.new(files: @files, selected_file: @selected_file) %>
   </div>
 <% end %>

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

@@ -5,7 +5,7 @@
     <div data-controller="slug">
       <input type="hidden" value="<%= Panda::CMS::Current.root %>" data-slug-target="existing_root">
       <%= f.select :parent_id, options, {}, { "data-slug-target": "input_select", "data-action": "change->slug#setPrePath" } %>
-      <%= f.text_field :title, { data: { "slug-target": "input_text", action: "focusout->slug#generatePath" } } %>
+      <%= f.text_field :title, { data: { "slug-target": "input_text" }, "data-action": "focusout->slug#generatePath" } %>
       <%= f.text_field :path, { data: { prefix: Panda::CMS::Current.root, "slug-target": "output_text" } } %>
       <%= f.collection_select :panda_cms_template_id, Panda::CMS::Template.available, :id, :name %>
       <%= f.button %>

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

@@ -5,10 +5,10 @@
   <%= render Panda::Core::Admin::TableComponent.new(term: "submission", rows: submissions) do |table| %>
     <% fields.each do |field, title| %>
       <% table.column(title) do |submission| %>
-        <% if field[0] == "email" || field[0] == "email_address" %>
-          <a href="mailto:<%= submission.data[field[0]] %>" class="border-b border-gray-500 hover:text-gray-900"><%= submission.data[field[0]] %></a>
+        <% if field == "email" || field == "email_address" %>
+          <a href="mailto:<%= submission.data[field] %>" class="border-b border-gray-500 hover:text-gray-900"><%= submission.data[field] %></a>
         <% else %>
-          <%= simple_format(submission.data[field[0]]) %>
+          <%= simple_format(submission.data[field]) %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -1,7 +1,7 @@
 <div class="mb-6 pb-6 border-b border-gray-200 dark:border-gray-700 nested-form-wrapper" data-new-record="<%= form.object.new_record? %>">
-  <%= form.text_field :text, placeholder: "Menu item text" %>
-  <%= form.collection_select :panda_cms_page_id, Panda::CMS::Page.order(:title), :id, :title, { include_blank: "Select a page (optional)" }, { class: "mt-1" } %>
-  <%= form.text_field :external_url, placeholder: "External URL (optional)" %>
+  <%= form.text_field :text, label: "Menu Item Text" %>
+  <%= form.collection_select :panda_cms_page_id, Panda::CMS::Page.order(:title), :id, :title, { include_blank: "Select a page (optional)", label: "Page" }, { class: "mt-1" } %>
+  <%= form.text_field :external_url, label: "External URL (optional)" %>
 
   <div class="mt-3">
     <%= render Panda::Core::Admin::ButtonComponent.new(text: "Remove", action: :delete, link: "#", size: :small, data: { action: "click->nested-form#remove" }) %>

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

@@ -1,18 +1,17 @@
 <%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
-  <% component.heading(text: "Edit Menu: #{menu.name}", level: 1) %>
+  <% component.heading(text: "Edit Menu: #{@menu.name}", level: 1) %>
 
-  <%= panda_cms_form_with model: menu, url: admin_cms_menu_path(menu), method: :put do |f| %>
-    <%= render Panda::Core::Admin::FormErrorComponent.new(model: menu) %>
+  <%= panda_cms_form_with model: @menu, url: admin_cms_menu_path(@menu), method: :put, data: { controller: "menu-form" } do |f| %>
+    <%= render Panda::Core::Admin::FormErrorComponent.new(model: @menu) %>
 
     <%= f.text_field :name %>
-    <%= f.select :kind, options_for_select([["Static", "static"], ["Auto", "auto"]], selected: menu.kind), {}, { data: { action: "change->menu-form#kindChanged" } } %>
+    <%= f.select :kind, options_for_select([["Static", "static"], ["Auto", "auto"]], selected: @menu.kind), {}, { "data-action": "change->menu-form#kindChanged" } %>
 
-    <div data-controller="menu-form">
-      <div data-menu-form-target="startPageField" class="<%= 'hidden' unless menu.kind == 'auto' %>">
-        <%= f.collection_select :start_page_id, Panda::CMS::Page.order(:title), :id, :title, { include_blank: "Select a page..." }, { class: "mt-1" } %>
-      </div>
+    <div data-menu-form-target="startPageField" class="<%= 'hidden' unless @menu.kind == 'auto' %>">
+      <%= f.collection_select :start_page_id, Panda::CMS::Page.order(:title), :id, :title, { include_blank: "Select a page...", label: "Start Page" }, { class: "mt-1" } %>
+    </div>
 
-      <% if menu.kind == "static" %>
+      <% if @menu.kind == "static" %>
         <%= render Panda::Core::Admin::PanelComponent.new do |panel| %>
           <% panel.heading(text: "Menu Items") %>
 
@@ -24,8 +23,8 @@
             </template>
 
             <div class="space-y-4">
-              <% if menu.menu_items.any? %>
-                <%= f.fields_for :menu_items, menu.menu_items.sort_by(&:lft) do |item_form| %>
+              <% if @menu.menu_items.any? %>
+                <%= f.fields_for :menu_items, @menu.menu_items.sort_by(&:lft) do |item_form| %>
                   <%= render "menu_item_fields", form: item_form %>
                 <% end %>
               <% end %>
@@ -42,8 +41,8 @@
         <%= render Panda::Core::Admin::PanelComponent.new do |panel| %>
           <% panel.heading(text: "Auto-Generated Menu Items") %>
 
-          <% if menu.menu_items.any? %>
-            <%= render Panda::Core::Admin::TableComponent.new(term: "menu item", rows: menu.menu_items.root.self_and_descendants) do |table| %>
+          <% if @menu.menu_items.any? %>
+            <%= render Panda::Core::Admin::TableComponent.new(term: "menu item", rows: @menu.menu_items.root.self_and_descendants) do |table| %>
               <% table.column("Text") do |menu_item| %>
                 <div class="<%= "ml-#{menu_item.depth * 6}" %>">
                   <%= menu_item.text %>
@@ -57,7 +56,6 @@
           <% end %>
         <% end %>
       <% end %>
-    </div>
 
     <%= f.button "Save Menu" %>
   <% end %>

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

@@ -1,6 +1,6 @@
 <%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.heading(text: "Menus", level: 1) do |heading| %>
-    <% heading.button(action: :add, text: "New Menu", link: new_admin_cms_menu_path) %>
+    <% heading.button(action: :add, text: "New Menu", href: new_admin_cms_menu_path) %>
   <% end %>
   <%= 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) } %>

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

@@ -1,18 +1,17 @@
 <%= render Panda::Core::Admin::ContainerComponent.new do |component| %>
   <% component.heading(text: "New Menu", level: 1) %>
 
-  <%= panda_cms_form_with model: menu, url: admin_cms_menus_path, method: :post do |f| %>
+  <%= panda_cms_form_with model: menu, url: admin_cms_menus_path, method: :post, data: { controller: "menu-form" } do |f| %>
     <%= render Panda::Core::Admin::FormErrorComponent.new(model: menu) %>
 
     <%= f.text_field :name %>
-    <%= f.select :kind, options_for_select([["Static", "static"], ["Auto", "auto"]], selected: menu.kind || "static"), {}, { data: { action: "change->menu-form#kindChanged" } } %>
+    <%= f.select :kind, options_for_select([["Static", "static"], ["Auto", "auto"]], selected: menu.kind || "static"), {}, { "data-action": "change->menu-form#kindChanged" } %>
 
-    <div data-controller="menu-form">
-      <div data-menu-form-target="startPageField" class="hidden">
-        <%= f.collection_select :start_page_id, Panda::CMS::Page.order(:title), :id, :title, { include_blank: "Select a page..." }, { class: "mt-1" } %>
-      </div>
+    <div data-menu-form-target="startPageField" class="hidden">
+      <%= f.collection_select :start_page_id, Panda::CMS::Page.order(:title), :id, :title, { include_blank: "Select a page...", label: "Start Page" }, { class: "mt-1" } %>
+    </div>
 
-      <div data-menu-form-target="menuItemsSection">
+    <div data-menu-form-target="menuItemsSection">
         <%= render Panda::Core::Admin::PanelComponent.new do |panel| %>
           <% panel.heading(text: "Menu Items") %>
 
@@ -33,7 +32,6 @@
           </div>
         <% end %>
       </div>
-    </div>
 
     <%= f.button "Create Menu" %>
   <% end %>