spina 2.0.2 → 2.3.0

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

@@ -1,66 +1,79 @@
 module Spina
   module Admin
     class PagesController < AdminController
-      before_action :set_tabs, only: [:new, :create, :edit, :update]
       before_action :set_locale
-      before_action :set_page, only: [:edit, :update, :destroy, :children]
+      before_action :set_page, only: [:edit, :edit_content, :edit_template, :update, :destroy, :children]
+      before_action :set_tabs
 
       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.includes(:translations)
+        
+        
+        if params[:resource_id]
+          @resource = Resource.find(params[:resource_id])
+          @page_templates = Spina::Current.theme.new_page_templates(recommended: @resource.view_template)
+          @pages = @resource.pages.active.roots.includes(:translations)
+        else
+          @pages = Page.active.sorted.roots.main.includes(:translations)
+          @page_templates = Spina::Current.theme.new_page_templates
+        end
       end
 
       def new
-        @resource = Resource.find_by(id: params[:resource_id])
-        @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')
-        render layout: 'spina/admin/admin'
+        resource = Resource.find_by(id: params[:resource_id])
+        @page = Page.new(view_template: params[:view_template], resource: resource)
       end
 
       def create
-        @page = Page.new(page_params)
-        add_breadcrumb I18n.t('spina.pages.new')
+        @page = Page.new(page_params.merge(draft: true))
         if @page.save
-          @page.navigations << Spina::Navigation.where(auto_add_pages: true)
-          redirect_to spina.edit_admin_page_url(@page), flash: {success: t('spina.pages.saved')}
+          redirect_to spina.edit_admin_page_url(@page)
         else
-          render :new, layout: 'spina/admin/admin'
+          render turbo_stream: turbo_stream.update(view_context.dom_id(@page, :new_page_form), partial: "new_page_form")
         end
       end
 
-      def edit        
+      def edit
         add_index_breadcrumb
         add_breadcrumb @page.title
-        render layout: 'spina/admin/admin'
+      end
+
+      def edit_content
+        @parts = current_theme.view_templates.find do |view_template|
+          view_template[:name].to_s == @page.view_template.to_s
+        end&.dig(:parts) || []
+      end
+
+      def edit_template
+        render layout: false
       end
 
       def update
-        respond_to do |format|
-          Mobility.locale = @locale
-          if @page.update(page_params)
-            @page.touch
-            format.html { redirect_to spina.edit_admin_page_url(@page, params: {locale: @locale}), flash: {success: t('spina.pages.saved')} }
-            format.js
+        Mobility.locale = @locale
+        if @page.update(page_params)
+          if @page.saved_change_to_draft? && @page.live?
+            flash[:confetti] = t('spina.pages.published')
           else
-            format.html do
-              Mobility.locale = I18n.default_locale
-              render :edit, layout: 'spina/admin/admin'
-            end
+            flash[:success] = t('spina.pages.saved')
           end
+          
+          redirect_to spina.edit_admin_page_url(@page, params: {locale: @locale})
+        else
+          add_index_breadcrumb
+          Mobility.locale = I18n.locale
+          add_breadcrumb @page.title
+          flash.now[:error] = t('spina.pages.couldnt_be_saved')
+          render :edit, status: :unprocessable_entity
         end
       end
 
       def sort
-        params[:list].each_pair do |parent_pos, parent_node|
-          update_child_pages_position(parent_node)
-          update_page_position(parent_node, parent_pos, nil)
+        params[:ids].each.with_index do |id, index| 
+          Page.where(id: id).update_all(position: index + 1)
         end
-        head :ok
+        
+        flash.now[:info] = t("spina.pages.sorting_saved")
+        render_flash
       end
 
       def children
@@ -68,49 +81,39 @@ module Spina
         render layout: false
       end
 
-      def destroy        
+      def destroy
+        flash[:info] = t('spina.pages.deleted')    
         @page.destroy
         redirect_to spina.admin_pages_url
       end
 
       private
 
-      def set_locale
-        @locale = params[:locale] || I18n.default_locale
-      end
-
-      def add_index_breadcrumb
-        if @page.resource.present?
-          add_breadcrumb @page.resource.label, spina.admin_resource_path(@page.resource)
-        else
-          add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
+        def set_locale
+          @locale = params[:locale] || I18n.default_locale
         end
-      end
-
-      def set_tabs
-        @tabs = %w{page_content page_seo advanced}
-      end
-
-      def update_page_position(page, position, parent_id = nil)
-        Page.update(page[:id], position: position.to_i + 1, parent_id: parent_id )
-      end
-
-      def update_child_pages_position(node)
-        if node[:children].present?
-          node[:children].each_pair do |child_pos, child_node|
-            update_child_pages_position(child_node) if child_node[:children].present?
-            update_page_position(child_node, child_pos, node[:id])
+  
+        def add_index_breadcrumb
+          path = spina.admin_pages_path
+          if @page.resource
+            path = spina.admin_pages_path(resource_id: @page.resource_id)
           end
+          
+          add_breadcrumb t('spina.website.pages'), path, class: 'text-gray-400'
+        end
+  
+        def page_params
+          params.require(:page).permit!
+        end
+  
+        def set_page
+          @page = Page.find(params[:id])
         end
-      end
 
-      def page_params
-        params.require(:page).permit!
-      end
+        def set_tabs
+          @tabs = %w[page_content search_engines advanced]
+        end
 
-      def set_page
-        @page = Page.find(params[:id])
-      end
     end
   end
 end

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,9 +1,9 @@
 module Spina
   module Admin
     class PasswordResetsController < AdminController
-      layout "spina/login"
+      layout "spina/admin/sessions"
 
-      skip_before_action :authorize_spina_user
+      skip_before_action :authenticate
 
       def new
       end
@@ -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,10 +1,7 @@
 module Spina
   module Admin
     class SessionsController < AdminController
-
-      layout "spina/login"
-
-      skip_before_action :authorize_spina_user
+      skip_before_action :authenticate
 
       def new
       end
@@ -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,63 @@
 module Spina
   module Admin
     class UsersController < AdminController
-      before_action :set_breadcrumbs
+      before_action :authorize_authentication_module
       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
@@ -57,6 +67,15 @@ module Spina
         def set_user
           @user = User.find(params[:id])
         end
+        
+        def authorize_authentication_module
+          render status: 401 unless Spina.config.authentication == "Spina::Authentication::Sessions"
+        end
+        
+        def authorize_admin
+          render status: 401 unless current_spina_user.admin?
+        end
+        
     end
   end
 end