spina 1.2.0 → 2.0.0.alpha

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

@@ -0,0 +1,6 @@
+.page-form-label= f.object.title
+.page-form-control{data: {controller: "attachment-picker"}}
+  = f.hidden_field :signed_blob_id, data: {target: "attachment-picker.signedBlobId"}
+  = f.hidden_field :filename, data: {target: "attachment-picker.filename"}
+  .select-dropdown
+    = f.select :attachment_id, Spina::Attachment.sorted.map{|attachment| [attachment.file&.filename, attachment.id, data: {signed_blob_id: attachment.file&.blob&.signed_id, filename: attachment.file&.filename}]}, {include_blank: t("spina.attachments.choose_attachment")}, {data: {action: "attachment-picker#chooseAttachment"}}

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

@@ -0,0 +1,7 @@
+= f.hidden_field :image_id, class: 'image-id'
+= f.hidden_field :signed_blob_id, class: 'signed-blob-id'
+= f.hidden_field :filename, class: 'filename'
+- if f.object.signed_blob_id.present? && f.object.spina_image
+  = image_tag main_app.url_for(f.object.spina_image.variant(resize: "400x300^", crop: "400x300+0+0"))
+- else
+  = image_tag ""

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

@@ -0,0 +1,12 @@
+.page-form-label= f.object.title
+.page-form-control{data: {controller: "image-form"}}
+  .page-form-media-picker
+    = link_to admin_media_picker_path(selected_ids: f.object.image_ids, input: "media_picker_#{f.object.object_id}", mode: "multiple"), remote: true, class: 'images', data: {target: 'image-form.image'} do
+      .page-form-media-picker-placeholder=t "spina.images.choose"
+
+      %div{id: "media_picker_#{f.object.object_id}", data: data_attrs_for_image_collection(f)}
+        = f.fields_for :images do |ff|
+          = render partial: "spina/admin/parts/image_collections/fields", locals: {f: ff}
+
+    = button_tag type: :default, class: 'button button-small button-default', data: {action: "image-form#remove"} do
+      %i.icon.icon-cross{style: "margin: 0; font-size: 10px"}

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

@@ -0,0 +1,18 @@
+.page-form-label= f.object.title
+.page-form-control{data: {controller: "image-form"}}
+  .page-form-media-picker
+    %div{style: "width: 100%"}
+      = link_to admin_media_picker_path(selected_ids: [f.object.image_id], input: "media_picker_#{f.object.object_id}", mode: "single"), remote: true, class: 'image', data: {target: 'image-form.image'} do
+        .page-form-media-picker-placeholder=t "spina.images.choose_image"
+        %div{id: "media_picker_#{f.object.object_id}"}
+          = f.hidden_field :image_id, data: {target: 'image-form.imageId'}
+          = f.hidden_field :signed_blob_id, data: {target: 'image-form.signedBlobId'}
+          = f.hidden_field :filename, data: {target: 'image-form.filename'}
+        %div{style: "width: 200px; height: 150px; overflow: hidden"}
+          - if f.object.signed_blob_id.present? && f.object.spina_image.present?
+            = image_tag main_app.url_for(f.object.spina_image.variant(resize: "400x300^", crop: "400x300+0+0")), width: 200, height: 150
+
+      = f.text_field :alt, placeholder: "Alt text", class: 'page-form-media-picker-alt-text'
+
+    = button_tag type: :default, class: 'button button-small button-default', data: {action: "image-form#remove"} do
+      %i.icon.icon-cross{style: "margin: 0; font-size: 10px"}

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

@@ -0,0 +1,2 @@
+.page-form-label= f.object.title
+.page-form-control= f.text_field :content, placeholder: f.object.title

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

@@ -0,0 +1,3 @@
+.page-form-label= f.object.title
+.page-form-control
+  .select-dropdown= f.select :value, f.object.options, include_blank: t("spina.options.choose_option")

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

@@ -0,0 +1,15 @@
+.structure-form-pane{class: ('active' if f.options[:child_index].zero?), id: "structure_form_pane_#{f.object.object_id}", data: {part_id: f.object.object_id, target: "repeater-form.pane"}}
+  = f.hidden_field :title
+  = f.hidden_field :name
+
+  - parts = current_theme.parts.find{|p|p[:name].to_s == f.object.name.to_s}&.dig(:parts) || []
+
+  = f.fields_for :parts, build_parts(f.object, parts) do |ff|
+    = ff.hidden_field :title
+    = ff.hidden_field :type, value: ff.object.class
+    = ff.hidden_field :name
+
+    .structure-form-part
+      = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.to_s)}/form", f: ff
+
+  = link_to t('spina.delete'), '#', class: 'button button-mini button-link pull-right', data: {action: "repeater-form#delete", part_id: f.object.object_id}

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

@@ -0,0 +1,18 @@
+.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
+              = repeater_content.parts&.first&.content
+
+      %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/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/themes/default.rb

@@ -3,10 +3,10 @@
   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 = [{

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,11 +2,13 @@ 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 = []
 

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

data/lib/spina/engine.rb

@@ -1,4 +1,3 @@
-require 'spina'
 require 'haml-rails'
 require 'sass-rails'
 require 'coffee-rails'
@@ -11,6 +10,7 @@ require 'kaminari'
 require 'mobility'
 require 'rack-rewrite'
 require 'jsonb_accessor'
+require 'attr_json'
 
 module Spina
   class Engine < ::Rails::Engine
@@ -22,11 +22,22 @@ module Spina
     config.to_prepare do
       # Load helpers from main application
       Spina::ApplicationController.helper Rails.application.helpers
-
+ 
       # Require decorators from main application
       [Rails.root].flatten.map { |p| Dir[p.join('app', 'decorators', '**', '*_decorator.rb')]}.flatten.uniq.each do |decorator|
         Rails.configuration.cache_classes ? require(decorator) : load(decorator)
       end
+
+      # Register JSON part types for editing content
+      Spina::Part.register(
+        Spina::Parts::Line, 
+        Spina::Parts::Text, 
+        Spina::Parts::Image, 
+        Spina::Parts::ImageCollection, 
+        Spina::Parts::Repeater, 
+        Spina::Parts::Option, 
+        Spina::Parts::Attachment
+      )
     end
   end
 end