spina 2.0.2 → 2.3.0

data/app/models/spina/current.rb

@@ -2,5 +2,7 @@ module Spina
   class Current < ActiveSupport::CurrentAttributes
     attribute :page
     attribute :account
+    attribute :user
+    attribute :theme
   end
 end

data/app/models/spina/navigation.rb

@@ -11,5 +11,6 @@ module Spina
     def cache_key
       super + "_" + Mobility.locale.to_s
     end
+    
   end
 end

data/app/models/spina/navigation_item.rb

@@ -3,7 +3,7 @@ module Spina
     belongs_to :navigation, touch: true
     belongs_to :page
 
-    has_ancestry orphan_strategy: :adopt
+    has_ancestry
 
     scope :regular_pages, -> { joins(:page).where(spina_pages: {resource_id: nil}) }
     scope :sorted, -> { order('spina_navigation_items.position') }

data/app/models/spina/page.rb

@@ -19,7 +19,8 @@ module Spina
     # Pages can belong to a resource
     belongs_to :resource, optional: true
 
-    scope :regular_pages, ->  { where(resource: nil) }
+    scope :main, -> { where(resource_id: nil) }    
+    scope :regular_pages, ->  { main }
     scope :resource_pages, -> { where.not(resource: nil) }
     scope :active, -> { where(active: true) }
     scope :sorted, -> { order(:position) }
@@ -34,7 +35,7 @@ module Spina
     after_save :touch_navigations
 
     # Create a 301 redirect if materialized_path changed
-    after_save :rewrite_rule
+    after_update :rewrite_rule
 
     before_validation :set_materialized_path
     validates :title, presence: true
@@ -52,7 +53,11 @@ module Spina
     end
 
     def slug
-      url_title&.parameterize
+      url_title.to_s.to_slug.transliterate(*Spina.config.transliterations).normalize.to_s
+    end
+    
+    def homepage?
+      name == 'homepage'
     end
 
     def custom_page?
@@ -99,7 +104,7 @@ module Spina
     private
 
       def set_resource_from_parent
-        self.resource_id = parent.resource_id 
+        self.resource_id = parent.resource_id
       end
 
       def touch_navigations
@@ -121,7 +126,7 @@ module Spina
       def generate_materialized_path
         path_fragments = [resource&.slug]
         path_fragments.append *ancestors.collect(&:slug)
-        path_fragments.append(slug) unless name == 'homepage'
+        path_fragments.append(slug) unless homepage?
         path_fragments.compact.map(&:parameterize).join('/')
       end
       

data/app/models/spina/parts/base.rb

@@ -7,6 +7,12 @@ module Spina
 
       attr_json :title, :string
       attr_json :name, :string
+
+      def label
+        content&.to_s
+      end
+
+      def content; end
     end
   end
 end

data/app/models/spina/parts/image.rb

@@ -6,6 +6,8 @@ module Spina
       attr_json :alt, :string, default: ""
       attr_json :filename, :string, default: ""
 
+      attr_accessor :options
+
       def to_s
         alt.presence || filename.presence || Spina::Image.model_name.human
       end

data/app/models/spina/resource.rb

@@ -4,16 +4,26 @@ module Spina
 
     has_many :pages, dependent: :restrict_with_exception
 
+    after_commit :update_resource_pages, on: [:update]
+
     translates :slug, backend: :jsonb
 
     def pages
       case order_by
       when "title"
         super.joins(:translations).where(spina_page_translations: {locale: I18n.locale}).order("spina_page_translations.title")
+      when "created_at"
+        super.order(:created_at)
       else
-        super.order(created_at: :desc)
+        super.order(:position)
       end
     end
-    
+
+    def update_resource_pages
+      if previous_changes[:slug]
+        ResourcePagesUpdateJob.perform_later(id)
+      end
+    end
+
   end
 end

data/app/models/spina/user.rb

@@ -1,12 +1,12 @@
 module Spina
   class User < ApplicationRecord
+    include Gravatar
+    
     has_secure_password
     has_secure_token :password_reset_token
 
-    validates_presence_of :name, :email
-    validates_presence_of :password, on: :create
-    validate :uniqueness_of_email
-    validates :email, format: { with:/\A[^@]+@[^@]+\z/ }
+    validates :name, presence: true
+    validates :email, uniqueness: true, presence: true, format: { with:/\A[^@]+@[^@]+\z/ }
 
     def admin?
       admin
@@ -16,17 +16,5 @@ module Spina
       name
     end
 
-    def update_last_logged_in!
-      self.last_logged_in = Time.now
-      self.save!
-    end
-
-    private
-
-    def uniqueness_of_email
-      if email_changed? && User.where(email: email).exists?
-        errors.add(:email, I18n.t('errors.messages.taken'))
-      end
-    end
   end
 end

data/app/serializers/spina/api/base_serializer.rb

@@ -0,0 +1,6 @@
+module Spina::Api
+  class BaseSerializer
+    include JSONAPI::Serializer
+    singleton_class.include Spina::Engine.routes.url_helpers
+  end
+end

data/app/serializers/spina/api/image_serializer.rb

@@ -0,0 +1,20 @@
+module Spina::Api
+  class ImageSerializer < BaseSerializer    
+    set_type :image
+    
+    attributes :id
+    
+    attribute :original_url do |image, params|
+      params[:view_context].main_app.url_for(image.file)
+    end
+    
+    attribute :thumbnail_url do |image, params|
+      params[:view_context].main_app.url_for(image.variant(resize_to_fill: Spina.config.thumbnail_image_size))
+    end
+    
+    attribute :embedded_image_size_url do |image, params|
+      resize_key = Spina.config.embedded_image_size.is_a?(Array) ? :resize_to_limit : :resize
+      params[:view_context].main_app.url_for(image.variant(Hash[resize_key, Spina.config.embedded_image_size]))
+    end
+  end
+end

data/app/serializers/spina/api/navigation_serializer.rb

@@ -0,0 +1,30 @@
+module Spina::Api
+  class NavigationSerializer < BaseSerializer    
+    set_type :navigation
+    
+    attributes :name, :label
+    
+    attribute :tree do |navigation|
+      items_to_tree(navigation.navigation_items.sorted.roots.in_menu.live.joins(:page))
+    end
+    
+    class << self
+      
+      def items_to_tree(collection)
+        collection.map do |item|
+          {
+            depth: item.depth,
+            page: {
+              id: item.page_id,
+              menu_title: item.menu_title,
+              materialized_path: item.materialized_path
+            },
+            children: items_to_tree(item.children.sorted.in_menu.live.joins(:page))
+          }
+        end
+      end
+      
+    end
+    
+  end
+end

data/app/serializers/spina/api/page_serializer.rb

@@ -0,0 +1,28 @@
+module Spina::Api
+  class PageSerializer < BaseSerializer    
+    set_type :page
+    
+    attributes :title, :seo_title, :menu_title, :materialized_path, :name, :description, :view_template
+    
+    attribute(:content) { |page| page_content(page) }
+    
+    belongs_to :resource
+
+    class << self
+      
+      def page_content(page)
+        return [] unless view_template(page)
+        
+        view_template(page)[:parts].map do |part| 
+          { part => page.content(part) }
+        end
+      end
+      
+      def view_template(page)
+        Spina::Current.theme.view_templates.find{|view_template| view_template[:name] == page.view_template}
+      end
+      
+    end
+    
+  end
+end

data/app/serializers/spina/api/resource_serializer.rb

@@ -0,0 +1,12 @@
+module Spina::Api
+  class ResourceSerializer < BaseSerializer
+    set_type :resource
+    
+    attributes :name, :label, :view_template, :order_by, :slug
+    
+    has_many :pages, lazy_load_data: true, links: {
+      self: -> (object) { api_resource_path(object.id) },
+      related: -> (object) { api_resource_pages_path(object.id) }
+    }, meta: -> (resource) { {count: resource.pages.live.length} }
+  end
+end

data/app/views/layouts/spina/admin/admin.html.erb

@@ -0,0 +1,18 @@
+<% content_for(:body) do %>
+  <div class="flex flex-col md:flex-row md:h-screen min-h-screen w-full overflow-hidden">
+    <%= render partial: "spina/admin/shared/navigation" %>
+    
+    <section class="w-full md:overflow-scroll">
+      <%= yield %>
+      
+      <%= turbo_frame_tag "flash" do %>
+        <%= render partial: "spina/admin/shared/flash" %>
+      <% end %>
+    </section>
+  </div>
+  
+  <!-- Make sure all modals are rendered in this frame -->
+  <%= turbo_frame_tag "modal" %>
+<% end %>
+
+<%= render template: 'layouts/spina/admin/application' %>

data/app/views/layouts/spina/admin/application.html.erb

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="<%= I18n.locale %>">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
+    <meta name="turbo-cache-control" content="no-preview" />
+    <%= csrf_meta_tags %>
+    
+    <link rel="icon" href="<%= image_url('spina/favicon.png') %>" />
+    
+    <title>Spina CMS</title>
+    
+    <!-- Tailwind -->
+    <%= stylesheet_link_tag 'spina/application', data: {turbolinks_track: true} %>
+    
+    <!-- Spina's importmap -->
+    <%= spina_importmap_tags %>
+    
+    <!-- Plugins & Hooks -->
+    <%= yield(:head) %>
+    <%= render Spina::Hooks::HookComponent.new(partial: "head") %>
+  </head>
+
+  <body>
+    <%= content_for?(:body) ? yield(:body) : yield %>
+  </body>
+</html>

data/app/views/layouts/spina/admin/sessions.html.erb

@@ -0,0 +1 @@
+<%= render template: 'layouts/spina/admin/application' %>

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

@@ -0,0 +1,49 @@
+<%= form_with model: current_account, url: spina.admin_account_path do |f| %>
+
+  <%= render Spina::UserInterface::HeaderComponent.new do |header| %>
+    <% header.actions do %>
+    
+      <%= button_tag t('spina.accounts.save'), type: :submit, class: 'btn btn-primary', data: {controller: "button hotkeys", hotkeys: "command+s, ctrl+s", hotkeys_target: "button", action: "button#loading", loading_message: t("spina.ui.saving")} %>
+      
+    <% end %>
+  <% end %>
+  
+  <div class="p-4 md:p-8 max-w-screen-xl">
+    
+    <%= render Spina::Forms::GroupComponent.new(label: Spina::Account.human_attribute_name(:name), description: t('spina.accounts.name_description')) do %>
+      <%= render Spina::Forms::LabelComponent.new(f, :name) %>
+      <%= render Spina::Forms::TextFieldComponent.new(f, :name) %>
+    <% end %>
+      
+    <div class="border-t border-gray-200 my-6"></div>
+    
+    <%= render Spina::Forms::GroupComponent.new(label: Spina::Account.human_attribute_name(:address), description: t('spina.ui.optional')) do %>
+      <%= render Spina::Forms::LabelComponent.new(f, :address) %>
+      <%= render Spina::Forms::TextFieldComponent.new(f, :address) %>
+      
+      <div class="mt-5">
+        <%= render Spina::Forms::LabelComponent.new(f, :postal_code) %>
+        <%= render Spina::Forms::TextFieldComponent.new(f, :postal_code) %>
+      </div>
+      
+      <div class="mt-5">
+        <%= render Spina::Forms::LabelComponent.new(f, :city) %>
+        <%= render Spina::Forms::TextFieldComponent.new(f, :city) %>
+      </div>
+    <% end %>
+    
+    <div class="border-t border-gray-200 my-6"></div>
+    
+    <%= render Spina::Forms::GroupComponent.new(label: t('spina.accounts.contact_details'), description: t('spina.accounts.contact_details_description')) do %>
+      <%= render Spina::Forms::LabelComponent.new(f, :email) %>
+      <%= render Spina::Forms::TextFieldComponent.new(f, :email) %>
+      
+      <div class="mt-5">
+        <%= render Spina::Forms::LabelComponent.new(f, :phone) %>
+        <%= render Spina::Forms::TextFieldComponent.new(f, :phone) %>
+      </div>
+    <% end %>
+    
+  </div>
+
+<% end %>

data/app/views/spina/admin/attachments/_attachment.html.erb

@@ -0,0 +1,33 @@
+<%= turbo_frame_tag dom_id(attachment) do %>
+  <div class="flex items-center h-12 border-b border-gray-200 px-8 hover:bg-white group">
+    
+    <turbo-frame id="<%= dom_id(attachment) %>_filename" class="font-medium text-gray-800 h-full flex-1 w-56 text-sm flex items-center relative">
+      <span class="truncate"><%= attachment.file.filename %></span>
+    
+      <div class="absolute h-full opacity-0 group-hover:opacity-100 flex items-center right-0 pr-3 top-0">
+        <%= link_to spina.edit_admin_attachment_path(attachment), class: "btn btn-default h-7 px-2 mr-2 text-xs" do %>
+          <%= heroicon('pencil', style: :solid, class: 'w-4 h-4 mr-1 text-gray-600') %>
+          <%=t 'spina.ui.rename' %>
+        <% end %>
+        
+        <%= link_to file_url(attachment.file), class: "btn btn-default h-7 px-2 mr-2 text-xs" do %>
+          <%= heroicon('download', style: :solid, class: 'w-4 h-4 mr-1 text-gray-600') %>
+          <%=t 'spina.attachments.download' %>
+        <% end %>
+      </div>
+    </turbo-frame>
+    
+    <div class="text-gray-500 text-sm whitespace-nowrap flex items-center">
+      <%= number_to_human_size attachment.file.byte_size %>
+      <div class="uppercase ml-2 h-5 flex items-center rounded-md <%= content_type_color(attachment) %> text-white font-semibold px-1 text-xs">
+        <%= content_type(attachment) %>
+      </div>
+    </div>
+    <div class="text-gray-500 text-xs w-32 text-right whitespace-nowrap"><%=l attachment.created_at, format: :short %></div>
+    <div class="">
+      <%= button_to spina.admin_attachment_path(attachment), method: :delete, class: "block py-3 px-4 ml-2 text-gray-500 hover:text-gray-900", form: {data: {controller: "confirm", confirm_message: t('spina.attachments.delete_confirmation_html')}} do %>
+        <%= heroicon('trash', class: "w-5 h-5") %>
+      <% end %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,16 @@
+<%= turbo_frame_tag dom_id(@attachment) + "_filename" do %>
+  <%= form_with model: @attachment, url: spina.admin_attachment_path(@attachment), html: {class: 'w-full max-w-sm pr-3'} do |f| %>
+    <div class="flex items-center w-full">
+      <div class="relative w-full mr-2">
+        <%= text_field_tag :filename, @attachment.file.filename.base, class: 'form-input w-full h-9 pr-10 text-sm', placeholder: t('spina.media_library.filename'), data: {controller: "autofocus"} %>
+        <div class="absolute top-0 right-2 h-full flex items-center text-gray-400">
+          <%= ".#{@attachment.file.filename.extension}" %>
+        </div>
+      </div>
+      
+      <button type="submit" class="btn btn-default px-2">
+        <%= heroicon("check", style: :solid, class: "w-5 h-5") %>
+      </button>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,46 @@
+<%= render Spina::UserInterface::HeaderComponent.new do |header| %>
+  <% header.actions do %>
+    <%= form_with model: [:admin, Spina::Attachment.new], url: spina.admin_attachments_path, data: {controller: "form loading-button", loading_message: t('spina.media_library.uploading'), action: "turbo:submit-end->loading-button#doneLoading"} do |f| %>
+    
+      <%= f.file_field :files, multiple: true, id: "new_attachment_file_field", class: 'hidden', data: {action: "loading-button#loading form#requestSubmit"} %>
+      
+      <button type="button" class="btn btn-default" data-controller="delegate-click" data-action="delegate-click#click" data-loading-button-target="button" data-delegate-click-target="#new_attachment_file_field">
+        <%= heroicon("upload", style: :solid, class: "w-4 h-4 -ml-1 mr-1") %>
+        <%=t 'spina.attachments.upload' %>
+      </button>
+    <% end %>
+  <% end %>    
+  <% header.navigation do %>
+    <nav class="-mb-3 mt-4">
+      <ul class="inline-flex w-auto rounded-md bg-white">
+        <%= render Spina::UserInterface::TabLinkComponent.new(spina.admin_images_path) do %>
+          <%= heroicon('photograph', style: :solid, class: 'w-5 h-5 mr-2 -ml-1') %>
+          <%=t 'spina.media_library.images' %>
+        <% end %>
+        
+        <%= render Spina::UserInterface::TabLinkComponent.new(spina.admin_attachments_path, active: true) do %>
+          <%= heroicon('document', style: :solid, class: 'w-5 h-5 mr-2 -ml-1') %>
+          <%=t 'spina.media_library.attachments' %>
+        <% end %>
+      </ul>
+    </nav>
+  <% end %>
+<% end %>
+
+<div class="my-8 border-t border-gray-200">
+  
+  <div data-controller="infinite-scroll">
+    <%= turbo_frame_tag "attachments" do %>
+      <%= turbo_frame_tag "attachments-#{@attachments.current_page}" do %>
+        <%= render @attachments %>
+        
+        <% if @attachments.next_page %>
+          <%= turbo_frame_tag "attachments-#{@attachments.next_page}", data: {action: "turbo:frame-load->infinite-scroll#load"} do %>
+            <%= link_to t('spina.ui.load_more'), path_to_next_page(@attachments), class: 'hidden', data: {infinite_scroll_target: "button"} %>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </div>
+  
+</div>