chaltron 1.1.7 → 2.0.0

data/lib/chaltron/version.rb

@@ -1,3 +1,3 @@
 module Chaltron
-  VERSION = '1.1.7'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/generators/chaltron/install_generator.rb

@@ -15,6 +15,27 @@ module Chaltron
       end
     end
 
+    def add_gem_dependencies
+      gem 'devise'
+      gem 'omniauth'
+      gem 'omniauth-rails_csrf_protection'
+      gem 'gitlab_omniauth-ldap'
+      gem 'cancancan'
+
+      gem 'bootstrap'
+      gem 'autoprefixer-rails'
+      gem 'font-awesome-sass'
+
+      gem 'jquery-rails'
+      gem 'jquery-datatables'
+      gem 'ajax-datatables-rails'
+
+      gem 'bootstrap_form'
+      gem 'nprogress-rails'
+      gem 'simple-navigation'
+      gem 'rails-i18n'
+    end
+
     def db_migrations
       rake 'chaltron_engine:install:migrations'
     end
@@ -39,9 +60,43 @@ RUBY
       remove_file 'app/views/layouts/application.html.erb'
       directory 'app/views/layouts'
       directory 'app/assets/images'
-      # javascript
-      inject_into_file 'app/assets/javascripts/application.js',
-        "//= require chaltron\n", before: '//= require_tree .'
+    end
+
+    def add_javascript
+      dependencies =<<EOF
+//= require jquery
+//= require popper
+//= require bootstrap
+//= require datatables/jquery.dataTables
+//= require datatables/dataTables.bootstrap4
+//= require datatables/extensions/Responsive/dataTables.responsive
+//= require datatables/extensions/Responsive/responsive.bootstrap4
+//= require nprogress
+//= require nprogress-turbolinks
+//= require nprogress-ajax
+//= require chaltron
+EOF
+
+      inject_into_file 'app/assets/javascripts/application.js', dependencies, before: '//= require_tree .'
+
+      javascript =<<JS
+
+
+document.addEventListener('DOMContentLoaded', function(event) {
+  Chaltron.locale = $('body').data('locale');
+});
+
+NProgress.configure({
+  showSpinner: false,
+});
+
+JS
+      inject_into_file 'app/assets/javascripts/application.js', javascript, after: '//= require_tree .'
+    end
+
+    def add_stylesheets
+      copy_file 'app/assets/stylesheets/chaltron_custom.scss'
+      copy_file 'app/assets/stylesheets/datatables.scss'
     end
 
     def create_index_controller
@@ -51,7 +106,7 @@ RUBY
       # controller, views and assets replacement
       copy_file 'app/controllers/home_controller.rb', force: true
       directory 'app/views/home/', force: true
-      copy_file 'app/assets/javascripts/home.js.coffee', force: true
+      copy_file 'app/assets/javascripts/home.coffee', force: true
       copy_file 'app/assets/stylesheets/home.scss', force: true
 
       Array(1..10).each do |x|
@@ -65,7 +120,6 @@ RUBY
 
     def setup_chaltron
       copy_file 'config/initializers/chaltron.rb'
-      copy_file 'app/assets/stylesheets/chaltron_custom.scss'
     end
 
     def setup_authorization

data/lib/generators/chaltron/templates/Procfile

@@ -0,0 +1,2 @@
+web: bundle exec rails server -p 3000
+webpacker: ./bin/webpack-dev-server

data/lib/generators/chaltron/templates/app/assets/stylesheets/chaltron_custom.scss

@@ -2,21 +2,35 @@
  * See http://getbootstrap.com/docs/4.0/getting-started/theming to learn customization
  */
 
- $font-size-base: 0.85rem;
+$font-size-base: 0.85rem;
 
 // $theme-colors: (
 //   'primary': #343A40,   // Bootstrap dark color
 //   'primary': #6C757D    // Bootstrap secondary color
 // );
 
- @import 'chaltron';
+// to keep space for navbars (top and bottom)
+div#content {
+  margin-top: 2.7em;
+  margin-bottom: 2.7em;
+}
 
- // to keep space for navbars (top and bottom)
- div#content {
-   margin-top: 2.7em;
-   margin-bottom: 2.7em;
- }
+.flash-container {
+  top: 4em;
+}
 
- .flash-container {
-   top: 4em;
- }
+@import 'bootstrap';
+
+// font-awesome
+@import 'font-awesome-sprockets';
+@import 'font-awesome';
+
+// bootstrap_form
+@import 'rails_bootstrap_forms';
+
+// nprogress
+@import 'nprogress';
+@import 'nprogress-bootstrap';
+
+// at last
+@import 'chaltron';

data/lib/generators/chaltron/templates/app/assets/stylesheets/datatables.scss

@@ -0,0 +1,2 @@
+@import 'datatables/dataTables.bootstrap4';
+@import 'datatables/extensions/Responsive/responsive.bootstrap4';

data/lib/generators/chaltron/templates/app/views/layouts/application.html.erb

@@ -10,12 +10,12 @@
     <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
     <%= favicon_link_tag 'favicon.ico', rel: 'shortcut icon' %>
   </head>
-  <body>
+  <%= content_tag :body, data: { locale: I18n.locale } do %>
     <%= render 'layouts/navbar' %>
     <%= render 'layouts/flash' %>
     <div id='content'>
       <%= yield %>
     </div>
     <%= render 'layouts/footer' %>
-  </body>
+  <% end %>
 </html>

data/lib/generators/chaltron/templates/config/navigation.rb

@@ -54,14 +54,14 @@ SimpleNavigation::Configuration.run do |navigation|
     #                            when the item should be highlighted, you can set a regexp which is matched
     #                            against the current URI.  You may also use a proc, or the symbol <tt>:subpath</tt>.
     #
-    primary.item :news, 'Link 1', home_test1_path, link_html: { icon: 'bullhorn' }
-    primary.item :concerts, 'Link 2', home_test2_path, link_html: { icon: 'chart-line' }
-    primary.item :video, 'Link 3', home_test3_path, link_html: { icon: 'book' }
-    primary.item :info, 'Submenu', '#', link_html: { icon: 'hand-point-down' } do |info_nav|
-      info_nav.item :main_info_page, 'Link 4', home_test4_path, link_html: { icon: 'paw' }
-      info_nav.item :about_info_page, 'Link 5', home_test5_path, link_html: { icon: 'headphones' }
-      info_nav.item :contact_info_page, 'Link 6', home_test6_path, link_html: { icon: 'futbol' }
+    primary.item :news, 'Link 1', home_test1_path, link_html: { icon: 'fas fa-bullhorn' }
+    primary.item :concerts, 'Link 2', home_test2_path, link_html: { icon: 'fas fa-chart-line' }
+    primary.item :video, 'Link 3', home_test3_path, link_html: { icon: 'fas fa-book' }
+    primary.item :info, 'Submenu', '#', link_html: { icon: 'fas fa-hand-point-down' } do |info_nav|
+      info_nav.item :main_info_page, 'Link 4', home_test4_path, link_html: { icon: 'fas fa-paw' }
+      info_nav.item :about_info_page, 'Link 5', home_test5_path, link_html: { icon: 'fas fa-headphones' }
+      info_nav.item :contact_info_page, 'Link 6', home_test6_path, link_html: { icon: 'fas fa-futbol' }
     end
-    primary.item :user, 'Link7', home_test7_path, link_html: { icon: 'user' }
+    primary.item :user, 'Link7', home_test7_path, link_html: { icon: 'fas fa-user' }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chaltron
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 2.0.0
 platform: ruby
 authors:
 - vicvega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,230 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: devise
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: omniauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: omniauth-rails_csrf_protection
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gitlab_omniauth-ldap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bootstrap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: font-awesome-sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nprogress-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simple-navigation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-datatables
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ajax-datatables-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cancancan
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bootstrap_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails-i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -400,11 +176,13 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/chaltron.js
-- app/assets/javascripts/chaltron/datatables.js.coffee
-- app/assets/javascripts/chaltron/localization.js.coffee
-- app/assets/javascripts/chaltron/main.js.coffee
-- app/assets/javascripts/chaltron/navbar.js.coffee
-- app/assets/javascripts/dataTables/dataTables.bootstrap4.min.js
+- app/assets/javascripts/chaltron/core.js.erb
+- app/assets/javascripts/chaltron/datatables.js
+- app/assets/javascripts/chaltron/flash_messages.js
+- app/assets/javascripts/chaltron/ldap_create.js
+- app/assets/javascripts/chaltron/locales/en.json
+- app/assets/javascripts/chaltron/locales/it.json
+- app/assets/javascripts/chaltron/navbar.js
 - app/assets/stylesheets/chaltron.scss
 - app/assets/stylesheets/chaltron/layout.scss
 - app/assets/stylesheets/chaltron/logs.scss
@@ -463,22 +241,23 @@ files:
 - db/migrate/20200414150601_add_enabled_to_users.rb
 - lib/chaltron.rb
 - lib/chaltron/banner.rb
-- lib/chaltron/bootstrap_form.rb
 - lib/chaltron/controllers/helpers.rb
 - lib/chaltron/engine.rb
+- lib/chaltron/form_builder/bootstrap_form.rb
 - lib/chaltron/ldap/connection.rb
 - lib/chaltron/ldap/person.rb
 - lib/chaltron/ldap/user.rb
 - lib/chaltron/version.rb
-- lib/generators/chaltron/install/templates/Procfile
 - lib/generators/chaltron/install_generator.rb
+- lib/generators/chaltron/templates/Procfile
 - lib/generators/chaltron/templates/app/assets/images/700x300.gif
 - lib/generators/chaltron/templates/app/assets/images/favicon.ico
 - lib/generators/chaltron/templates/app/assets/images/slide1.gif
 - lib/generators/chaltron/templates/app/assets/images/slide2.gif
 - lib/generators/chaltron/templates/app/assets/images/slide3.gif
-- lib/generators/chaltron/templates/app/assets/javascripts/home.js.coffee
+- lib/generators/chaltron/templates/app/assets/javascripts/home.coffee
 - lib/generators/chaltron/templates/app/assets/stylesheets/chaltron_custom.scss
+- lib/generators/chaltron/templates/app/assets/stylesheets/datatables.scss
 - lib/generators/chaltron/templates/app/assets/stylesheets/home.scss
 - lib/generators/chaltron/templates/app/controllers/home_controller.rb
 - lib/generators/chaltron/templates/app/models/ability.rb