integral 1.0.1 → 1.5.0

data/app/controllers/integral/backend/posts_controller.rb

@@ -2,130 +2,44 @@ module Integral
   module Backend
     # Post management
     class PostsController < BaseController
-      before_action :set_post, only: %i[edit update destroy show activities activity]
-
-      # GET /
-      # Lists all posts
-      def index
-        respond_to do |format|
-          format.html do
-            set_grid(Integral::Grids::PostsGrid)
-          end
-
-          format.json do
-            if params[:gridview].present?
-              set_grid(Integral::Grids::PostsGrid)
-              render json: { content: render_to_string(partial: 'integral/backend/posts/grid', locals: { grid: @grid }) }
-            else
-              respond_to_record_selector(Integral::Post)
-            end
-          end
+      before_action :authorize_with_klass, except: %i[activities activity]
+      before_action :set_resource, except: %i[create new index list]
+
+      # POST /:id/duplicate
+      # Duplicate a resource
+      def duplicate
+        super do |cloned_resource|
+          cloned_resource.title = "Copy #{@resource.title[0...Integral.title_length_maximum - 5]}"
+          cloned_resource.view_count = 0
+          cloned_resource.tag_list = @resource.tag_list_on(@resource.tag_context)
+          cloned_resource.slug = @resource.slug
+          cloned_resource.status = :draft
+          cloned_resource.published_at = nil
         end
       end
 
       # GET /new
-      # Post creation form
+      # Post creation screen
       def new
-        add_breadcrumb I18n.t('integral.navigation.new'), :new_backend_post_path
-        @post = Post.new
-      end
-
-      # POST /
-      # Post creation
-      def create
-        @post = Post.new(post_params)
-        @post.user = current_user
-
-        if @post.save
-          respond_successfully(notification_message('creation_success'), edit_backend_post_path(@post.id))
-        else
-          respond_failure(notification_message('creation_failure'), @post, :new)
-        end
-      end
-
-      # GET /:id/edit
-      # Post edit form
-      def edit
-        add_breadcrumb I18n.t('integral.navigation.edit'), :edit_backend_post_path
-      end
-
-      # PUT /:id
-      # Updating a post
-      def update
-        if @post.update(post_params)
-          respond_successfully(notification_message('edit_success'), edit_backend_post_path(@post.id))
-        else
-          respond_failure(notification_message('edit_failure'), @post, :edit)
-        end
-      end
-
-      # DELETE /:id
-      def destroy
-        if @post.destroy
-          respond_successfully(notification_message('delete_success'), backend_posts_path)
-        else
-          flash[:error] = notification_message('delete_failure')
-          redirect_to backend_posts_path
-        end
-      end
-
-      # GET /:id/activities
-      def activities
-        respond_with_activities(:edit_backend_post_url)
-      end
-
-      # GET /:id/activities/:id
-      def activity
-        authorize Version
-
-        add_breadcrumb I18n.t('integral.navigation.activity'), :activities_backend_post_url
-        add_breadcrumb I18n.t('integral.actions.view')
-
-        @activity = PostVersion.find(params[:activity_id]).decorate
+        super
+        @resource.user = current_user
       end
 
       private
 
-      def grid_options
-        default_grid_options = { 'order' => 'updated_at',
-                                 'page' => 1,
-                                 'descending' => true }
-        grid_params = params[:grid].present? ? params[:grid].permit(:descending, :order, :page, :title, :user, :status) : {}
-        grid_params.delete_if { |_k, v| v.empty? }
-        default_grid_options.merge(grid_params)
-      end
-      helper_method :grid_options
-
-      def activity_grid_options
-        default_grid_options = { 'order' => 'date',
-                                 'page' => 1,
-                                 'descending' => true,
-                                 'item_id' => @post.id,
-                                 'object' => 'Integral::Post' }
-        grid_params = params[:grid].present? ? params[:grid].permit(:descending, :order, :page, :user, :action, :object) : {}
-        grid_params.delete_if { |_k, v| v.empty? }
-        default_grid_options.merge(grid_params)
-      end
-      helper_method :activity_grid_options
-
-      def set_post
-        @post = Post.find(params[:id])
-      end
-
-      def post_params
-        permitted_post_params = %i[title slug body description tag_list image_id preview_image_id status lock_version]
+      def resource_params
+        permitted_post_params = %i[title slug body description tag_list image_id preview_image_id status lock_version user_id category_id]
 
         permitted_post_params.concat Integral.additional_post_params
         params.require(:post).permit(*permitted_post_params)
       end
 
-      def set_breadcrumbs
-        add_breadcrumb I18n.t('integral.navigation.dashboard'), :backend_dashboard_path
-        add_breadcrumb I18n.t('integral.navigation.posts'), :backend_posts_path
+      def white_listed_grid_params
+        %i[descending order page user action object title status]
       end
 
-      def notification_message(namespace_type)
-        super('posts', namespace_type)
+      def resource_klass
+        Integral::Post
       end
     end
   end

data/app/controllers/integral/backend/settings_controller.rb

@@ -22,6 +22,10 @@ module Integral
 
       private
 
+      def resource_klass
+        Integral::Settings
+      end
+
       def parsed_value(value)
         return true if value == '_1'
         return false if value == '_0'
@@ -32,7 +36,7 @@ module Integral
       def settings_params
         permitted_settings_params = %i[
           website_title contact_email homepage_id newsletter_api_key newsletter_list_id github_url
-          twitter_url facebook_url youtube_url google_plus_url linkedin_url instagram_url
+          twitter_url facebook_url youtube_url linkedin_url instagram_url
           google_tag_manager_id facebook_app_id twitter_handler main_menu_list_id
         ]
         permitted_settings_params.concat Integral.additional_settings_params
@@ -40,13 +44,8 @@ module Integral
         params[:settings].permit(*permitted_settings_params)
       end
 
-      def set_breadcrumbs
-        add_breadcrumb I18n.t('integral.breadcrumbs.dashboard'), :backend_dashboard_path
-        add_breadcrumb I18n.t('integral.breadcrumbs.settings'), :backend_settings_path
-      end
-
-      def authorize_with_klass
-        authorize Settings
+      def render_default_action_bar?
+        false
       end
     end
   end

data/app/controllers/integral/backend/static_pages_controller.rb

@@ -5,6 +5,20 @@ module Integral
       # GET /
       # Dashboard to show website stats and other useful information
       def dashboard; end
+
+      def resource_klass
+        nil
+      end
+
+      private
+
+      def dataset_at_a_glance
+        ActsAsIntegral.backend_at_a_glance_card_items.map do |item|
+          { scope: item, label: "Total #{item.model_name.human.pluralize}" }
+        end
+      end
+
+      def set_breadcrumbs; end
     end
   end
 end

data/app/controllers/integral/backend/users_controller.rb

@@ -2,42 +2,22 @@ module Integral
   module Backend
     # Users controller
     class UsersController < BaseController
-      before_action :set_user, only: %i[edit update destroy show]
+      before_action :set_resource, except: %i[create new index list account]
+      before_action :authorize_with_klass, except: %i[activities activity show edit update account notifications read_notification]
       before_action :authorize_with_instance, only: %i[show edit update]
-      before_action :authorize_with_klass, only: %i[index new create destroy]
-      before_action -> { set_grid(Integral::Grids::UsersGrid) }, only: [:index]
-
-      # GET /
-      # Lists all users
-      def index
-        respond_to do |format|
-          format.html
-          format.json do
-            render json: { content: render_to_string(partial: 'integral/backend/users/grid', locals: { grid: @grid }) }
-          end
-        end
-      end
-
-      # GET /new
-      # User creation form
-      def new
-        add_breadcrumb I18n.t('integral.navigation.new'), :new_backend_user_path
-        @user = User.new
-      end
 
-      # GET /:id
-      # Show specific user
-      #
-      def show
-        add_breadcrumb @user.name, :backend_user_path
+      # GET /:id/edit
+      # Resource edit screen
+      def edit
+        add_breadcrumb @resource.name, :backend_user_path
+        add_breadcrumb I18n.t('integral.navigation.edit'), "edit_backend_#{controller_name.singularize}_path".to_sym
       end
 
       # GET /account
       # Show specific users account page
-      #
       def account
-        @user = current_user
-        add_breadcrumb @user.name, :backend_account_path
+        @resource = current_user
+        add_breadcrumb @resource.name, :backend_account_path
 
         render :show
       end
@@ -45,85 +25,87 @@ module Integral
       # POST /
       # User creation
       def create
-        @user = User.invite!(user_params, current_user)
+        @resource = User.invite!(resource_params, current_user)
 
-        if @user.errors.present?
-          respond_failure I18n.t('integral.backend.users.notification.creation_failure'), 'new'
+        if @resource.errors.present?
+          respond_failure(notification_message('creation_failure'), 'new')
         else
-          respond_successfully I18n.t('integral.backend.users.notification.creation_success'), backend_user_path(@user)
+          respond_successfully(notification_message('creation_success'), backend_user_path(@resource))
         end
       end
 
-      # GET /:id/edit
-      # User edit form
-      def edit
-        add_breadcrumb @user.name, :backend_user_path
-        add_breadcrumb I18n.t('integral.navigation.edit'), :edit_backend_user_path
-      end
-
       # PUT /:id
       # Updating a user
       def update
-        authorized_user_params = user_params
-        authorized_user_params.delete(:role_ids) unless policy(@user).manager?
+        authorized_user_params = resource_params
+        authorized_user_params.delete(:role_ids) unless policy(current_user).manager?
 
-        if @user.update(authorized_user_params)
-          respond_successfully I18n.t('integral.backend.users.notification.edit_success'), backend_user_path(@user)
+        if @resource.update(authorized_user_params)
+          respond_successfully(notification_message('edit_success'), backend_user_path(@resource))
         else
-          respond_failure I18n.t('integral.backend.users.notification.edit_failure'), 'edit'
+          respond_failure(notification_message('edit_failure'), 'edit')
         end
       end
 
-      # DELETE /:id
-      def destroy
-        @user.destroy
-
-        respond_successfully I18n.t('integral.backend.users.notification.delete_success'), backend_users_path
+      # GET /:id/notifications
+      def notifications
+        load_more_url = notifications_backend_user_url(current_user, page: current_page+1) if current_user.notifications.count > current_page * Notification::Notification.per_page
+        render json: { content: render_to_string(current_user.notifications.recent.page(current_page).decorate, cached: true), load_more_url: load_more_url }
       end
 
-      private
-
-      def grid_options
-        default_grid_options = { 'order' => 'updated_at',
-                                 'page' => 1,
-                                 'descending' => true }
-        grid_params = params[:grid].present? ? params[:grid].permit(:descending, :order, :page, :name) : {}
-        grid_params.delete_if { |_k, v| v.empty? }
-        default_grid_options.merge(grid_params)
+      # PUT /:id/read_notification
+      def read_notification
+        if current_user.notifications.find(params[:notification_id]).read!
+          head :ok
+        else
+          head :unprocessable_entity
+        end
       end
-      helper_method :grid_options
 
-      def respond_successfully(flash_message, redirect_path)
-        flash[:notice] = flash_message
-        redirect_to redirect_path
+      # PUT /:id/block
+      # Block a user
+      def block
+        if @resource.blocked!
+          respond_successfully(notification_message('edit_success'), backend_user_path(@resource))
+        else
+          respond_failure(notification_message('edit_failure'), 'edit')
+        end
       end
 
-      def respond_failure(flash_message, template)
-        flash.now[:error] = flash_message
-        render template
+      # PUT /:id/unblock
+      # Unblock a user
+      def unblock
+        if @resource.active!
+          respond_successfully(notification_message('edit_success'), backend_user_path(@resource))
+        else
+          respond_failure(notification_message('edit_failure'), 'edit')
+        end
       end
 
-      def set_user
-        @user = User.find(params[:id])
-      end
+      private
 
-      def user_params
-        return params.require(:user).permit(:name, :email, :avatar, :locale, role_ids: []) unless params[:user][:password].present?
+      def current_page
+        params[:page].to_i
+      end
 
-        params.require(:user).permit(:name, :email, :avatar, :locale, :password, :password_confirmation, role_ids: [])
+      def white_listed_grid_params
+        %i[descending order page user action object name status]
       end
 
-      def authorize_with_klass
-        authorize User
+      def resource_klass
+        Integral::User
       end
 
-      def authorize_with_instance
-        authorize @user
+      def resource_params
+        unless params[:user][:password].present?
+          return params.require(:user).permit(:name, :email, :avatar, :locale, :notify_me, role_ids: [])
+        end
+
+        params.require(:user).permit(:name, :email, :avatar, :locale, :notify_me, :password, :password_confirmation, role_ids: [])
       end
 
-      def set_breadcrumbs
-        add_breadcrumb I18n.t('integral.navigation.dashboard'), :backend_dashboard_path
-        add_breadcrumb I18n.t('integral.navigation.users'), :backend_users_path
+      def authorize_with_instance
+        authorize @resource
       end
     end
   end

data/app/controllers/integral/blog_controller.rb

@@ -15,5 +15,17 @@ module Integral
     def set_breadcrumbs
       add_breadcrumb I18n.t('integral.breadcrumbs.home'), :root_url
     end
+
+    def page_title
+      return t('.title') unless params[:page].present?
+
+      "Page #{params[:page]} - #{t('.title')}"
+    end
+
+    def page_description
+      return t('.description') unless params[:page].present?
+
+      "Page #{params[:page]} - #{t('.description')}"
+    end
   end
 end

data/app/controllers/integral/categories_controller.rb

@@ -0,0 +1,45 @@
+module Integral
+  # Front end categories controller
+  class CategoriesController < BlogController
+    before_action :find_resource, only: [:show]
+
+    # GET /:id
+    # Presents all posts with particular category
+    def show
+      add_breadcrumb @resource.title, nil
+
+      page_title = params[:page].present? ? "#{@resource.title} - Page #{params[:page]}" : @resource.title
+      page_description = params[:page].present? ? "#{@resource.description} - Page #{params[:page]}" : @resource.description
+
+      @meta_data = {
+        page_title: page_title,
+        page_description: page_description,
+        image: @resource&.image&.url
+      }
+
+      @posts = Integral::Post.published.where(category_id: @resource.id).includes(:image).order('published_at DESC').paginate(page: params[:page]).decorate
+    end
+
+    def url_for(options={})
+      if options.is_a?(Hash) && options.include?(:category_path) && options[:category_path] == true
+        "#{category_path(@resource)}?page=#{options[:page]}"
+      elsif options.is_a?(Hash) && options.empty?
+        category_path(@resource)
+      else
+        super(options)
+      end
+    end
+    helper_method :url_for
+
+    private
+
+    def find_resource
+      @resource = Integral::Category.find(params[:id])
+    end
+
+    def set_breadcrumbs
+      super
+      add_breadcrumb t('integral.breadcrumbs.blog'), :posts_url
+    end
+  end
+end