cm-admin 0.5.4 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 590c14bc3ee438f00943ac40316aaf1e0850639a5eda8da1d4c73dec80b11963
-  data.tar.gz: df5b1269f85267cc86e123c15b950e50292396771cb83cc10dc27bb3337d7416
+  metadata.gz: 4005c7711af2f931298a2054cd527de1a67a92a42deaecd8fb71b37fbcdc5fb2
+  data.tar.gz: 8fa616289069247a2418896b7ac2cb4f6ca5ec1dfc121d5a06cececb9c3a5242
 SHA512:
-  metadata.gz: 1b530f87e1a584d25e43684491ddee0156d7544bcb31f13c8b4d53aedff611ff0ffae7fc4ea9898d5186f4a3453463d7d77b7ecf4f39bee8020fcb4c753f6e76
-  data.tar.gz: ec22d42e7c47f2755642a902821db15616378361b661b0a609d22fe5b678527ae6ddddf62d902ba0aa55fc647eb215bb4704df046f5b7bbf5625c1b7ffceaa2f
+  metadata.gz: 82d898a13ff420a9c3e7b9df6f9daca9174df4bc3587c879cac1817cdbdcb5e812562f81a7e5ed8716729da466da5240037e3d7bca36900d5efb355859c4ca1a
+  data.tar.gz: 29a54f03bb2aaa0cec4aa0fecaef373376e94a4e6e47e67219245ae257f2f2774ad388e9a4b8b9510a23d45f130fc9a6703128403b512256525d2197dae292a0

data/app/assets/stylesheets/cm_admin/base/table.scss

@@ -5,6 +5,13 @@
     background-color: $white;
     overflow: auto;
 
+    .sticky-container {
+      z-index: 4;
+      .cm-filters-v2 {
+        padding: 16px 24px 36px 24px;
+      }
+    }
+
     &__filters {
       // If you want to overwrite filters styles ---> add styles here
     }
@@ -65,10 +72,12 @@
       }
     }
 
+
     .new-admin-table {
       overflow: auto;
       margin-top: 40px;
       margin-bottom: 50px;
+      height: 280px;
       .cm-table {
         table-layout: fixed;
         position: relative;
@@ -79,8 +88,8 @@
         &__header {
           .header-row {
             display: block;
-            position: relative;
             width: 100%;
+            position: relative;
             box-shadow: inset 0px -1px 0px rgba(148, 151, 155, 0.15);
             th {
               @include font($size: $t6-text, $color: $ink-lighter-clr, $weight: bold);
@@ -89,10 +98,22 @@
               max-width: 200px;
               padding: 12px 16px 12px 16px;
             }
+            th:nth-child(2){
+              position: sticky;
+              left: 38px;
+              z-index: 2;
+              background-color: #fff;
+              border-bottom: 1.21px solid rgb(240, 239, 239);
+            }
             .check-box-space {
+              position: sticky;
+              left: 0;
               min-width: fit-content;
               max-width: fit-content;
               padding: 12px 8px 12px 16px;
+              z-index: 2;
+              background-color: #fff;
+              border-bottom: 1.21px solid rgb(240, 239, 239);
               span {
                 vertical-align: text-top;
               }
@@ -100,24 +121,47 @@
           }
         }
         &__body {
+          // display: block;
+          // overflow: auto;
+          // overflow-x: hidden;
+          // position: relative;
+          // width: 100%;
+          // height: 335px;
           display: block;
           position: relative;
-          width: 100%;        .body-row {
-            box-shadow: inset 0px -1px 0px rgba(148, 151, 155, 0.15);
-            transition: all .2s linear;
+          width: 100%;        
+          .body-row {
+            border-bottom: 1.21px solid rgb(240, 239, 239);
+            td:nth-child(2){
+              position: sticky;
+              left: 38px;
+              z-index: 2;
+              background-color: #fff;
+            }
+            
             &:nth-last-child(1) {
               box-shadow: none;
             }
             &:hover {
               background-color: $grey-lighter-clr;
+              td:nth-child(1) {
+                background-color: $grey-lighter-clr;
+              }
+              td:nth-child(2) {
+                background-color: $grey-lighter-clr;
+              }
               .row-action-cell {
                 opacity: 1;
               }
             }
             .check-box-space {
+              position: sticky;
+              left: 0;
               min-width: fit-content;
               max-width: fit-content;
               padding: 16px 8px 16px 16px;
+              z-index: 2;
+              background-color: #fff;
               span {
                 vertical-align: text-top;
               }
@@ -145,6 +189,17 @@
                 align-items: center;
                 justify-content: center;
                 height: 100%;
+                .popup-card {
+                  width:fit-content;
+                  .popup-option {
+                    a {
+                      font-weight: 500;
+                      font-size: 14px;
+                      line-height: 22px;
+                      color: #1D2129;
+                    }
+                  }
+                }
                 .tool-btn {
                   background-color: transparent;
                   border: none;
@@ -154,15 +209,20 @@
           }
         }
       }
+      .cm-table > thead {
+        position:sticky;
+        top:0;
+        background-color: #fff;
+        z-index: 3;
+      }
     }
 
     .admin-table-index {
-
       position: fixed;
       width: calc(100% - 285px);
       left: 245px;
       background-color: #fff;
-      z-index: 1;
+      z-index: 4;
       .table-sticky-top {
         position: sticky;
         top: 254px;
@@ -172,6 +232,8 @@
         justify-content: space-between;
         align-items: center;
         padding-bottom: 16px;
+        margin-top: -20px;
+        background-color: #fff;
         &__total-count {
           font-size: $t4-text;
           line-height: 22px;

data/app/assets/stylesheets/cm_admin/components/_drawer.scss

@@ -0,0 +1,90 @@
+@import "../helpers/index.scss";
+
+.cm-drawer {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 5;
+  background-color: rgba(0, 0, 0, .7);
+  &__container {
+    position: relative;
+    width: 360px;
+    height: 100%;
+    background: $white;
+    box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.16);
+    .header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 24px;
+      background: #F8F9FA;
+      &__lhs {
+        .title {
+          font-family: $primary-font;
+          font-size: $t1-text;
+          font-weight: 600;
+          line-height: 28px;
+          color: $primary-text-clr;
+          margin-bottom: 8px;
+        }
+        .description {
+          font-family: $primary-font;
+          font-size: $t4-text;
+          line-height: 22px;
+          color: $primary-text-clr;
+          margin-bottom: 0;
+        }
+      }
+      &__rhs {
+        color: $ink-lighter-clr;
+      }
+    }
+    .body {
+      padding: 24px;
+      .info-text {
+        font-family: $primary-font;
+        font-size: $t4-text;
+        line-height: 22px;
+        color: $primary-text-clr;
+      }
+    }
+  }
+}
+
+.drawer-slide-in {
+  animation: slideInLeft .3s ease-in forwards;
+}
+
+.drawer-slide-out {
+  animation: slideOutLeft .3s ease-in forwards;
+}
+
+@keyframes slideInLeft {
+  0% {
+     left: -400px;
+     opacity: 0;
+  }
+  100% {
+      left: 0;
+     opacity: 1;
+  }
+}
+
+@keyframes slideOutLeft {
+  0% {
+     left: 0;
+     opacity: 1;
+  }
+  100% {
+      left: -400px;
+     opacity: 0;
+  }
+}
+
+.drawer {
+  cursor: pointer;
+}

data/app/assets/stylesheets/cm_admin/components/index.scss

@@ -5,3 +5,4 @@
 @import './dropdown-popup';
 @import './range';
 @import './modal';
+@import './drawer';

data/app/javascript/packs/cm_admin/scaffolds.js

@@ -40,4 +40,29 @@ $(document).on('click', '.row-action-cell', function(e) {
   } else {
     return $(this).find('.table-export-popup').addClass('hidden');
   }
+});
+
+
+$(document).on('click', '.drawer-btn', function(e) {
+  e.stopPropagation();
+  drawer_el = $(this).parent().closest('.drawer').find('.cm-drawer')
+  if (drawer_el.hasClass('hidden')) {
+     drawer_el.removeClass('hidden');
+     drawer_container = drawer_el.find('.drawer-container')
+     if (drawer_container.hasClass('drawer-slide-out')) {
+        drawer_container.removeClass('drawer-slide-out');
+     }
+     drawer_container.addClass('drawer-slide-in');
+  } else {
+    return drawer_el.addClass('hidden');
+  }
+});
+
+$(document).on('click', '.drawer-close', function(e) {
+  e.stopPropagation();
+  $('.drawer-container').removeClass('drawer-slide-in');
+  $('.drawer-container').addClass('drawer-slide-out');
+  setTimeout(() => {
+    $('.cm-drawer').addClass('hidden');
+  }, 300);
 });

data/app/views/cm_admin/main/_drawer.html.slim

@@ -0,0 +1,13 @@
+.cm-drawer.hidden
+  .cm-drawer__container#drawer-container
+    .header  
+      .header__lhs 
+        h2.title Review
+        p.description Theresa Webb
+      .header__rhs 
+        i.fa.fa-times.drawer-close.pointer
+    .body 
+      p.info-text
+        | It was really an amazing experience being an Unschooler. Its really different from other e-learning websites in every aspects like certification, providing internship opportunities and many more. I am going to recommend Unschool for sure!
+
+  

data/app/views/cm_admin/main/_table.html.slim

@@ -24,26 +24,32 @@
               input.cm-checkbox type="checkbox"
           - @model.available_fields[:index].each_with_index do |column, index|
             td.text-ellipsis
-              span class="#{column.cm_css_class}"
+              span class="#{column.field_type.to_s} #{column.cm_css_class} "
                 - if index == 0
                   = link_to ar_object.send(column.field_name), "/cm_admin/#{ar_object.model_name.collection}/#{ar_object.id}"
                 - else
                   = show_field_value(ar_object, column)
-          td.row-action-cell
-            .row-action-tool
-              button.secondary-btn.tool-btn type="button"
-                span
-                  i.fa.fa-bars.bolder
-                span
-                  i.fa.fa-angle-down
-              .popup-card.table-export-popup.hidden
-                .popup-option
-                  a href="#{page_url('edit', ar_object)}"
-                    | Edit
-                - @model.available_actions.select{|act| act if act.route_type == 'member'}.each do |custom_action|
-                  - if custom_action.display_if.call(ar_object)
-                    .popup-option
-                      = link_to custom_action.name, custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb
+                  - if column.field_type == :drawer
+                    = render partial: column.drawer_partial, locals: { ar_object: ar_object}
+
+          - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
+          - custom_actions = @model.available_actions.select{|act| act if act.route_type == 'member' && [:button, :modal].include?(act.display_type)}
+          - if custom_actions.any? || edit_action.any?
+            td.row-action-cell
+              .row-action-tool
+                button.secondary-btn.tool-btn type="button"
+                  span
+                    i.fa.fa-bars.bolder
+                  span
+                    i.fa.fa-angle-down
+                .popup-card.table-export-popup.hidden
+                  - if edit_action.any?
+                    = link_to "#{page_url('edit', ar_object)}" do
+                      .popup-option Edit
+                  - custom_actions.each do |custom_action|
+                    - if custom_action.display_if.call(ar_object)
+                      = link_to custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
+                        .popup-option = custom_action.name.titleize
 
 .cm-pagination
   .cm-pagination__lhs Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}

data/app/views/cm_admin/main/_top_navbar.html.slim

@@ -20,9 +20,9 @@
             li
               .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'
                 span Export
-
-      a.primary-btn.ml-2 href="#{page_url('new')}"
-        | Add
+      - new_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('new')}
+      - if new_action.any?
+        = link_to 'Add', "#{page_url('new')}", class: 'primary-btn ml-2'
       - @model.available_actions.select{|act| act if act.route_type == 'collection'}.each do |custom_action|
         - if custom_action.display_type == :button
           = link_to custom_action.name.titleize, @model.ar_model.table_name + '/' + custom_action.path, class: 'primary-btn ml-2', method: custom_action.verb
@@ -37,5 +37,4 @@
 
       - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
       - if edit_action.any?
-        a.primary-btn.ml-2 href="#{page_url('edit', @ar_object)}"
-          = "Edit #{@model.name}"
+        = link_to "Edit #{@model.name}", "#{page_url('edit', @ar_object)}", class: 'primary-btn ml-2'

data/app/views/cm_admin/main/associated_index.html.slim

@@ -1,6 +1,6 @@
 .cm-index-page
 	.index-page
-		.index-page__table-container.pt-0
+		.index-page__table-container
 			== render partial: 'cm_admin/main/associated_table'
 
 		// = column_pop_up(@associated_model)

data/app/views/cm_admin/main/index.html.slim

@@ -10,3 +10,4 @@
 
     = column_pop_up(@model)
     = manage_column_pop_up(@model)
+

data/lib/cm_admin/model.rb

@@ -21,7 +21,8 @@ module CmAdmin
     include Models::Blocks
     include Models::DslMethod
     include Models::ControllerMethod
-    attr_accessor :available_actions, :actions_set, :available_fields, :permitted_fields, :current_action, :params, :filters, :available_tabs
+    attr_accessor :available_actions, :actions_set, :available_fields, :permitted_fields,
+      :current_action, :params, :filters, :available_tabs, :icon_name
     attr_reader :name, :ar_model, :is_visible_on_sidebar
 
     # Class variable for storing all actions
@@ -32,6 +33,7 @@ module CmAdmin
       @name = entity.name
       @ar_model = entity
       @is_visible_on_sidebar = true
+      @icon_name = 'fa fa-th-large'
       @available_actions ||= []
       @current_action = nil
       @available_tabs ||= []
@@ -59,7 +61,7 @@ module CmAdmin
       current_action = CmAdmin::Models::Action.find_by(self, name: action_name.to_s)
       if current_action
         @current_action = current_action
-        @ar_object = @ar_model.find(params[:id])
+        @ar_object = @ar_model.name.classify.constantize.find(params[:id])
         if @current_action.child_records
           child_records = @ar_object.send(@current_action.child_records)
           @associated_model = CmAdmin::Model.find_by(name: @ar_model.reflect_on_association(@current_action.child_records).klass.name)
@@ -90,6 +92,10 @@ module CmAdmin
       @is_visible_on_sidebar = visible_option
     end
 
+    def set_icon(name)
+      @icon_name = name
+    end
+
 
     private
 

data/lib/cm_admin/models/action.rb

@@ -6,7 +6,9 @@ module CmAdmin
       include Actions::Blocks
       attr_accessor :name, :verb, :layout_type, :layout, :partial, :path, :page_title, :page_description,
         :child_records, :is_nested_field, :nested_table_name, :parent, :display_if, :route_type, :code_block,
-        :display_type, :action_type, :redirection_url
+        :display_type, :action_type, :redirection_url, :sort_direction, :sort_column
+
+      VALID_SORT_DIRECTION = Set[:asc, :desc].freeze
 
       def initialize(attributes = {}, &block)
         if attributes[:layout_type].present? && attributes[:layout].nil? && attributes[:partial].nil?
@@ -30,6 +32,8 @@ module CmAdmin
         self.display_if = lambda { |arg| return true }
         self.display_type = :button
         self.action_type = :default
+        self.sort_column = :created_at
+        self.sort_direction = :desc
       end
 
       class << self

data/lib/cm_admin/models/cm_show_section.rb

@@ -7,12 +7,10 @@ module CmAdmin
       def initialize(section_name, &block)
         @available_section_fields = []
         @section_name = section_name
-        puts "-- reached here --"
         instance_eval(&block)
       end
 
       def field(field_name, options={})
-        puts "For printing field #{field_name}"
         @available_section_fields << CmAdmin::Models::Field.new(field_name, options)
       end
     end

data/lib/cm_admin/models/column.rb

@@ -2,7 +2,7 @@ module CmAdmin
   module Models
     class Column
       attr_accessor :field_name, :field_type, :header, :format, :prefix, :suffix, :exportable, :round,
-      :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable
+      :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable, :drawer_partial
 
       def initialize(field_name, attributes = {})
         @field_name = field_name

data/lib/cm_admin/models/controller_method.rb

@@ -7,23 +7,23 @@ module CmAdmin
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
         @ar_object = @ar_model.find(params[:id])
       end
-  
+
       def index(params)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'index')
         # Based on the params the filter and pagination object to be set
         @ar_object = filter_by(params, nil, filter_params(params))
       end
-  
+
       def new(params)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'new')
         @ar_object = @ar_model.new
       end
-  
+
       def edit(params)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'edit')
         @ar_object = @ar_model.find(params[:id])
       end
-  
+
       def update(params)
         @ar_object = @ar_model.find(params[:id])
         @ar_object.assign_attributes(resource_params(params))
@@ -41,6 +41,8 @@ module CmAdmin
         sort_direction = %w[asc desc].include?(sort_params[:sort_direction]) ? sort_params[:sort_direction] : "asc"
         sort_params = {sort_column: sort_column, sort_direction: sort_direction}
         records = self.name.constantize.where(nil) if records.nil?
+        records = records.order("#{current_action.sort_column} #{current_action.sort_direction}")
+
         final_data = CmAdmin::Models::Filter.filtered_data(filter_params, records, @filters)
         pagy, records = pagy(final_data)
         filtered_result.data = records
@@ -50,7 +52,7 @@ module CmAdmin
         # filtered_result.facets.sort = sort_params
         return filtered_result
       end
-  
+
       def resource_params(params)
         permittable_fields = @permitted_fields || @ar_model.columns.map(&:name).reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym)
         permittable_fields += @ar_model.reflect_on_all_attachments.map {|x|
@@ -62,15 +64,16 @@ module CmAdmin
         }.compact
         nested_tables = self.available_fields[:new].except(:fields).keys
         nested_tables += self.available_fields[:edit].except(:fields).keys
-        nested_fields = nested_tables.map {|table|
+        nested_fields = nested_tables.uniq.map {|table|
           Hash[
             table.to_s + '_attributes',
             table.to_s.classify.constantize.columns.map(&:name).reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym) + [:id, :_destroy]
           ]
         }
         permittable_fields += nested_fields
+        @ar_model.columns.map { |col| permittable_fields << col.name.split('_cents') if col.name.include?('_cents') }
         params.require(self.name.underscore.to_sym).permit(*permittable_fields)
       end
     end
   end
-end
+end

data/lib/cm_admin/models/dsl_method.rb

@@ -24,14 +24,14 @@ module CmAdmin
         @current_action.page_description = page_description
         yield
       end
-  
+
       def cm_edit(page_title: nil,page_description: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'edit')
         @current_action.page_title = page_title
         @current_action.page_description = page_description
         yield
       end
-  
+
       def cm_new(page_title: nil,page_description: nil,&block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'new')
         @current_action.page_title = page_title
@@ -44,13 +44,13 @@ module CmAdmin
           @current_action.page_title = title
         end
       end
-  
+
       def page_description(description)
         if @current_action
           @current_action.page_description = description
         end
       end
-  
+
       def tab(tab_name, custom_action, associated_model: nil, layout_type: nil, layout: nil, partial: nil, &block)
         if custom_action.to_s == ''
           @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
@@ -65,12 +65,12 @@ module CmAdmin
         end
         yield if block
       end
-  
+
       def cm_show_section(section_name, &block)
         @available_fields[@current_action.name.to_sym] ||= []
         @available_fields[@current_action.name.to_sym] << CmAdmin::Models::CmShowSection.new(section_name, &block)
       end
-  
+
       def form_field(field_name, options={}, arg=nil)
         unless @current_action.is_nested_field
           @available_fields[@current_action.name.to_sym][:fields] << CmAdmin::Models::FormField.new(field_name, options[:input_type], options)
@@ -79,23 +79,24 @@ module CmAdmin
           @available_fields[@current_action.name.to_sym][@current_action.nested_table_name] << CmAdmin::Models::FormField.new(field_name, options[:input_type], options)
         end
       end
-  
+
       def nested_form_field(field_name, &block)
         @current_action.is_nested_field = true
         @current_action.nested_table_name = field_name
         yield
       end
-  
+
       def column(field_name, options={})
         @available_fields[@current_action.name.to_sym] ||= []
         if @available_fields[@current_action.name.to_sym].select{|x| x.lockable}.size > 0 && options[:lockable]
           raise "Only one column can be locked in a table."
         end
+
         unless @available_fields[@current_action.name.to_sym].map{|x| x.field_name.to_sym}.include?(field_name)
           @available_fields[@current_action.name.to_sym] << CmAdmin::Models::Column.new(field_name, options)
         end
       end
-  
+
       def all_db_columns(options={})
         field_names = self.instance_variable_get(:@ar_model)&.columns&.map{|x| x.name.to_sym}
         if options.include?(:exclude) && field_names
@@ -130,6 +131,24 @@ module CmAdmin
       def filter(db_column_name, filter_type, options={})
         @filters << CmAdmin::Models::Filter.new(db_column_name: db_column_name, filter_type: filter_type, options: options)
       end
+
+      def sort_direction(direction = :desc)
+        raise ArgumentError, "Select a valid sort direction like #{CmAdmin::Models::Action::VALID_SORT_DIRECTION.join(' or ')} instead of #{direction}" unless CmAdmin::Models::Action::VALID_SORT_DIRECTION.include?(direction.to_sym.downcase)
+
+        @current_action.sort_direction = direction.to_sym if @current_action
+      end
+
+      def sort_column(column = :created_at)
+        model = if @current_action.child_records
+          CmAdmin::Model.find_by(name: @current_action.child_records.to_s.classify)
+        else
+          self
+        end
+        db_columns = model.instance_variable_get(:@ar_model)&.columns&.map{|x| x.name.to_sym}
+        raise "Sorting for custom column #{column} does not exist." unless db_columns.include?(column.to_sym)
+
+        @current_action.sort_column = column.to_sym if @current_action
+      end
     end
   end
-end
+end

data/lib/cm_admin/models/form_field.rb

@@ -15,6 +15,7 @@ module CmAdmin
 
       def set_default_values
         self.disabled = false
+        self.label = self.field_name.to_s.titleize
       end
     end
   end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.5.4"
+  VERSION = "0.5.7"
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -43,10 +43,15 @@ module CmAdmin
             ar_object.send(field.field_name).to_s.titleize
           when :tag
             content_tag :span, class: "status-tag default-#{ar_object.send(field.field_name.to_s + '_before_type_cast')}" do
-              ar_object.send(field.field_name).to_s.titleize
+              ar_object.send(field.field_name).to_s.upcase
             end
           when :attachment
             concat show_attachment_value(ar_object, field)
+          when :drawer
+            content_tag :span do
+              concat content_tag(:span, truncate(ar_object.send(field.field_name).to_s, length: 25))
+              concat content_tag(:a, " View", class: "drawer-btn")
+            end
           end
         end
       end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -44,10 +44,10 @@ module CmAdmin
                 if field.input_type.eql?(:hidden)
                   concat input_field_for_column(f, field)
                 else
-                  concat f.label field.field_name, class: 'field-label'
+                  concat f.label field.label, class: 'field-label'
                   concat tag.br
                   concat(content_tag(:div, class: "datetime-wrapper") do
-                    concat input_field_for_column(f, field)  
+                    concat input_field_for_column(f, field)
                   end)
                   concat tag.p resource.errors[field.field_name].first if resource.errors[field.field_name].present?
                 end

data/lib/cm_admin/view_helpers/navigation_helper.rb

@@ -11,16 +11,16 @@ module CmAdmin
               content_tag(:a, href: path) do
                 content_tag(:div, class: 'menu-item') do
                   content_tag(:span, class: 'menu-icon') do
-                    concat tag.i class: 'fa fa-th-large'
+                    concat tag.i class: "#{model.icon_name}"
                   end +
-                  model.name
+                  model.name.pluralize
                 end
               end
             elsif navigation_type == "quick_links"
               content_tag(:a, href: path, class: 'visible') do
                 content_tag(:div, class: 'result-item') do
                   content_tag(:span) do
-                    concat tag.i class: 'fa fa-th-large'
+                    concat tag.i class: "#{model.icon_name}"
                   end +
                   content_tag(:span) do
                     model.name

data/tmp/cache/webpacker/last-compilation-digest-development

@@ -1 +1 @@
-33d3c35c58c8db0310c4cb3ec7ff742813910e07
+07d558738c316293586496817b2bccbf6430b5bd

data/yarn.lock

@@ -2941,9 +2941,9 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
-  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -6589,9 +6589,9 @@ urix@^0.1.0:
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse@^1.4.3, url-parse@^1.5.1:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
-  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.7
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -116,6 +116,7 @@ files:
 - app/assets/stylesheets/cm_admin/cm_admin.css.scss
 - app/assets/stylesheets/cm_admin/components/_alerts.scss
 - app/assets/stylesheets/cm_admin/components/_buttons.scss
+- app/assets/stylesheets/cm_admin/components/_drawer.scss
 - app/assets/stylesheets/cm_admin/components/_dropdown-popup.scss
 - app/assets/stylesheets/cm_admin/components/_input.scss
 - app/assets/stylesheets/cm_admin/components/_modal.scss
@@ -139,6 +140,7 @@ files:
 - app/javascript/stylesheets/cm_admin/application.scss
 - app/views/cm_admin/main/_associated_table.html.slim
 - app/views/cm_admin/main/_cm_pagy_nav.html.slim
+- app/views/cm_admin/main/_drawer.html.slim
 - app/views/cm_admin/main/_filters.html.slim
 - app/views/cm_admin/main/_nested_fields.html.slim
 - app/views/cm_admin/main/_nested_table_form.html.slim
@@ -228,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: This is an admin panel gem