cm-admin 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 590c14bc3ee438f00943ac40316aaf1e0850639a5eda8da1d4c73dec80b11963
-  data.tar.gz: df5b1269f85267cc86e123c15b950e50292396771cb83cc10dc27bb3337d7416
+  metadata.gz: 740dc3d69ceebeee0f6137dc2858b9d10bea0f5ef5c71013c988115e445b779b
+  data.tar.gz: d6f44e0ad96646096ab7fd33595c9e57e9605d5f6e746638b1a3141876854adb
 SHA512:
-  metadata.gz: 1b530f87e1a584d25e43684491ddee0156d7544bcb31f13c8b4d53aedff611ff0ffae7fc4ea9898d5186f4a3453463d7d77b7ecf4f39bee8020fcb4c753f6e76
-  data.tar.gz: ec22d42e7c47f2755642a902821db15616378361b661b0a609d22fe5b678527ae6ddddf62d902ba0aa55fc647eb215bb4704df046f5b7bbf5625c1b7ffceaa2f
+  metadata.gz: 95e5b8b2e3ac48e776577fe2cdbfb864f82c29777210e57c5342a726593b51d8f543d4b5ef1bafe7e4bb693746881b646ca3504857d07b7749c5ee791b8d4721
+  data.tar.gz: 3b6a1a37c18bbae57b57e662f4ff6401a8fba43470cc7da6b5e1b8af3f174120d15fa928e8d745afddb7f3be20841b4f9b6bc391a935ca2dd29de66bf7f1fe47

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,86 @@
+@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;
+  }
+}

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,27 @@ $(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();
+  if ($('.cm-drawer').hasClass('hidden')) {
+     $('.cm-drawer').removeClass('hidden');
+     if ($('#drawer-container').hasClass('drawer-slide-out')) {
+        $('#drawer-container').removeClass('drawer-slide-out');
+     }
+     $('#drawer-container').addClass('drawer-slide-in');
+  } else {
+    return $('.cm-drawer').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

@@ -16,6 +16,7 @@
             input.cm-checkbox type="checkbox"
         - @model.available_fields[:index].each do |column|
           th = column.header
+        // th Drawer
     tbody.cm-table__body
       - @ar_object.data.each do |ar_object|
         tr.body-row
@@ -29,6 +30,8 @@
                   = 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
+           // button.drawer-btn Open Drawer
           td.row-action-cell
             .row-action-tool
               button.secondary-btn.tool-btn type="button"

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

@@ -10,3 +10,4 @@
 
     = column_pop_up(@model)
     = manage_column_pop_up(@model)
+  == render 'cm_admin/main/drawer'

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/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))
@@ -50,7 +50,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 +62,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/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.5"
 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/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.7"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a"
+  integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==
   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.5
 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-02-21 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