integral 1.3.0 → 1.4.0

data/app/assets/stylesheets/integral/frontend/share_modal.sass

@@ -1,6 +1,5 @@
 $facebook-color: #3b5998
 $twitter-color: #1da1f2
-$google-plus-color: #dd4b39
 
 #share-modal
   text-align: center
@@ -19,7 +18,3 @@ $google-plus-color: #dd4b39
       background-color: $twitter-color
       &:hover
         background-color: darken($twitter-color, 10%)
-    &.google-plus
-      background-color: $google-plus-color
-      &:hover
-        background-color: darken($google-plus-color, 10%)

data/app/assets/stylesheets/integral/support/gallery.sass

@@ -1,7 +1,15 @@
 .modal--gallery
   padding-top: 3em
+  iframe
+    height: 100%
+    width: 100%
   .content
     visibility: hidden
+    width: 100%
+    height: 100%
+    text-align: center
+    > img
+      max-height: 100%
   .placeholder
     margin: 10em 0
     text-align: center

data/app/assets/stylesheets/integral/support/media-query-indicator.sass

@@ -3,6 +3,8 @@
   * Red: Small Screens
   * Orange: Medium Screens
   * Green: Large and above
+  * Blue: Xlarge Screens
+  * Black: XXlarge and above
   */
 .query-indicator
   display: block
@@ -22,4 +24,8 @@
     background-color: #ffa500
   @include breakpoint(large)
     background-color: #008000
+  @include breakpoint(xlarge)
+    background-color: #1b8ecf
+  @include breakpoint(xxlarge)
+    background-color: #0c1116
 

data/app/controllers/integral/application_controller.rb

@@ -11,13 +11,19 @@ module Integral
     # Search Engine Optimization
     # before_render :load_meta_tags
 
-
     # Override added as workaround for before_render Rails 5 incompatibility
     def render(*args, &block)
       before_render
       super
     end
 
+    helper_method :category_path
+
+    # @return [String] path to category page
+    def category_path(category)
+      "/#{Integral.blog_namespace}/#{category.slug}"
+    end
+
     private
 
     # Actions that should be carried out before rendering

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

@@ -2,9 +2,16 @@ module Integral
   module Backend
     # Activity management
     class ActivitiesController < BaseController
-      before_action :authorize_with_klass
+      before_action :authorize_with_klass, except: [:widget]
       before_action -> { set_grid }
 
+      def widget
+        activities = cast_activities(@grid.assets.limit(10))
+        last_created_at = activities.last.created_at.utc if activities.present?
+
+        render json: { content: render_to_string(partial: 'integral/backend/activities/activity', collection: activities), last_created_at: last_created_at }
+      end
+
       # POST /grid
       # AJAX grid for activities
       # TODO: Could move this grid action into index action and respond different if json request
@@ -44,8 +51,12 @@ module Integral
         authorize Version
       end
 
+      def resource_klass
+        Integral::Version
+      end
+
       def grid_options
-        grid_params = params[:grid].present? ? params[:grid].permit(:descending, :order, :page, :user, :action, :object) : {}
+        grid_params = params[:grid].present? ? params[:grid].permit(:descending, :order, :page, :user, :action, :object, :created_at, :item_id) : {}
         grid_params.delete_if { |_k, v| v.empty? }
         { 'order' => 'date', 'page' => 1, descending: true }.merge(grid_params)
       end

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

@@ -26,9 +26,39 @@ module Integral
       include Pundit
       rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
+      # GET /:id
+      # Show resource
+      def show
+        add_breadcrumb I18n.t('integral.navigation.list'), "list_backend_#{controller_name}_path".to_sym
+        add_breadcrumb I18n.t('integral.actions.view'), "backend_#{controller_name.singularize}_path".to_sym
+      end
+
       # GET /
       # Lists all resources
       def index
+        # TODO: This default behaviour will switch to 'list' action
+
+        respond_to do |format|
+          format.html do
+            set_grid
+          end
+
+          format.json do
+            if params[:gridview].present?
+              set_grid
+              render json: { content: render_to_string(partial: "integral/backend/#{controller_name}/grid", locals: { grid: @grid }) }
+            else
+              respond_to_record_selector
+            end
+          end
+        end
+      end
+
+      # GET /list
+      # Lists all resources
+      def list
+        add_breadcrumb I18n.t('integral.navigation.list'), "new_backend_#{controller_name.singularize}_path".to_sym
+
         respond_to do |format|
           format.html do
             set_grid
@@ -70,6 +100,7 @@ module Integral
       # GET /:id/edit
       # Resource edit screen
       def edit
+        add_breadcrumb I18n.t('integral.actions.view'), "backend_#{controller_name.singularize}_path".to_sym
         add_breadcrumb I18n.t('integral.navigation.edit'), "edit_backend_#{controller_name.singularize}_path".to_sym
       end
 
@@ -86,12 +117,21 @@ module Integral
       # DELETE /:id
       def destroy
         if @resource.destroy
-          respond_successfully(notification_message('delete_success'), send("backend_#{controller_name}_path"))
+          respond_to do |format|
+            format.html { respond_successfully(notification_message('delete_success'), send("backend_#{controller_name}_path")) }
+            format.js { head :no_content }
+          end
         else
-          error_message = @resource.errors.full_messages.to_sentence
-          flash[:error] = "#{notification_message('delete_failure')} - #{error_message}"
+          respond_to do |format|
+            format.html do
+              error_message = @resource.errors.full_messages.to_sentence
+              flash[:error] = "#{notification_message('delete_failure')} - #{error_message}"
+
+              redirect_to send("backend_#{controller_name}_path")
+            end
+            format.js { head :unprocessable_entity }
+          end
 
-          redirect_to send("backend_#{controller_name}_path")
         end
       end
 
@@ -121,7 +161,7 @@ module Integral
         end
 
         respond_to do |format|
-          format.html
+          format.html { render template: 'integral/backend/activities/shared/index', locals: { form_url: send("activities_backend_#{controller_name.singularize}_url", @resource.id) } }
           format.json { render json: { content: render_to_string(partial: 'integral/backend/activities/shared/grid', locals: { grid: @grid }) } }
         end
       end
@@ -134,6 +174,8 @@ module Integral
         add_breadcrumb I18n.t('integral.actions.view')
 
         @activity = resource_version_klass.find(params[:activity_id]).decorate
+
+        render template: 'integral/backend/activities/shared/show', locals: { record: @resource.decorate }
       end
 
       private
@@ -200,7 +242,8 @@ module Integral
       def notification_message(type_namespace, object_namespace = nil)
         object_namespace = controller_name if object_namespace.nil?
 
-        I18n.t("integral.backend.#{object_namespace}.notification.#{type_namespace}")
+        I18n.t("integral.backend.#{object_namespace}.notification.#{type_namespace}",
+               default: I18n.t("integral.backend.notifications.#{type_namespace}", type: resource_klass.model_name.human))
       end
 
       def set_grid
@@ -209,10 +252,18 @@ module Integral
         end
       end
 
+      helper_method :resource_klass
       def resource_klass
         controller_name.classify.constantize
       end
 
+      helper_method :cast_activities
+      def cast_activities(activites)
+        activites.map do |version|
+          version.becomes(version.item_type.constantize.paper_trail.version_class).decorate
+        end
+      end
+
       def resource_grid_klass
         "Integral::Grids::#{controller_name.classify.pluralize}Grid".constantize
       end
@@ -222,7 +273,9 @@ module Integral
       end
 
       def set_resource
-        @resource = resource_klass.find(params[:id])
+        scope = ['activities', 'activity'].include?(action_name) ? resource_klass.unscoped : resource_klass
+
+        @resource = scope.find(params[:id])
       end
 
       def grid_options

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

@@ -0,0 +1,49 @@
+module Integral
+  module Backend
+    # Categories controller
+    class CategoriesController < BaseController
+      before_action :authorize_with_klass, except: %i[activities activity]
+      before_action :set_resource, except: %i[create new index list]
+
+      # PUT /:id
+      # Updating a resource
+      def update
+        if @resource.update(resource_params)
+          flash.now[:notice] = notification_message('edit_success')
+          render json: { redirect_url: request.referrer }, status: :created
+        else
+          render json: { message: notification_message('edit_failure') }, status: :unprocessable_entity
+        end
+      end
+
+      # GET /:id/edit
+      # Category update screen
+      def edit
+        render json: { content: render_to_string(partial: 'integral/backend/categories/modal', locals: { category: @resource, title: 'Edit Category', modal_id: "modal--category-edit-#{@resource.id}" }) }
+      end
+
+      # POST /
+      # Category creation
+      def create
+        @resource = Integral::Category.new(resource_params)
+
+        if @resource.save
+          flash.now[:notice] = notification_message('creation_success')
+          render json: { redirect_url: request.referrer }, status: :created
+        else
+          render json: { message: notification_message('creation_failure') }, status: :unprocessable_entity
+        end
+      end
+
+      private
+
+      def resource_params
+        params.require(:category).permit(:title, :slug, :description, :image_id)
+      end
+
+      def resource_klass
+        Integral::Category
+      end
+    end
+  end
+end

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

@@ -2,8 +2,8 @@ module Integral
   module Backend
     # Pages controller
     class PagesController < BaseController
-      before_action :authorize_with_klass, only: %i[index new create edit update destroy]
-      before_action :set_resource, only: %i[edit update destroy show activities activity duplicate]
+      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
@@ -17,10 +17,15 @@ module Integral
       # @return [BasePolicy] current authorization policy
       def current_policy
         return policy(@page) if @page
+
         policy(Integral::Page.new)
       end
       helper_method :current_policy
 
+      # GET /
+      # Page dashboard screen
+      def index; end
+
       private
 
       def resource_params

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

@@ -2,8 +2,8 @@ module Integral
   module Backend
     # Post management
     class PostsController < BaseController
-      before_action :authorize_with_klass, only: %i[index new create edit update destroy]
-      before_action :set_resource, only: %i[edit update destroy show activities activity duplicate]
+      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
@@ -14,6 +14,7 @@ module Integral
           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
 
@@ -24,10 +25,14 @@ module Integral
         @resource.user = current_user
       end
 
+      # GET /
+      # Post dashboard screen
+      def index; end
+
       private
 
       def resource_params
-        permitted_post_params = %i[title slug body description tag_list image_id preview_image_id status lock_version user_id]
+        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)

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

@@ -6,6 +6,10 @@ module Integral
       # Dashboard to show website stats and other useful information
       def dashboard; end
 
+      def resource_klass
+        nil
+      end
+
       private
 
       def set_breadcrumbs; end

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

@@ -2,9 +2,9 @@ module Integral
   module Backend
     # Users controller
     class UsersController < BaseController
-      before_action :set_resource, only: %i[edit update destroy show activities activity]
+      before_action :set_resource, except: %i[create new index list]
+      before_action :authorize_with_klass, except: %i[activities activity show edit update]
       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 }, only: [:index]
 
       # GET /
@@ -48,9 +48,9 @@ module Integral
         @resource = User.invite!(resource_params, current_user)
 
         if @resource.errors.present?
-          respond_failure I18n.t('integral.backend.users.notification.creation_failure'), 'new'
+          respond_failure(notification_message('creation_failure'), 'new')
         else
-          respond_successfully I18n.t('integral.backend.users.notification.creation_success'), backend_user_path(@resource)
+          respond_successfully(notification_message('creation_success'), backend_user_path(@resource))
         end
       end
 
@@ -61,20 +61,26 @@ module Integral
         authorized_user_params.delete(:role_ids) unless policy(current_user).manager?
 
         if @resource.update(authorized_user_params)
-          respond_successfully I18n.t('integral.backend.users.notification.edit_success'), backend_user_path(@resource)
+          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
 
       private
 
+      def white_listed_grid_params
+        %i[descending order page user action object name status]
+      end
+
       def resource_klass
         Integral::User
       end
 
       def resource_params
-        return params.require(:user).permit(:name, :email, :avatar, :locale, role_ids: []) unless params[:user][:password].present?
+        unless params[:user][:password].present?
+          return params.require(:user).permit(:name, :email, :avatar, :locale, role_ids: [])
+        end
 
         params.require(:user).permit(:name, :email, :avatar, :locale, :password, :password_confirmation, role_ids: [])
       end

data/app/controllers/integral/categories_controller.rb

@@ -0,0 +1,31 @@
+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
+
+      @meta_data = {
+        page_title: @resource.title,
+        page_description: @resource.description,
+        image: @resource&.image&.url
+      }
+
+      @posts = Integral::Post.published.where(category_id: @resource.id).paginate(page: params[:page])
+    end
+
+    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

data/app/controllers/integral/pages_controller.rb

@@ -10,7 +10,7 @@ module Integral
       @meta_data = {
         page_title: @page.title,
         page_description: @page.description,
-        open_graph:  {
+        open_graph: {
           image: @page.image&.url(:large)
         }
       }