cm-admin 0.3.0 → 0.4.0

data/lib/cm_admin.rb

@@ -27,7 +27,9 @@ module CmAdmin
 
     def config(entity, &block)
       if entity.is_a?(Class)
-        @@cm_admin_models << CmAdmin::Model.new(entity, &block)
+        unless CmAdmin::Model.find_by({name: entity.name})
+          @@cm_admin_models << CmAdmin::Model.new(entity, &block)
+        end
       end
     end
   end

data/lib/generators/cm_admin/install_generator.rb

@@ -1,14 +1,26 @@
 require 'rails/generators'
 
-module CmAdmin
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('templates', __dir__)
+    def add_required_gems
+      gem 'slim'
+      gem 'simple_form'
+      system("yarn add bootstrap")
+      system("yarn add @fortawesome/fontawesome-free")
+      system("yarn add select2")
+      system("yarn add daterangepicker")
+      system("yarn add jgrowl")
+    end
+
+    def copy_layout_file
+      copy_file "layouts/_side_navbar.html.slim", "app/views/layouts/_side_navbar.html.slim"
+      copy_file "layouts/_navbar.html.slim", "app/views/layouts/_navbar.html.slim"
+      remove_file "app/views/layouts/application.html.erb"
+      copy_file "layouts/application.html.slim", "app/views/layouts/application.html.slim"
+    end
 
-      def copy_initializer
-        copy_file 'cm_admin_initializer.rb', 'config/initializers/cm_admin.rb'
-        route 'mount CmAdmin::Engine => "/cm_admin"'
-      end
+    def copy_asset_file
+      copy_file "assets/images/cm.png", "app/assets/images/cm.png"
+      directory "assets/stylesheets/", "app/assets/stylesheets/"
+      remove_file "app/assets/stylesheets/application.css"
     end
   end
 end

data/package.json

@@ -3,11 +3,16 @@
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.3",
+    "@nathanvda/cocoon": "^1.2.14",
+    "@popperjs/core": "^2.9.2",
     "@rails/activestorage": "^6.0.0",
     "@rails/ujs": "^6.0.0",
     "@rails/webpacker": "5.3.0",
-    "bootstrap": "4.6.0",
+    "bootstrap": "^5.0.1",
+    "daterangepicker": "^3.1.0",
+    "flatpickr": "^4.6.9",
     "jquery": "^3.6.0",
+    "moment": "^2.29.1",
     "popper.js": "^1.16.1",
     "turbolinks": "^5.2.0"
   },

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

@@ -0,0 +1 @@
+33d3c35c58c8db0310c4cb3ec7ff742813910e07

data/yarn.lock

@@ -890,6 +890,13 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz#c36ffa64a2a239bf948541a97b6ae8d729e09a9a"
   integrity sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w==
 
+"@nathanvda/cocoon@^1.2.14":
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/@nathanvda/cocoon/-/cocoon-1.2.14.tgz#aaea910e4b9c0d28d5bdcb7f3743617db46b09af"
+  integrity sha512-WcEt2vVp50de2i7rkD4O+96O1iMtMIcTBNGPocrHfcmHDujKOngoLHFF8Ektgoh8PjwFAJMxx8WyGv0BtKTjxQ==
+  dependencies:
+    jquery "^3.3.1"
+
 "@npmcli/move-file@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
@@ -898,6 +905,11 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
+"@popperjs/core@^2.9.2":
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
+  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
+
 "@rails/activestorage@^6.0.0":
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.1.3.tgz#d76ce0fe59b5778e05b967c22c61b2964fde112a"
@@ -1491,10 +1503,10 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-bootstrap@4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
-  integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
+bootstrap@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.1.tgz#e7939d599119dc818a90478a2a299bdaff037e09"
+  integrity sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -2309,6 +2321,14 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
+daterangepicker@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/daterangepicker/-/daterangepicker-3.1.0.tgz#718d606614331df3e774c9aba82ccd8838d45da1"
+  integrity sha512-DxWXvvPq4srWLCqFugqSV+6CBt/CvQ0dnpXhQ3gl0autcIDAruG1PuGG3gC7yPRNytAD1oU1AcUOzaYhOawhTw==
+  dependencies:
+    jquery ">=1.10"
+    moment "^2.9.0"
+
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -2897,6 +2917,11 @@ findup-sync@^3.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
+flatpickr@^4.6.9:
+  version "4.6.9"
+  resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.9.tgz#9a13383e8a6814bda5d232eae3fcdccb97dc1499"
+  integrity sha512-F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw==
+
 flatted@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
@@ -3738,7 +3763,7 @@ jest-worker@^26.5.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jquery@^3.6.0:
+jquery@>=1.10, jquery@^3.3.1, jquery@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
@@ -4169,6 +4194,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+moment@^2.29.1, moment@^2.9.0:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -68,6 +68,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: cocoon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.15
 description: This is an admin panel gem
 email:
 - sajinprasadkm@gmail.com
@@ -79,6 +93,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -112,22 +127,34 @@ files:
 - app/assets/stylesheets/cm_admin/helpers/index.scss
 - app/controllers/cm_admin/application_controller.rb
 - app/controllers/cm_admin/exports_controller.rb
-- app/controllers/cm_admin/main_controller.rb
+- app/controllers/cm_admin/static_controller.rb
 - app/helpers/cm_admin/application_helper.rb
+- app/helpers/cm_admin/custom_helper.rb
 - app/javascript/packs/cm_admin/application.js
 - app/javascript/packs/cm_admin/filters.js
+- app/javascript/packs/cm_admin/quick_search.js
 - app/javascript/packs/cm_admin/scaffolds.js
+- 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/_filters.html.slim
+- app/views/cm_admin/main/_nested_fields.html.slim
+- app/views/cm_admin/main/_nested_table_form.html.slim
 - app/views/cm_admin/main/_table.html.slim
+- app/views/cm_admin/main/_tabs.html.slim
 - app/views/cm_admin/main/_top_navbar.html.slim
+- app/views/cm_admin/main/associated_index.html.slim
+- app/views/cm_admin/main/associated_show.html.slim
 - app/views/cm_admin/main/dashboard.html.slim
 - app/views/cm_admin/main/edit.html.slim
 - app/views/cm_admin/main/index.html.slim
 - app/views/cm_admin/main/new.html.slim
 - app/views/cm_admin/main/show.html.slim
+- app/views/cm_admin/static/error_401.html.slim
 - app/views/layouts/_left_sidebar_nav.html.slim
+- app/views/layouts/_quick_links.html.slim
 - app/views/layouts/cm_admin.html.slim
+- app/views/layouts/static.html.slim
 - bin/console
 - bin/setup
 - bin/webpack
@@ -141,7 +168,7 @@ files:
 - config/webpack/production.js
 - config/webpack/test.js
 - config/webpacker.yml
-- lib/c.png
+- lib/.DS_Store
 - lib/cm_admin.rb
 - lib/cm_admin/constants.rb
 - lib/cm_admin/engine.rb
@@ -149,24 +176,31 @@ files:
 - lib/cm_admin/models/action.rb
 - lib/cm_admin/models/actions/blocks.rb
 - lib/cm_admin/models/blocks.rb
+- lib/cm_admin/models/cm_show_section.rb
 - lib/cm_admin/models/column.rb
+- lib/cm_admin/models/controller_method.rb
+- lib/cm_admin/models/dsl_method.rb
 - lib/cm_admin/models/export.rb
 - lib/cm_admin/models/field.rb
 - lib/cm_admin/models/filter.rb
+- lib/cm_admin/models/form_field.rb
+- lib/cm_admin/models/tab.rb
 - lib/cm_admin/utils.rb
 - lib/cm_admin/version.rb
 - lib/cm_admin/view_helpers.rb
-- lib/cm_admin/view_helpers/field_column_helper.rb
+- lib/cm_admin/view_helpers/column_field_helper.rb
+- lib/cm_admin/view_helpers/field_display_helper.rb
+- lib/cm_admin/view_helpers/filter_helper.rb
 - lib/cm_admin/view_helpers/form_field_helper.rb
 - lib/cm_admin/view_helpers/form_helper.rb
+- lib/cm_admin/view_helpers/manage_column_popup_helper.rb
 - lib/cm_admin/view_helpers/navigation_helper.rb
 - lib/cm_admin/view_helpers/page_info_helper.rb
 - lib/generators/cm_admin/install_generator.rb
-- lib/generators/cm_admin/templates/cm_admin_initializer.rb
 - lib/tasks/webpack_install.rake
 - package.json
 - postcss.config.js
-- yarn-error.log
+- tmp/cache/webpacker/last-compilation-digest-development
 - yarn.lock
 homepage: https://github.com/commutatus/cm-admin
 licenses:

data/app/controllers/cm_admin/main_controller.rb

@@ -1,8 +0,0 @@
-module CmAdmin
-  class MainController < CmAdmin::ApplicationController
-    layout 'cm_admin'
-
-    def dashboard
-    end
-  end
-end

data/lib/cm_admin/view_helpers/field_column_helper.rb

@@ -1,23 +0,0 @@
-module CmAdmin
-  module ViewHelpers
-    module ColumnFieldHelper
-
-      def column_for_field_helper(ar_object, column)
-        value = ar_object.send(column.db_column_name)
-        case column.column_type
-        when :datetime
-          if column.format.present?
-            value = ar_object.send(column.db_column_name).strftime(column.format)
-          else
-            value = ar_object.send(column.db_column_name).strftime("%d/%m/%Y")
-          end
-          if column.prefix.present?
-            value = column.prefix.to_s + ' ' + value
-          end
-        end
-        return value
-      end
-
-    end
-  end
-end

data/lib/generators/cm_admin/templates/cm_admin_initializer.rb

@@ -1,4 +0,0 @@
-CmAdmin.setup do |config|
-  # Sets the default layout to be used for admin
-  config.layout = 'admin'
-end

data/yarn-error.log

@@ -1,44 +0,0 @@
-Arguments: 
-  /usr/local/bin/node /usr/local/Cellar/yarn/1.22.10/libexec/bin/yarn.js webpack --config /Users/vidya/Documents/Projects/cm-admin/config/webpack/production.js
-
-PATH: 
-  /Users/vidya/.rbenv/versions/2.6.3/lib/ruby/gems/2.6.0/bin:/Users/vidya/.rbenv/versions/2.6.3/bin:/usr/local/Cellar/rbenv/1.1.2/libexec:/Users/vidya/.pyenv/shims:/usr/local/opt/php@7.0/sbin:/usr/local/opt/php@7.0/bin:/Users/vidya/.rbenv/shims:/Users/vidya/.rbenv/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
-
-Yarn version: 
-  1.22.10
-
-Node version: 
-  12.13.1
-
-Platform: 
-  darwin x64
-
-Trace: 
-  SyntaxError: /Users/vidya/Documents/Projects/cm-admin/package.json: Unexpected token } in JSON at position 192
-      at JSON.parse (<anonymous>)
-      at /usr/local/Cellar/yarn/1.22.10/libexec/lib/cli.js:1625:59
-      at Generator.next (<anonymous>)
-      at step (/usr/local/Cellar/yarn/1.22.10/libexec/lib/cli.js:310:30)
-      at /usr/local/Cellar/yarn/1.22.10/libexec/lib/cli.js:321:13
-
-npm manifest: 
-  {
-    "name": "cm-admin",
-    "private": true,
-    "dependencies": {
-      "@rails/activestorage": "^6.0.0",
-      "@rails/ujs": "^6.0.0",
-      "@rails/webpacker": "5.3.0",
-      "turbolinks": "^5.2.0",
-    },
-    "version": "0.1.0",
-    "devDependencies": {
-      "webpack-dev-server": "^3.11.2"
-    }
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  No lockfile