spina 2.11.0 → 2.13.0

data/app/components/spina/pages/new_page_button_component.html.erb

@@ -2,7 +2,7 @@
 
   <%= render Spina::UserInterface::DropdownComponent.new do |dropdown| %>
     <% dropdown.button(classes: "btn btn-primary w-full") do %>
-      <%= helpers.heroicon("plus", style: :solid, class: "w-7 h-7 -ml-2") %>
+      <%= helpers.heroicon("document-plus", style: :solid, class: "w-5 h-5 -ml-1 mr-1") %>
       <%=t 'spina.pages.new' %>
     <% end %>
     
@@ -13,7 +13,7 @@
             <%= template.title %>
             
             <% if template.recommended %>
-              <span class="text-green-500 text-xs"><%=t 'spina.pages.recommended' %></span>
+              <span class="text-emerald-500 text-xs"><%=t 'spina.pages.recommended' %></span>
             <% end %>
           </div>
           <div class="text-gray-400"><%= template.description %></div>
@@ -25,7 +25,7 @@
 <% else %>
 
   <%= link_to helpers.spina.new_admin_page_path(view_template: view_template.name, resource_id: resource&.id), class: "btn btn-primary w-full", data: {turbo_frame: "modal"} do %>
-    <%= helpers.heroicon("plus", style: :solid, class: "w-7 h-7 -ml-2") %>
+    <%= helpers.heroicon("document-plus", style: :solid, class: "w-5 h-5 -ml-1 mr-1") %>
     <%=t 'spina.pages.new' %>
   <% end %>
   

data/app/components/spina/pages/new_page_button_component.rb

@@ -1,19 +1,18 @@
 module Spina::Pages
   class NewPageButtonComponent < Spina::ApplicationComponent
     attr_reader :view_templates, :resource
-    
+
     def initialize(view_templates = [], resource: nil)
       @view_templates = view_templates
       @resource = resource
     end
-    
+
     def view_template
       view_templates.first
     end
-    
+
     def render?
       view_templates.any?
     end
-    
   end
-end
+end

data/app/components/spina/pages/page_component.html.erb

@@ -1,12 +1,24 @@
-<li data-id="<%= @page.id %>">
+<turbo-frame id="page_<%= @page.id %>" data-id="<%= @page.id %>">
   <div class="flex items-center border-gray-200 border-b <%= css_class %> bg-opacity-50">
     <% if sortable? %>
-      <div data-sortable-handle class="p-4 text-gray-300 hover:text-gray-600 cursor-move">
-        <%= helpers.heroicon("menu-alt-4", style: :solid, class: "w-4 h-4 -mr-4") %>
-      </div>
+      <% if draggable? %>
+        <div data-sortable-handle class="p-4 text-gray-300 hover:text-gray-600 cursor-move">
+          <%= helpers.heroicon("menu-alt-4", style: :solid, class: "w-4 h-4 -mr-4") %>
+        </div>
+      <% else %>
+        <div class="pl-2">          
+          <%= button_to helpers.spina.sort_one_admin_page_path(@page, direction: "up"), class: "btn btn-default shadow-none border-gray-200 border-b-0 rounded-b-none px-1 h-5 sort-up" do %>
+            <%= helpers.heroicon("chevron-up", style: :solid, class: 'w-4 h-4 text-gray-600') %>
+          <% end %>
+
+          <%= button_to helpers.spina.sort_one_admin_page_path(@page), class: "btn btn-default shadow-none border-gray-200 rounded-t-none px-1 h-5 sort-down" do %>
+            <%= helpers.heroicon("chevron-down", style: :solid, class: 'w-4 h-4 text-gray-600') %>
+          <% end %>
+        </div>
+      <% end %>
     <% end %>
     
-    <%= link_to helpers.spina.edit_admin_page_path(@page), class: "block text-spina font-medium text-sm p-4 hover:text-spina-dark" do %>
+    <%= link_to helpers.spina.edit_admin_page_path(@page), class: "block text-spina font-medium text-sm p-4 hover:text-spina-dark", data: {turbo_frame: "_top"} do %>
       <%= @page.menu_title %>
       
       <small class="font-normal"><%= label %></small>
@@ -20,6 +32,6 @@
   </div>
 
   <% if children.any? %>
-    <%= render Spina::Pages::ListComponent.new(pages: children, sortable: sortable) %>
+    <%= render Spina::Pages::ListComponent.new(pages: children, sortable: sortable, draggable: draggable) %>
   <% end %>
-</li>
+</turbo-frame>

data/app/components/spina/pages/page_component.rb

@@ -1,13 +1,14 @@
 module Spina
   module Pages
     class PageComponent < ApplicationComponent
-      attr_reader :sortable
-  
-      def initialize(page:, sortable: true)
+      attr_reader :sortable, :draggable
+
+      def initialize(page:, sortable: true, draggable: true)
         @page = page
         @sortable = sortable
+        @draggable = draggable
       end
-      
+
       def label
         labels = []
         labels << t("spina.pages.concept") if @page.draft?
@@ -16,15 +17,19 @@ module Spina
         return nil if labels.size.zero?
         "(#{labels.join(", ")})"
       end
-      
+
       def sortable?
         sortable
       end
-  
+
+      def draggable?
+        draggable
+      end
+
       def depth
         @page.depth
       end
-      
+
       def css_class
         case depth
         when 1
@@ -33,11 +38,10 @@ module Spina
           "pl-10 bg-gray-200"
         end
       end
-  
+
       def children
         @children ||= @page.children.active.sorted
       end
-  
     end
   end
-end
+end

data/app/components/spina/pages/page_select_component.rb

@@ -1,7 +1,7 @@
 module Spina::Pages
   class PageSelectComponent < Spina::ApplicationComponent
     attr_accessor :name, :pages, :include_blank, :selected, :disabled
-    
+
     def initialize(name, pages, include_blank: false, selected: nil, disabled: nil)
       @name = name
       @pages = pages
@@ -9,13 +9,12 @@ module Spina::Pages
       @selected = selected
       @disabled = disabled
     end
-    
+
     def options
       Spina::Page.sort_by_ancestry(pages.arrange(order: :position)).map do |page|
-        page_menu_title = page.menu_title.indent(page.depth, '–')
+        page_menu_title = page.menu_title.indent(page.depth, "–")
         [page_menu_title, page.id]
       end
     end
-
   end
 end

data/app/components/spina/pages/tab_button_component.rb

@@ -1,11 +1,9 @@
 module Spina
   module Pages
     class TabButtonComponent < ApplicationComponent
-
       def initialize(tab_name:)
         @tab_name = tab_name
       end
-
     end
   end
-end
+end

data/app/components/spina/pages/translations_component.html.erb

@@ -19,7 +19,7 @@
       <div class="py-1">
         <% if missing_locales.any? %>
           <% missing_locales.each do |locale| %>
-            <%= link_to helpers.spina.edit_admin_page_path(@page, locale: locale), class: "block px-3 py-2 text-sm leading-4 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 font-medium" do %>
+            <%= link_to helpers.spina.edit_admin_page_path(@page, locale: locale), class: "block px-3 py-2 text-sm leading-4 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 font-medium", data: {turbo_frame: "_top"} do %>
               <div class="text-yellow-500">
                 <%=t('spina.pages.add_translation', language: '<span class="font-semibold">' + t("spina.languages.#{locale}") + '</span>').html_safe %>
               </div>
@@ -29,7 +29,7 @@
         <% end %>
 
         <% existing_locales.each do |locale| %>
-          <%= link_to helpers.spina.edit_admin_page_path(@page, locale: locale), class: "block px-3 py-2 text-sm leading-4 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 font-medium" do %>
+          <%= link_to helpers.spina.edit_admin_page_path(@page, locale: locale), class: "block px-3 py-2 text-sm leading-4 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 font-medium", data: {turbo_frame: "_top"} do %>
             <div class="text-gray-700">
               <%=t('spina.pages.edit_translation', language: '<span class="font-semibold">' + t("spina.languages.#{locale}") + '</span>').html_safe %>  
             </div>

data/app/components/spina/pages/translations_component.rb

@@ -1,32 +1,30 @@
 module Spina
   module Pages
     class TranslationsComponent < ApplicationComponent
-  
       def initialize(page, label: nil)
         @page = page
         @label = label
       end
-      
+
       def render?
         spina_locales.many?
       end
-  
+
       def missing_locales
         spina_locales - existing_locales
       end
-  
+
       def existing_locales
         @existing_locales ||= @page.translations.pluck(:locale).map(&:to_sym).sort_by do |locale|
           spina_locales.index(locale)
         end
       end
-  
+
       private
-  
-        def spina_locales
-          Spina.locales.map(&:to_sym)
-        end
-  
+
+      def spina_locales
+        Spina.locales.map(&:to_sym)
+      end
     end
   end
-end
+end

data/app/components/spina/user_interface/dropdown_button_component.rb

@@ -2,15 +2,15 @@ module Spina
   module UserInterface
     class DropdownButtonComponent < ApplicationComponent
       attr_reader :disabled
-      
+
       def initialize(disabled: false)
         @disabled = disabled
       end
-      
+
       def call
         content_tag :button, content, {class: classes, type: :submit, disabled: disabled}
       end
-      
+
       def classes
         if disabled
           "block w-full text-left px-3 py-2 text-sm leading-4 text-gray-400 font-medium cursor-default"
@@ -20,4 +20,4 @@ module Spina
       end
     end
   end
-end
+end

data/app/components/spina/user_interface/dropdown_component.rb

@@ -1,28 +1,27 @@
 module Spina
   module UserInterface
-    class DropdownComponent < ApplicationComponent      
+    class DropdownComponent < ApplicationComponent
       renders_one :button, "ButtonComponent"
-      
+
       renders_one :menu, "MenuComponent"
-      
+
       class ButtonComponent < ApplicationComponent
         attr_reader :classes
-        
+
         def initialize(classes:)
           @classes = classes
         end
-        
+
         def call
-          content_tag :button, content, {type: 'button', class: classes, data: {action: "reveal#toggle"}}
+          content_tag :button, content, {type: "button", class: classes, data: {action: "reveal#toggle"}}
         end
       end
-      
+
       class MenuComponent < ApplicationComponent
         def call
           content_tag :div, content, {class: "origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg border border-gray-200 z-20 rounded-md bg-white shadow-xs py-1", hidden: true, data: {reveal: true, transition: true}}
         end
       end
-      
     end
   end
-end
+end

data/app/components/spina/user_interface/flash_message_component.rb

@@ -1,16 +1,15 @@
 module Spina
   module UserInterface
     class FlashMessageComponent < ApplicationComponent
-      
       def initialize(type:, message:)
         @type = type
         @message = message
       end
-      
+
       def confetti?
         @type == "confetti" && !Spina.config.party_pooper
       end
-      
+
       def theme
         case @type
         when "alert", "error"
@@ -19,7 +18,6 @@ module Spina
           "bg-gray-400"
         end
       end
-      
     end
   end
-end
+end

data/app/components/spina/user_interface/header_component.rb

@@ -1,9 +1,9 @@
 module Spina
   module UserInterface
-    class HeaderComponent < ApplicationComponent      
+    class HeaderComponent < ApplicationComponent
       renders_one :actions
       renders_one :navigation
       renders_one :after_breadcrumbs
     end
   end
-end
+end

data/app/components/spina/user_interface/modal_component.rb

@@ -1,11 +1,9 @@
 module Spina
   module UserInterface
     class ModalComponent < ApplicationComponent
-      
       def initialize(size: "max-w-lg")
         @size = size
       end
-      
     end
   end
-end
+end

data/app/components/spina/user_interface/tab_link_component.rb

@@ -1,14 +1,13 @@
 module Spina
   module UserInterface
     class TabLinkComponent < ApplicationComponent
-      
       def initialize(name = nil, url = nil, active: false)
         url = name if url.nil?
         @url = url
         @name = name
         @active = active
       end
-      
+
       def css_classes
         if @active
           "cursor-default text-gray-900 bg-spina-dark bg-opacity-10"
@@ -16,7 +15,6 @@ module Spina
           ""
         end
       end
-      
     end
   end
 end

data/app/components/spina/user_interface/translations_component.rb

@@ -1,26 +1,24 @@
 module Spina
   module UserInterface
     class TranslationsComponent < ApplicationComponent
-  
       def initialize(record, label: nil)
         @record = record
         @label = label
       end
-      
+
       def render?
         spina_locales.many?
       end
-      
+
       def locales
         spina_locales
       end
-  
+
       private
-  
-        def spina_locales
-          Spina.locales.map(&:to_sym)
-        end
-  
+
+      def spina_locales
+        Spina.locales.map(&:to_sym)
+      end
     end
   end
-end
+end

data/app/controllers/concerns/spina/api/paginable.rb

@@ -2,43 +2,42 @@ module Spina
   module Api
     module Paginable
       extend ActiveSupport::Concern
-    
+
       private
-      
-        def pagination(records)
-          paginated_records = records.page(params[:page]).per(params[:per_page])
-          [paginated_records, {
-            meta: pagination_meta(paginated_records),
-            links: pagination_links(paginated_records)
-          }]
-        end
-        
-        def pagination_meta(paginated_records)
-          {
-            current_page: paginated_records.current_page,
-            total: paginated_records.total_count,
-            per_page: paginated_records.limit_value,
-            path: view_context.url_for(only_path: true)
-          }
-        end
-        
-        def pagination_links(paginated_records)
-          {
-            first: path_to_first_page,
-            prev: view_context.path_to_prev_page(paginated_records),
-            next: view_context.path_to_next_page(paginated_records),
-            last: path_to_last_page(paginated_records)
-          }
-        end
-        
-        def path_to_first_page
-          view_context.url_for(page: 1, per_page: params[:per_page], only_path: true)
-        end
-        
-        def path_to_last_page(paginated_records)
-          view_context.url_for(page: paginated_records.total_pages, per_page: params[:per_page], only_path: true)
-        end
-          
+
+      def pagination(records)
+        paginated_records = records.page(params[:page]).per(params[:per_page])
+        [paginated_records, {
+          meta: pagination_meta(paginated_records),
+          links: pagination_links(paginated_records)
+        }]
+      end
+
+      def pagination_meta(paginated_records)
+        {
+          current_page: paginated_records.current_page,
+          total: paginated_records.total_count,
+          per_page: paginated_records.limit_value,
+          path: view_context.url_for(only_path: true)
+        }
+      end
+
+      def pagination_links(paginated_records)
+        {
+          first: path_to_first_page,
+          prev: view_context.path_to_prev_page(paginated_records),
+          next: view_context.path_to_next_page(paginated_records),
+          last: path_to_last_page(paginated_records)
+        }
+      end
+
+      def path_to_first_page
+        view_context.url_for(page: 1, per_page: params[:per_page], only_path: true)
+      end
+
+      def path_to_last_page(paginated_records)
+        view_context.url_for(page: paginated_records.total_pages, per_page: params[:per_page], only_path: true)
+      end
     end
   end
-end
+end

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

@@ -0,0 +1,27 @@
+module Spina
+  module CurrentSpinaAccount
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :current_spina_account
+      helper_method :current_spina_account
+      helper_method :current_account
+    end
+
+    private
+
+    def current_account
+      ActiveSupport::Deprecation.warn(
+        "#current_account is deprecated, due to a common authentication namespace conflict. \n" \
+        "Please use #current_spina_account instead."
+      )
+      current_spina_account
+    end
+
+    def current_spina_account
+      Spina::Current.account ||= ::Spina::Account.first
+    end
+
+    remove_method :current_account if Spina.config.disable_current_account
+  end
+end

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

@@ -1,17 +1,16 @@
 module Spina
   module CurrentTheme
     extend ActiveSupport::Concern
-    
+
     included do
       before_action :current_theme
       helper_method :current_theme
     end
-  
+
     private
-    
-      def current_theme
-        Spina::Current.theme ||= ::Spina::Theme.find_by_name(current_account.theme)
-      end
-        
+
+    def current_theme
+      Spina::Current.theme ||= ::Spina::Theme.find_by_name(current_spina_account.theme)
+    end
   end
 end