cm-admin 0.3.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35f20e9b85e2ad48730aed1d0f2a9ad1a56d03c951969b85270f74b00990f725
-  data.tar.gz: 03533bffdcf8d85c46c39d50ef1f011200526e6d5d6b937e82ddfd350d1a2a48
+  metadata.gz: dfec95ffd823756a98b20c323fbe673123031f28c0ba4da0f99148b9ecb5bde6
+  data.tar.gz: 78601ced8fbacade877acb859adb35d3467fb59a30f8378378d4ea18187ca38f
 SHA512:
-  metadata.gz: bf6a9cecd5793c32dd963973bd1196413f8c997918501934afd5c8cebf2738565e57876e76afef4a5b3e7b0c4f4d71d3ebf20ea0d291524f2c56f08013781429
-  data.tar.gz: 287eab8c29339f326b6e70b5255b62d2762eb9439866e879f2454458273a8a38fb55e345f1a11fb9a695a86f5da282c8b3d5a792618bb444550d8af7074d1728
+  metadata.gz: 74277a250eea68170ba20c9f084a5733c07ffddd2948a189e43b183900ec125ca8768dcffeec4308b85de1cfa6e376193d1513279c3b083b0a1c6f65b7e4d6d9
+  data.tar.gz: b1f323c0340c805ad4190d35d0e87cec5fb922e35eafea36091c8fb7c127e352fcbc8e3a10c422b0b42bbd30b09c97acb6e628b03f4b170865ecea2809edea68

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at charithsaivadla@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -1,9 +1,10 @@
 source "https://rubygems.org"
 
-gem 'pagy'
+gem 'pagy', '~> 4.11.0'
 gem 'slim'
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
+gem 'cocoon'
 
 # Specify your gem's dependencies in cm_admin.gemspec
 gemspec

data/Gemfile.lock

@@ -1,29 +1,30 @@
 PATH
   remote: .
   specs:
-    cm_admin (0.1.0)
+    cm-admin (0.4.2)
       axlsx_rails (~> 0.6.1)
-      pagy (~> 3.13)
+      cocoon (~> 1.2.15)
+      pagy (~> 4.11.0)
       slim (~> 4.1.0)
       webpacker (~> 5.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.3.2)
-      actionview (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionpack (6.1.4.1)
+      actionview (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionview (6.1.4.1)
+      activesupport (= 6.1.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.3.2)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -33,11 +34,12 @@ GEM
       actionpack (>= 3.1)
       caxlsx (>= 3.0)
     builder (3.2.4)
-    caxlsx (3.1.0)
+    caxlsx (3.1.1)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
+    cocoon (1.2.15)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
     diff-lcs (1.4.4)
@@ -45,17 +47,15 @@ GEM
     htmlentities (4.3.4)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.10.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_portile2 (2.5.3)
     minitest (5.14.4)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
-    pagy (3.13.0)
+    pagy (4.11.0)
     racc (1.5.2)
     rack (2.2.3)
     rack-proxy (0.7.0)
@@ -65,13 +65,13 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    railties (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 0.13)
       thor (~> 1.0)
     rake (12.3.3)
     rspec (3.10.0)
@@ -87,7 +87,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubyzip (2.3.0)
+    rubyzip (2.3.2)
     semantic_range (3.0.0)
     slim (4.1.0)
       temple (>= 0.7.6, < 0.9)
@@ -108,11 +108,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cm_admin!
-  pagy
+  cm-admin!
+  cocoon
+  pagy (~> 4.11.0)
   rake (~> 12.0)
   rspec (~> 3.0)
   slim
 
 BUNDLED WITH
-   2.1.4
+   2.0.2

data/README.md

@@ -7,7 +7,7 @@ New CmAdmin gem
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'cm_admin'
+gem 'cm-admin'
 ```
 
 And then execute:
@@ -16,7 +16,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install cm_admin
+    $ gem install cm-admin
 
 ## Usage
 
@@ -24,7 +24,9 @@ Install the gem
 
     $ rails g cm_admin:install
 
-This will generate an initializer which contains the basic setup. This also includes a layout called `admin` which can be used in the application.
+## Usage
+
+For demo check [here](http://cm-admin.labs.commutatus.com/admin/users/)
 
 ## Development
 

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

@@ -42,18 +42,6 @@
 
     .get-start-btn {
       width: 100%;
-      padding: 8px;
-      @include font($size: $t4-text, $color: $white);
-      background: linear-gradient(to right, $brand-color 50%, transparent 50%);
-      background-size: 200% 100%;
-      background-position: right bottom;
-      border: 1px solid $white;
-      border-radius: $radius-4;
-      @include transition-linear;
-      &:hover {
-        background-position: left bottom;
-        border-color: $brand-color;
-      }
     }
 
     .forgot-password {

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

@@ -199,7 +199,7 @@
   margin-left: 2px;
 }
 
-.text-ellipsis {
+.text-ellipsis div {
   overflow: hidden;
   text-overflow: ellipsis;
 }

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

@@ -1,10 +1,6 @@
 @import "../helpers/index.scss";
 
 .cm-filters-v2 {
-  position: fixed;
-  top: 140px;
-  left: 225px;
-  width: calc(100% - 225px);
   min-height: 64px;
   padding: 16px 24px;
   background-color: $white;
@@ -13,7 +9,7 @@
     @include flex(row, flex-start, center, wrap);
     .filter-chips-wrapper {
       .filter-chip {
-        margin-left: 16px
+        margin-left: 16px;
       }
     }
     .add-filter-btn {
@@ -21,13 +17,15 @@
       line-height: 22px;
       font-weight: 600;
       color: $primary-text-clr;
-      margin-left: 16px;
       cursor: pointer;
       span {
         margin-right: 4px;
       }
+      &:hover {
+        color: $brand-color;
+      }
     }
-    .clear-btn { 
+    .clear-btn {
       position: relative;
       font-size: $t4-text;
       line-height: 22px;
@@ -43,6 +41,9 @@
         height: 32px;
         border-left: 1px solid $grey-regular-clr;
       }
+      &:hover {
+        color: $primary-text-clr;
+      }
     }
   }
 }

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

@@ -9,7 +9,6 @@
 }
 
 .form-page {
-  margin-top: 140px;
   padding: 24px;
   background-color: $white;
   &__inner {
@@ -72,8 +71,8 @@
     }
   }
 
-  .custom-form {
-    max-width: 700px;
+  .cm-admin-form {
+    max-width: 600px;
     .form-field {
       margin-bottom: 20px;
       .form-label {
@@ -99,70 +98,6 @@
         }
       }
 
-      .form-select {
-        //select2 styles
-        .select2 {
-          width: 100% !important;
-          .selection {
-            //single-select-styles
-            .select2-selection--single {
-              height: 39px;
-              border: 1px solid #c1c7d0;
-              border-radius: $radius-2;
-              &:focus {
-                border-color: #66afe9;
-                outline: 0;
-                box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
-              }
-              .select2-selection__rendered {
-                color: #555555;
-                line-height: 36px;
-                .select2-search--inline {
-                  .select2-search__field {
-                    height: 26px !important;
-                  }
-                }
-              }
-              .select2-selection__arrow {
-                top: 7px;
-                b {
-                  border-color: #0099ff transparent transparent transparent;
-                }
-              }
-            }
-            //multi-select-styles
-            .select2-selection--multiple {
-              max-height: 39px;
-              border: 1px solid #c1c7d0;
-              border-radius: $radius-2;
-              overflow-y: auto;
-              .select2-selection__rendered {
-                .select2-search--inline {
-                  .select2-search__field {
-                    height: 26px !important;
-                    border: none;
-                  }
-                }
-              }
-            }
-          }
-        }
-
-        //single-select-arrow-styles
-        .select2-container--open {
-          .selection {
-            .select2-selection--single {
-              .select2-selection__arrow {
-                top: 7px;
-                b {
-                  border-color: transparent transparent #0099ff transparent;
-                }
-              }
-            }
-          }
-        }
-      }
-
       .file-upload {
         position: relative;
         display: flex;
@@ -182,8 +117,7 @@
           opacity: 0;
           cursor: pointer;
         }
-        span {
-          text-align: center;
+        label {
           color: #0099ff;
           margin: 0;
           cursor: pointer;
@@ -196,15 +130,15 @@
 
       .radio-label {
         color: #172b4d;
-        font-size: size(16);
-        font-weight: weight(bold);
+        font-size: 16px;
+        font-weight: 600;
         margin-left: 8px;
       }
 
       .checkbox-label {
         color: #172b4d;
-        font-size: size(16);
-        font-weight: weight(bold);
+        font-size: 16px;
+        font-weight: 600;
         margin-left: 8px;
       }
     }

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

@@ -1,14 +1,12 @@
 @import "../helpers/index.scss";
 
 .cm-navbar {
-  position: fixed;
   top: 0;
   right: 0;
   left: 225px;
   display: flex;
   justify-content: space-between;
-  width: calc(100% - 225px);
-  height: 140px;
+  min-height: 140px;
   padding: 24px 24px 16px;
   background-color: $white;
   z-index: 2;

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

@@ -66,4 +66,11 @@
       padding: 0;
     }
   }
+  .active-item {
+    background: #D9DEE3;
+    width: 100%;
+    height: 40px;
+    float: left;
+    border-radius: 2px;
+  }
 }

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

@@ -1,5 +1,9 @@
 @import "../helpers/index.scss";
 
+html {
+  overflow: hidden;
+}
+
 body {
   box-sizing: border-box;
   width: 100%;
@@ -18,8 +22,8 @@ body {
   .panel-area {
     width: calc(100% - 225px);
     margin-left: 225px;
+    height: 100vh;
     overflow-y: auto;
-    overflow-x: hidden;
   }
 
   .components {
@@ -58,4 +62,37 @@ a {
 
 .opacity-1 {
   opacity: 1 !important;
-}
+}
+
+.page-container {
+  height: 100vh;
+}
+
+.sticky-container {
+  position: sticky;
+  top: 0;
+  background-color: #fff;
+  z-index: 1;
+}
+
+.scrollable {
+  overflow: auto;
+}
+
+.datetime-wrapper {
+  position: relative;
+}
+
+.cm-admin-static {
+  width: auto;
+  text-align: center;
+  padding: 0 15px;
+}
+
+.date-filter-wrapper {
+  position: absolute;
+  line-height: 28px;
+  top: 0;
+  opacity: 0;
+  z-index: -1;
+}

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

@@ -1,11 +1,33 @@
 @import "../helpers/index.scss";
 
 .show-page {
-  margin-top: 194px;
+  overflow: auto;
   
   &__tabs {
     .cm-tabs-bar {
-      // If you want to overwrite tabs styles ---> add styles here
+      background-color: #FFF;
+      width: 100%;
+      .nav-pills {
+        margin-left: 20px;
+      }
+      .nav-link {
+        position: static;
+        left: 0%;
+        right: 0%;
+        font-size: 14px;
+        line-height: 22px;
+        flex: none;
+        order: 0;
+        flex-grow: 0;
+        color: #6B7586;
+        background-color: #FFF;
+        border-radius: 0px;
+      }
+      .nav-link.active {
+        color: #6554E0;
+        border-bottom: 3px #6554E0 solid;
+        background-color: #FFF;
+      }
     }
   }