panda_cms 0.5.10 → 0.6.0

data/app/assets/config/panda_cms_manifest.js

@@ -1 +1,3 @@
 //= link_tree ../builds/ .css
+//= link_directory ../../javascript/panda_cms .js
+//= link_directory ../../javascript/panda_cms/controllers .js

data/app/assets/stylesheets/panda_cms/application.tailwind.css

@@ -13,9 +13,9 @@
 
     --color-highlight: 208 64 20; /* #D04014 */
 
-    --color-active: 188 230 163; /* #BCE6A3 */
+    --color-active: 0 135 85; /* #008755 */
     --color-warning: 250 207 142; /* #FACF8E */
-    --color-inactive: 211 229 249; /* #D3E5F9 */
+    --color-inactive: 216 247 245; /* #d6e4f7 */
     --color-error: 245 129 129; /* #F58181 */
   }
 
@@ -29,6 +29,7 @@
 
     --color-active: 166 211 129; /* #A6D381 */
     --color-warning: 244 190 102; /* #F4BE66 */
+    --color-inactive: 216 247 245; /* #d6e4f7 */
     --color-error: 208 64 20; /* #D04014 */
   }
 
@@ -39,37 +40,12 @@
   }
 }
 
-.ql-editor {
-  border: none !important;
-  /* font-size: 1.3rem !important; */
-  padding: 0 !important;
-  margin: 0;
-
-  margin-top: -1rem;
-
-  &:active, &:focus {
-    border: none;
-    outline: none;
-  }
-
-  h1, h2, h3, p {
-    margin-bottom: 20px !important;
-    font-size: 130% !important;
-  }
-
-  li {
-    font-size: 130% !important;
-  }
-}
-
 @import "actiontext.css";
 
 /*
  * Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
  * the trix-editor content (whether displayed or under editing). Feel free to incorporate this
  * inclusion directly in any other asset bundle and remove this file.
- *
- *= require trix
 */
 
 /*

data/app/builders/panda_cms/form_builder.rb

@@ -12,7 +12,7 @@ module PandaCms
           label(attribute) + meta_text(options) +
             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 + " rounded-l-none border-l-none"))
+                super(attribute, options.reverse_merge(class: input_styles_prefix + " input-prefix rounded-l-none border-l-none"))
             end
         end
       else

data/app/components/panda_cms/admin/button_component.rb

@@ -5,13 +5,14 @@ module PandaCms
     class ButtonComponent < ViewComponent::Base
       attr_accessor :text, :action, :link, :icon, :size, :data
 
-      def initialize(text: "Button", action: nil, data: {}, link: "#", icon: nil, size: :regular)
+      def initialize(text: "Button", action: nil, data: {}, link: "#", icon: nil, size: :regular, id: nil)
         @text = text
         @action = action
         @data = data
         @link = link
         @icon = icon
         @size = size
+        @id = id
       end
 
       def call
@@ -33,15 +34,17 @@ module PandaCms
         classes += case @action
         when :save, :create
           "text-white bg-active"
+        when :save_inactive
+          "text-white bg-inactive"
         when :secondary
-          "text-highlight border border-highlight bg-white hover:bg-sky-100 focus-visible:outline-highlight "
+          "text-dark border-2 border-dark bg-transparent hover:bg-light transition-all "
         when :delete, :destroy, :danger
           "text-error border border-error bg-red-100 hover:bg-red-200 hover:text-error focus-visible:outline-red-300 "
         else
           "text-dark border-2 border-dark bg-transparent hover:bg-light transition-all "
         end
 
-        content_tag :a, href: @link, class: classes, data: @data do
+        content_tag :a, href: @link, class: classes, data: @data, id: @id do
           @text
         end
       end

data/app/components/panda_cms/admin/flash_message_component.rb

@@ -19,7 +19,7 @@ module PandaCms
         when :warning
           "text-warning"
         when :info, :notice
-          "text-highlight"
+          "text-active"
         else
           "text-mid"
         end

data/app/components/panda_cms/admin/tag_component.rb

@@ -15,7 +15,7 @@ module PandaCms
 
         classes += case @status
         when :active
-          "text-black ring-black/30 bg-active border-0 "
+          "text-white ring-black/30 bg-active border-0 "
         when :draft
           "text-black ring-black/30 bg-warning "
         when :inactive, :hidden

data/app/components/panda_cms/code_component.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module PandaCms
+  # Text component
+  # @param key [Symbol] The key to use for the text component
+  # @param text [String] The text to display
+  # @param editable [Boolean] If the text is editable or not (defaults to true)
+  # @param options [Hash] The options to pass to the content_tag
+  class CodeComponent < ViewComponent::Base
+    KIND = "code"
+
+    def initialize(key: :text_component, text: "", editable: true, **options)
+      @key = key
+      @text = text
+      @options = options || {}
+      @options[:id] ||= "code-#{key.to_s.dasherize}"
+      @editable = editable
+    end
+
+    def call
+      # TODO: For the non-editable version, grab this from a cache or similar?
+      block = PandaCms::Block.find_by(kind: KIND, key: @key, panda_cms_template_id: Current.page.panda_cms_template_id)
+
+      if block.nil?
+        raise PandaCms::MissingBlockError("Block with key #{@key} not found") unless Rails.env.production?
+        return false
+      end
+
+      block_content = block.block_contents.find_by(panda_cms_page_id: Current.page.id)
+      code_content = block_content&.content.to_s
+
+      if component_is_editable?
+        @options[:contenteditable] = "plaintext-only"
+        @options[:data] = {
+          "editable-kind": "html",
+          "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[: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
+        code_content.html_safe
+      end
+    end
+
+    def component_is_editable?
+      # TODO: Permissions
+      @editable && is_embedded? && Current.user&.admin
+    end
+
+    def is_embedded?
+      # TODO: Check security on this - embed_id should match something?
+      request.params.dig(:embed_id).present?
+    end
+  end
+end

data/app/components/panda_cms/page_menu_component.html.erb

@@ -1,13 +1,15 @@
-<nav class="<%= @styles[:container] %>">
+<nav class="<%= styles[:container] %>">
   <ul role="list" class="p-0 m-0">
     <li>
-      <a href="<%= menu_item.page.path %>" class="<%= menu_item.page == PandaCms::Current.page ? @styles[:current_page_active] : @styles[:current_page_inactive] %>">
+      <a href="<%= menu_item.page.path %>" class="<%= menu_item.page == PandaCms::Current.page ? styles[:current_page_active] : styles[:current_page_inactive] %>">
         <%= menu_item.text %>
       </a>
     </li>
     <ul>
-      <% PandaCms::MenuItem.each_with_level(menu_item.descendants) do |submenu_item, level| %>
-        <li data-level="<%= level %>" data-page-id="<%= submenu_item.page.id %>" class="<% if level > 1 && !PandaCms::Current.page.id.in?(submenu_item.page.self_and_ancestors.ids + submenu_item.page.siblings.ids) %>hidden <% end %> <%= submenu_item.page == PandaCms::Current.page ? @styles[:active] : @styles[:inactive] %>">
+      <% PandaCms::MenuItem.includes(:page).each_with_level(menu_item.descendants) do |submenu_item, level| %>
+        <% next if PandaCms::Current.page == menu_item.page && level > 1 # If we're on the "top" menu item, only show its direct ancestors %>
+        <% next if submenu_item.page.depth > PandaCms::Current.page.depth && !PandaCms::Current.page.in?(submenu_item.page.ancestors) %>
+        <li data-level="<%= level %>" data-page-id="<%= submenu_item.page.id %>" class="<%= submenu_item.page == PandaCms::Current.page ? @styles[:active] : @styles[:inactive] %>">
           <a href="<%= submenu_item.page.path %>" class="<%= helpers.menu_indent(submenu_item, indent_with: @styles[:indent_with]) %>"><%= submenu_item.page.title %></a>
         </li>
       <% end %>

data/app/components/panda_cms/page_menu_component.rb

@@ -2,24 +2,33 @@
 
 module PandaCms
   class PageMenuComponent < ViewComponent::Base
+    attr_accessor :page
     attr_accessor :menu_item
-    attr_accessor :children
+    attr_accessor :styles
 
     def initialize(page:, start_depth:, styles: {})
-      start_page = if page.depth == start_depth
-        page
-      else
-        page.ancestors.find { |anc| anc.depth == start_depth }
-      end
+      @page = page
+
+      unless @page.nil?
+        start_page = if @page.depth == start_depth
+          @page
+        else
+          @page.ancestors.find { |anc| anc.depth == start_depth }
+        end
+
+        menu = start_page&.page_menu
+        return if menu.nil?
 
-      menu = PandaCms::Menu.find_by(kind: "auto", start_page: start_page)
-      @menu_item = menu.menu_items.order(:lft)&.first unless menu.nil?
+        @menu_item = menu.menu_items.order(:lft)&.first
 
-      @children = menu_item&.descendants unless menu_item.nil?
+        # Set some default styles for sanity
+        @styles = styles
+        @styles[:indent_with] ||= "pl-2"
+      end
+    end
 
-      # Set some default styles for sanity
-      @styles = styles
-      @styles[:indent_with] ||= "pl-2"
+    def render?
+      @page&.path != "/" && @menu_item.present?
     end
   end
 end

data/app/components/panda_cms/rich_text_component.html.erb

@@ -1,38 +1,6 @@
-<%= content_tag(:div, @content, @options) %>
-
-<script type="text/javascript">
-    document.addEventListener("pandaCmsRichTextEditorLoaded", function() {
-      console.debug("[Panda CMS] Called event listener: pandaCmsRichTextEditorLoaded for <%= @options[:id] %>");
-
-      // Allowing per-element toolbar configuration, if needed
-      let quillOptions = {
-        modules: {
-          toolbar: [
-            [{ header: [1, 2, 3, false] }],
-            ["bold", "italic", "underline"],
-            [{ list: "ordered" }, { list: "bullet" }],
-            [{ script: "sub" }, { script: "super" }],
-            [{ color: [] }, { background: [] }],
-            [{ align: [] }],
-            ["link", "image", "video", "code-block", "clean"],
-          ],
-          magicUrl: true,
-          imageCompressor: {
-            quality: 0.9,
-            maxWidth: 2000,
-            maxHeight: 2000,
-            imageType: "image/png",
-            keepImageTypes: ["image/jpeg", "image/jpg", "image/png"],
-          },
-        },
-        theme: "snow",
-      };
-
-      let quillVar = "<%= @options[:id] %>";
-      console.debug(`[Panda CMS] Enabling Quill editor: ${quillVar}`);
-      console.debug(`[Panda CMS] Quill options for ${quillVar}: `, quillOptions);
-
-      Quill.register("modules/imageCompressor", imageCompressor);
-      quillVar = new Quill("#" + quillVar, quillOptions);
-    });
-  </script>
+<% if @editable %>
+  <input id="trix_<%= @options[:id] %>" value="<%= @content %>" type="hidden" name="trix_<%= @options[:id] %>" data-editor-block-content-id="<%= @options[:data][:block_content_id] %>" data-editor-type="<%= @options[:data][:mode] %>">
+  <trix-editor input="trix_<%= @options[:id] %>" class="panda-cms-content"></trix-editor>
+<% else %>
+  <div class="panda-cms-content"><%= @content %></div>
+<% end %>

data/app/components/panda_cms/rich_text_component.rb

@@ -9,6 +9,10 @@ module PandaCms
   class RichTextComponent < ViewComponent::Base
     KIND = "rich_text"
 
+    attr_accessor :editable
+    attr_accessor :content
+    attr_accessor :options
+
     def initialize(key: :text_component, text: "Lorem ipsum...", editable: true, **options)
       @key = key
       @text = text
@@ -18,20 +22,33 @@ module PandaCms
 
     # Check if the element is editable and set up the content
     def before_render
-      @editable &&= params[:embed_id].present? && params[:embed_id] == Current.page.id && Current.user&.admin?
-
+      @editable &&= params[:embed_id].present? && params[:embed_id] == Current.page.id && Current.user.admin?
       block = PandaCms::Block.find_by(kind: "rich_text", key: @key, panda_cms_template_id: Current.page.panda_cms_template_id)
       block_content = block.block_contents.find_by(panda_cms_page_id: Current.page.id)
-      @content = block_content.content.html_safe
-      @options[:id] = "editor_rich_text_#{block_content&.id&.tr("-", "_")}"
-      @options[:class] ||= ""
-      @options[:class] += " content-rich-text"
+      @content = block_content.content
+
+      @options[:id] = "editor_rich_text_#{block_content.id.tr("-", "_")}"
 
       if @editable
         @options[:data] = {
-          block_content_id: block_content&.id
+          block_content_id: block_content&.id,
+          mode: "rich-text"
         }
+      else
+        @content = @content.html_safe
       end
+    rescue => e
+      if Rails.env.production?
+        Sentry.capture_exception(e) if defined?(Sentry)
+      else
+        raise e
+      end
+      false
+    end
+
+    # Only render the component if there is some content set, or if the component is editable
+    def render?
+      @content.present? || @editable
     end
   end
 end

data/app/components/panda_cms/text_component.rb

@@ -21,17 +21,37 @@ module PandaCms
     end
 
     def call
-      # TODO: For the non-editable version, grab this from a cache or similar?
+      content_tag(:span, @content, @options, false) # Don't escape the content
+    rescue
+      if !Rails.env.production? || is_defined?(Sentry)
+        raise PandaCms::MissingBlockError("Block with key #{@key} not found")
+      else
+        false
+      end
+    end
+
+    #
+    # Prepares content for display
+    #
+    # @usage Do not use this when rendering editable content
+    def prepare_content_for_display(content)
+      # Replace \n characters with <br> tags
+      content.gsub("\n", "<br>")
+    end
+
+    # Check if the element is editable
+    # TODO: Check user permissions
+    def before_render
+      @editable &&= params[:embed_id].present? && params[:embed_id] == Current.page.id
+
       block = PandaCms::Block.find_by(kind: KIND, key: @key, panda_cms_template_id: Current.page.panda_cms_template_id)
 
       if block.nil?
-        raise PandaCms::MissingBlockError("Block with key #{@key} not found") unless Rails.env.production?
         return false
       end
 
       block_content = block.block_contents.find_by(panda_cms_page_id: Current.page.id)
       plain_text = block_content&.content.to_s
-
       if @editable
         @options[:contenteditable] = "plaintext-only"
         @options[:data] = {
@@ -41,27 +61,10 @@ module PandaCms
         }
 
         @options[:id] = "editor-#{block_content&.id}"
-        content = plain_text
+        @content = plain_text
       else
-        content = prepare_content_for_display(plain_text)
+        @content = prepare_content_for_display(plain_text)
       end
-
-      content_tag(:span, content, @options, false) # Don't escape the content
-    end
-
-    #
-    # Prepares content for display
-    #
-    # @usage Do not use this when rendering editable content
-    def prepare_content_for_display(content)
-      # Replace \n characters with <br> tags
-      content.gsub("\n", "<br>")
-    end
-
-    # Check if the element is editable
-    # TODO: Check user permissions
-    def before_render
-      @editable &&= params[:embed_id].present? && params[:embed_id] == Current.page.id
     end
   end
 end

data/app/controllers/panda_cms/admin/dashboard_controller.rb

@@ -14,17 +14,25 @@ module PandaCms
     private
 
     def set_initial_breadcrumb
-      add_breadcrumb "Dashboard", PandaCms.admin_path
+      add_breadcrumb "Dashboard", PandaCms.route_namespace
     end
 
     def domain_expiry
       return "" if request.domain == "localhost"
 
-      whois_record = Whois.whois(request.domain)
-      if (parser = whois_record&.parser)
-        " (expiry date: #{parser.expires_on&.strftime("%d %b %Y")})"
-      else
-        " (error parsing WHOIS data)"
+      begin
+        whois_record = Whois.whois(request.domain)
+        if (parser = whois_record&.parser)
+          " (expiry date: #{parser.expires_on&.strftime("%d %b %Y")})"
+        else
+          " (error parsing WHOIS data)"
+        end
+      rescue => e
+        if defined?(Sentry)
+          Sentry.capture_exception(e)
+        end
+
+        ""
       end
     end
   end

data/app/controllers/panda_cms/admin/menus_controller.rb

@@ -3,8 +3,7 @@
 module PandaCms
   module Admin
     class MenusController < 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]
       before_action :authenticate_admin_user!
 
       # Lists all menus which can be managed by the administrator
@@ -15,47 +14,6 @@ module PandaCms
         render :index, locals: {menus: menus}
       end
 
-      # Loads the menu editor
-      # @type GET
-      def edit
-        add_breadcrumb menu.name, edit_admin_menu_path(menu)
-      end
-
-      # GET /admin/menus/new
-      # @type GET
-      def new
-        @menu = PandaCms::Menu.new
-        @menu.menu_items.new
-        set_new_menu_breadcrumb
-      end
-
-      # POST /admin/menus
-      def create
-        @menu = PandaCms::Menu.new(menu_params)
-
-        if @menu.save
-          redirect_to admin_menus_path, notice: "Menu was successfully created."
-        else
-          flash[:error] = @menu.errors.full_messages.join(", ")
-          set_new_menu_breadcrumb
-          render :new, status: :unprocessable_entity
-        end
-      end
-
-      # @type PATCH/PUT
-      # @return
-      def update
-        if menu.update!(menu_params)
-          redirect_to edit_admin_menu_path(menu),
-            status: :see_other,
-            flash: {success: "This menu was successfully updated!"}
-        else
-          add_breadcrumb menu.name, edit_admin_menu_path(menu)
-          flash[:error] = "There was an error updating the menu."
-          render :edit, status: :unprocessable_entity
-        end
-      end
-
       private
 
       def menu
@@ -65,17 +23,6 @@ module PandaCms
       def set_initial_breadcrumb
         add_breadcrumb "Menus", admin_menus_path
       end
-
-      def set_new_menu_breadcrumb
-        add_breadcrumb "Add New Menu", new_admin_menu_path
-      end
-
-      # Only allow a list of trusted parameters through.
-      # @type private
-      # @return ActionController::StrongParameters
-      def menu_params
-        params.require(:menu).permit(:name, menu_items_attributes: %i[id text external_url sort_order panda_cms_page_id _destroy])
-      end
     end
   end
 end

data/app/controllers/panda_cms/admin/pages_controller.rb

@@ -26,6 +26,7 @@ module PandaCms
       # @type GET
       def edit
         add_breadcrumb page.title, edit_admin_page_path(page)
+
         render :edit, locals: {page: page, template: page.template}
       end
 
@@ -64,7 +65,7 @@ module PandaCms
         @page ||= if params[:id]
           PandaCms::Page.find(params[:id])
         else
-          PandaCms::Page.new(template: PandaCms::Template.most_used)
+          PandaCms::Page.new(template: PandaCms::Template.default)
         end
       end
 

data/app/controllers/panda_cms/admin/sessions_controller.rb

@@ -6,14 +6,14 @@ module PandaCms
       layout "panda_cms/public"
 
       def new
-        @providers = PandaCms.authentication.select { |_, v| v[:enabled] && !v[:hidden] }.keys
+        @providers = PandaCms.config.authentication.select { |_, v| v[:enabled] && !v[:hidden] }.keys
       end
 
       def create
         user_info = request.env.dig("omniauth.auth", "info")
         provider = params[:provider].to_sym
 
-        unless PandaCms.authentication.dig(provider, :enabled)
+        unless PandaCms.config.authentication.dig(provider, :enabled)
           Rails.logger.error "Authentication provider '#{provider}' is not enabled"
           redirect_to admin_login_path, flash: {error: t("panda_cms.admin.sessions.create.error")}
           return
@@ -21,8 +21,8 @@ module PandaCms
 
         user = PandaCms::User.find_by(email: user_info["email"])
 
-        if !user && PandaCms.authentication.dig(provider, :create_account_on_first_login)
-          create_as_admin = PandaCms.authentication.dig(provider, :create_as_admin)
+        if !user && PandaCms.config.authentication.dig(provider, :create_account_on_first_login)
+          create_as_admin = PandaCms.config.authentication.dig(provider, :create_as_admin)
 
           # Always create the first user as admin, regardless of what our settings look like
           # else we can't ever really login. :)
@@ -47,9 +47,16 @@ module PandaCms
           end
         end
 
-        if user.nil? || !user.admin?
+        if user.nil?
+          # User can't be found with this email address
+          Rails.logger.error "User does not exist: #{user_info["email"]}"
+          redirect_to admin_login_path, flash: {error: t("panda_cms.admin.sessions.create.error")}
+          return
+        end
+
+        if !user.admin?
           # User can't be found with this email address or can't login
-          Rails.logger.info "User #{user.id} attempted admin login, is not admin." if user && !user.admin
+          Rails.logger.error "User ID #{user.id} attempted admin login, is not admin." if user && !user.admin
           redirect_to admin_login_path, flash: {error: t("panda_cms.admin.sessions.create.error")}
           return
         end

data/app/controllers/panda_cms/application_controller.rb

@@ -32,7 +32,7 @@ module PandaCms
       PandaCms::Current.page = nil
       PandaCms::Current.user ||= User.find_by(id: session[:user_id]) if session[:user_id]
 
-      PandaCms.url ||= PandaCms::Current.root
+      PandaCms.config.url ||= PandaCms::Current.root
     end
 
     def authenticate_user!

data/app/controllers/panda_cms/pages_controller.rb

@@ -8,7 +8,7 @@ module PandaCms
     end
 
     def show
-      if PandaCms.require_login_to_view && !user_signed_in?
+      if PandaCms.config.require_login_to_view && !user_signed_in?
         redirect_to panda_cms_maintenance_path and return
       end
 

data/app/controllers/panda_cms/posts_controller.rb

@@ -1,7 +1,7 @@
 module PandaCms
   class PostsController < ApplicationController
     def show
-      @posts_index_page = PandaCms::Page.find_by(path: "/#{PandaCms.posts[:prefix]}")
+      @posts_index_page = PandaCms::Page.find_by(path: "/#{PandaCms.config.posts[:prefix]}")
       @post = PandaCms::Post.find_by(slug: "/#{params[:slug]}")
       @title = @post.title
 

data/app/helpers/panda_cms/application_helper.rb

@@ -12,9 +12,9 @@ module PandaCms
 
     def title_tag
       if @breadcrumbs.present?
-        "#{@breadcrumbs.last&.name} · #{PandaCms.title}".html_safe
+        "#{@breadcrumbs.last&.name} · #{PandaCms.config.title}".html_safe
       else
-        PandaCms.title
+        PandaCms.config.title
       end
     end