spina 1.1.2 → 2.0.0.beta

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

@@ -0,0 +1,26 @@
+module Spina
+  module CurrentMethods
+    extend ActiveSupport::Concern
+    
+    included do
+      helper_method :current_theme
+      helper_method :current_spina_user
+      helper_method :current_account
+    end
+  
+    private
+    
+      def current_theme
+        @current_theme ||= Spina::Theme.find_by_name(current_account.theme)
+      end
+      
+      def current_spina_user
+        @current_spina_user ||= Spina::User.where(id: session[:user_id]).first if session[:user_id]
+      end
+    
+      def current_account
+        @current_account ||= Spina::Account.first
+      end
+        
+  end
+end

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

@@ -4,9 +4,12 @@ module Spina
 
     included do
       rescue_from ActiveRecord::RecordNotFound, with: :redirect_or_render_404
+
+      helper Spina::PagesHelper
       
       before_action :set_locale
       before_action :set_current_page
+      before_action :set_current_account
     end
 
     def show
@@ -27,6 +30,12 @@ module Spina
 
       def set_current_page
         Spina::Current.page = page
+        Spina::Current.page.view_context = view_context
+      end
+
+      def set_current_account
+        Spina::Current.account = Spina::Account.first
+        Spina::Current.account.view_context = view_context
       end
 
       def page_by_locale(locale)

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

@@ -1,6 +1,7 @@
 module Spina
   module Admin
     class AccountsController < AdminController
+      before_action :set_locale
 
       def edit
         add_breadcrumb I18n.t('spina.preferences.account'), spina.edit_admin_account_path
@@ -22,23 +23,18 @@ module Spina
       def style
         add_breadcrumb I18n.t('spina.preferences.style'), spina.style_admin_account_path
         @themes = ::Spina::Theme.all
-        @layout_parts = current_theme.layout_parts.map { |layout_part| current_account.layout_part(layout_part) }
       end
 
       private
 
-      def account_params
-        params.require(:account).permit(:address, :city, :email, :name, :phone,
-                                        :postal_code, :preferences, :google_analytics,
-                                        :google_site_verification, :facebook, :twitter, :google_plus,
-                                        :instagram, :youtube, :linkedin,
-                                        :kvk_identifier, :theme, :vat_identifier, :robots_allowed,
-                                        layout_parts_attributes:
-                                          [:id, :layout_partable_type, :layout_partable_id,
-                                            :name, :title, :position, :content, :page_id,
-                                            layout_partable_attributes:
-                                              [:content, :photo_tokens, :attachment_tokens, :id]])
-      end
+        def account_params
+          params.require(:account).permit!
+        end
+
+        def set_locale
+          @locale = params[:locale] || I18n.default_locale
+        end
+        
     end
   end
 end

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

@@ -1,6 +1,10 @@
 module Spina
   module Admin
-    class AdminController < ::Spina::ApplicationController
+    class AdminController < ActionController::Base
+      include Spina::CurrentMethods
+      
+      helper Spina::Engine.helpers
+      
       before_action :set_admin_locale
       before_action :authorize_spina_user
 

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

@@ -24,28 +24,6 @@ module Spina
         redirect_to spina.admin_attachments_url
       end
 
-      def select
-        @selected_attachment_id = Attachment.find_by(id: params[:selected_attachment_id]).try(:id)
-        @hidden_field_id = params[:hidden_field_id]
-        @attachments = Attachment.sorted
-        @attachment = Attachment.new
-      end
-
-      def insert
-        @attachment = Attachment.find(params[:attachment_id])
-        Rails.logger.info "HAHA HA HA #{@attachment.id}"
-      end
-
-      def select_collection
-        @selected_attachment_ids = Attachment.where(id: params[:selected_attachment_ids]).ids
-        @attachments = Attachment.sorted
-        @attachment = Attachment.new
-      end
-
-      def insert_collection
-        @attachments = Attachment.where(id: params[:attachment_ids])
-      end
-
       private
 
       def set_breadcrumbs

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

@@ -8,7 +8,7 @@ module Spina
       def index
         add_breadcrumb I18n.t('spina.website.images'), admin_images_path
         @media_folders = MediaFolder.order(:name)
-        @images = Image.sorted.where(media_folder_id: nil).with_attached_file.page(params[:page])
+        @images = Image.sorted.where(media_folder_id: nil).with_attached_file.page(params[:page]).per(25)
       end
 
       # There's no file validation yet in ActiveStorage

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

@@ -2,39 +2,38 @@ module Spina
   module Admin
     class MediaPickerController < AdminController
       before_action :set_media_folders
+      before_action :set_selected_images
 
       def show
-        if @media_folder.present?
-          @images = @media_folder.images.page(params[:page])
-        else
-          @images = Image.where(media_folder_id: nil).page(params[:page])
-        end
+        @images = Image.where(media_folder: @media_folder).order(created_at: :desc).page(params[:page]).per(25)
+        @mode = params[:mode]
 
-        if params[:selected_ids].present?
-          ids = params[:selected_ids].map(&:to_i).join(', ')
-          @images = @images.order(Arel.sql("CASE WHEN id IN(#{ids}) THEN 0 ELSE 1 END, created_at DESC"))
-        else
-          @images = @images.sorted
+        if selected_ids.any?
+          @images = @images.reorder(Arel.sql("CASE WHEN id IN(#{selected_ids.join(', ')}) THEN 0 ELSE 1 END, created_at DESC"))
         end
 
-        render params[:page].present? ? :infinite_scroll : :show
-      end
-
-      def select
-        if params[:multiple]
-          @images = Image.where(id: params[:image_ids].split("-"))
-        else 
-          @image = Image.find(params[:image_id])
+        respond_to do |format|
+          format.html { render layout: false }
+          format.js { render :infinite_scroll if params[:page].present? }
         end
       end
 
       private
 
         def set_media_folders
-          @media_folders = MediaFolder.order(:name)
+          @media_folders = MediaFolder.order(:name).joins(:images).uniq
           @media_folder = MediaFolder.find(params[:media_folder_id]) if params[:media_folder_id].present?
         end
 
+        def set_selected_images
+          @selected_images = Image.where(id: selected_ids).sort_by{|image| selected_ids.index(image.id)}
+        end
+
+        def selected_ids
+          params[:selected_ids].present? ? params[:selected_ids].map(&:to_i) : []
+        end
+        helper_method :selected_ids
+
     end
   end
 end

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

@@ -8,18 +8,17 @@ module Spina
       def index
         add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
         redirect_to admin_pages_path unless current_admin_path.starts_with?('/pages')
-        @pages = Page.active.sorted.roots.regular_pages
+        @pages = Page.active.sorted.roots.regular_pages.includes(:translations)
       end
 
       def new
         @resource = Resource.find_by(id: params[:resource_id])
-        @page = Page.new(resource: @resource, parent: Page.find_by(id: params[:parent_id]) || @resource&.parent_page)
+        @page = Page.new(resource: @resource, parent: Page.find_by(id: params[:parent_id]))
         add_index_breadcrumb
         if current_theme.new_page_templates.any? { |template| template[0] == params[:view_template] }
           @page.view_template = params[:view_template]
         end
         add_breadcrumb I18n.t('spina.pages.new')
-        @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
         render layout: 'spina/admin/admin'
       end
 
@@ -30,7 +29,6 @@ module Spina
           @page.navigations << Spina::Navigation.where(auto_add_pages: true)
           redirect_to spina.edit_admin_page_url(@page), flash: {success: t('spina.pages.saved')}
         else
-          @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
           render :new, layout: 'spina/admin/admin'
         end
       end
@@ -38,11 +36,10 @@ module Spina
       def edit        
         add_index_breadcrumb
         add_breadcrumb @page.title
-        @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
         render layout: 'spina/admin/admin'
       end
 
-      def update 
+      def update
         respond_to do |format|
           Mobility.locale = @locale
           if @page.update(page_params)
@@ -51,7 +48,6 @@ module Spina
             format.js
           else
             format.html do
-              @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
               Mobility.locale = I18n.default_locale
               render :edit, layout: 'spina/admin/admin'
             end

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

@@ -1,7 +1,7 @@
 module Spina
   module Admin
     class ResourcesController < AdminController
-
+      before_action :set_locale
       before_action :set_resource, only: [:show, :edit, :update]
 
       def show        
@@ -13,8 +13,8 @@ module Spina
         add_breadcrumb t('spina.edit')
       end
 
-      def update        
-        if @resource.update(resource_params)
+      def update
+        if Mobility.with_locale(@locale) { @resource.update(resource_params) }
           redirect_to spina.admin_resource_path(@resource)
         else
           render :edit
@@ -24,12 +24,17 @@ module Spina
       private
 
         def resource_params
-          params.require(:resource).permit(:label, :view_template, :order_by, :parent_page_id)
+          params.require(:resource).permit(:label, :slug, :view_template, :order_by, :parent_page_id)
         end
 
         def set_resource
           @resource = Resource.find(params[:id])          
         end
+
+        def set_locale
+          @locale = params[:locale] || I18n.default_locale
+        end
+
     end
   end
 end

data/app/controllers/spina/application_controller.rb

@@ -1,24 +1,7 @@
-module Spina
-  class ApplicationController < ActionController::Base
-
-    protect_from_forgery with: :exception
-
-    private
-
-    def current_theme
-      @current_theme = ::Spina::Theme.find_by_name(current_account.theme)
-    end
-    helper_method :current_theme
-
-    def current_spina_user
-      @current_spina_user ||= ::Spina::User.where(id: session[:user_id]).first if session[:user_id]
-    end
-    helper_method :current_spina_user
-
-    def current_account
-      @current_account ||= ::Spina::Account.first
-    end
-    helper_method :current_account
-
-  end
+class Spina::ApplicationController < Spina.frontend_parent_controller.constantize
+  include Spina::CurrentMethods
+  
+  helper Spina::Engine.helpers
+  
+  protect_from_forgery with: :exception
 end

data/app/controllers/spina/pages_controller.rb

@@ -1,20 +1,18 @@
-module Spina
-  class PagesController < Spina::ApplicationController
-    include Spina::Frontend
+class Spina::PagesController < Spina::ApplicationController
+  include Spina::Frontend
 
-    before_action :current_spina_user_can_view_page?, except: [:robots]
+  before_action :current_spina_user_can_view_page?, except: [:robots]
 
-    helper_method :page
+  helper_method :page
 
-    def homepage
-      render_with_template(page)
-    end
+  def homepage
+    render_with_template(page)
+  end
 
-    private
+  private
 
-      def current_spina_user_can_view_page?
-        raise ActiveRecord::RecordNotFound unless current_spina_user.present? || page.live?
-      end
+    def current_spina_user_can_view_page?
+      raise ActiveRecord::RecordNotFound unless current_spina_user.present? || page.live?
+    end
 
-  end
 end

data/app/controllers/spina/sitemaps_controller.rb

@@ -1,8 +1,8 @@
-module Spina
-  class SitemapsController < Spina::ApplicationController
-    def show
-      I18n.locale = I18n.default_locale
-      @pages = Page.live.sorted
-    end
+class Spina::SitemapsController < Spina::ApplicationController
+  
+  def show
+    I18n.locale = I18n.default_locale
+    @pages = Spina::Page.live.sorted
   end
+  
 end

data/app/helpers/spina/admin/pages_helper.rb

@@ -1,34 +1,36 @@
 module Spina
   module Admin
     module PagesHelper
-      def link_to_add_structure_item_fields(f, &block)
-        item = StructureItem.new
-        fields = f.fields_for(:structure_items, item, child_index: item.object_id) do |builder|
-          build_structure_parts(f.object.page_part.name, item)
-          render("spina/admin/structure_items/fields", f: builder)
+
+      def link_to_add_repeater_fields(f)
+        repeater_content = Spina::Parts::RepeaterContent.new(name: f.object.name, title: f.object.title)
+        fields = f.fields_for(:content, [repeater_content], child_index: repeater_content.object_id) do |builder|
+          render("spina/admin/parts/repeaters/fields", f: builder)
         end
-        link_to '#', class: "add_structure_item_fields button button-link", data: {id: item.object_id, fields: fields.gsub("\n", "")} do
+        link_to '#', class: "add_structure_item_fields button button-link", data: {id: repeater_content.object_id, fields: fields.gsub("\n", "")} do
           icon('plus')
         end
       end
 
-      def build_structure_parts(name, item)
-        structure = current_theme.structures.find { |structure| structure[:name] == name }
-        return item.parts unless structure.present?
-        structure[:structure_parts].map do |attributes|
-          part = item.parts.where(name: attributes[:name]).first_or_initialize(attributes)
-          part.partable = part.partable_type.constantize.new if part.partable.blank?
-          part.options = attributes[:options]
-          part
+      def data_attrs_for_image_collection(f)
+        image = Spina::Parts::Image.new
+        fields = f.fields_for(:images, [image], child_index: image.object_id) do |builder|
+          render("spina/admin/parts/image_collections/fields", f: builder)
         end
+        {fields: fields.gsub("\n", ""), id: image.object_id}
       end
 
-      def partable_partial_namespace(partable)
-        partable_type_partial_namespace(partable.model_name.to_s)
+      def build_parts(partable, parts)
+        I18n.with_locale(@locale) do
+          parts.map do |part|
+            part_attributes = current_theme.parts.find{|p|p[:name].to_s == part.to_s}
+            partable.part(part_attributes)
+          end
+        end
       end
 
-      def partable_type_partial_namespace(partable_type)
-        partable_type.tableize.sub(/\Aspina\//, '')
+      def parts_partial_namespace(part_type)
+        part_type.tableize.sub(/\Aspina\/parts\//, '')
       end
 
       def flatten_nested_hash(hash)
@@ -36,14 +38,14 @@ module Spina
       end
 
       def page_ancestry_options(page)
-        pages = Spina::Page.active.regular_pages
+        pages = Spina::Page.active.regular_pages.includes(:translations)
         pages = pages.where.not(id: page.subtree.ids) unless page.new_record? || !page.methods.include?(:subtree)
 
         (flatten_nested_hash(pages.arrange(order: :position)).map do |page|
           next if page.depth >= Spina.config.max_page_depth - 1
           page_menu_title = page.depth.zero? ? page.menu_title : " #{page.menu_title}".indent(page.depth, '-')
           [page_menu_title, page.id]
-        end << [page.parent&.menu_title, page&.parent_id].compact).uniq.compact
+        end << [page.parent&.menu_title, page&.parent_id].compact).map(&:presence).uniq.compact
       end
 
       def option_label(part, value)