Add templates and sections to shop

.rubycritic.yml

@@ -14,4 +14,5 @@ paths:
   - plugins/ShinyPages/app
   - plugins/ShinyProfiles/app
   - plugins/ShinySearch/app
+  - plugins/ShinyShop/app
   - plugins/ShinySEO/app

db/migrate/20250715133806_add_shop_tables.shiny_shop.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+# This migration comes from shiny_shop (originally 20250715130616)
+# ShinyShop plugin for ShinyCMS ~ https://shinycms.org
+#
+# Copyright 2009-2025 Denny de la Haye ~ https://denny.me
+#
+# ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later)
+
+class AddShopTables < ActiveRecord::Migration[8.0]
+  def change
+    create_table :shiny_shop_templates, force: :cascade do |t|
+      t.string :name, null: false
+      t.text :description
+      t.string :filename, null: false
+
+      t.timestamps
+      t.datetime :deleted_at, index: true
+    end
+
+    create_table :shiny_shop_template_elements, force: :cascade do |t|
+      t.string :name, null: false
+      t.string :content
+      t.string :element_type, default: 'short_text', null: false
+      t.integer :position
+
+      t.belongs_to :template, foreign_key: { to_table: :shiny_shop_templates }, null: false
+
+      t.timestamps
+      t.datetime :deleted_at, index: true
+    end
+
+    create_table :shiny_shop_sections, force: :cascade do |t|
+      t.string :internal_name, null: false
+      t.string :public_name
+      t.string :slug, null: false
+      t.text :description
+      t.integer :position
+      t.boolean :show_in_menus, default: true, null: false
+      t.boolean :show_on_site, default: true, null: false
+
+      t.belongs_to :section, foreign_key: { to_table: :shiny_shop_sections }
+
+      t.timestamps
+      t.datetime :deleted_at, index: true
+
+      t.index [:section_id, :slug], name: :index_shop_sections_on_section_id_and_slug, unique: true
+    end
+
+    change_table :shiny_shop_products, force: :cascade do |t|
+      t.boolean :show_in_menus, default: true, null: false
+
+      t.belongs_to :section, foreign_key: { to_table: :shiny_shop_sections }
+      t.belongs_to :template, foreign_key: { to_table: :shiny_shop_templates }
+
+      t.index [:section_id, :slug], name: :index_products_on_section_id_and_slug, unique: true
+      t.datetime :deleted_at, index: true
+    end
+
+    create_table :shiny_shop_product_elements, force: :cascade do |t|
+      t.string :name, null: false
+      t.string :content
+      t.string :element_type, default: 'short_text', null: false
+      t.integer :position
+
+      t.belongs_to :product, foreign_key: { to_table: :shiny_shop_products }, null: false
+
+      t.timestamps
+      t.datetime :deleted_at, index: true
+    end
+  end
+end

db/migrate/20251202133022_remove_product_slug_unique_index.shiny_shop.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# This migration comes from shiny_shop (originally 20251202131048)
+# ShinyShop plugin for ShinyCMS ~ https://shinycms.org
+#
+# Copyright 2009-2025 Denny de la Haye ~ https://denny.me
+#
+# ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later)
+
+class RemoveProductSlugUniqueIndex < ActiveRecord::Migration[8.0]
+  def change
+    remove_index :shop_products, :slug, if_exists: true
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 # less error prone than running all of your migrations from scratch. Old migrations may fail
 # to apply correctly if those migrations use external dependencies or application code.
 
-ActiveRecord::Schema[8.0].define(version: 2025_07_07_134039) do
+ActiveRecord::Schema[8.0].define(version: 2025_12_02_133022) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
   enable_extension "pg_stat_statements"
@@ -469,6 +469,19 @@
     t.index ["user_id"], name: "index_shiny_profiles_profiles_on_user_id", unique: true
   end
 
+  create_table "shiny_shop_product_elements", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "content"
+    t.string "element_type", default: "short_text", null: false
+    t.integer "position"
+    t.bigint "product_id", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "deleted_at", precision: nil
+    t.index ["deleted_at"], name: "index_shiny_shop_product_elements_on_deleted_at"
+    t.index ["product_id"], name: "index_shiny_shop_product_elements_on_product_id"
+  end
+
   create_table "shiny_shop_products", force: :cascade do |t|
     t.string "internal_name", null: false
     t.string "public_name"
@@ -482,9 +495,56 @@
     t.integer "price"
     t.boolean "active", default: false, null: false
     t.string "stripe_price_id"
-    t.index ["slug"], name: "index_shiny_shop_products_on_slug", unique: true
+    t.boolean "show_in_menus", default: true, null: false
+    t.bigint "section_id"
+    t.bigint "template_id"
+    t.datetime "deleted_at", precision: nil
+    t.index ["deleted_at"], name: "index_shiny_shop_products_on_deleted_at"
+    t.index ["section_id", "slug"], name: "index_products_on_section_id_and_slug", unique: true
+    t.index ["section_id"], name: "index_shiny_shop_products_on_section_id"
     t.index ["stripe_id"], name: "index_shiny_shop_products_on_stripe_id", unique: true
     t.index ["stripe_price_id"], name: "index_shiny_shop_products_on_stripe_price_id", unique: true
+    t.index ["template_id"], name: "index_shiny_shop_products_on_template_id"
+  end
+
+  create_table "shiny_shop_sections", force: :cascade do |t|
+    t.string "internal_name", null: false
+    t.string "public_name"
+    t.string "slug", null: false
+    t.text "description"
+    t.integer "position"
+    t.boolean "show_in_menus", default: true, null: false
+    t.boolean "show_on_site", default: true, null: false
+    t.bigint "section_id"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "deleted_at", precision: nil
+    t.index ["deleted_at"], name: "index_shiny_shop_sections_on_deleted_at"
+    t.index ["section_id", "slug"], name: "index_shop_sections_on_section_id_and_slug", unique: true
+    t.index ["section_id"], name: "index_shiny_shop_sections_on_section_id"
+  end
+
+  create_table "shiny_shop_template_elements", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "content"
+    t.string "element_type", default: "short_text", null: false
+    t.integer "position"
+    t.bigint "template_id", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "deleted_at", precision: nil
+    t.index ["deleted_at"], name: "index_shiny_shop_template_elements_on_deleted_at"
+    t.index ["template_id"], name: "index_shiny_shop_template_elements_on_template_id"
+  end
+
+  create_table "shiny_shop_templates", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "description"
+    t.string "filename", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "deleted_at", precision: nil
+    t.index ["deleted_at"], name: "index_shiny_shop_templates_on_deleted_at"
   end
 
   create_table "shinycms_anonymous_authors", force: :cascade do |t|
@@ -746,6 +806,11 @@
   add_foreign_key "shiny_pages_template_elements", "shiny_pages_templates", column: "template_id"
   add_foreign_key "shiny_profiles_links", "shiny_profiles_profiles", column: "profile_id"
   add_foreign_key "shiny_profiles_profiles", "shinycms_users", column: "user_id"
+  add_foreign_key "shiny_shop_product_elements", "shiny_shop_products", column: "product_id"
+  add_foreign_key "shiny_shop_products", "shiny_shop_sections", column: "section_id"
+  add_foreign_key "shiny_shop_products", "shiny_shop_templates", column: "template_id"
+  add_foreign_key "shiny_shop_sections", "shiny_shop_sections", column: "section_id"
+  add_foreign_key "shiny_shop_template_elements", "shiny_shop_templates", column: "template_id"
   add_foreign_key "shinycms_capabilities", "shinycms_capability_categories", column: "category_id"
   add_foreign_key "shinycms_comments", "shinycms_comments", column: "parent_id"
   add_foreign_key "shinycms_comments", "shinycms_discussions", column: "discussion_id"

plugins/ShinyCMS/.rubocop.yml

@@ -180,6 +180,7 @@ Rails/RenderInline:
   Exclude:
     - ../../app/controllers/application_controller.rb
     - ../ShinyPages/app/controllers/shiny_pages/pages_controller.rb
+    - ../ShinyShop/app/controllers/shiny_shop/products_controller.rb
 
 # Configurable user model
 Rails/ReflectionClassName:

plugins/ShinyCMS/app/assets/stylesheets/shinycms/admin_area.scss

@@ -194,6 +194,10 @@ main p {
   padding:          0.5em 1em;
 }
 
+.button_to {
+  display: inline;
+}
+
 
 // ========== ( drag-to-sort ) ==========
 
@@ -302,6 +306,16 @@ form .ui-sortable-handle {
   text-decoration:  none;
 }
 
+.table-striped .actions button {
+  background:       $input-bg;
+  border:           1px solid $input-border;
+  border-radius:    0.2em;
+  color:            $button-text;
+  height:           1.9em;
+  padding:          0.2em 0.5em 0.4em;
+  text-decoration:  none;
+}
+
 .table-striped .actions a:hover {
   background:       $input-border;
   color:            $input-bg;

plugins/ShinyCMS/app/controllers/shinycms/errors_controller.rb

@@ -12,7 +12,15 @@ class ErrorsController < ApplicationController
     include ShinyCMS::MainSiteControllerBase
 
     def not_found
-      render status: :not_found
+      respond_to do |format|
+        format.html do
+          @resource_type = request.env[ 'action_dispatch.exception' ]&.model&.demodulize || 'Page'
+          render status: :not_found
+        end
+        format.any do
+          head :not_found
+        end
+      end
     end
 
     def internal_server_error

plugins/ShinyCMS/app/views/shinycms/errors/not_found.html.erb

@@ -1,6 +1,4 @@
-<% resource_type ||= 'page' %>
-
-<% @page_title = t( '.title', resource_type: resource_type.capitalize ) %>
+<% @page_title = t( '.title', resource_type: @resource_type.capitalize ) %>
 
 <section>
   <header>
@@ -10,7 +8,7 @@
   </header>
 
   <p>
-    <%= t( '.explanation', resource_type: resource_type.downcase ) %>
+    <%= t( '.explanation', resource_type: @resource_type.downcase ) %>
   </p>
 </section>
 

plugins/ShinyCMS/app/views/shinycms/menu/_menu.html.erb

@@ -11,4 +11,9 @@
   <% if feature_enabled? :tags %>
   <%= render partial: 'menu/tags' %>
   <% end %>
+
+  <% if plugin_loaded? :ShinyShop %>
+  <%= render partial: 'shiny_shop/menu/products',
+             locals: { items: shop_top_level_menu_items } %>
+  <% end %>
 </ul>

plugins/ShinyCMS/spec/fixtures/TEST/views/shiny_shop/products/an_example.html.erb

@@ -0,0 +1,14 @@
+<% @page_title = @product.name %>
+<h1>
+  <%= @product.name %>
+</h1>
+<p>
+  <%= image_tag url_for( an_image ), class: 'classy' if an_image&.attached? %>
+</p>
+<h2>
+  <%= a_heading %>
+</h2>
+
+<%= simple_format some_text %>
+
+<%= sanitize html_text %>

plugins/ShinyCMS/spec/models/shinycms/plugins_components_spec.rb

@@ -17,7 +17,7 @@
       expect( models ).to be_an Enumerable
 
       expect( models.first ).to be ShinyAccess::Group
-      expect( models.last  ).to be ShinyProfiles::Profile
+      expect( models.last  ).to be ShinyShop::TemplateElement
     end
   end
 

plugins/ShinyCMS/spec/requests/shinycms/discussions_controller_spec.rb

@@ -84,7 +84,7 @@
 
       expect( response      ).to have_http_status :not_found
       expect( response.body ).to have_css 'h2', text: I18n.t(
-        'shinycms.errors.not_found.title', resource_type: 'Page'
+        'shinycms.errors.not_found.title', resource_type: 'Discussion'
       )
     end
   end

plugins/ShinyCMS/spec/spec_helper.rb

@@ -26,8 +26,9 @@
 
 RSpec.configure do |config|
   config.before( :suite ) do
-    # Copy TEST theme templates into place
-    FileUtils.cp_r 'plugins/ShinyCMS/spec/fixtures/TEST', 'themes/TEST' unless Dir.exist? 'themes/TEST'
+    # Copy fresh TEST theme templates into place
+    FileUtils.rm_r 'themes/TEST' if Dir.exist? 'themes/TEST'
+    FileUtils.cp_r 'plugins/ShinyCMS/spec/fixtures/TEST', 'themes/TEST'
   end
 
   # This setting specifies which spec files to load when `rspec` is run without
@@ -62,6 +63,10 @@
       SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
         [ SimpleCov::Formatter::Codecov, SimpleCov::Formatter::JSONFormatter ]
       )
+    else
+      SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+        [ SimpleCov::Formatter::HTMLFormatter ]
+      )
     end
   end
 

plugins/ShinyPages/app/controllers/shiny_pages/admin/templates_controller.rb

@@ -53,7 +53,6 @@ def create
 
     def edit
       authorize @template
-      # binding.pry
     end
 
     def update
@@ -86,7 +85,6 @@ def stash_new_template
     end
 
     def stash_template
-      # binding.pry
       @template = Template.find( params[:id] )
     end
 

plugins/ShinyShop/app/components/shiny_shop/admin/menu/section_component.html.erb

@@ -1,4 +1,6 @@
-<% return unless @current_user.can? :list, :products %>
+<% return unless @current_user.can?( :list, :products          ) ||
+                 @current_user.can?( :list, :product_sections  ) ||
+                 @current_user.can?( :list, :product_templates ) %>
 
 <%= component 'admin/menu/section',
     text: t( 'shiny_shop.admin.products.menu' ), icon: 'rss' do %>
@@ -10,4 +12,16 @@
       text: t( 'shiny_shop.admin.products.new.title' ), icon: 'pencil',
       if: @current_user.can?( :add, :products ) %>
 
+  <%= component 'admin/menu/item', link: shiny_shop.new_section_path,
+      text: t( 'shiny_shop.admin.sections.new.title' ), icon: 'playlist-add',
+      if: @current_user.can?( :add, :product_sections ) %>
+
+  <%= component 'admin/menu/item', link: shiny_shop.templates_path,
+      text: t( 'shiny_shop.admin.templates.index.title' ), icon: 'library',
+      if: @current_user.can?( :list, :product_templates ) %>
+
+  <%= component 'admin/menu/item', link: shiny_shop.new_template_path,
+      text: t( 'shiny_shop.admin.templates.new.title' ), icon: 'library-add',
+      if: @current_user.can?( :add, :product_templates ) %>
+
 <% end %>