spina 2.0.2 → 2.1.0

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

@@ -0,0 +1,10 @@
+module Spina::Admin
+  class ParentPagesController < AdminController
+    
+    def index
+      @resource = Spina::Resource.find_by(id: params[:resource_id])
+      @pages = Spina::Page.where(resource: @resource).sorted.includes(:translations)
+    end
+    
+  end
+end

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

@@ -1,7 +1,7 @@
 module Spina
   module Admin
     class PasswordResetsController < AdminController
-      layout "spina/login"
+      layout "spina/admin/sessions"
 
       skip_before_action :authorize_spina_user
 
@@ -18,7 +18,7 @@ module Spina
           redirect_to admin_login_path, flash: {success: t('spina.forgot_password.instructions_sent')}
         else
           flash.now[:alert] = t('spina.forgot_password.unknown_user')
-          render :new
+          render :new, status: :unprocessable_entity
         end
       end
 
@@ -34,7 +34,7 @@ module Spina
         elsif @user.update(user_params)
           redirect_to admin_login_path, flash: {success: t('spina.forgot_password.success')}
         else
-          render :edit
+          render :edit, status: :unprocessable_entity
         end
       end
 

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

@@ -2,20 +2,17 @@ module Spina
   module Admin
     class ResourcesController < AdminController
       before_action :set_locale
-      before_action :set_resource, only: [:show, :edit, :update]
-
-      def show        
-        add_breadcrumb @resource.label
-      end
+      before_action :set_resource, only: [:edit, :update]
 
       def edit        
-        add_breadcrumb @resource.label, spina.admin_resource_path(@resource)
+        add_breadcrumb @resource.label, spina.admin_pages_path(resource_id: @resource.id), class: 'text-gray-400'
         add_breadcrumb t('spina.edit')
       end
 
       def update
         if Mobility.with_locale(@locale) { @resource.update(resource_params) }
-          redirect_to spina.admin_resource_path(@resource)
+          flash[:success] = t('spina.resources.saved')
+          redirect_to spina.admin_pages_path(resource_id: @resource.id)
         else
           render :edit
         end

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

@@ -1,9 +1,6 @@
 module Spina
   module Admin
     class SessionsController < AdminController
-
-      layout "spina/login"
-
       skip_before_action :authorize_spina_user
 
       def new
@@ -12,17 +9,17 @@ module Spina
       def create
         user = User.where(email: params[:email]).first
         if user && user.authenticate(params[:password])
-          session[:user_id] = user.id
-          user.update_last_logged_in!
+          session[:spina_user_id] = user.id
+          user.touch(:last_logged_in)
           redirect_to spina.admin_root_url
         else
           flash.now[:alert] = I18n.t('spina.notifications.wrong_username_or_password')
-          render "new"
+          render "new", status: :unprocessable_entity
         end
       end
 
       def destroy
-        session[:user_id] = nil
+        session.delete(:spina_user_id)
         redirect_to "/"
       end
     end

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

@@ -1,9 +1,10 @@
 module Spina
   module Admin
-    class SettingsController < AdminController
-
+    class SettingsController < AdminController      
       before_action :find_or_set_settings
       before_action :set_breadcrumbs
+      
+      admin_section :settings
 
       def edit
         add_breadcrumb t("spina.#{plugin.namespace}.title")
@@ -20,36 +21,36 @@ module Spina
 
       private
 
-      def setting_class
-        "spina/#{plugin.namespace}/setting".classify.constantize
-      end
-
-      def plugin
-        Spina::Plugin.find_by(namespace: params[:plugin])
-      end
-      helper_method :plugin
-
-      def find_or_set_settings
-        @setting = setting_class.first_or_create do |setting|
-          plugin.settings.each do |attribute, type|
-            setting.send("#{attribute}=", (type.is_a?(Hash) ? type.first.last : nil))
+        def setting_class
+          "spina/#{plugin.namespace}/setting".classify.constantize
+        end
+  
+        def plugin
+          Spina::Plugin.find_by(namespace: params[:plugin])
+        end
+        helper_method :plugin
+  
+        def find_or_set_settings
+          @setting = setting_class.first_or_create do |setting|
+            plugin.settings.each do |attribute, type|
+              setting.send("#{attribute}=", (type.is_a?(Hash) ? type.first.last : nil))
+            end
+          end
+          plugin.settings.keys.reject do |x|
+            @setting.preferences.keys.map(&:to_sym).include? x
+          end.each do |key|
+            value = plugin.settings[key].is_a?(Hash) ? plugin.settings[key].first.last : nil
+            @setting.send("#{key}=", value)
           end
         end
-        plugin.settings.keys.reject do |x|
-          @setting.preferences.keys.map(&:to_sym).include? x
-        end.each do |key|
-          value = plugin.settings[key].is_a?(Hash) ? plugin.settings[key].first.last : nil
-          @setting.send("#{key}=", value)
+  
+        def set_breadcrumbs
+          add_breadcrumb t('spina.settings.title')
+        end
+  
+        def settings_params
+          params.require(:setting).permit(plugin.settings.keys)
         end
-      end
-
-      def set_breadcrumbs
-        add_breadcrumb t('spina.settings.title')
-      end
-
-      def settings_params
-        params.require(:setting).permit(plugin.settings.keys)
-      end
 
     end
   end

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

@@ -0,0 +1,23 @@
+module Spina
+  module Admin
+    class ThemeController < AdminController
+      admin_section :settings
+      
+      def edit
+        add_breadcrumb t('spina.theme.theme')
+      end
+      
+      def update
+        Spina::Current.account.update(theme_params)
+        redirect_to spina.edit_admin_theme_path, flash: {success: t('spina.theme.saved')}
+      end
+      
+      private
+      
+        def theme_params
+          params.require(:account).permit(:theme)
+        end
+      
+    end
+  end
+end

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

@@ -1,53 +1,62 @@
 module Spina
   module Admin
     class UsersController < AdminController
-      before_action :set_breadcrumbs
       before_action :authorize_admin, except: [:index]
       before_action :set_user, only: [:edit, :update, :destroy]
+      
+      admin_section :settings
 
       def index
-        @users = User.all
+        @users = User.order(:name)
+        add_breadcrumb I18n.t('spina.preferences.users'), spina.admin_users_path
       end
 
       def new
         @user = User.new
+        add_index_breadcrumb
         add_breadcrumb I18n.t('spina.users.new')
       end
 
       def create
         @user = User.new(user_params)
-        add_breadcrumb I18n.t('spina.users.new')
         if @user.save
           redirect_to admin_users_url
         else
           flash.now[:alert] = I18n.t('spina.users.cannot_be_created')
-          render :new
+          add_index_breadcrumb
+          add_breadcrumb I18n.t('spina.users.new')
+          render :new, status: :unprocessable_entity
         end
       end
 
-      def edit        
+      def edit
+        add_index_breadcrumb
         add_breadcrumb "#{@user}"
       end
 
-      def update        
-        add_breadcrumb "#{@user}"
+      def update
         if @user.update(user_params)
+          flash[:success] = t('spina.users.saved')
           redirect_to spina.admin_users_url
         else
           flash.now[:alert] = I18n.t('spina.users.cannot_be_created')
-          render :edit
+          add_index_breadcrumb
+          add_breadcrumb "#{@user}"
+          render :edit, status: :unprocessable_entity
         end
       end
 
-      def destroy        
-        @user.destroy unless @user == current_spina_user
-        redirect_to admin_users_url
+      def destroy
+        if @user != current_spina_user   
+          @user.destroy 
+          redirect_to spina.admin_users_url, flash: {success: t('spina.users.deleted')}
+        end
       end
 
       private
 
-        def set_breadcrumbs
-          add_breadcrumb I18n.t('spina.preferences.users'), spina.admin_users_path
+        def add_index_breadcrumb
+          add_breadcrumb I18n.t('spina.preferences.users'), spina.admin_users_path, class: 'text-gray-400'
         end
 
         def user_params

data/app/controllers/spina/pages_controller.rb

@@ -1,7 +1,7 @@
 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?
 
   helper_method :page
 

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

@@ -0,0 +1,26 @@
+require 'nokogiri'
+
+module Spina::Admin
+	module IconsHelper
+	
+		class FileNotFound < StandardError
+	  end
+		
+		def heroicon(name, style: :outline, **options)
+	    file = read_file(Spina::Engine.root.join("app/assets/icons/heroicons", style.to_s, "#{name}.svg"))
+	    
+	    doc = Nokogiri::XML(file)
+	    svg = doc.root
+	    svg[:class] = options[:class]
+	    ActiveSupport::SafeBuffer.new(svg.to_s)
+		end
+		
+		private
+		
+	    def read_file(path)
+	      File.exist?(path) || raise(FileNotFound, "File #{path} not found")
+	      File.read(path)
+	    end  
+
+	end
+end

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

@@ -0,0 +1,18 @@
+module Spina::Admin
+  module ImagesHelper
+  
+    def ratio_tailwind_class_for_image_part(image)
+      case image.options.try(:[], :ratio)
+      when "portrait"
+        "w-28"
+      when "landscape"
+        "w-48"
+      when "wide"
+        "w-80"
+      else
+        "w-36" # Square (default)
+      end
+    end
+  
+  end
+end

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

@@ -1,57 +1,30 @@
-module Spina
-  module Admin
-    module PagesHelper
-
-      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: repeater_content.object_id, fields: fields.gsub("\n", "")} do
-          icon('plus')
-        end
-      end
-
-      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}
+module Spina::Admin
+  module PagesHelper
+    
+    def asset_available?(path)
+      if Rails.configuration.assets.compile
+        Rails.application.precompiled_assets.include?(path)
+      else
+        Rails.application.assets_manifest.assets[path].present?
       end
+    end
 
-      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
+    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 parts_partial_namespace(part_type)
-        part_type.tableize.sub(/\Aspina\/parts\//, '')
-      end
-
-      def flatten_nested_hash(hash)
-        hash.flat_map{|k, v| [k, *flatten_nested_hash(v)]}
-      end
-
-      def page_ancestry_options(page)
-        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).map(&:presence).uniq.compact
-      end
-
-      def option_label(part, value)
-        t(['options',part.name,value].compact.join('.'))
-      end
+    def parts_partial_namespace(part_type)
+      part_type.tableize.sub(/\Aspina\/parts\//, '')
+    end
 
+    def option_label(part, value)
+      t(['options',part.name,value].compact.join('.'))
     end
+
   end
 end

data/app/helpers/spina/images_helper.rb

@@ -3,12 +3,40 @@ module Spina
 
     def thumbnail_url(image)
       return "" if image.nil?
-      main_app.url_for(image.variant(resize: "400x300^", crop: "400x300+0+0"))
+      main_app.url_for(image.variant(resize_to_fill: [400, 300]))
     end
 
     def embedded_image_url(image)
       return "" if image.nil?
-      main_app.url_for(image.variant(resize: Spina.config.embedded_image_size))
+
+      # support both ImageProcessing gem macro :resize_to_limit and ImageMagick-specific :resize
+      resize_key = if !Spina.config.embedded_image_size.is_a?(Array)
+                     :resize
+                   else
+                     :resize_to_limit
+                   end
+      main_app.url_for(image.variant(Hash[resize_key, Spina.config.embedded_image_size]))
+    end
+    
+    def content_type_color(image)
+      case content_type(image)
+      when "png"
+        "bg-green-300"
+      when "heic"
+        "bg-blue-200"
+      when "jpg", "jpeg"
+        "bg-blue-400"
+      when "gif"
+        "bg-indigo-300"
+      when "svg"
+        "bg-yellow-400"
+      else
+        "bg-gray-400"
+      end
+    end
+    
+    def content_type(image)
+      image.file.content_type.split("/").last
     end
 
   end