cm-admin 1.1.8 → 1.1.9

data/app/assets/stylesheets/cm_admin/pages/import_page.scss

@@ -25,7 +25,7 @@
       line-height: 22px;
       margin-bottom: 0;
     }
-  }   
+  }
   &__body {
     padding: 16px 24px;
     .body-title {
@@ -63,9 +63,6 @@
 
     .actions-wrapper {
       margin-top: 32px;
-      button {
-        padding: 5px 10px;
-      }
     }
 
     //form UI
@@ -90,7 +87,7 @@
           margin-bottom: 16px;
           text-transform: uppercase;
         }
-        .steps-wrapper  {
+        .steps-wrapper {
           .steps-title {
             @include font($size: size(16), $weight: bold);
             font-family: $primary-font;
@@ -116,10 +113,6 @@
           }
         }
       }
-      .import-btn {
-        padding: 5px 10px;
-      }
     }
-   
   }
-}
+}

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

@@ -5,11 +5,9 @@
 - if custom_actions.any? || edit_action.present? || destroy_action.present?
   td.row-action-cell
     .row-action-tool
-      button.secondary-btn.tool-btn
+      button.btn-ghost.dropdown-toggle
         span
           i.fa.fa-bars.bolder
-        span
-          i.fa.fa-angle-down
       .popup-card.table-export-popup.hidden
         - if edit_action.present?
           = link_to cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object.id) do

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

@@ -8,7 +8,7 @@
       - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first
       - polymorphic_name = (association && association.inverse_of && association.inverse_of.options[:polymorphic]) ? association.inverse_of.name : ''
       a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/new?associated_id=#{@ar_object.id}&associated_class=#{@ar_object.class.name.underscore}&polymorphic_name=#{polymorphic_name}&referrer=#{request.path}"
-        button.secondary-btn.column-btn Add
+        button.btn-secondary Add
     / button.secondary-btn.column-btn data-target="#columnActionModal" data-toggle="modal" type="button"
     /   span
     /     i.fa.fa-columns.bolder

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

@@ -15,7 +15,8 @@
         | Chapter 1
       .field-remove-action
         - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
-          = link_to_remove_association "", f, class: 'fa fa-trash ghost-btn accordion-delete-btn'
+          .accordion-delete-btn
+            = link_to_remove_association "", f, class: 'fa fa-trash btn-ghost'
     div.accordion-collapse.collapse.show[aria-labelledby="headingOne" id="#{assoc_name}-#{f.object.id}"]
       .accordion-body
         - fields.each do |field|

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

@@ -7,4 +7,4 @@
         = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, section: section }
     - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
       .links
-        = link_to_add_association "+ Add #{assoc_name.to_s.titleize}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, section: section }}, class: 'd-inline-block secondary-btn mt-2'
+        = link_to_add_association "+ Add #{assoc_name.to_s.titleize}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: assoc_name, section: section }}, class: 'd-inline-block btn-secondary mt-2'

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

@@ -1,4 +1,4 @@
-ul.nav.nav-pills
+ul.tabs
   - @model.available_tabs.each do |nav_item|
     - if nav_item.display_if.call(@ar_object)
       - if nav_item.custom_action.empty? || (nav_item.custom_action.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{nav_item.custom_action}?"))

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

@@ -1,33 +1,27 @@
-.cm-navbar
-  .cm-navbar__lhs
+.entity-header
+  .entity-header__info
     - if cm_admin.method_defined?(:"#{@model.name.underscore}_index_path") && (@model.current_action.name == 'show' || @model.current_action.layout_type.present?)
-      .bread-crumb-area
-        .breadcrumb-text
-          = link_to "#{@model.name.titleize.pluralize} /", cm_admin.send(:"#{@model.name.underscore}_index_path")
-    .nav-title-area
-      p.title-text = action_title
-      p.title-sub-text = action_description
-  .cm-navbar__rhs
+      .breadcrumb
+        = link_to "#{@model.name.titleize.pluralize} /", cm_admin.send(:"#{@model.name.underscore}_index_path"), class: 'text-reset'
+    h4 = action_title
+    p.mb-0.text-body-secondary = action_description
+  .entity-header__actions
     - if @model.current_action.name == 'index'
       - if has_valid_policy(@model.name, :exportable)
         .export-container
           .dropdown
-            button.secondary-btn data-bs-toggle='dropdown'
-              span
+            button.btn-secondary.dropdown-toggle data-bs-toggle='dropdown'
                 i.fa.fa-arrow-down
-              span
                 | Export
-              span
-                i.fa.fa-angle-down
             ul.dropdown-menu.export-popup
               li
                 .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'
                   span Export
       - if @model.importer && has_valid_policy(@model.name, :importable)
-        = link_to 'Import', cm_admin.send(:"#{@model.name.underscore}_import_path"), class: 'primary-btn ml-2'
+        = link_to 'Import', cm_admin.send(:"#{@model.name.underscore}_import_path"), class: 'btn-primary ml-2'
       - new_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('new')}
       - if new_action.any? && policy([:cm_admin, @model.name.classify.constantize]).new?
-        = link_to 'Add', cm_admin.send(:"#{@model.name.underscore}_new_path"), class: 'primary-btn ml-2'
+        = link_to 'Add', cm_admin.send(:"#{@model.name.underscore}_new_path"), class: 'btn-primary ml-2'
       - @model.available_actions.select{|act| act if act.route_type == 'collection'}.each do |custom_action|
         = custom_action_items(custom_action, 'index')
     - elsif @model.current_action.name == 'show'
@@ -36,4 +30,4 @@
 
       - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
       - if edit_action.any? && policy([:cm_admin, @model.name.classify.constantize]).edit?
-        = link_to "Edit #{@model.name.titleize.pluralize}", cm_admin.send(:"#{@model.name.underscore}_edit_path", @ar_object), class: 'primary-btn ml-2'
+        = link_to "Edit #{@model.name.titleize.pluralize}", cm_admin.send(:"#{@model.name.underscore}_edit_path", @ar_object), class: 'btn-primary ml-2'

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

@@ -1,8 +1,7 @@
 .show-page.cm-page-container
-  .show-page__tabs.sticky-container.page-top-bar
-    .cm-tabs-bar
-      == render 'cm_admin/main/top_navbar'
-      == render 'cm_admin/main/tabs'
+  .show-page__header.sticky-container.page-top-bar
+    == render 'cm_admin/main/top_navbar'
+    == render 'cm_admin/main/tabs'
   .show-page__inner.scrollable
     .history-box
       - @ar_object.action_trails.each do |at|

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

@@ -12,7 +12,7 @@
         p.success-msg Your file has been uploaded and it will be processed soon.
         / p.success-msg-info An email will be sent once the process is completed. If there are any problems with the import, we'll let you know through an email.
       .actions-wrapper
-        a.secondary-btn href="#{cm_admin.send(:"#{@model.name.underscore}_import_path")}" Import new data
+        a.btn-secondary href="#{cm_admin.send(:"#{@model.name.underscore}_import_path")}" Import new data
         / button.cta-btn.ml-2 Back to Page_Name
     - else
       = simple_form_for(FileImport.new, url: "/admin/#{@model.ar_model.table_name}/import", method: :post, html: { class: "csv-import-form" }) do |f|
@@ -32,4 +32,4 @@
                 li Add your data on the file without changing the format
                 li Save the file as a csv
                 li Upload the file in the field above
-        = f.button :submit, class: "cta-btn import-btn", value: 'Import data'
+        = f.button :submit, class: "btn-cta", value: 'Import data'

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

@@ -16,4 +16,4 @@
                 - @ar_object.errors.full_messages.each do |error_message|
                   li = error_message
 
-      = generate_form(@ar_object.class.name.constantize.new, @model)
+      = generate_form(@ar_object, @model)

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

@@ -1,8 +1,7 @@
 .show-page.cm-page-container
-  .show-page__tabs.sticky-container.page-top-bar
-    .cm-tabs-bar
-      == render 'cm_admin/main/top_navbar'
-      == render 'cm_admin/main/tabs'
+  .show-page__header.sticky-container.page-top-bar
+    == render 'cm_admin/main/top_navbar'
+    == render 'cm_admin/main/tabs'
   .show-page__inner.scrollable
     - if @action.partial
       == render @action.partial

data/app/views/layouts/_quick_links.html.slim

@@ -19,7 +19,7 @@
             span.move-arrow
               i.fa.fa-long-arrow-down
             span Select
-          button.text-btn.enter-btn
+          p.enter-text
             | ENTER
-          button.text-btn.open-btn
+          p.open-text
             | open

data/app/views/layouts/cm_admin.html.slim

@@ -25,22 +25,20 @@ html
       .panel-area
         - if defined?(@action) && (@action&.layout_type.to_s == 'cm_association_show' || @action.parent == "show")
           .show-page.cm-page-container
-            .show-page__tabs.sticky-container.page-top-bar
-              .cm-tabs-bar
-                == render 'cm_admin/main/top_navbar'
-                == render 'cm_admin/main/tabs'
+            .show-page__header.sticky-container.page-top-bar
+              == render 'cm_admin/main/top_navbar'
+              == render 'cm_admin/main/tabs'
             .show-page__inner.scrollable
               = yield
         - elsif defined?(@action) && (@action&.layout_type.to_s == 'cm_association_index' || @action.parent == "index")
           .show-page.cm-page-container
-            .show-page__tabs.sticky-container.page-top-bar
-              .cm-tabs-bar
-                == render 'cm_admin/main/top_navbar'
-                - if @ar_object.model_name
-                  == render 'cm_admin/main/tabs'
-                - if @associated_model && @associated_model.filters.present?
-                  .filters-bar
-                    == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
+            .show-page__header.sticky-container.page-top-bar
+              == render 'cm_admin/main/top_navbar'
+              - if @ar_object.model_name
+                == render 'cm_admin/main/tabs'
+              - if @associated_model && @associated_model.filters.present?
+                .filters-bar
+                  == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
             = yield
         - else
           = yield

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.1.8'
+  VERSION = '1.1.9'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -94,7 +94,8 @@ module CmAdmin
           end
           concat split_form_into_section(resource, form_obj, sections_array)
           concat tag.br
-          concat form_obj.submit 'Save', class: 'cta-btn mt-3 form_submit', data: {form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
+           # TODO: form_submit class is used for JS functionality, Have to remove 
+          concat form_obj.submit 'Save', class: 'btn-cta mt-3 form_submit', data: {form_class: "cm_#{form_obj.object.class.name.downcase}_form"}
         end
       end
     end

data/lib/cm_admin/view_helpers/manage_column_popup_helper.rb

@@ -65,8 +65,8 @@ module CmAdmin
 
       def manage_column_footer
         concat(content_tag(:div, class: 'modal-footer') do
-          concat tag.button 'Close', class: 'gray-border-btn', data: {bs_dismiss: 'modal'}
-          concat tag.button 'Save', class: 'cta-btn'
+          concat tag.button 'Close', class: 'btn-secondary', data: {bs_dismiss: 'modal'}
+          concat tag.button 'Save', class: 'btn-cta'
         end)
         return
       end

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -67,7 +67,7 @@ module CmAdmin
             when :modal
               custom_modal_button(custom_action)
             when :page
-              link_to custom_action_title(custom_action), "#{@model.ar_model.table_name}/#{custom_action.path}", class: 'secondary-btn ml-2', method: custom_action.verb
+              link_to custom_action_title(custom_action), "#{@model.ar_model.table_name}/#{custom_action.path}", class: 'btn-secondary ml-2', method: custom_action.verb
             end
           end
         end
@@ -83,14 +83,14 @@ module CmAdmin
 
       def custom_action_button(custom_action, current_action_name)
         if current_action_name == "index"
-          button_to custom_action_title(custom_action), @model.ar_model.table_name + '/' + custom_action.path, class: 'secondary-btn ml-2', method: custom_action.verb
+          button_to custom_action_title(custom_action), @model.ar_model.table_name + '/' + custom_action.path, class: 'btn-secondary ml-2', method: custom_action.verb
         elsif current_action_name == "show"
-          button_to custom_action_title(custom_action), custom_action.path.gsub(':id', params[:id]), class: 'secondary-btn ml-2', method: custom_action.verb
+          button_to custom_action_title(custom_action), custom_action.path.gsub(':id', params[:id]), class: 'btn-secondary ml-2', method: custom_action.verb
         end
       end
 
       def custom_modal_button(custom_action)
-        link_to custom_action_title(custom_action), '', class: 'secondary-btn ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
+        link_to custom_action_title(custom_action), '', class: 'btn-secondary ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
       end
 
       def custom_action_title(custom_action)

data/lib/cm_admin/view_helpers.rb

@@ -53,7 +53,8 @@ module CmAdmin
           concat hidden_field_tag 'class_name', klass.name.to_s, id: 'export-to-file-klass'
           concat checkbox_row(klass)
           concat tag.hr
-          concat submit_tag 'Export', class: 'btn btn-primary btn-bordered export-to-file-btn'
+          # TODO: export-to-file-btn class is used for JS functionality, Have to remove 
+          concat submit_tag 'Export', class: 'btn-primary export-to-file-btn' 
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -172,6 +172,7 @@ files:
 - ".rubocop.yml"
 - ".stylelintrc.json"
 - ".travis.yml"
+- ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock