spina 2.0.2 → 2.3.0

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

@@ -1,31 +1,35 @@
 module Spina
   module Admin
     class AdminController < ActionController::Base
-      include Spina::CurrentMethods
+      include Spina.config.authentication.constantize
+      include Spina::CurrentAccount, Spina::CurrentTheme
       
       helper Spina::Engine.helpers
       
+      before_action :add_view_path
       before_action :set_admin_locale
-      before_action :authorize_spina_user
-
+      before_action :authenticate
+      
+      admin_section :content
+      
       def current_admin_path
         request.fullpath[%r{/#{ Spina.config.backend_path }(.*)}, 1]
       end
       helper_method :current_admin_path
 
       private
+      
+        def render_flash
+          render turbo_stream: turbo_stream.update("flash", partial: "spina/admin/shared/flash")
+        end
 
-      def set_admin_locale
-        I18n.locale = I18n.default_locale
-      end
-
-      def authorize_spina_user
-        redirect_to admin_login_path, flash: {information: I18n.t('spina.notifications.login')} unless current_spina_user
-      end
-
-      def authorize_admin
-        render status: 401 unless current_spina_user.admin?
-      end
+        def set_admin_locale
+          I18n.locale = I18n.default_locale
+        end
+        
+        def add_view_path
+          prepend_view_path Spina::Engine.root.join('app/views/spina/admin')
+        end
 
     end
   end

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

@@ -3,11 +3,16 @@ module Spina
     class AttachmentsController < AdminController
       before_action :set_breadcrumbs
 
-      layout "spina/admin/media_library"
-
       def index
-        add_breadcrumb I18n.t('spina.website.documents'), spina.admin_attachments_path
-        @attachments = Attachment.sorted
+        @attachments = Attachment.sorted.with_attached_file.page(params[:page]).per(25)
+      end
+      
+      def show
+        @attachment = Attachment.find(params[:id])
+      end
+      
+      def edit
+        @attachment = Attachment.find(params[:id])
       end
 
       def create
@@ -16,18 +21,34 @@ module Spina
           attachment.file.attach(file)
           attachment
         end
+        
+        respond_to do |format|
+          format.turbo_stream { render turbo_stream: turbo_stream.prepend("attachments", partial: "attachment", collection: @attachments)}
+          format.html { redirect_to spina.admin_attachments_url }
+        end
+      end
+      
+      def update
+        @attachment = Attachment.find(params[:id])
+        if params[:filename].present?
+          extension = @attachment.file.filename.extension
+          filename = "#{params[:filename]}.#{extension}"
+          @attachment.file.blob.update(filename: filename)
+        end
+        
+        redirect_to [:admin, @attachment]
       end
 
       def destroy
         @attachment = Attachment.find(params[:id])
         @attachment.destroy
-        redirect_to spina.admin_attachments_url
+        render turbo_stream: turbo_stream.remove(@attachment)
       end
 
       private
 
       def set_breadcrumbs
-        add_breadcrumb I18n.t('spina.website.media_library'), spina.admin_media_library_path
+        add_breadcrumb I18n.t('spina.website.media_library')
       end
 
       def attachment_params

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

@@ -1,14 +1,20 @@
 module Spina
   module Admin
     class ImagesController < AdminController
+      before_action :set_media_folder
       before_action :set_breadcrumbs
 
-      layout "spina/admin/media_library"
-
       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]).per(25)
+        @images = Image.sorted.where(media_folder: @media_folder).with_attached_file.page(params[:page]).per(25)
+      end
+      
+      def show
+        @image = Image.find(params[:id])
+      end
+      
+      def edit
+        @image = Image.find(params[:id])
       end
 
       # There's no file validation yet in ActiveStorage
@@ -18,7 +24,7 @@ module Spina
       def create
         @images = params[:image][:files].map do |file|
           # Create the image and attach the file
-          image = Image.create(media_folder_id: params[:media_library])
+          image = Image.create(media_folder_id: image_params[:media_folder_id])
           image.file.attach(file)
 
           # Was it not an image after all? DESTROY IT
@@ -26,24 +32,54 @@ module Spina
 
           image
         end.compact
+        
+        if params[:modal]
+          redirect_to spina.admin_media_picker_path(media_folder_id: image_params[:media_folder_id])
+        else
+          render turbo_stream: turbo_stream.prepend("images", partial: "image", collection: @images)
+        end
+      end
+      
+      def update
+        @image = Image.find(params[:id])
+        @image.update(image_params) if params[:image].present?
+        if params[:filename].present?
+          extension = @image.file.filename.extension
+          filename = "#{params[:filename]}.#{extension}"
+          @image.file.blob.update(filename: filename)
+        end
+        if @image.saved_change_to_media_folder_id?
+          render :update
+        else
+          redirect_to [:admin, @image]
+        end
       end
 
       def destroy
         @image = Image.find(params[:id])
         @image.destroy
-        redirect_back fallback_location: spina.admin_images_url
-      end
-
-      def add_to_media_folder
-        @media_folder = MediaFolder.find(params[:id])
-        @media_folder.images << Image.find(params[:image_id])
-        render json: @media_folder
+        render turbo_stream: turbo_stream.remove(@image)
       end
 
       private
 
         def set_breadcrumbs
-          add_breadcrumb I18n.t('spina.website.media_library'), admin_media_library_path
+          if @media_folder.present?
+            add_breadcrumb I18n.t('spina.website.media_library'), admin_images_path, class: 'text-gray-400'
+            add_breadcrumb @media_folder.name
+          else
+            add_breadcrumb I18n.t('spina.website.media_library')
+          end
+        end
+        
+        def set_media_folder
+          if params[:media_folder_id].present?
+            @media_folder = MediaFolder.find(params[:media_folder_id])
+          end
+        end
+        
+        def image_params
+          params.require(:image).permit(:media_folder_id)
         end
 
     end

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

@@ -0,0 +1,41 @@
+module Spina::Admin
+  class LayoutController < AdminController
+    before_action :set_account
+    before_action :set_locale
+    before_action :set_breadcrumb
+    
+    admin_section :content
+
+    def edit
+    end
+
+    def update
+      if @account.update(layout_params)
+        redirect_to spina.edit_admin_layout_path, flash: {success: t('spina.layout.saved')}
+      else
+        flash.now[:error] = t('spina.layout.couldnt_be_saved')
+        render partial: 'error', status: :unprocessable_entity
+      end
+    end
+
+    private
+    
+      # Permit all attributes when editing your layout
+      def layout_params
+        params.require(:account).permit!
+      end
+      
+      def set_breadcrumb
+        add_breadcrumb t('spina.layout.layout')
+      end
+
+      def set_account
+        @account = current_account
+      end
+
+      def set_locale
+        @locale = params[:locale] || I18n.default_locale
+      end
+
+  end
+end

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

@@ -1,7 +1,6 @@
 module Spina
   module Admin
     class MediaFoldersController < AdminController
-      layout "spina/admin/media_library"
 
       def new
         @media_folder = MediaFolder.new
@@ -11,24 +10,22 @@ module Spina
         @media_folder = MediaFolder.find(params[:id])
       end
 
-      def show
-        add_breadcrumb I18n.t('spina.website.media_library'), admin_media_library_path
-        add_breadcrumb I18n.t('spina.website.images'), spina.admin_images_path
-        @media_folder = MediaFolder.find(params[:id])
-        add_breadcrumb @media_folder.name
-        @images = @media_folder.images.sorted.page(params[:page])
-      end
-
       def create
         @media_folder = MediaFolder.new(media_folder_params)
-        @media_folder.save
-        redirect_to spina.admin_images_path
+        if @media_folder.save
+          redirect_to spina.admin_images_path
+        else
+          render turbo_stream: turbo_stream.update(view_context.dom_id(@media_folder, :form), partial: "form")
+        end
       end
 
       def update
         @media_folder = MediaFolder.find(params[:id])
-        @media_folder.update(media_folder_params)
-        redirect_to spina.admin_media_folder_path(@media_folder)
+        if @media_folder.update(media_folder_params)
+          redirect_to spina.admin_media_folder_images_path(@media_folder)
+        else
+          render turbo_stream: turbo_stream.update(view_context.dom_id(@media_folder, :form), partial: "form")
+        end
       end
 
       def destroy

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

@@ -1,39 +1,15 @@
 module Spina
   module Admin
     class MediaPickerController < AdminController
-      before_action :set_media_folders
-      before_action :set_selected_images
-
+      
       def show
-        @images = Image.where(media_folder: @media_folder).order(created_at: :desc).page(params[:page]).per(25)
-        @mode = params[:mode]
-
-        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
-
-        respond_to do |format|
-          format.html { render layout: false }
-          format.js { render :infinite_scroll if params[:page].present? }
+        @images = Spina::Image.sorted.with_attached_file.page(params[:page]).per(16)
+        
+        if @media_folder = Spina::MediaFolder.find_by(id: params[:media_folder_id])
+          @images = @images.where(media_folder: @media_folder)
         end
       end
-
-      private
-
-        def set_media_folders
-          @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/move_pages_controller.rb

@@ -0,0 +1,24 @@
+module Spina
+  module Admin
+    class MovePagesController < AdminController
+      
+      def new
+        @page = Page.find(params[:page_id])
+      end
+      
+      def update
+        @page = Page.find(params[:page_id])
+        @page.update(page_params)
+        flash[:success] = t('spina.pages.moved')
+        redirect_back fallback_location: spina.edit_admin_page_url(@page)
+      end
+      
+      private
+      
+        def page_params
+          params.require(:page).permit(:parent_id, :resource_id)
+        end
+      
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Spina
+  module Admin
+    class NavigationItemsController < AdminController
+      before_action :set_navigation
+      
+      def new
+        @navigation_item = @navigation.navigation_items.new(parent_id: params[:parent_id])
+        @pages = Page.sorted
+      end
+      
+      def create
+        @navigation_item = NavigationItem.new(navigation_item_params)
+        if @navigation_item.save
+          render turbo_stream: turbo_stream.append(@navigation_item.parent || @navigation, @navigation_item)
+        end
+      end
+      
+      def destroy
+        @navigation_item = @navigation.navigation_items.find(params[:id])
+        @navigation_item.destroy
+        render turbo_stream: turbo_stream.remove(view_context.dom_id(@navigation_item, :container))
+      end
+      
+      private
+      
+        def navigation_item_params
+          params.require(:navigation_item).permit(:page_id, :parent_id).merge(navigation_id: @navigation.id)
+        end
+      
+        def set_navigation
+          @navigation = Navigation.find(params[:navigation_id])
+        end
+      
+    end
+  end
+end

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

@@ -1,35 +1,38 @@
 module Spina
   module Admin
     class NavigationsController < AdminController
-      layout 'spina/admin/pages'
-
-      before_action :set_breadcrumb, except: [:show]
+      before_action :set_breadcrumb
       before_action :set_navigation, only: [:show, :edit, :update]
-
-      def show        
-        add_breadcrumb t('spina.website.pages')
+      
+      admin_section :content
+      
+      def index
+        navigation = Spina::Navigation.order(:position).first
+        if navigation
+          redirect_to spina.edit_admin_navigation_path(navigation)
+        end
       end
 
-      def edit        
-        add_breadcrumb @navigation.label, spina.admin_navigation_path(@navigation)
-        add_breadcrumb t('spina.edit')
+      def edit
+        @navigations = Spina::Navigation.order(:position)
         render layout: 'spina/admin/admin'
       end
 
       def update        
         if @navigation.update(navigation_params)
-          redirect_to spina.admin_navigation_path(@navigation)
+          redirect_to spina.edit_admin_navigation_path(@navigation)
         else
           render :edit
         end
       end
 
       def sort
-        params[:list].each_pair do |parent_pos, parent_node|
-          update_child_pages_position(parent_node)
-          update_navigation_item_position(parent_node[:id], parent_pos, nil)
+        params[:ids].each.with_index do |id, index| 
+          NavigationItem.where(id: id).update_all(position: index + 1)
         end
-        head :ok
+        
+        flash.now[:info] = t("spina.navigations.sorting_saved")
+        render_flash
       end
 
       private
@@ -48,11 +51,11 @@ module Spina
         end
 
         def set_breadcrumb
-          add_breadcrumb t('spina.website.pages'), spina.admin_pages_path
+          add_breadcrumb t('spina.navigations.navigations')
         end
 
         def navigation_params
-          params.require(:navigation).permit(:auto_add_pages, page_ids: [])
+          params.require(:navigation).permit(:label, :auto_add_pages, page_ids: [])
         end
 
         def set_navigation