spina 1.2.0 → 2.0.2

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

@@ -0,0 +1,17 @@
+.page-form-label= f.object.title
+.page-form-control
+  .structure-form{data: {controller: "repeater-form"}}
+    .structure-form-menu
+      %ul{data: {target: "repeater-form.list"}}
+        - (f.object.content || []).each.with_index do |repeater_content, index|
+          %li{class: ('active' if index.zero?), data: {part_id: repeater_content.object_id, target: "repeater-form.listItem"}}
+            = link_to "#structure_form_pane_#{repeater_content.object_id}" do
+              %i.icon.icon-bars.sortable-handle
+              %span= strip_tags(repeater_content.parts&.first&.content.to_s)
+
+      %div{style: "margin-top: 6px; margin-left: 6px"}
+        = link_to_add_repeater_fields f do
+          = icon('plus')
+    .structure-form-content{data: {target: "repeater-form.content"}}
+      = f.fields_for :content do |ff|
+        = render 'spina/admin/parts/repeaters/fields', f: ff

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

@@ -0,0 +1,6 @@
+.page-form-label= f.object.title
+.page-form-content
+  .page-form-rich-text
+    = f.hidden_field :content, id: "#{f.object.object_id}_input"
+    %trix-editor.text-input.trix-content{ input: "#{f.object.object_id}_input" }
+

data/app/views/spina/admin/resources/edit.html.haml

@@ -1,6 +1,6 @@
 - if @resource.errors.any?
   - content_for :notifications do
-    .notification.notification-danger.animated.fadeInRight
+    .notification.notification-danger.animated.fadeInLeft
       = icon('exclamation')
       .notification-message
         =t 'spina.notifications.alert'
@@ -9,21 +9,44 @@
         = icon('cross')
 
 = form_with model: @resource, url: spina.admin_resource_path(@resource) do |f|
+  = hidden_field_tag :locale, @locale
+
   %header#header
-    .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
+    .breadcrumbs
+      = render_breadcrumbs separator: '<div class="divider"></div>'
+      %span{style: 'margin-left: 10px'}
+        - if Spina.config.locales.size > 1
+          %div{style: "display: inline-block", data: {dropdown: true}}
+            = link_to '#', class: 'button button-default button-small', style: 'margin-left: 0; margin-right: 0', data: {trigger: 'dropdown', target: '#locales'} do
+              = icon('comment')
+              =t "spina.languages.#{@locale}"
+              %i.icon.icon-chevron-down{style: 'font-size: 9px; margin-right: 0'}
+
+            %ul#locales
+              - Spina.config.locales.each do |locale|
+                %li
+                  = link_to t("spina.languages.#{locale}"), "?locale=#{locale}", style: ('font-weight: 600' if @locale.to_s == locale.to_s).to_s
 
     #header_actions
       %button.button.button-primary{type: 'submit', style: 'margin-right: 0'}
         = icon('check')
         =t 'spina.save'
 
-  .well
-    .horizontal-form
+  .horizontal-form
+    %div{style: "margin: 40px 0"}
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Resource.human_attribute_name :label
         .horizontal-form-content
-          = f.text_field :label, placeholder: Spina::Resource.human_attribute_name(:label)
+          .page-form-control
+            = f.text_field :label, placeholder: Spina::Resource.human_attribute_name(:label)
+
+      .horizontal-form-group
+        .horizontal-form-label
+          = Spina::Resource.human_attribute_name :slug
+        .horizontal-form-content
+          .page-form-control
+            = f.text_field :slug, placeholder: Spina::Resource.human_attribute_name(:slug), value: f.object.slug(locale: @locale)&.parameterize
 
       .horizontal-form-group
         .horizontal-form-label

data/app/views/spina/admin/resources/show.html.haml

@@ -1,10 +1,13 @@
 - content_for(:header_actions) do
   
-  = link_to spina.edit_admin_resource_path(@resource), class: 'button' do
-    = t('spina.resources.edit')
+  = link_to spina.edit_admin_resource_path(@resource), class: 'button button-default' do
+    .button-content
+      = icon('pencil')
+      = t('spina.resources.edit')
 
   = link_to spina.new_admin_page_path(params: {resource_id: @resource.id, view_template: @resource.view_template.presence || 'show'}), class: 'button button-primary icon-only', style: 'margin-right: 0' do
     = icon('plus')
+    = t('spina.pages.new')
 
 .well
   .dd#pages_list

data/app/views/spina/admin/shared/_notifications.html.haml

@@ -1,6 +1,6 @@
 %aside#notifications
   - if flash[:notice]
-    .notification.animated.fadeInRight
+    .notification.animated.fadeInLeft
       = icon('info')
       .notification-message
         = flash[:notice].html_safe
@@ -9,7 +9,7 @@
         = icon('cross')
 
   - if flash[:alert]
-    .notification.notification-danger.animated.fadeInRight
+    .notification.notification-danger.animated.fadeInLeft
       = icon('exclamation')
       .notification-message
         = flash[:alert].html_safe
@@ -18,8 +18,8 @@
         = icon('cross')
 
   - if flash[:success]
-    .notification.notification-success.animated.fadeInRight
-      = icon('large-check')
+    .notification.notification-success.animated.fadeInLeft
+      = icon('check')
       .notification-message
         = flash[:success].html_safe
         %small= flash[:success_small].try(:html_safe)

data/config/routes.rb

@@ -1,4 +1,17 @@
+Rails.application.routes.draw do
+  if ActiveStorage.respond_to?(:resolve_model_to_route)
+    resolve("Spina::Parts::Image") { |image, options| route_for(ActiveStorage.resolve_model_to_route, image, options) }
+    resolve("Spina::Parts::ImageVariant") { |image, options| route_for(ActiveStorage.resolve_model_to_route, image, options) }
+    resolve("Spina::Parts::Attachment") { |attachment, options| route_for(ActiveStorage.resolve_model_to_route, attachment, options) }
+  else
+    resolve("Spina::Parts::Image") { |image, options| route_for(:rails_blob, image, options) }
+    resolve("Spina::Parts::ImageVariant") { |image, options| route_for(:rails_representation, image, options) }
+    resolve("Spina::Parts::Attachment") { |attachment, options| route_for(:rails_blob, attachment, options) }
+  end
+end
+
 Spina::Engine.routes.draw do
+
   # Backend
   namespace :admin, path: Spina.config.backend_path do
     root to: "pages#index"

data/db/migrate/12_add_url_title_to_spina_page_translations.rb

@@ -1,4 +1,4 @@
-class AddUrlTitleToSpinaPageTranslations < ActiveRecord::Migration[6.0]
+class AddUrlTitleToSpinaPageTranslations < ActiveRecord::Migration[5.2]
   def change
     add_column :spina_page_translations, :url_title, :string
   end

data/db/migrate/13_add_json_attributes_to_spina_accounts.rb

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

data/db/migrate/14_add_json_attributes_to_spina_pages.rb

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

data/db/migrate/15_add_slug_to_spina_resources.rb

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

data/lib/generators/spina/templates/app/views/demo/pages/demo.html.haml

@@ -1,28 +1,20 @@
 %h1= current_page.title
+= content :option
 
-%h5 Line
-%p= content :line
-
-%h5 Content
-!= content :text
-
-%h5 Image
-
+= content :headline
+= content.text :headline
+= content.html :body
 - if has_content?(:image)
-  %p= image_tag content(:image).variant(resize: "200x100")
+  = content.image_tag :image, resize: '100x100'
 
-%h5 Image collection
+= current_account.content :line
 
-%ul
-  - content(:image_collection)&.images&.each do |image|
-    %li= image_tag image.variant(resize: '100x100')
+- repeater current_account.content(:repeater) do |repeater_content|
+  = repeater_content.content :line
 
-%h5 Structure
+- images :image_collection do |image|
+  = content.image_tag image, resize: '50x50'
 
-%ul
-  - content(:structure)&.structure_items&.each do |item|
-    %li
-      %h6 Title
-      %p= item.content(:title)
-      %h6 Description
-      != item.content(:description)
+- repeater :repeater do |project|
+  = project.content.html :line
+  = project.content.image_tag :image, resize: '50x50'

data/lib/generators/spina/templates/app/views/demo/pages/homepage.html.haml

@@ -1,2 +1,2 @@
 %h1= current_page.title
-!= content(:text)
+= content.html :body

data/lib/generators/spina/templates/config/initializers/mobility.rb

@@ -1,5 +1,14 @@
-Mobility.configure do |config|
-  config.default_backend = :table
-  config.accessor_method = :translates
-  config.query_method    = :i18n
+Mobility.configure do
+  plugins do
+    backend :table
+    active_record
+    reader
+    writer
+    backend_reader
+    query
+    cache
+    presence
+    fallbacks false # default to false, enable if passed fallbacks: true
+    default
+  end
 end

data/lib/generators/spina/templates/config/initializers/spina.rb

@@ -11,6 +11,10 @@ Spina.configure do |config|
 
   # Specify a backend path. Defaults to /admin.
   # config.backend_path = 'admin'
+  
+  # The parent controller all frontend Spina controllers inherit from
+  # Defaults to ApplicationController
+  # config.frontend_parent_controller = "ApplicationController"
 
   # Pages Options
   # ===============

data/lib/generators/spina/templates/config/initializers/themes/default.rb

@@ -3,22 +3,22 @@
   theme.name = 'default'
   theme.title = 'Default Theme'
 
-  theme.page_parts = [{
-    name:           'text',
-    title:          'Text',
-    partable_type:  'Spina::Text'
+  theme.parts = [{
+    name: 'text',
+    title: "Text",
+    part_type: "Spina::Parts::Text"
   }]
 
   theme.view_templates = [{
     name:       'homepage',
     title:      'Homepage',
-    page_parts: ['text']
+    parts: ['text']
   }, {
     name: 'show',
     title:        'Default',
     description:  'A simple page',
     usage:        'Use for your content',
-    page_parts:   ['text']
+    parts:   ['text']
   }]
 
   theme.custom_pages = [{
@@ -30,7 +30,7 @@
 
   theme.navigations = [{
     name: 'mobile',
-    label: 'Mobile'  
+    label: 'Mobile'
   }, {
     name: 'main',
     label: 'Main navigation',

data/lib/generators/spina/templates/config/initializers/themes/demo.rb

@@ -3,69 +3,57 @@
   theme.name = 'demo'
   theme.title = 'Demo theme'
 
-  theme.page_parts = [{
-    name:           'line',
-    title:          'Line',
-    partable_type:  'Spina::Line'
+  theme.layout_parts = ['line', 'body']
+
+  # New config
+  theme.parts = [{
+    name: 'repeater',
+    title: "Repeater",
+    part_type: "Spina::Parts::Repeater",
+    parts: ['line', 'image', 'headline', 'image_collection']
   }, {
-    name:           'text',
-    title:          'Text',
-    partable_type:  'Spina::Text'
+    name: 'line',
+    title: "Line",
+    part_type: "Spina::Parts::Line"
   }, {
-    name:           'image',
-    title:          'Image',
-    partable_type:  'Spina::Image'
+    name: 'body',
+    title: "Body",
+    part_type: "Spina::Parts::Text"
   }, {
-    name:           'image_collection',
-    title:          'Image collection',
-    partable_type:  'Spina::ImageCollection'
+    name: "image_collection",
+    title: "Image collection",
+    part_type: "Spina::Parts::ImageCollection"
   }, {
-    name:           'attachment',
-    title:          'Attachment',
-    partable_type:  'Spina::Attachment'
+    name: 'image',
+    title: "Image",
+    part_type: "Spina::Parts::Image"
   }, {
-    name:           'attachment_collection',
-    title:          'Attachment collection',
-    partable_type:  'Spina::AttachmentCollection'
+    name: 'headline',
+    title: "Headline",
+    part_type: "Spina::Parts::Line"
   }, {
-    name:           'structure',
-    title:          'Structure',
-    partable_type:  'Spina::Structure'
-  }]
-
-  theme.structures = [{
-    name: 'structure',
-    structure_parts: [{
-      name:           'title',
-      title:          'Title',
-      partable_type:  'Spina::Line'
-    }, {
-      name:           'description',
-      title:          'Description',
-      partable_type:  'Spina::Text'
-    }]
-  }]
-
-  theme.layout_parts = [{
-    name:           'line',
-    title:          'Line',
-    partable_type:  'Spina::Line'
+    name: 'footer',
+    title: "Footer",
+    part_type: "Spina::Parts::Text"
   }]
 
   theme.view_templates = [{
     name: 'homepage',
     title: 'Homepage',
-    page_parts: ['text'],
+    page_parts: [],
+    parts: ['headline', 'body', 'image_collection']
   }, {
     name: 'show',
     title: 'Default',
     usage: 'Use for your content',
-    page_parts: ['text']
+    page_parts: [],
+    parts: ['body', 'image', 'repeater']
   }, {
     name: 'demo',
     title: 'Demo',
     description: 'Contains examples of every page part',
-    page_parts: ['line', 'text', 'image', 'image_collection', 'attachment', 'attachment_collection', 'structure']
+    page_parts: [],
+    parts: ['body', 'image_collection', 'image', 'repeater']
   }]
 
   theme.custom_pages = [{

data/lib/spina.rb

@@ -2,24 +2,39 @@ require 'spina/engine'
 require 'spina/railtie'
 require 'spina/plugin'
 require 'spina/theme'
+require 'spina/attr_json_spina_parts_model'
 
 module Spina
 
   include ActiveSupport::Configurable
 
+  PARTS = []
   PLUGINS = []
   THEMES = []
 
-  config_accessor :backend_path, :disable_frontend_routes, :storage, :max_page_depth, :locales
+  config_accessor :backend_path, 
+                  :frontend_parent_controller,
+                  :disable_frontend_routes,
+                  :max_page_depth, 
+                  :locales, 
+                  :embedded_image_size
 
+  # Specify a backend path. Defaults to /admin.
   self.backend_path = 'admin'
+  
+  # The parent controller all frontend Spina controllers inherit from
+  # Default is ApplicationController
+  self.frontend_parent_controller = "ApplicationController"
 
   self.disable_frontend_routes = false
 
-  self.storage = :file
-
   self.max_page_depth = 5
 
   self.locales = [I18n.default_locale]
 
+  # Images that are embedded in the Trix editor are resized to fit
+  # You can optimize this for your website and go for a smaller (or larger) size
+  # Default: 2000x2000px
+  self.embedded_image_size = "2000x2000>"
+
 end

data/lib/spina/attr_json_spina_parts_model.rb

@@ -0,0 +1,29 @@
+require 'attr_json/type/polymorphic_model'
+
+# Extending the PolymorphicModel to use the Spina::PARTS array as input
+# as opposed to arguments
+module AttrJson
+  module Type
+    class SpinaPartsModel < PolymorphicModel
+
+      def model_names
+        spina_parts_lookup.keys
+      end
+
+      def model_types
+        spina_parts_lookup.values
+      end
+
+      def spina_parts_lookup
+        @spina_parts_lookup ||= Spina::PARTS.map(&:to_type).map do |type|
+          [type.model.name, type]
+        end.to_h
+      end
+
+      def type_for_model_name(model_name)
+        spina_parts_lookup[model_name]
+      end
+
+    end
+  end
+end