keppler 2.1.14 → 2.1.15

data/installer/core/app/models/role.rb

@@ -11,8 +11,10 @@ class Role < ApplicationRecord
             inclusion: { in: Rolify.resource_types },
             allow_nil: true
   scopify
+  validates_presence_of :name
   validates_uniqueness_of :name
   has_many :permissions, dependent: :destroy
+
   def self.search_field
     :name_cont
   end

data/installer/core/app/models/user.rb

@@ -16,11 +16,11 @@ class User < ApplicationRecord
          :recoverable, :rememberable, :trackable, :validatable
 
   def rol
-    roles.first.name
+    roles&.first&.name || 'default'
   end
 
   def permissions?
-    roles.first.permissions?
+    roles&.first&.permissions?
   end
 
   def allowed_modules

data/installer/core/app/views/admin/layouts/_sidebar.html.haml

@@ -3,7 +3,7 @@
     %ul.sidebar-menu.tree{ 'data-widget': 'tree' }
       %li.sidebar-item
         = link_to '/admin/dashboard', class: "sidebar-link #{'active' if request.env['REQUEST_PATH'].eql?('/admin/dashboard')}", 'data-turbolinks': false do
-          %i.icon-pie-chart
+          %i.bx.bx-pie-chart-alt
           %span= t('keppler.sidebar-menu.dashboard')
         - @sidebar.each do |menu|
           - menu.each do |key, _value|
@@ -13,7 +13,7 @@
                   - if included_in?(current_user.allowed_modules, menu[key]['submenu'].map(&:keys).flatten) || can?(menu[key]['model'].constantize).index? || allowed_action?(menu[key]['model'], menu[key]['submenu'].map(&:keys).flatten)
                     %li.sidebar-item{ class: ('active' if menu[key]['current'].include?(controller_path)) }
                       %a.sidebar-link{ href: '#', class: ('active current' if menu[key]['current'].include?(controller_path)) }
-                        %i{ class: "icon-#{menu[key]['icon']}" }
+                        %i{ class: "bx bx-#{menu[key]['icon']}" }
                         %span= t("keppler.sidebar-menu.#{menu[key]['name'].parameterize}")
                       %ul.treeview-menu
                         - menu[key]['submenu'].each do |submenu, _val|
@@ -33,12 +33,12 @@
               - if !menu[key]['enviroment'] || menu[key]['enviroment'].eql?(Rails.env)
                 %li.sidebar-item.treeview{ class: ('active' if controller_name.eql?(menu[key]['name'])) }
                   = link_to menu[key]['url_path'], class: "sidebar-link collapsible-header #{'current' if menu[key]['current'].include?(controller_path)}", 'data-no-turbolink': true do
-                    %i{ class: "icon-#{menu[key]['icon']}" }
+                    %i{ class: "bx bx-#{menu[key]['icon']}" }
                     %span= t("keppler.sidebar-menu.#{menu[key]['name'].parameterize}")
 
       %li.sidebar-item{ class: ('active' if 'admin/settings/basic_information'.eql?(controller_path)) }
         %a.sidebar-link{ href: '#', class: ('active current' if 'admin/settings/basic_information'.eql?(controller_path)) }
-          %i.icon-settings
+          %i.bx.bx-cog
           %span= t('keppler.sidebar-menu.setting')
         %ul.treeview-menu
           - if Rails.env.eql?('development')
@@ -59,14 +59,14 @@
               = t('keppler.sidebar-menu.setting-submenu.social-accounts')
       %li.sidebar-item.info-keppler
         %a.sidebar-link{ href: '#' }
-          %i.icon-exclamation
+          %i.bx.bx-error-circle
           %span= t('keppler.sidebar-menu.about')
 :javascript
   $('.info-keppler').click(function (ev) {
     ev.preventDefault();
     swal({
       html: '<h1 class="modal-h1">Keppler <span>Admin</span></h1><div class="modal-info">' +
-        '<span> v 2.1.14 </span>' +
+        '<span> v 2.1.15 </span>' +
         "<span>#{t('keppler.release_date')}: 25/10/2018</span>" +
         '<span>Ruby on Rails v 5.2.1</span>' +
         '<ul class= "modal-social">' +

data/installer/core/app/views/admin/rockets/rockets.haml

@@ -8,10 +8,10 @@
           .file-uploader
             .file-container
               = file_field_tag :rocket # , multiple: true
-              %i.file-icon.icon-rocket
+              %i.file-icon.bx.bx-rocket
               %h5.file-text= t 'keppler.rockets.drop'
             %a.spinnerTrigger#installRocket
-              %i.icon-rocket
+              %i.bx.bx-rocket
               = t 'keppler.rockets.install'
 
   .col-md-6.col-lg-6
@@ -35,8 +35,8 @@
               - @rockets.each do |rocket|
                 %tr
                   %td
-                    %i.icon-rocket
-                    %span.rocket-name= rocket
+                    %i.bx.bx-rocket
+                    %span.rocket-name= rocket.split('keppler_').last.humanize
                     .pull-right
                       - rocket_name = rocket.split(' ')[0..-3].join(' ')
                       - if rocket_is_built?(rocket_name)

data/installer/core/app/views/admin/roles/_form.html.haml

@@ -25,4 +25,3 @@
                     .col-xs-12
                       .pull-right
                         = f.button :submit, t('keppler.actions.save'), name: '_save', class: 'btn-primary'
-                        = f.button :submit, t('keppler.actions.save_and_add_another'), name: '_add_other'

data/installer/core/app/views/admin/scripts/index.html.haml

@@ -33,7 +33,6 @@
           .hide
             = form_tag admin_script_upload_path(@objects), id: 'upload-form', multipart: true, method: :post do
               = file_field_tag :file, id: 'upload-file'
-
         .box.slice-box
           .box-body.no-padding
             %table.table

data/installer/core/config/menu.yml

@@ -2,19 +2,19 @@ menu:
   dashboard:
     name: dashboard
     url_path: /admin
-    icon: pie-chart
+    icon: dashboard
     current: ['admin/dashboard']
     model: Dashboard
   script:
     name: scripts
     url_path: /admin/scripts
-    icon: chart
+    icon: code
     current: ['admin/scripts']
     model: Script
   seo:
     name: Seo
     current: ['admin/meta_tags']
-    icon: graph
+    icon: chart
     model: Seo
     url_path: /admin/meta_tags
     submenu:

data/installer/core/db/seeds.rb

@@ -151,4 +151,4 @@ if defined?(KepplerFrontend) && KepplerFrontend.is_a?(Module)
     )
   end
   puts 'Frontend functions has been created'
-end
+end

data/installer/core/lib/generators/keppler_add_module/templates/controllers/controller.rb

@@ -40,7 +40,7 @@ module <%= ROCKET_CLASS_NAME %>
 
       # PATCH/PUT <%= route_url %>/1
       def update
-        if <%= MODULE_CLASS_NAME %>.update(<%= MODULE_NAME.singularize %>_params)
+        if @<%= MODULE_NAME.singularize %>.update(<%= MODULE_NAME.singularize %>_params)
           redirect(@<%= MODULE_NAME.singularize %>, params)
         else
           render :edit

data/installer/core/lib/plugins/config/menu.yml

@@ -3,7 +3,7 @@ menu:
     name: keppler menu
     current: ['/']
     url_path: /
-    icon: layers
+    icon: rocket
     model: User
     submenu:
       # - new:

data/installer/core/rockets/keppler_capsules/config/menu.yml

@@ -2,7 +2,7 @@ menu:
   keppler_capsules:
     name: Keppler Capsules
     current: ['']
-    icon: cursor
+    icon: cube
     model: KepplerCapsules::Capsule
     enviroment: development
     submenu:

data/installer/core/rockets/keppler_frontend/app/assets/javascripts/keppler_frontend/admin/editor.js

@@ -75,6 +75,8 @@ var codeHTML = {
         autoCloseTags: true,
         matchTags: {bothTags: true},
         showTrailingSpace: true,
+        showToken: /\w/,
+        scrollbarStyle: "overlay",
         highlightSelectionMatches: {
           showToken: /\w/,
           annotateScrollbar: true
@@ -136,6 +138,7 @@ var codeCSS = {
         indentUnit: 2,
         showTrailingSpace: true,
         tabSize: 2,
+        scrollbarStyle: "overlay",
         highlightSelectionMatches: {
           showToken: /\w/,
           annotateScrollbar: true
@@ -182,6 +185,7 @@ var codeJs = {
         indentUnit: 2,
         tabSize: 2,
         showTrailingSpace: true,
+        scrollbarStyle: "overlay",
         highlightSelectionMatches: {
           showToken: /\w/,
           annotateScrollbar: true
@@ -228,6 +232,7 @@ var codeJsErb = {
         indentUnit: 2,
         tabSize: 2,
         showTrailingSpace: true,
+        scrollbarStyle: "overlay",
         highlightSelectionMatches: {
           showToken: /\w/,
           annotateScrollbar: true
@@ -274,6 +279,7 @@ var codeAction = {
         indentUnit: 2,
         tabSize: 2,
         showTrailingSpace: true,
+        scrollbarStyle: "overlay",
         highlightSelectionMatches: {
           showToken: /\w/,
           annotateScrollbar: true
@@ -315,6 +321,7 @@ var codeCallback = {
         mode: "text/x-ruby",
         keyMap: "sublime",
         theme: 'monokai',
+        scrollbarStyle: "overlay",
         autoCloseBrackets: true,
         matchBrackets: true,
         indentUnit: 2,
@@ -365,6 +372,7 @@ var codeFunction = {
         matchBrackets: true,
         indentUnit: 2,
         tabSize: 2,
+        scrollbarStyle: "overlay",
         showTrailingSpace: true,
         highlightSelectionMatches: {
           showToken: /\w/,

data/installer/core/rockets/keppler_frontend/app/assets/javascripts/keppler_frontend/admin/layout_editor.js

@@ -35,6 +35,7 @@ var codeHead = {
         matchBrackets: true,
         theme: "monokai",
         tabSize: 2,
+        scrollbarStyle: "overlay",
         autoCloseTags: true,
         matchTags: {bothTags: true},
         showTrailingSpace: true,
@@ -86,6 +87,7 @@ var codeHeader = {
         matchBrackets: true,
         indentUnit: 2,
         tabSize: 2,
+        scrollbarStyle: "overlay",
         showTrailingSpace: true,
         highlightSelectionMatches: {
           showToken: /\w/,
@@ -132,6 +134,7 @@ var codeFooter = {
         matchBrackets: true,
         indentUnit: 2,
         tabSize: 2,
+        scrollbarStyle: "overlay",
         showTrailingSpace: true,
         highlightSelectionMatches: {
           showToken: /\w/,

data/installer/core/rockets/keppler_frontend/app/assets/javascripts/keppler_frontend/admin/partial_editor.js

@@ -35,6 +35,7 @@ var codePartialHTML = {
         matchBrackets: true,
         theme: "monokai",
         tabSize: 2,
+        scrollbarStyle: "overlay",
         autoCloseTags: true,
         matchTags: {bothTags: true},
         showTrailingSpace: true,
@@ -87,6 +88,7 @@ var codePartialCSS = {
         indentUnit: 2,
         showTrailingSpace: true,
         tabSize: 2,
+        scrollbarStyle: "overlay",
         highlightSelectionMatches: {
           showToken: /\w/,
           annotateScrollbar: true
@@ -132,6 +134,7 @@ var codePartialJs = {
         matchBrackets: true,
         indentUnit: 2,
         tabSize: 2,
+        scrollbarStyle: "overlay",
         showTrailingSpace: true,
         highlightSelectionMatches: {
           showToken: /\w/,

data/installer/core/rockets/keppler_frontend/config/data/views.yml

@@ -8,11 +8,11 @@
   position: 1
   deleted_at: 
   created_at: !ruby/object:ActiveSupport::TimeWithZone
-    utc: 2018-11-05 15:25:45.322404000 Z
+    utc: 2018-11-13 12:30:35.395815000 Z
     zone: &1 !ruby/object:ActiveSupport::TimeZone
       name: America/Caracas
-    time: 2018-11-05 11:25:45.322404000 Z
+    time: 2018-11-13 08:30:35.395815000 Z
   updated_at: !ruby/object:ActiveSupport::TimeWithZone
-    utc: 2018-11-05 15:25:45.322404000 Z
+    utc: 2018-11-13 12:30:35.395815000 Z
     zone: *1
-    time: 2018-11-05 11:25:45.322404000 Z
+    time: 2018-11-13 08:30:35.395815000 Z

data/installer/core/rockets/keppler_frontend/config/menu.yml

@@ -2,7 +2,7 @@ menu:
   keppler_frontend:
     name: Keppler Frontend
     current: ['']
-    icon: layers
+    icon: layout
     model: KepplerFrontend::View
     enviroment: development
     submenu:

data/installer/core/rockets/keppler_ga_dashboard/config/menu.yml

@@ -2,5 +2,5 @@ menu:
   dashboard:
     name: dashboard
     url_path: /admin/dashboard
-    icon: pie-chart
+    icon: dashboard
     current: ['keppler_ga_dashboard/dashboard']

data/lib/keppler/version.rb

@@ -1,3 +1,3 @@
 module Keppler
-  VERSION = "2.1.14"
+  VERSION = "2.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keppler
 version: !ruby/object:Gem::Version
-  version: 2.1.14
+  version: 2.1.15
 platform: ruby
 authors:
 - Luis Perez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -277,11 +277,17 @@ files:
 - installer/core/app/assets/stylesheets/admin/components/navigation/_turbolinks.scss
 - installer/core/app/assets/stylesheets/admin/components/paginator/_paginator.scss
 - installer/core/app/assets/stylesheets/admin/fonts-and-icons/ZXuke1cDvLCKLDcimxB44_lu.woff2
+- installer/core/app/assets/stylesheets/admin/fonts-and-icons/boxicons.css
 - installer/core/app/assets/stylesheets/admin/fonts-and-icons/fonts.css
 - installer/core/app/assets/stylesheets/admin/fonts-and-icons/fonts/Simple-Line-Icons.eot
 - installer/core/app/assets/stylesheets/admin/fonts-and-icons/fonts/Simple-Line-Icons.ttf
 - installer/core/app/assets/stylesheets/admin/fonts-and-icons/fonts/Simple-Line-Icons.woff
 - installer/core/app/assets/stylesheets/admin/fonts-and-icons/fonts/Simple-Line-Icons.woff2
+- installer/core/app/assets/stylesheets/admin/fonts-and-icons/fonts/boxicons.eot
+- installer/core/app/assets/stylesheets/admin/fonts-and-icons/fonts/boxicons.svg
+- installer/core/app/assets/stylesheets/admin/fonts-and-icons/fonts/boxicons.ttf
+- installer/core/app/assets/stylesheets/admin/fonts-and-icons/fonts/boxicons.woff
+- installer/core/app/assets/stylesheets/admin/fonts-and-icons/fonts/boxicons.woff2
 - installer/core/app/assets/stylesheets/admin/fonts-and-icons/icons.css
 - installer/core/app/assets/stylesheets/admin/pages/_appearance.scss
 - installer/core/app/assets/stylesheets/admin/pages/_bootstrap-colorpicker.scss
@@ -554,6 +560,7 @@ files:
 - installer/core/config/menu.yml
 - installer/core/config/permissions.yml
 - installer/core/config/puma.rb
+- installer/core/config/roles.yml
 - installer/core/config/routes.rb
 - installer/core/config/secrets.yml
 - installer/core/config/settings.yml
@@ -589,11 +596,6 @@ files:
 - installer/core/db/migrate/20180904144238_create_seos.rb
 - installer/core/db/schema.rb
 - installer/core/db/seeds.rb
-- installer/core/docs/diagrams/keppler_core/config
-- installer/core/docs/diagrams/keppler_frontend/editor/resources_editor.dia
-- installer/core/docs/diagrams/keppler_frontend/views/create_view.dia
-- installer/core/docs/diagrams/keppler_frontend/views/delete_view.dia
-- installer/core/docs/diagrams/keppler_frontend/views/delete_view.dia.autosave
 - installer/core/lib/generators/install_rocket/USAGE
 - installer/core/lib/generators/install_rocket/install_rocket_generator.rb
 - installer/core/lib/generators/keppler_add_module/USAGE
@@ -1688,7 +1690,6 @@ files:
 - installer/plugins/generators/keppler_scaffold/templates/views/show.js.haml
 - installer/plugins/install.rb
 - installer/plugins/layouts/application.html.haml
-- keppler-2.1.9.gem
 - keppler.gemspec
 - lib/keppler.rb
 - lib/keppler/add.rb