katalyst-content 0.1.2 → 0.2.1

data/app/views/katalyst/content/columns/_column.html+form.erb

@@ -0,0 +1,27 @@
+<%= form_with model: column, scope: :item, url: path do |form| %>
+  <%= render "hidden_fields", form: form %>
+  <%= render "form_errors", form: form %>
+
+  <div class="field">
+    <%= form.label :heading %>
+    <%= form.text_field :heading %>
+  </div>
+
+  <div class="field">
+    <%= form.label :show_heading %>
+    <%= form.check_box :show_heading %>
+  </div>
+
+  <div class="field">
+    <%= form.label :background %>
+    <%= form.select :background, Katalyst::Content.config.backgrounds %>
+  </div>
+
+  <div class="field">
+    <%= form.label :visible %>
+    <%= form.check_box :visible %>
+  </div>
+
+  <%= form.submit "Done" %>
+  <%= link_to "Discard", :back %>
+<% end %>

data/app/views/katalyst/content/columns/_column.html.erb

@@ -0,0 +1,14 @@
+<%= content_item_tag column do %>
+  <%= tag.h3 column.heading if column.show_heading? %>
+
+  <% items = column.children.select(&:visible?) %>
+  <% last = items.pop %>
+  <div class="columns-container">
+    <div class="column">
+      <%= render_content_items items %>
+    </div>
+    <div class="column">
+      <%= render_content_items [last] if last %>
+    </div>
+  </div>
+<% end %>

data/app/views/katalyst/content/contents/_content.html+form.erb

@@ -1,13 +1,6 @@
 <%= form_with model: content, scope: :item, url: path do |form| %>
-  <%= form.hidden_field :container_type %>
-  <%= form.hidden_field :container_id %>
-  <%= form.hidden_field :type %>
-
-  <%= tag.div class: "errors" do %>
-    <% content.errors.full_messages.each do |error| %>
-      <li class="error"><%= error %></li>
-    <% end %>
-  <% end if content.errors.any? %>
+  <%= render "hidden_fields", form: form %>
+  <%= render "form_errors", form: form %>
 
   <div class="field">
     <%= form.label :heading %>
@@ -31,7 +24,7 @@
 
   <div class="field">
     <%= form.label :content %>
-    <%= form.rich_text_area :content %>
+    <%= form.rich_text_area :content, content_editor_rich_text_options %>
   </div>
 
   <%= form.submit "Done" %>

data/app/views/katalyst/content/contents/_content.html.erb

@@ -1,5 +1,5 @@
-<div class="<%= content.background %>">
-  <%= tag.h2 content.heading if content.show_heading? %>
+<%= content_item_tag content do %>
+  <%= tag.h3 content.heading if content.show_heading? %>
 
   <%= content.content %>
-</div>
+<% end %>

data/app/views/katalyst/content/editor/_list_item.html.erb

@@ -3,6 +3,7 @@
     data-content-item-id="<%= item.id %>"
     data-content-index="<%= item.index %>"
     data-content-depth="<%= item.depth %>"
+    <%= "data-content-layout" if item.layout? %>
     data-deny-de-nest
     data-deny-nest
     data-deny-collapse

data/app/views/katalyst/content/figures/_figure.html+form.erb

@@ -0,0 +1,32 @@
+<%= form_with model: figure, scope: :item, url: path do |form| %>
+  <%= render "hidden_fields", form: form %>
+  <%= render "form_errors", form: form %>
+
+  <div class="field">
+    <%= form.label :image %>
+    <%= form.file_field :image %>
+  </div>
+
+  <div class="field">
+    <%= form.label :heading %>
+    <%= form.text_field :heading %>
+  </div>
+
+  <div class="field">
+    <%= form.label :background %>
+    <%= form.select :background, Katalyst::Content.config.backgrounds %>
+  </div>
+
+  <div class="field">
+    <%= form.label :visible %>
+    <%= form.check_box :visible %>
+  </div>
+
+  <div class="field">
+    <%= form.label :caption %>
+    <%= form.text_field :caption %>
+  </div>
+
+  <%= form.submit "Done" %>
+  <%= link_to "Discard", :back %>
+<% end %>

data/app/views/katalyst/content/figures/_figure.html.erb

@@ -0,0 +1,4 @@
+<%= content_item_tag figure do %>
+  <%= image_tag figure.image, alt: figure.alt %>
+  <%= tag.figcaption figure.caption if figure.caption.present? %>
+<% end %>

data/app/views/katalyst/content/groups/_group.html+form.erb

@@ -0,0 +1,27 @@
+<%= form_with model: group, scope: :item, url: path do |form| %>
+  <%= render "hidden_fields", form: form %>
+  <%= render "form_errors", form: form %>
+
+  <div class="field">
+    <%= form.label :heading %>
+    <%= form.text_field :heading %>
+  </div>
+
+  <div class="field">
+    <%= form.label :show_heading %>
+    <%= form.check_box :show_heading %>
+  </div>
+
+  <div class="field">
+    <%= form.label :background %>
+    <%= form.select :background, Katalyst::Content.config.backgrounds %>
+  </div>
+
+  <div class="field">
+    <%= form.label :visible %>
+    <%= form.check_box :visible %>
+  </div>
+
+  <%= form.submit "Done" %>
+  <%= link_to "Discard", :back %>
+<% end %>

data/app/views/katalyst/content/groups/_group.html.erb

@@ -0,0 +1,7 @@
+<%= content_item_tag group do %>
+  <%= tag.h3 group.heading if group.show_heading? %>
+
+  <div>
+    <%= render_content_items group.children %>
+  </div>
+<% end %>

data/app/views/katalyst/content/items/_form_errors.html.erb

@@ -0,0 +1,5 @@
+<%= tag.ul class: "errors" do %>
+  <% form.object.errors.full_messages.each do |error| %>
+    <li class="error"><%= error %></li>
+  <% end %>
+<% end if form.object.errors.any? %>

data/app/views/katalyst/content/items/_hidden_fields.html.erb

@@ -0,0 +1,3 @@
+<%= form.hidden_field :container_type %>
+<%= form.hidden_field :container_id %>
+<%= form.hidden_field :type %>

data/app/views/katalyst/content/items/_item.html+form.erb

@@ -1,13 +1,6 @@
 <%= form_with model: item, scope: :item, url: path do |form| %>
-  <%= form.hidden_field :container_type %>
-  <%= form.hidden_field :container_id %>
-  <%= form.hidden_field :type %>
-
-  <%= tag.div class: "errors" do %>
-    <% item.errors.full_messages.each do |error| %>
-      <li class="error"><%= error %></li>
-    <% end %>
-  <% end if item.errors.any? %>
+  <%= render "hidden_fields", form: form %>
+  <%= render "form_errors", form: form %>
 
   <div class="field">
     <%= form.label :heading %>

data/app/views/katalyst/content/items/_item.html.erb

@@ -1,3 +1,3 @@
-<div class="<%= item.background %>">
-  <%= tag.h2 item.heading if item.show_heading? %>
-</div>
+<%= content_item_tag item do %>
+  <%= tag.h3 item.heading if item.show_heading? %>
+<% end %>

data/app/views/katalyst/content/sections/_section.html+form.erb

@@ -0,0 +1,27 @@
+<%= form_with model: section, scope: :item, url: path do |form| %>
+  <%= render "hidden_fields", form: form %>
+  <%= render "form_errors", form: form %>
+
+  <div class="field">
+    <%= form.label :heading %>
+    <%= form.text_field :heading %>
+  </div>
+
+  <div class="field">
+    <%= form.label :show_heading %>
+    <%= form.check_box :show_heading %>
+  </div>
+
+  <div class="field">
+    <%= form.label :background %>
+    <%= form.select :background, Katalyst::Content.config.backgrounds %>
+  </div>
+
+  <div class="field">
+    <%= form.label :visible %>
+    <%= form.check_box :visible %>
+  </div>
+
+  <%= form.submit "Done" %>
+  <%= link_to "Discard", :back %>
+<% end %>

data/app/views/katalyst/content/sections/_section.html.erb

@@ -0,0 +1,7 @@
+<%= content_item_tag section do %>
+  <%= tag.h2 section.heading if section.show_heading? %>
+
+  <div>
+    <%= render_content_items section.children %>
+  </div>
+<% end %>

data/config/locales/en.yml

@@ -1,4 +1,15 @@
 en:
+  activerecord:
+    attributes:
+      katalyst/content/figure:
+        heading: "Alternate text"
+    errors:
+      messages:
+        missing_item: Content items are missing or invalid
+      models:
+        katalyst/content/item:
+          content_type_invalid: file type not supported
+          file_size_out_of_range: must be less than %{max_size}
   views:
     katalyst:
       content:
@@ -8,5 +19,9 @@ en:
           discard: Discard
           publish: Publish
           published_html: Published <i>(last updated %{last_update})</i>
+          unpublished_html: Unpublished
           revert: Revert
           save: Save
+        item:
+          size_hint:
+            Must be less than %{max_size}

data/config/routes.rb

@@ -1,3 +1,4 @@
 Katalyst::Content::Engine.routes.draw do
+  resources :direct_uploads, only: :create
   resources :items
 end

data/db/migrate/20220926061535_add_fields_for_figure_to_katalyst_content_items.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddFieldsForFigureToKatalystContentItems < ActiveRecord::Migration[7.0]
+  def change
+    add_column :katalyst_content_items, :caption, :string
+  end
+end

data/lib/katalyst/content/config.rb

@@ -11,8 +11,15 @@ module Katalyst
       config_accessor(:items) do
         %w[
           Katalyst::Content::Content
+          Katalyst::Content::Figure
+          Katalyst::Content::Section
+          Katalyst::Content::Group
+          Katalyst::Content::Column
+          Katalyst::Content::Aside
         ]
       end
+      config_accessor(:image_mime_types) { %w[image/png image/gif image/jpeg image/webp] }
+      config_accessor(:max_image_size) { 20 }
     end
   end
 end

data/lib/katalyst/content/version.rb

@@ -2,6 +2,6 @@
 
 module Katalyst
   module Content
-    VERSION = "0.1.2"
+    VERSION = "0.2.1"
   end
 end

data/spec/factories/katalyst/content/items.rb

@@ -1,16 +1,42 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :katalyst_content_item, class: "Katalyst::Content::Item" do
+  trait :content_item_defaults do
     heading { Faker::Lorem.word }
     show_heading { true }
     background { Katalyst::Content.config.backgrounds.sample }
+    depth { 0 }
+  end
+
+  factory :katalyst_content_item, class: "Katalyst::Content::Item" do
+    content_item_defaults
   end
 
   factory :katalyst_content_content, class: "Katalyst::Content::Content" do
-    heading { Faker::Lorem.word }
-    show_heading { true }
-    background { Katalyst::Content.config.backgrounds.sample }
+    content_item_defaults
     content { Faker::Hacker.say_something_smart }
   end
+
+  factory :katalyst_content_figure, class: "Katalyst::Content::Figure" do
+    content_item_defaults
+    image { image_upload }
+    alt { Faker::Lorem.sentence }
+    caption { Faker::Hacker.say_something_smart }
+  end
+
+  factory :katalyst_content_section, class: "Katalyst::Content::Section" do
+    content_item_defaults
+  end
+
+  factory :katalyst_content_group, class: "Katalyst::Content::Group" do
+    content_item_defaults
+  end
+
+  factory :katalyst_content_aside, class: "Katalyst::Content::Aside" do
+    content_item_defaults
+  end
+
+  factory :katalyst_content_column, class: "Katalyst::Content::Column" do
+    content_item_defaults
+  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-content
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
-dependencies: []
+date: 2022-11-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: active_storage_validations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - developers@katalyst.com.au
@@ -25,10 +39,12 @@ files:
 - app/assets/javascripts/controllers/content/editor/list_controller.js
 - app/assets/javascripts/controllers/content/editor/new_item_controller.js
 - app/assets/javascripts/controllers/content/editor/status_bar_controller.js
+- app/assets/javascripts/controllers/content/editor/trix_controller.js
 - app/assets/javascripts/utils/content/editor/container.js
 - app/assets/javascripts/utils/content/editor/item.js
 - app/assets/javascripts/utils/content/editor/rules-engine.js
 - app/assets/stylesheets/katalyst/content/_index.scss
+- app/assets/stylesheets/katalyst/content/editor/_figure.scss
 - app/assets/stylesheets/katalyst/content/editor/_icon.scss
 - app/assets/stylesheets/katalyst/content/editor/_index.scss
 - app/assets/stylesheets/katalyst/content/editor/_item-actions.scss
@@ -37,40 +53,61 @@ files:
 - app/assets/stylesheets/katalyst/content/editor/_status-bar.scss
 - app/assets/stylesheets/katalyst/content/editor/_trix-rails.scss
 - app/controllers/katalyst/content/application_controller.rb
+- app/controllers/katalyst/content/direct_uploads_controller.rb
 - app/controllers/katalyst/content/items_controller.rb
-- app/helpers/katalyst/content/application_helper.rb
 - app/helpers/katalyst/content/editor/base.rb
 - app/helpers/katalyst/content/editor/container.rb
+- app/helpers/katalyst/content/editor/errors.rb
 - app/helpers/katalyst/content/editor/item.rb
 - app/helpers/katalyst/content/editor/list.rb
 - app/helpers/katalyst/content/editor/new_item.rb
 - app/helpers/katalyst/content/editor/status_bar.rb
 - app/helpers/katalyst/content/editor_helper.rb
+- app/helpers/katalyst/content/frontend_helper.rb
 - app/models/concerns/katalyst/content/container.rb
 - app/models/concerns/katalyst/content/garbage_collection.rb
 - app/models/concerns/katalyst/content/has_tree.rb
 - app/models/concerns/katalyst/content/version.rb
+- app/models/katalyst/content/aside.rb
+- app/models/katalyst/content/column.rb
 - app/models/katalyst/content/content.rb
+- app/models/katalyst/content/figure.rb
+- app/models/katalyst/content/group.rb
 - app/models/katalyst/content/item.rb
+- app/models/katalyst/content/layout.rb
 - app/models/katalyst/content/node.rb
+- app/models/katalyst/content/section.rb
 - app/models/katalyst/content/types/nodes_type.rb
 - app/views/active_storage/blobs/_blob.html.erb
+- app/views/katalyst/content/asides/_aside.html+form.erb
+- app/views/katalyst/content/asides/_aside.html.erb
+- app/views/katalyst/content/columns/_column.html+form.erb
+- app/views/katalyst/content/columns/_column.html.erb
 - app/views/katalyst/content/contents/_content.html+form.erb
 - app/views/katalyst/content/contents/_content.html.erb
 - app/views/katalyst/content/editor/_item.html.erb
 - app/views/katalyst/content/editor/_list_item.html.erb
 - app/views/katalyst/content/editor/_new_item.html.erb
 - app/views/katalyst/content/editor/_new_items.html.erb
+- app/views/katalyst/content/figures/_figure.html+form.erb
+- app/views/katalyst/content/figures/_figure.html.erb
+- app/views/katalyst/content/groups/_group.html+form.erb
+- app/views/katalyst/content/groups/_group.html.erb
+- app/views/katalyst/content/items/_form_errors.html.erb
+- app/views/katalyst/content/items/_hidden_fields.html.erb
 - app/views/katalyst/content/items/_item.html+form.erb
 - app/views/katalyst/content/items/_item.html.erb
 - app/views/katalyst/content/items/edit.html.erb
 - app/views/katalyst/content/items/new.html.erb
 - app/views/katalyst/content/items/update.turbo_stream.erb
+- app/views/katalyst/content/sections/_section.html+form.erb
+- app/views/katalyst/content/sections/_section.html.erb
 - app/views/layouts/action_text/contents/_content.html.erb
 - config/importmap.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20220913003839_create_katalyst_content_items.rb
+- db/migrate/20220926061535_add_fields_for_figure_to_katalyst_content_items.rb
 - lib/katalyst/content.rb
 - lib/katalyst/content/config.rb
 - lib/katalyst/content/engine.rb