spina 2.20.0 → 2.21.0

data/app/controllers/concerns/spina/current_spina_account.rb

@@ -11,7 +11,7 @@ module Spina
     private
 
     def current_account
-      ActiveSupport::Deprecation.warn(
+      Spina.deprecator.warn(
         "#current_account is deprecated, due to a common authentication namespace conflict. \n" \
         "Please use #current_spina_account instead."
       )

data/app/controllers/spina/admin/page_select_options_controller.rb

@@ -15,7 +15,7 @@ module Spina
         end
         
         @pages ||= Page.all
-        @pages = @pages.joins(:translations).where("spina_page_translations.title ILIKE :query OR materialized_path ILIKE :query", query: "%#{params[:search]}%").order(created_at: :desc).distinct.page(params[:page]).per(20)
+        @pages = @pages.joins(:translations).where("LOWER(spina_page_translations.title) LIKE LOWER(:query) OR LOWER(materialized_path) LIKE LOWER(:query)", query: "%#{params[:search]}%").order(created_at: :desc).distinct.page(params[:page]).per(20)
         render :index
       end
       

data/app/controllers/spina/admin/resource_select_options_controller.rb

@@ -11,7 +11,7 @@ module Spina
 
       def search
         @resources ||= Resource.all
-        @resources = @resources.where("name ILIKE :query OR label ILIKE :query", query: "%#{params[:search]}%").order(created_at: :desc).distinct.page(params[:page]).per(20)
+        @resources = @resources.where("LOWER(name) LIKE LOWER(:query) OR LOWER(label) LIKE LOWER(:query)", query: "%#{params[:search]}%").order(created_at: :desc).distinct.page(params[:page]).per(20)
         render :index
       end
 

data/app/controllers/spina/application_controller.rb

@@ -1,4 +1,4 @@
-class Spina::ApplicationController < Spina.frontend_parent_controller.constantize
+class Spina::ApplicationController < Spina.config.frontend_parent_controller.constantize
   include Spina.config.authentication.constantize
   include Spina::CurrentTheme
   include Spina::CurrentSpinaAccount

data/app/jobs/spina/replace_signed_id_job.rb

@@ -5,19 +5,22 @@ module Spina
     def perform(old_signed_id, new_signed_id)
       return if old_signed_id.blank? || new_signed_id.blank?
 
-      pages = get_pages(old_signed_id)
-      accounts = Spina::Account.all
-
-      [pages, accounts].each do |records|
-        records.update_all("json_attributes = REGEXP_REPLACE(json_attributes::text, '#{old_signed_id}', '#{new_signed_id}', 'g')::jsonb")
-      end
+      replace_in_records(Spina::Page, old_signed_id, new_signed_id)
+      replace_in_records(Spina::Account, old_signed_id, new_signed_id)
     end
 
     private
 
-    def get_pages(signed_id)
-      return Spina::Page.none unless signed_id.present?
-      Spina::Page.where("json_attributes::text LIKE ?", "%#{signed_id}%")
+    def replace_in_records(model, old_signed_id, new_signed_id)
+      model.find_each(batch_size: 100) do |record|
+        next unless record.json_attributes.present?
+
+        json_string = record.json_attributes.to_json
+        next unless json_string.include?(old_signed_id)
+
+        updated_json = json_string.gsub(old_signed_id, new_signed_id)
+        record.update_column(:json_attributes, JSON.parse(updated_json))
+      end
     end
   end
 end

data/app/models/concerns/spina/attachable.rb

@@ -7,7 +7,7 @@ module Spina
       
       scope :with_filename, ->(query) do
         joins(:file_blob).where(
-          "active_storage_blobs.filename ILIKE ?",
+          "LOWER(active_storage_blobs.filename) LIKE LOWER(?)",
           "%" + Image.sanitize_sql_like(query) + "%"
         )
       end

data/app/models/concerns/spina/translated_content.rb

@@ -6,7 +6,7 @@ module Spina
 
     included do
       # Store each locale's content in [locale]_content as an array of parts
-      Spina.locales.each do |locale|
+      Spina.config.locales.each do |locale|
         attr_json "#{locale}_content".to_sym, AttrJson::Type::SpinaPartsModel.new, array: true, default: -> { [] }
         attr_json_setter_monkeypatch "#{locale}_content".to_sym
         attr_json_accepts_nested_attributes_for "#{locale}_content".to_sym

data/app/models/spina/account.rb

@@ -23,7 +23,7 @@ module Spina
       args.each do |method_name|
         define_method method_name do
           if preferences.try(:[], method_name.to_sym).present?
-            ActiveSupport::Deprecation.warn("#{method_name} is stored as a symbol. Please set and save it again using #{method_name}= on your Spina::Account model to store it as a string. You can do this from the UI by saving your account preferences.")
+            Spina.deprecator.warn("#{method_name} is stored as a symbol. Please set and save it again using #{method_name}= on your Spina::Account model to store it as a string. You can do this from the UI by saving your account preferences.")
           end
 
           preferences.try(:[], method_name.to_s) ||
@@ -78,7 +78,7 @@ module Spina
           parent_page = Page.find_by(name: page[:parent])
           ancestry = [parent_page&.ancestry, parent_page&.id].compact.join("/")
         end
-        
+
         Page.where(name: page[:name])
           .first_or_create(title: page[:title])
           .update(view_template: page[:view_template], deletable: page[:deletable], ancestry: ancestry)

data/app/models/spina/resource.rb

@@ -2,11 +2,13 @@ module Spina
   class Resource < ApplicationRecord
     extend Mobility
 
+    attribute :slug, :json, default: -> { {} }
+
     has_many :pages, dependent: :restrict_with_exception
 
     after_commit :update_resource_pages, on: [:update]
 
-    translates :slug, backend: :jsonb
+    translates :slug, backend: :json
 
     def pages
       case order_by

data/app/models/spina/setting.rb

@@ -1,5 +1,7 @@
 module Spina
   class Setting < ApplicationRecord
+    attribute :preferences, :json, default: -> { {} }
+
     validates :plugin, presence: true
   end
 end

data/app/presenters/spina/menu_presenter.rb

@@ -2,12 +2,9 @@ module Spina
   class MenuPresenter
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::UrlHelper
-    include ActiveSupport::Configurable
 
-    attr_accessor :collection, :output_buffer
-
-    # Configuration
-    config_accessor :menu_tag, :menu_css,
+    attr_accessor :collection, :output_buffer,
+      :menu_tag, :menu_css, :menu_id,
       :list_tag, :list_css,
       :list_item_tag, :list_item_css,
       :link_tag_css,
@@ -16,14 +13,12 @@ module Spina
       :include_drafts,
       :depth # root nodes are at depth 0
 
-    # Default configuration
-    self.menu_tag = :nav
-    self.list_tag = :ul
-    self.list_item_tag = :li
-    self.include_drafts = false
-
     def initialize(collection)
       @collection = collection
+      @menu_tag = :nav
+      @list_tag = :ul
+      @list_item_tag = :li
+      @include_drafts = false
     end
 
     def to_html
@@ -38,7 +33,7 @@ module Spina
     end
 
     def render_menu(collection)
-      content_tag(menu_tag, class: menu_css) do
+      content_tag(menu_tag, class: menu_css, id: menu_id) do
         render_items(scoped_collection(collection))
       end
     end

data/app/views/spina/admin/embeds/new.html.erb

@@ -4,15 +4,15 @@
     
     <%= turbo_frame_tag :embeddable_form do %>
       <div class="flex h-full">
-        <div class="p-4 w-64 bg-gray-100 md:bg-opacity-50">
+        <div class="p-4 w-64 bg-gray-100 md:bg-gray-100/50">
           <div class="text-xs font-medium text-gray-600 mb-2">
             <%=t "spina.embeds.embed_a_component" %>
           </div>
           <% embeddables.each do |embeddable| %>
             <% if embeddable.name == @embeddable.class.name %>
-              <% classes = "font-medium w-full text-sm px-3 py-2 rounded-lg flex items-center text-gray-900 bg-spina-dark bg-opacity-20" %>
+              <% classes = "font-medium w-full text-sm px-3 py-2 rounded-lg flex items-center text-gray-900 bg-spina-dark/20" %>
             <% else %>
-              <% classes = "font-medium w-full text-sm px-3 py-2 rounded-lg flex items-center text-gray-600 hover:bg-gray-200 bg-opacity-100 hover:bg-gray-200" %>
+              <% classes = "font-medium w-full text-sm px-3 py-2 rounded-lg flex items-center text-gray-600 hover:bg-gray-200 hover:bg-gray-200" %>
             <% end %>
           
             <%= link_to spina.new_admin_embed_path(embed_type: embeddable.name), class: classes, data: {turbo_frame: :embeddable_form} do %>
@@ -44,4 +44,4 @@
     <% end %>
     
   </div>
-<% end %>
+<% end %>

data/app/views/spina/admin/images/_image.html.erb

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag dom_id(image) do %>
   <div class="flex items-center h-12 border-b border-gray-200 px-8 hover:bg-white group">
     <div class="w-8 mr-4 h-12 flex justify-center">
-      <%= link_to spina.admin_image_path(image), class: "flex items-center cursor-zoom-in", data: {turbo_frame: "modal"} do %>
+      <%= link_to spina.admin_image_path(image), class: "flex flex-1 items-center cursor-zoom-in", data: {turbo_frame: "modal"} do %>
         <%= image_tag thumbnail_url(image), class: "object-contain" %>
       <% end %>
     </div>

data/app/views/spina/admin/layout/edit.html.erb

@@ -1,4 +1,4 @@
-<div data-controller="tabs" data-tabs-active="cursor-default text-gray-900 bg-spina-dark bg-opacity-10" data-tabs-inactive="cursor-pointer bg-transparent text-gray-400 border-transparent">
+<div data-controller="tabs" data-tabs-active="cursor-default text-gray-900 bg-spina-dark/10" data-tabs-inactive="cursor-pointer bg-transparent text-gray-400 border-transparent">
   <%= render Spina::UserInterface::HeaderComponent.new do |header| %>
     <% header.with_actions do %>
       <%= render Spina::UserInterface::TranslationsComponent.new(@account, label: @locale.upcase) %>
@@ -42,4 +42,4 @@
     </div>
   
   <% end %>
-</div>
+</div>

data/app/views/spina/admin/move_pages/new.html.erb

@@ -15,13 +15,13 @@
       </div>
     </div>
     <div class="px-4 py-6 sm:px-6 sm:flex sm:flex-row-reverse">
-      <span class="flex w-full rounded-md shadow-sm sm:ml-3 sm:w-auto">
+      <span class="flex w-full rounded-md shadow-xs sm:ml-3 sm:w-auto">
         <button type="submit" class="btn btn-primary">
           <%=t 'spina.pages.move_page' %>
           <%= heroicon('arrow-right', style: :solid, class: 'w-4 h-4 ml-1') %>
         </button>
       </span>
-      <span class="mt-3 flex w-full rounded-md shadow-sm sm:mt-0 sm:w-auto">
+      <span class="mt-3 flex w-full rounded-md shadow-xs sm:mt-0 sm:w-auto">
         <button type="button" class="btn btn-default" data-action="modal#close">
           <%=t 'spina.ui.cancel' %>
         </button>

data/app/views/spina/admin/navigation_items/_navigation_item.html.erb

@@ -1,5 +1,5 @@
 <li data-id="<%= navigation_item.id %>" id="<%= dom_id(navigation_item, :container) %>">
-  <div class="btn w-56 px-0 text-gray-700 bg-white shadow-sm border-gray-300 cursor-default justify-start">
+  <div class="btn w-56 px-0 text-gray-700 bg-white shadow-xs border-gray-300 cursor-default justify-start">
     <div data-sortable-handle class="cursor-move px-2 pl-4 h-full flex items-center text-gray-400 hover:text-gray-700">
       <%= heroicon('menu-alt-4', style: :solid, class: 'w-4 h-4 -ml-1') %>  
     </div>
@@ -21,17 +21,17 @@
       
       <div hidden data-reveal data-transition class="origin-top-right absolute left-0 z-10 mt-1 w-48 rounded-md shadow-lg">
         <div class="rounded-md bg-gray-700 shadow-xs py-1">
-          <%= link_to spina.new_admin_navigation_navigation_item_path(@navigation, parent_id: navigation_item.id), class: "px-3 py-1 text-xs leading-5 text-gray-200 hover:bg-gray-800 hover:text-white focus:outline-none flex items-center", data: {turbo_frame: "modal", action: "reveal#hide"} do %>
+          <%= link_to spina.new_admin_navigation_navigation_item_path(@navigation, parent_id: navigation_item.id), class: "px-3 py-1 text-xs leading-5 text-gray-200 hover:bg-gray-800 hover:text-white focus:outline-hidden flex items-center", data: {turbo_frame: "modal", action: "reveal#hide"} do %>
             <%= heroicon('plus', style: :mini, class: 'w-4 h-4 mr-2') %>
             <%=t 'spina.navigations.add_sub_item' %>
           <% end %>
 
-          <%= link_to spina.edit_admin_navigation_navigation_item_path(@navigation, id: navigation_item.id, locale: @locale), class: "px-3 py-1 text-xs leading-5 text-gray-200 hover:bg-gray-800 hover:text-white focus:outline-none flex items-center", data: {turbo_frame: "modal", action: "reveal#hide"} do %>
+          <%= link_to spina.edit_admin_navigation_navigation_item_path(@navigation, id: navigation_item.id, locale: @locale), class: "px-3 py-1 text-xs leading-5 text-gray-200 hover:bg-gray-800 hover:text-white focus:outline-hidden flex items-center", data: {turbo_frame: "modal", action: "reveal#hide"} do %>
             <%= heroicon('pencil-square', style: :mini, class: 'w-4 h-4 mr-2') %>
             <%=t 'spina.navigations.edit_item' %>
           <% end %>
           
-          <%= button_to spina.admin_navigation_navigation_item_path(@navigation, navigation_item), method: :delete, class: "bg-transparent w-full text-left cursor-pointer font-medium px-3 py-1 text-xs leading-5 text-red-400 hover:bg-gray-800 hover:text-red-400 focus:outline-none flex items-center", form: {data: {action: "reveal#hide", controller: "confirm", confirm_message: t('spina.navigations.delete_item_confirmation_html')}} do %>
+          <%= button_to spina.admin_navigation_navigation_item_path(@navigation, navigation_item), method: :delete, class: "bg-transparent w-full text-left cursor-pointer font-medium px-3 py-1 text-xs leading-5 text-red-400 hover:bg-gray-800 hover:text-red-400 focus:outline-hidden flex items-center", form: {data: {action: "reveal#hide", controller: "confirm", confirm_message: t('spina.navigations.delete_item_confirmation_html')}} do %>
             <%= heroicon('trash', class: 'w-4 h-4 mr-2') %>
             <%=t 'spina.navigations.delete_item' %>
           <% end %>
@@ -46,4 +46,4 @@
     
     <%= render navigation_item.children.sorted %>
   </ul>
-</li>
+</li>

data/app/views/spina/admin/pages/_form.html.erb

@@ -1,4 +1,4 @@
-<div data-controller="tabs" data-tabs-active="cursor-default text-gray-900 bg-spina-dark bg-opacity-10" data-tabs-inactive="cursor-pointer bg-transparent text-gray-400 border-transparent">
+<div data-controller="tabs" data-tabs-active="cursor-default text-gray-900 bg-spina-dark/10" data-tabs-inactive="cursor-pointer bg-transparent text-gray-400 border-transparent">
   <%= render Spina::UserInterface::HeaderComponent.new do |header| %>
     <% header.with_after_breadcrumbs do %>
       <% if @page.draft? %>

data/app/views/spina/admin/pages/_form_advanced.html.erb

@@ -37,7 +37,7 @@
   </div>
 
   <div class="col-span-2">
-    <%= f.text_field :menu_title, placeholder: Spina::Page.human_attribute_name(:show_in_menu_placeholder), value: f.object.menu_title(fallback: false, default: nil), class: "form-input shadow-sm text-sm w-full" %>
+    <%= f.text_field :menu_title, placeholder: Spina::Page.human_attribute_name(:show_in_menu_placeholder), value: f.object.menu_title(fallback: false, default: nil), class: "form-input shadow-xs text-sm w-full" %>
   </div>
 
   <div class="col-span-1 mt-6 md:mt-0">

data/app/views/spina/admin/pages/edit_template.html.erb

@@ -21,12 +21,12 @@
       </div>
     </div>
     <div class="px-4 py-6 sm:px-6 sm:flex sm:flex-row-reverse">
-      <span class="flex w-full rounded-md shadow-sm sm:ml-3 sm:w-auto">
+      <span class="flex w-full rounded-md shadow-xs sm:ml-3 sm:w-auto">
         <button type="submit" class="btn btn-primary">
           <%=t 'spina.pages.change_view_template' %>
         </button>
       </span>
-      <span class="mt-3 flex w-full rounded-md shadow-sm sm:mt-0 sm:w-auto">
+      <span class="mt-3 flex w-full rounded-md shadow-xs sm:mt-0 sm:w-auto">
         <button type="button" class="btn btn-default" data-action="modal#close">
           <%=t 'spina.ui.cancel' %>
         </button>

data/app/views/spina/admin/pages/index.html.erb

@@ -42,7 +42,7 @@
 
 <% if @pages.any? %>
   
-  <div class="my-6 md:m-8 bg-white md:rounded-lg border-l-0 border-r-0 border md:border-r md:border-l border-gray-200 border-b-0 shadow-sm">
+  <div class="my-6 md:m-8 bg-white md:rounded-lg border-l-0 border-r-0 border md:border-r md:border-l border-gray-200 border-b-0 shadow-xs">
     <%= render Spina::Pages::ListComponent.new(pages: @pages, sortable: @resource.nil? || @resource&.order_by.blank?) %>
   </div>
   

data/app/views/spina/admin/parts/image_collections/_fields.html.erb

@@ -5,7 +5,7 @@
   
   <div class="h-28 w-28 rounded-lg shadow-md overflow-hidden relative mr-3">
     
-    <button class="absolute top-0 left-0 mt-2 ml-2 z-10 cursor-pointer flex items-center h-9 px-2 rounded-md bg-gray-700 bg-opacity-50 border-gray-300 active:shadow-inner text-gray-200 hover:text-white text-sm font-medium leading-none leading-none shadow-sm" data-action="image-collection#removeImage" data-id="<%= f.object.object_id %>" type="button">
+    <button class="absolute top-0 left-0 mt-2 ml-2 z-10 cursor-pointer flex items-center h-9 px-2 rounded-md bg-gray-700/50 border-gray-300 active:shadow-inner text-gray-200 hover:text-white text-sm font-medium leading-none leading-none shadow-xs" data-action="image-collection#removeImage" data-id="<%= f.object.object_id %>" type="button">
       <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
       </svg>

data/app/views/spina/admin/parts/images/_form.html.erb

@@ -8,7 +8,7 @@
   <%= f.hidden_field :filename, data: {media_picker_target: "filename"} %>
   <%= f.hidden_field :image_id, data: {media_picker_target: "imageId"} %>
 
-  <button class="absolute mt-3 ml-2 z-10 cursor-pointer flex items-center h-9 px-2 rounded-md bg-gray-700 bg-opacity-50 border-gray-300 active:shadow-inner text-gray-200 hover:text-white text-sm font-medium leading-none leading-none shadow-sm" data-action="media-picker#removeImage" data-media-picker-target="clearButton" type="button">
+  <button class="absolute mt-3 ml-2 z-10 cursor-pointer flex items-center h-9 px-2 rounded-md bg-gray-700/50 border-gray-300 active:shadow-inner text-gray-200 hover:text-white text-sm font-medium leading-none leading-none shadow-xs" data-action="media-picker#removeImage" data-media-picker-target="clearButton" type="button">
     <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
     </svg>

data/app/views/spina/admin/parts/page_links/_form.html.erb

@@ -4,7 +4,7 @@
   <div data-controller="select reveal data-binding" data-placeholder="<%=t "spina.pages.select_page" %>" class="relative mt-1" data-reveal-away-value>
     <%= f.hidden_field :page_id, data: { select_target: "input", action: 'change->data-binding#update', binding_target: 'label', binding_condition: "$source.value == ''", binding_attribute: 'hidden' } %>
     <div class="flex">
-      <div class="rounded-md border text-gray-700 bg-white shadow-sm border-gray-300">
+      <div class="rounded-md border text-gray-700 bg-white shadow-xs border-gray-300">
         <button type="button" class="w-full py-1.5 px-3 inline-flex items-center text-sm font-medium" data-action="reveal#toggle select#autofocus">
           <%= heroicon("link", style: :mini, class: "w-4 h-4 mr-1 text-gray-600") %>
           <div data-select-target="label">
@@ -19,7 +19,7 @@
       </div>
     </div>
     <div class="relative mt-1">
-      <div data-reveal data-transition hidden class="absolute shadow-lg border border-gray-200 origin-top-right rounded-md z-10 top-0">
+      <div data-reveal data-transition hidden class="absolute shadow-lg border border-gray-200 origin-top-right rounded-md z-50 top-0">
         <div class="rounded-md bg-white shadow-xs">
           <%= form_with url: spina.search_admin_page_select_options_path, data: {turbo_frame: "page_select_options_#{f.object.object_id}", controller: "form", debounce_time: 100} do |ff| %>
             <%= ff.hidden_field :object_id, value: f.object.object_id %>

data/app/views/spina/admin/parts/repeaters/_form.html.erb

@@ -2,7 +2,7 @@
   <label class="block text-sm leading-5 font-medium text-gray-700"><%= f.object.title %></label>
   <div class="text-gray-400 text-sm"><%= f.object.hint %></div>
 
-  <div class="-mt-4 flex flex-col md:flex-row" data-controller="tabs" data-tabs-active="bg-spina-dark bg-opacity-10 text-gray-900" data-tabs-inactive="text-gray-500">
+  <div class="-mt-4 flex flex-col md:flex-row" data-controller="tabs" data-tabs-active="bg-spina-dark/10 text-gray-900" data-tabs-inactive="text-gray-500">
     <div class="md:w-64 md:pr-6">
       <%
         # Fields

data/app/views/spina/admin/parts/resource_links/_form.html.erb

@@ -12,7 +12,7 @@
       </div>
     </button>
     <div class="relative mt-1">
-      <div data-reveal data-transition hidden class="absolute shadow-lg border border-gray-200 origin-top-right rounded-md z-10 top-0">
+      <div data-reveal data-transition hidden class="absolute shadow-lg border border-gray-200 origin-top-right rounded-md z-50 top-0">
         <div class="rounded-md bg-white shadow-xs">
           <%= form_with url: spina.search_admin_resource_select_options_path, data: {turbo_frame: "resource_select_options_#{f.object.object_id}", controller: "form", debounce_time: 100} do |ff| %>
             <%= ff.hidden_field :object_id, value: f.object.object_id %>

data/app/views/spina/admin/parts/texts/_form.html.erb

@@ -4,10 +4,10 @@
   <div class="mt-1 relative">
     <%= f.hidden_field :content, id: "#{f.object.object_id}_input" %>
 
-    <div class="relative form-textarea p-4 pt-0 shadow-sm max-w-5xl" data-controller="trix" id="<%= "insert_#{f.object.object_id}_trix-toolbar" %>" data-action="media-picker:done->trix#insertAttachment trix-file-accept->trix#fileAccept">
+    <div class="relative form-textarea p-4 pt-0 shadow-xs max-w-5xl" data-controller="trix" id="<%= "insert_#{f.object.object_id}_trix-toolbar" %>" data-action="media-picker:done->trix#insertAttachment trix-file-accept->trix#fileAccept">
       <%= render Spina::Forms::TrixToolbarComponent.new("#{f.object.object_id}_trix-toolbar") %>
       
-      <trix-editor class="prose prose-sm focus:outline-none max-w-3xl xl:border-r border-dashed border-gray-200 pr-3" toolbar="<%= f.object.object_id %>_trix-toolbar" input="<%= f.object.object_id %>_input" data-trix-target="editor" data-action="trix-file-accept->trix#preventDefault"></trix-editor>
+      <trix-editor class="prose prose-sm focus:outline-hidden max-w-3xl xl:border-r border-dashed border-gray-200 pr-3" toolbar="<%= f.object.object_id %>_trix-toolbar" input="<%= f.object.object_id %>_input" data-trix-target="editor" data-action="trix-file-accept->trix#preventDefault"></trix-editor>
     </div>
   </div>
 </div>

data/app/views/spina/admin/settings/_wysiwyg_field.html.erb

@@ -4,10 +4,10 @@
   <div class="mt-1 relative">
     <%= f.hidden_field attribute, id: "#{f.object.object_id}_input" %>
 
-    <div class="relative form-textarea p-4 pt-0 shadow-sm max-w-5xl" data-controller="trix" id="<%= "insert_#{f.object.object_id}_trix-toolbar" %>" data-action="media-picker:done->trix#insertAttachment">      
+    <div class="relative form-textarea p-4 pt-0 shadow-xs max-w-5xl" data-controller="trix" id="<%= "insert_#{f.object.object_id}_trix-toolbar" %>" data-action="media-picker:done->trix#insertAttachment">      
       <%= render Spina::Forms::TrixToolbarComponent.new("#{f.object.object_id}_trix-toolbar") %>
       
-      <trix-editor class="prose prose-sm focus:outline-none max-w-3xl xl:border-r border-dashed border-gray-200 pr-3" toolbar="<%= f.object.object_id %>_trix-toolbar" input="<%= f.object.object_id %>_input" data-trix-target="editor" data-action="trix-file-accept->trix#preventDefault"></trix-editor>
+      <trix-editor class="prose prose-sm focus:outline-hidden max-w-3xl xl:border-r border-dashed border-gray-200 pr-3" toolbar="<%= f.object.object_id %>_trix-toolbar" input="<%= f.object.object_id %>_input" data-trix-target="editor" data-action="trix-file-accept->trix#preventDefault"></trix-editor>
     </div>
   </div>
-<% end %>
+<% end %>

data/app/views/spina/admin/shared/_navigation.html.erb

@@ -1,5 +1,5 @@
 <nav class="w-full md:max-w-xs bg-spina-dark md:bg-gradient-to-b from-spina-dark to-spina-light relative md:overflow-hidden" data-controller="navigation">
-  <div class="flex flex-row md:flex-col justify-between h-full w-full bg-black p-1 md:p-3 bg-opacity-0 duration-300 ease-in-out transition-colors md:bg-opacity-50" data-navigation-target="primary">
+  <div class="flex flex-row md:flex-col justify-between h-full w-full bg-black/0 p-1 md:p-3 duration-300 ease-in-out transition-colors md:bg-black/50" data-navigation-target="primary">
 
     <ul class="flex md:flex-col">
       <%= render Spina::MainNavigation::SubNavComponent.new(:content) do |nav| %>

data/app/views/spina/admin/users/index.html.erb

@@ -9,7 +9,7 @@
 <% end %>
 
 <div class="p-8">
-  <div class="shadow-sm border border-gray-200 bg-white rounded-lg">
+  <div class="shadow-xs border border-gray-200 bg-white rounded-lg">
     <%= render partial: 'user', collection: @users %>
   </div>
-</div>
+</div>

data/app/views/spina/sitemaps/show.xml.builder

@@ -7,7 +7,7 @@ xml.urlset "xmlns" => "http://www.google.com/schemas/sitemap/0.9", "xmlns:xhtml"
 
       # Translations
       page.translations.each do |translation|
-        if translation.locale.in? Spina.locales.map(&:to_s)
+        if translation.locale.in? Spina.config.locales.map(&:to_s)
           Mobility.with_locale(translation.locale) do
             xml.xhtml(:link, rel: "alternate", hreflang: translation.locale, href: "#{request.protocol}#{request.host}#{page.materialized_path}")
           end

data/config/routes.rb

@@ -96,8 +96,8 @@ Spina::Engine.routes.draw do
     root to: "pages#homepage"
 
     # Pages
-    get "/:locale/*id" => "pages#show", :constraints => {locale: /#{Spina.locales.join('|')}/}
-    get "/:locale/" => "pages#homepage", :constraints => {locale: /#{Spina.locales.join('|')}/}
+    get "/:locale/*id" => "pages#show", :constraints => {locale: /#{Spina.config.locales.join('|')}/}
+    get "/:locale/" => "pages#homepage", :constraints => {locale: /#{Spina.config.locales.join('|')}/}
     get "/*id" => "pages#show", :as => "page", :controller => "pages", :constraints => ->(request) {
       request.path.exclude?(ActiveStorage.routes_prefix) &&
         !(Rails.env.development? && request.path.starts_with?("/rails/"))

data/db/migrate/13_add_json_attributes_to_spina_accounts.rb

@@ -1,5 +1,5 @@
 class AddJsonAttributesToSpinaAccounts < ActiveRecord::Migration[5.2]
   def change
-    add_column :spina_accounts, :json_attributes, :jsonb
+    add_column :spina_accounts, :json_attributes, :json
   end
 end

data/db/migrate/14_add_json_attributes_to_spina_pages.rb

@@ -1,5 +1,5 @@
 class AddJsonAttributesToSpinaPages < ActiveRecord::Migration[5.2]
   def change
-    add_column :spina_pages, :json_attributes, :jsonb
+    add_column :spina_pages, :json_attributes, :json
   end
 end

data/db/migrate/15_add_slug_to_spina_resources.rb

@@ -1,5 +1,5 @@
 class AddSlugToSpinaResources < ActiveRecord::Migration[5.2]
   def change
-    add_column :spina_resources, :slug, :jsonb
+    add_column :spina_resources, :slug, :json
   end
 end

data/db/migrate/18_change_default_spina_resources_slug.rb

@@ -1,9 +1,9 @@
 class ChangeDefaultSpinaResourcesSlug < ActiveRecord::Migration[7.0]
   def up
-    change_column :spina_resources, :slug, :jsonb, default: {}
+    # Default handled in model layer for MySQL compatibility
   end
 
   def down
-    change_column :spina_resources, :slug, :jsonb, default: nil
+    # Default handled in model layer for MySQL compatibility
   end
 end

data/db/migrate/7_create_spina_settings.rb

@@ -2,7 +2,7 @@ class CreateSpinaSettings < ActiveRecord::Migration[5.0]
   def change
     create_table :spina_settings do |t|
       t.string :plugin
-      t.jsonb :preferences, default: {}
+      t.json :preferences
       t.timestamps
     end
 

data/lib/generators/spina/tailwind_config_generator.rb

@@ -3,7 +3,7 @@ module Spina
     source_root File.expand_path("../templates", __FILE__)
 
     def create_tailwind_config_file
-      filename = "app/assets/config/spina/tailwind.config.js"
+      filename = "app/assets/stylesheets/spina/application.tailwind.css"
       template filename
       insert_into_file ".gitignore", <<~TEXT