integral 1.0.1 → 1.5.0

data/app/assets/stylesheets/integral/frontend/modules/vertical-post.scss

@@ -0,0 +1,31 @@
+.post-card {
+  box-shadow: none;
+  &:hover {
+    box-shadow: $card-shadow;
+  }
+  > a {
+    .card-section {
+      padding: 20px;
+      color: $black;
+      font-size: 14px;
+
+      > h3 {
+        margin-bottom: 15px;
+        font-size: 16px;
+      }
+
+      > p {
+        -webkit-line-clamp: 3;
+        display: -webkit-box;
+        overflow: hidden;
+        -webkit-box-orient: vertical;
+      }
+    }
+  }
+
+  &-image {
+    object-fit: cover;
+    height: 185px;
+    width: 100%;
+  }
+}

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
@@ -11,6 +19,10 @@
       font-size: 2em
       margin-bottom: 0.5em
   .main-swiper
+    height: 0
+    margin-bottom: 0
+    .swiper-wrapper
+      height: 100%
     .swiper-button-prev, .swiper-button-next
       position: absolute
       top: 40%
@@ -22,12 +34,16 @@
         font-size: 1.5em
     .swiper-slide
       margin: auto 0
+      text-align: center
+      img
+        max-height: 100%
   .thumb-swiper
     height: 9em
     padding: 0.5em 0
+    margin-bottom: 0
     .swiper-slide
-      width: 12em
-      height: 8em
+      width: 10em
+      height: 6em
       cursor: pointer
       @include breakpoint(small down)
         width: 8em

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

@@ -1,8 +1,10 @@
 /** Indicator used to display to developer what media query is currently active
   *
-  * Red: Small Screens
-  * Orange: Medium Screens
-  * Green: Large and above
+  * Red: Small screens
+  * Orange: Medium screens
+  * Green: Large screens
+  * Blue: Xlarge Screens
+  * Black: XXlarge screens 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,14 +11,21 @@ module Integral
     # Search Engine Optimization
     # before_render :load_meta_tags
 
-    private
-
     # Override added as workaround for before_render Rails 5 incompatibility
-    def render(*args, &blk)
+    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
     def before_render
       load_meta_tags

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

@@ -2,39 +2,36 @@ module Integral
   module Backend
     # Activity management
     class ActivitiesController < BaseController
-      before_action :authorize_with_klass
-      before_action -> { set_grid(Integral::Grids::ActivitiesGrid) }
+      before_action :authorize_with_klass, except: [:widget]
 
-      # POST /grid
-      # AJAX grid for activities
-      # TODO: Could move this grid action into index action and respond different if json request
-      def grid
-        render json: { content: render_to_string(partial: 'integral/backend/activities/grid',
-                                                 locals: { grid: @grid }) }
+      def widget
+        activities = cast_activities(resource_grid.assets.where.not(whodunnit: nil).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
 
       # GET /
       # Lists all activities
-      def index; end
-
-      # TODO: Implement this or some particular versioned one through routes.
-      #
-      # /admin/pages/activity -> All Page activity
-      # /admin/pages/:id/activity -> Specific Page activity
-      #
-      # /admin/posts/activity -> All Page activity
-      # /admin/posts/:id/activity -> Specific Page activity
-      #
-      # etc
-      #
-      # # GET /activity:id
-      # # View an Activity
-      # def show
-      #   @activity = Integral::Version.find(params[:id])
-      # end
+      def index
+        respond_to do |format|
+          format.html
+          format.json do
+            render json: { content: render_to_string(partial: "integral/backend/shared/grid/grid") }
+          end
+        end
+      end
 
       private
 
+      def list_backend_resources_url
+        backend_activities_url
+      end
+
+      def backend_resource_url(resource)
+        resource.url
+      end
+
       def set_breadcrumbs
         add_breadcrumb I18n.t('integral.breadcrumbs.dashboard'), :backend_dashboard_url
         add_breadcrumb I18n.t('integral.breadcrumbs.activity'), :backend_activities_url
@@ -44,12 +41,20 @@ 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
       helper_method :grid_options
+
+      def render_default_action_bar?
+        false
+      end
     end
   end
 end

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

@@ -13,28 +13,126 @@ module Integral
         end
       end
 
-      # Prevent CSRF attacks by raising an exception.
-      protect_from_forgery with: :exception
+      protect_from_forgery with: :exception # Prevent CSRF attacks by raising an exception.
 
-      layout :layout_by_resource
+      layout :layout_by_resource # Set layout
 
       before_action :authenticate_user! # User Auth
       before_action :set_locale # User custom locale
       before_action :set_breadcrumbs # Breadcrumbs
-
-      # Track user activity via paper_trail
-      before_action :set_paper_trail_whodunnit
+      before_action :set_paper_trail_whodunnit # Track user activity via paper_trail
 
       # User authorization
       include Pundit
       rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
-      private
+      # GET /:id
+      # Show resource
+      def show
+        add_breadcrumb I18n.t('integral.navigation.list'), list_backend_resources_url
+        add_breadcrumb I18n.t('integral.actions.view')
+      end
+
+      # GET /
+      # Resource dashboard
+      def index; end
+
+      # GET /list
+      # Lists all resources
+      def list
+        add_breadcrumb I18n.t('integral.navigation.list'), list_backend_resources_url
+
+        respond_to do |format|
+          format.html
+          format.json do
+            if params[:gridview].present?
+              render json: { content: render_to_string(partial: "integral/backend/shared/grid/grid") }
+            else
+              respond_to_record_selector
+            end
+          end
+        end
+      end
+
+      # GET /new
+      # Resource creation screen
+      def new
+        add_breadcrumb I18n.t('integral.navigation.new'), "new_backend_#{controller_name.singularize}_path".to_sym
+        @resource = resource_klass.new
+      end
 
-      def respond_with_activities(breadcrumb_url)
+      # POST /
+      # Resource creation
+      def create
+        add_breadcrumb I18n.t('integral.navigation.create')
+        @resource = resource_klass.new(resource_params)
+
+        yield if block_given?
+
+        if @resource.save
+          respond_successfully(notification_message('creation_success'), edit_backend_resource_url(@resource))
+        else
+          respond_failure(notification_message('creation_failure'), :new)
+        end
+      end
+
+      # GET /:id/edit
+      # Resource edit screen
+      def edit
+        add_breadcrumb I18n.t('integral.actions.view'), backend_resource_url(@resource)
+        add_breadcrumb I18n.t('integral.actions.edit')
+      end
+
+      # PUT /:id
+      # Updating a resource
+      def update
+        if @resource.update(resource_params)
+          respond_successfully(notification_message('edit_success'), send("edit_backend_#{controller_name.singularize}_path", @resource.id))
+        else
+          respond_failure(notification_message('edit_failure'), :edit)
+        end
+      end
+
+      # DELETE /:id
+      def destroy
+        if @resource.destroy
+          respond_to do |format|
+            format.html { respond_successfully(notification_message('delete_success'), send("backend_#{controller_name}_path")) }
+            format.js { head :no_content }
+          end
+        else
+          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
+
+        end
+      end
+
+      # POST /:id/duplicate
+      # Duplicate a resource
+      def duplicate
+        cloned_resource = @resource.dup
+
+        yield cloned_resource if block_given?
+
+        if cloned_resource.save
+          respond_successfully(notification_message('clone_success'), send("edit_backend_#{controller_name.singularize}_path", cloned_resource.id))
+        else
+          respond_failure(notification_message('clone_failure'), :edit)
+        end
+      end
+
+      # GET /:id/activities
+      def activities
         authorize Version
 
-        add_breadcrumb I18n.t('integral.navigation.edit'), breadcrumb_url
+        add_breadcrumb I18n.t('integral.actions.view'), backend_resource_url(@resource)
         add_breadcrumb I18n.t('integral.navigation.activity')
 
         @grid = Integral::Grids::ActivitiesGrid.new(activity_grid_options.except('page')) do |scope|
@@ -42,11 +140,32 @@ module Integral
         end
 
         respond_to do |format|
-          format.html
+          format.html { render template: 'integral/backend/activities/shared/index', locals: { form_url: activities_backend_resource_url(@resource) } }
           format.json { render json: { content: render_to_string(partial: 'integral/backend/activities/shared/grid', locals: { grid: @grid }) } }
         end
       end
 
+      # GET /:id/activities/:id
+      def activity
+        authorize Version
+
+        add_breadcrumb I18n.t('integral.navigation.activity'), activities_backend_resource_url(@resource)
+        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
+
+      # Redirect user to integral dashboard after successful signup
+      def after_accept_path_for(user)
+        user.active!
+
+        integral.backend_dashboard_path
+      end
+
       # Redirect user to integral dashboard after successful login
       def after_sign_in_path_for(_resource)
         integral.backend_dashboard_path
@@ -77,31 +196,28 @@ module Integral
         I18n.locale = current_user.locale if current_user.present?
       end
 
-      def respond_to_record_selector(klass)
-        records = klass.search(params[:search]).order('updated_at DESC').paginate(page: params[:page])
+      def respond_to_record_selector
+        records = resource_klass.search(params[:search]).order('updated_at DESC').paginate(page: params[:page])
         render json: { content: render_to_string(partial: 'integral/backend/shared/record_selector/collection', locals: { collection: records }) }
       end
 
-      # def respond_to_record_selector_item(record)
-      #   render json: {
-      #     html: render_to_string('integral/backend/shared/record_selector/record',
-      #                            layout: false,
-      #                            locals: { :list_item => record.to_list_item }) }
-      # end
-
       def respond_successfully(flash_message, redirect_path)
         flash[:notice] = flash_message
         redirect_to redirect_path
       end
 
-      def respond_failure(message, record, template)
+      def respond_failure(message, template, record = nil)
+        record = @resource if record.nil?
+
         error_message = record.errors.full_messages.to_sentence
         flash.now[:error] = "#{message} - #{error_message}"
         render template, status: :unprocessable_entity
       end
 
-      # Abstract method. Override if providing breadcrumbs
-      def set_breadcrumbs; end
+      def set_breadcrumbs
+        add_breadcrumb I18n.t('integral.navigation.dashboard'), :backend_dashboard_path
+        add_breadcrumb I18n.t("integral.navigation.#{controller_name}"), "backend_#{controller_name}_path".to_sym
+      end
 
       def stale_record_recovery_action
         flash.now[:error] = 'Overwrite prevented. Another user has changed this record ' \
@@ -109,15 +225,138 @@ module Integral
         render :edit, status: :conflict
       end
 
-      def notification_message(object_namespace, type_namespace)
-        I18n.t("integral.backend.#{object_namespace}.notification.#{type_namespace}")
+      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}",
+               default: I18n.t("integral.backend.notifications.#{type_namespace}", type: resource_klass.model_name.human))
+      end
+
+      helper_method :decorated_resource
+      def decorated_resource
+        @decorated_resource ||= @resource.decorate
       end
 
-      def set_grid(grid_klass)
-        @grid = grid_klass.new(grid_options.except('page')) do |scope|
+      helper_method :resource_grid
+      def resource_grid
+        @resource_grid ||= resource_grid_klass.new(grid_options.except('page')) do |scope|
           scope.page(grid_options['page']).per_page(25)
         end
       end
+
+      helper_method :resource_grid_columns
+      def resource_grid_columns
+        []
+      end
+
+      helper_method :render_default_action_bar?
+      def render_default_action_bar?
+        action_name == 'index' || action_name == 'show'
+      end
+
+      helper_method :new_backend_resource_url
+      def new_backend_resource_url
+        send("new_backend_#{resource_klass.model_name.singular_route_key}_url")
+      end
+
+      helper_method :list_backend_resources_url
+      def list_backend_resources_url
+        send("list_backend_#{resource_klass.model_name.route_key}_url")
+      end
+
+      helper_method :activities_backend_resource_url
+      def activities_backend_resource_url(resource)
+        send("activities_backend_#{controller_name.singularize}_url", resource.id)
+      end
+
+      helper_method :backend_resource_url
+      def backend_resource_url(resource)
+        send("backend_#{resource_klass.model_name.singular_route_key}_url", resource)
+      end
+
+      helper_method :edit_backend_resource_url
+      def edit_backend_resource_url(resource)
+        send("edit_backend_#{resource_klass.model_name.singular_route_key}_url", resource)
+      end
+
+      helper_method :duplicate_backend_resource_url
+      def duplicate_backend_resource_url(resource)
+        send("duplicate_backend_#{resource_klass.model_name.singular_route_key}_url", resource)
+      end
+
+      helper_method :activities_backend_resource_url
+      def activities_backend_resource_url(resource)
+        send("activities_backend_#{resource_klass.model_name.singular_route_key}_url", resource)
+      end
+
+      helper_method :resource_klass
+      def resource_klass
+        controller_name.classify.constantize
+      end
+
+      helper_method :dataset_at_a_glance
+      def dataset_at_a_glance
+        if resource_klass.respond_to?(:statuses)
+          resource_klass.statuses.keys.map do |status|
+            { scope: resource_klass.send(status), label: t("integral.statuses.#{status}") }
+          end
+        else
+          [
+            { scope: resource_klass.all, label: "All #{resource_klass.model_name.human.pluralize}" }
+          ]
+        end
+      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
+
+      def resource_version_klass
+        "#{resource_klass}Version".constantize
+      end
+
+      def set_resource
+        scope = ['activities', 'activity'].include?(action_name) ? resource_klass.unscoped : resource_klass
+
+        @resource = scope.find(params[:id])
+      end
+
+      def grid_options
+        default_grid_options = { 'order' => 'updated_at',
+                                 'page' => 1,
+                                 'descending' => true }
+        grid_params = params[:grid].present? ? params[:grid].permit(*white_listed_grid_params) : {}
+        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' => @resource.id,
+                                 'object' => resource_klass.to_s }
+        grid_params = params[:grid].present? ? params[:grid].permit(*white_listed_grid_params) : {}
+        grid_params.delete_if { |_k, v| v.empty? }
+        default_grid_options.merge(grid_params)
+      end
+      helper_method :activity_grid_options
+
+      def white_listed_grid_params
+        raise NotImplementedError, 'Specify the accepted grid parameters'
+      end
+
+      def authorize_with_klass
+        authorize resource_klass
+      end
     end
   end
 end