panda_cms 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d703e97407899867cc2ba819715b0c042aa2bfeb52b550b975d692c755da6b29
-  data.tar.gz: 8cd9e111ac125f721a800b49e9447972b3c4e429e80441f5c5f7b27d713cfd66
+  metadata.gz: 785a3596f68d157ff6e6363a95c507f536554f276fec85626e488cb3e3ca167f
+  data.tar.gz: 8847bd7ffd2b09a6e42a2fc7d4444de20f38e42e91616620092caf558ffafe3d
 SHA512:
-  metadata.gz: 357cd56e8fcb1ba6f0266c820f516a47b168812843a5b024cb03f65c131a852ae0ff985782f2a048cce6b4170998ba0644b178c9772af41c93e3802993c6de72
-  data.tar.gz: 72c27644d6b690b93579cf112d5e9eb7b018d9bd02a46ca0bd994a868b71c1f7ed1fae0612821b3d533799d7d3cf67167ec4dd913713b2977bed3578ca8e02e4
+  metadata.gz: bf0a5477ebf5c79bd379275f63bbdb0da9e80896ac81372b976f4dc8a02c9635e2799ff6da1325efe4bdb0368e96a4ffef1271c0340344e52dd3e8a3456e61c5
+  data.tar.gz: 0bf5912db2be52720903d71be1ab9fba53b873aad9723caf1b3d4b6b9fe1f372cb81eb54b29d3f33874bfea12ecbc072f67497fb359054ac72efa59352c17693

data/app/assets/builds/panda_cms.css

@@ -879,6 +879,10 @@ a.block-link:after {
   visibility: visible;
 }
 
+.collapse {
+  visibility: collapse;
+}
+
 .static {
   position: static;
 }
@@ -1167,6 +1171,10 @@ a.block-link:after {
   display: grid;
 }
 
+.contents {
+  display: contents;
+}
+
 .hidden {
   display: none;
 }
@@ -1341,6 +1349,10 @@ a.block-link:after {
   cursor: pointer;
 }
 
+.resize {
+  resize: both;
+}
+
 .list-disc {
   list-style-type: disc;
 }
@@ -2026,6 +2038,11 @@ a.block-link:after {
   --tw-ring-offset-width: 2px;
 }
 
+.blur {
+  --tw-blur: blur(8px);
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
+
 .filter {
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }

data/app/assets/config/panda_cms_manifest.js

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

data/app/components/panda_cms/code_component.rb

@@ -15,6 +15,8 @@ module PandaCms
       @options = options || {}
       @options[:id] ||= "code-#{key.to_s.dasherize}"
       @editable = editable
+
+      raise BlockError.new("Key 'code' is not allowed for CodeComponent") if key == :code
     end
 
     def call
@@ -22,7 +24,7 @@ module PandaCms
       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?
+        raise PandaCms::MissingBlockError.new("Block with key #{@key} not found for page #{Current.page.title}") unless Rails.env.production?
         return false
       end
 

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

@@ -1,3 +1,6 @@
 <% @menu_items.each do |menu_item| %>
   <a href="<%= menu_item.resolved_link %>" class="<%= menu_item.css_classes %>"><%= menu_item.text %></a>
+  <% if @render_page_menu && menu_item.page %>
+    <%= render PandaCms::PageMenuComponent.new(page: menu_item.page, start_depth: 1, styles: @page_menu_styles, show_heading: false) %>
+  <% end %>
 <% end %>

data/app/components/panda_cms/menu_component.rb

@@ -12,12 +12,13 @@ module PandaCms
     #  The "default" key is applied to all menu items. "inactive" and "active" are set based on the
     #  current path.
     # @return [void]
-    def initialize(name:, current_path: "", styles: {})
+    def initialize(name:, current_path: "", styles: {}, render_page_menu: false, page_menu_styles: {})
       @menu = PandaCms::Menu.find_by(name: name)
       @menu_items = @menu.menu_items
       @menu_items = @menu_items.where("depth <= ?", @menu.depth) if @menu.depth
       @menu_items = @menu_items.order(:lft)
       @current_path = current_path.to_s
+      @render_page_menu = render_page_menu
 
       @menu_items = @menu_items.order(:lft).map do |menu_item|
         if is_active?(menu_item)
@@ -28,6 +29,12 @@ module PandaCms
 
         menu_item
       end
+
+      # TODO: Surely don't need this but Current.page isn't working in the component
+      if @render_page_menu
+        @current_page = PandaCms::Page.find_by(path: @current_path)
+        @page_menu_styles = page_menu_styles
+      end
     end
 
     def is_active?(menu_item)

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

@@ -1,10 +1,12 @@
 <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] %>">
-        <%= menu_item.text %>
-      </a>
-    </li>
+    <% if @show_heading %>
+      <li>
+        <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>
+    <% end %>
     <ul>
       <% 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 %>

data/app/components/panda_cms/page_menu_component.rb

@@ -6,7 +6,7 @@ module PandaCms
     attr_accessor :menu_item
     attr_accessor :styles
 
-    def initialize(page:, start_depth:, styles: {})
+    def initialize(page:, start_depth:, styles: {}, show_heading: true)
       @page = page
 
       unless @page.nil?
@@ -21,6 +21,8 @@ module PandaCms
 
         @menu_item = menu.menu_items.order(:lft)&.first
 
+        @show_heading = show_heading
+
         # Set some default styles for sanity
         @styles = styles
         @styles[:indent_with] ||= "pl-2"

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

@@ -1,6 +1,6 @@
 <% 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>
+  <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>
 <% else %>
   <div class="panda-cms-content"><%= @content %></div>
 <% end %>

data/app/components/panda_cms/rich_text_component.rb

@@ -25,15 +25,23 @@ module PandaCms
       @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
+      if block_content.nil?
+        block_content = PandaCms::BlockContent.create(block: block, panda_cms_page_id: Current.page.id, content: "")
+      end
 
-      @options[:id] = "editor_rich_text_#{block_content.id.tr("-", "_")}"
+      @content = block_content.cached_content || block_content.content
+      @options[:id] = block_content.id
 
       if @editable
         @options[:data] = {
-          block_content_id: block_content&.id,
-          mode: "rich-text"
+          page_id: Current.page.id,
+          mode: "rich_text"
         }
+
+        @content = block_content.content
+      elsif @content.is_a?(Hash)
+        renderer = PandaCms::EditorJs::Renderer.new(@content)
+        @content = renderer.render
       else
         @content = @content.html_safe
       end

data/app/components/panda_cms/text_component.rb

@@ -24,7 +24,7 @@ module PandaCms
       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")
+        raise PandaCms::MissingBlockError.new("Block with key #{@key} not found for page #{Current.page.title}")
       else
         false
       end

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

@@ -11,7 +11,7 @@ module PandaCms
       # @type PATCH/PUT
       # @return
       def update
-        if @block_content.update(block_content_params)
+        if @block_content.update!(content: params[:content])
           @block_content.page.touch # Update the page's updated_at
           render json: @block_content, status: :ok
         else