lato 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df735930c50baedc7cd02983684c95b44df0ac32e3acdd3724cc0a8b6a017f3d
-  data.tar.gz: b5442d7576eed9fa4ccab09472895ebfdf1ee47ab66bf81c90ce71efff38b31f
+  metadata.gz: d6adeb777cb566b2e9d542140ebf059a817c6f94a7afa11b508f194d3ffe6a1a
+  data.tar.gz: 6e462303df7baf36f4dac902c5c25d1a5da45abeeaf3dca434c6333cc3793555
 SHA512:
-  metadata.gz: 61b499814b967a6d6eb46cff9de9d4df83104a6487bdcc2bd876db7b9d53477e8b72df26de44182b4f8b7ddadf542b324652ccefea1bf7b460986189dd25d337
-  data.tar.gz: c68a2c8f7682d11eeef3462e0f940747f3cf370f9e5b3fc6cc370907c49fd57ce0a9aa42dc45850957555cd4c5885456cc2fb7583cddcf43c3dfaec86c6c9a3a
+  metadata.gz: fb537cf7b8d676714301243ed815eb50e3ee9216ce72d10c0f034a38119952c8c5e8b404e70d641ba26c576c89de5a5ebe04085404cc5cb3749cee0ccbbbd931
+  data.tar.gz: 8b9ef05c50607bce795873155a4be715162abe82c96f9792299fd4aeb91f4f07f50f8e5721d1361c11a9fe916dd13ce8b5531e0a8a8c1dd059d50634a0db0921

data/README.md

@@ -98,4 +98,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## To do
 - Gestione abbonamenti e acquisti singoli con integrazione Stripe
-- Gestione input file operazione
+- Gestione input file operazione

data/app/assets/javascripts/lato/controllers/lato_action_controller.js

@@ -22,18 +22,46 @@ export default class extends Controller {
 
       modalTarget.addEventListener('show.bs.modal', () => {
         this.usedModals.push(index)
+
+        // update backdrop z-index in case of multiple opened modals
+        setTimeout(() => { // use setTimeout because bsModalBackdropElement is not always ready after 'show.bs.modal' event
+          if (this.usedModals.length > 1) {
+            for (let i = 0; i < this.usedModals.length; i++) {
+              const bsModal = this.bsModals[this.usedModals[i]]
+  
+              const bsModalElement = bsModal._element
+              if (bsModalElement) bsModalElement.style.zIndex = 1055 + i + 1
+  
+              const bsModalBackdropElement = bsModal._backdrop._element
+              if (bsModalBackdropElement) bsModalBackdropElement.style.zIndex = 1055 + i
+            }
+          }
+        }, 1)
       })
       modalTarget.addEventListener('hide.bs.modal', () => {
-        this.usedModals = this.usedModals.filter((i) => i != index)
-        this.modalBodyTargets[index].innerHTML = ''
+        setTimeout(() => {
+          this.usedModals = this.usedModals.filter((i) => i != index)
+          this.modalBodyTargets[index].innerHTML = ''
+        }, 500)
       })
     })
   }
 
   disconnect() {
+    // call dispose to all bootstrap modals (clear bootstrap modal)
     this.bsModals.forEach((bsModal) => {
       bsModal.dispose()
     })
+
+    // clean modalTitle content
+    this.modalTitleTargets.forEach((modalTitleTarget) => {
+      modalTitleTarget.innerHTML = ''
+    })
+
+    // clean modalBody content
+    this.modalBodyTargets.forEach((modalBodyTarget) => {
+      modalBodyTarget.innerHTML = ''
+    })
   }
 
   triggerTargetConnected(element) {

data/app/assets/javascripts/lato/controllers/lato_operation_controller.js

@@ -12,12 +12,16 @@ export default class extends Controller {
 
   connect() {
     if (this.hasUpdateTarget) {
-      setTimeout(() => {
+      this._timeout = setTimeout(() => {
         this.updateTarget.click()
       }, 2000)
     }
   }
 
+  disconnect() {
+    if (this._timeout) clearTimeout(this._timeout)
+  }
+
   outputFileTargetConnected(element) {
     element.click()
   }

data/app/models/concerns/lato_user_application.rb

@@ -0,0 +1,9 @@
+module LatoUserApplication
+  extend ActiveSupport::Concern
+
+  included do
+    # Add here custom relations, scopes, ecc.
+  end
+
+  # Add here custom methods
+end

data/app/models/lato/user.rb

@@ -1,5 +1,7 @@
 module Lato
   class User < ApplicationRecord
+    include LatoUserApplication
+
     has_secure_password
 
     # Kredis

data/app/views/lato/components/_index.html.erb

@@ -4,86 +4,94 @@
     <%= hidden_field_tag :key, key %>
     <%= hidden_field_tag :sort_by, params[:sort_by] %>
 
-    <div class="table-responsive">
-      <table class="table table-striped table-bordered">
-        <thead>
-          <% if custom_actions.any? || searchable_columns.any? %>
-            <tr>
-              <td colspan="<%= columns.length %>">
-                <div class="d-flex justify-content-between">
-                  <% if searchable_columns.any? %>
-                    <div class="input-group">
-                      <input type="text" name="search" class="form-control" placeholder="Ricerca per: <%= searchable_columns.map { |c| collection.model.human_attribute_name(c) }.to_sentence %>" value="<%= params[:search] %>">
-                      <button class="btn btn-outline-primary" type="submit"><i class="bi bi-search"></i></button>
-                    </div>
-                  <% else %>
-                    <div></div>
-                  <% end %>
+    <% if false && browser.device.mobile? %>
 
-                  <div class="btn-group ms-2">
-                    <% if custom_actions.any? %>
-                      <% custom_actions.each do |action_key, action_params| %>
-                        <%= link_to action_params[:path], { class: 'btn btn-primary' }.merge(action_params) do %>
-                          <i class="<%= action_params[:icon] %>"></i>
-                        <% end %>
-                      <% end %>
-                    <% end %>
-                  </div>
-                </div>
-              </td>
-            </tr>
-          <% end %>
-          <tr class="align-middle">
-            <% columns.each do |column| %>
-              <th scope="col">
-                <div class="d-flex align-items-center">
-                  <span><%= collection.model.human_attribute_name column %></span>
-                  <% if sortable_columns.include?(column) %>
-                    <div class="btn-group ms-3">
-                      <div class="position-relative btn btn-sm <%= params[:sort_by] == "#{column}|ASC" ? 'btn-primary' : 'btn-outline-primary' %>">
-                        <input type="submit" name="sort_by" value="<%= column %>|ASC" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; opacity: 0">
-                        <i class="bi bi-sort-up"></i>
-                      </div>
+      <p>Work in progress</p>
+
+    <% else %>
 
-                      <div class="position-relative btn btn-sm <%= params[:sort_by] == "#{column}|DESC" ? 'btn-primary' : 'btn-outline-primary' %>">
-                        <input type="submit" name="sort_by" value="<%= column %>|DESC" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; opacity: 0">
-                        <i class="bi bi-sort-down"></i>
+      <div class="table-responsive">
+        <table class="table table-striped table-bordered">
+          <thead>
+            <% if custom_actions.any? || searchable_columns.any? %>
+              <tr>
+                <td colspan="<%= columns.length %>">
+                  <div class="d-flex justify-content-between">
+                    <% if searchable_columns.any? %>
+                      <div class="input-group">
+                        <input type="text" name="search" class="form-control" placeholder="Ricerca per: <%= searchable_columns.map { |c| collection.model.human_attribute_name(c) }.to_sentence %>" value="<%= params[:search] %>">
+                        <button class="btn btn-outline-primary" type="submit"><i class="bi bi-search"></i></button>
                       </div>
+                    <% else %>
+                      <div></div>
+                    <% end %>
+
+                    <div class="btn-group ms-2">
+                      <% if custom_actions.any? %>
+                        <% custom_actions.each do |action_key, action_params| %>
+                          <%= link_to action_params[:path], { class: 'btn btn-primary' }.merge(action_params) do %>
+                            <i class="<%= action_params[:icon] %>"></i>
+                          <% end %>
+                        <% end %>
+                      <% end %>
                     </div>
-                  <% end %>
-                </div>
-              </th>
+                  </div>
+                </td>
+              </tr>
             <% end %>
-          </tr>
-        </thead>
-        <tbody>
-          <% collection.each do |member| %>
-            <tr>
+            <tr class="align-middle">
               <% columns.each do |column| %>
-                <td>
-                  <% viewer_function_name = "#{model_name_underscore}_#{column}" %>
-                  <%= respond_to?(viewer_function_name) ? send(viewer_function_name, member) : member.send(column) %>
-                </td>
+                <th scope="col">
+                  <div class="d-flex align-items-center">
+                    <span><%= collection.model.human_attribute_name column %></span>
+                    <% if sortable_columns.include?(column) %>
+                      <div class="btn-group ms-3">
+                        <div class="position-relative btn btn-sm <%= params[:sort_by] == "#{column}|ASC" ? 'btn-primary' : 'btn-outline-primary' %>">
+                          <input type="submit" name="sort_by" value="<%= column %>|ASC" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; opacity: 0">
+                          <i class="bi bi-sort-up"></i>
+                        </div>
+
+                        <div class="position-relative btn btn-sm <%= params[:sort_by] == "#{column}|DESC" ? 'btn-primary' : 'btn-outline-primary' %>">
+                          <input type="submit" name="sort_by" value="<%= column %>|DESC" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; opacity: 0">
+                          <i class="bi bi-sort-down"></i>
+                        </div>
+                      </div>
+                    <% end %>
+                  </div>
+                </th>
               <% end %>
             </tr>
-          <% end %>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td colspan="<%= columns.length %>">
-              <div class="d-flex justify-content-between align-items-center">
-                <% if collection.respond_to?(:total_pages) %>
-                  <div><%= paginate collection %></div>
-                <% else %>
-                  <div></div>
+          </thead>
+          <tbody>
+            <% collection.each do |member| %>
+              <tr>
+                <% columns.each do |column| %>
+                  <td>
+                    <% viewer_function_name = "#{model_name_underscore}_#{column}" %>
+                    <%= respond_to?(viewer_function_name) ? send(viewer_function_name, member) : member.send(column) %>
+                  </td>
                 <% end %>
-                <span class="text-muted"><%= collection.count %> risultati visualizzati
-              </div>
-            </td>
-          </tr>
-        </tfoot>
-      </table>
-    </div>
+              </tr>
+            <% end %>
+          </tbody>
+          <tfoot>
+            <tr>
+              <td colspan="<%= columns.length %>">
+                <div class="d-flex justify-content-between align-items-center">
+                  <% if collection.respond_to?(:total_pages) %>
+                    <div><%= paginate collection %></div>
+                  <% else %>
+                    <div></div>
+                  <% end %>
+                  <span class="text-muted"><%= collection.count %> risultati visualizzati
+                </div>
+              </td>
+            </tr>
+          </tfoot>
+        </table>
+      </div>
+
+    <% end %>
   <% end %>
 
 <% end %>

data/app/views/layouts/lato/_navbar-brand_content.html.erb

@@ -1 +1,6 @@
-<%= Lato.config.application_title %>
+<%= Lato.config.application_title %>
+
+<!--
+<img src="https://getbootstrap.com/docs/5.0/assets/brand/bootstrap-logo.svg" alt="" width="30" height="24" class="d-inline-block align-text-top">
+<span><%= Lato.config.application_title %></span>
+-->

data/app/views/layouts/lato/application.html.erb

@@ -7,7 +7,7 @@
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
 
-  <%= stylesheet_link_tag "application", media: "all" %>
+  <%= stylesheet_link_tag Lato.config.assets_stylesheet_entry, media: "all" %>
   <%= javascript_importmap_tags %>
 </head>
 <body

data/lib/lato/config.rb

@@ -12,6 +12,9 @@ module Lato
     # Authentication configs
     attr_accessor :auth_disable_signup
 
+    # Assets configs
+    attr_accessor :assets_stylesheet_entry
+
     # Email configs
     attr_accessor :email_from
 
@@ -25,6 +28,8 @@ module Lato
 
       @auth_disable_signup = false
 
+      @assets_stylesheet_entry = 'application'
+
       @session_lifetime = 30.days
       @session_root_path = nil # :tutorial_path
 

data/lib/lato/version.rb

@@ -1,3 +1,3 @@
 module Lato
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/lib/lato.rb

@@ -1,5 +1,6 @@
 require "kaminari"
 require "bootstrap"
+require "browser"
 
 require "lato/version"
 require "lato/engine"

data/lib/tasks/lato_tasks.rake

@@ -5,6 +5,8 @@ namespace :lato do
     desc 'Install Lato engine and run tasks on main rails application'
     task :application do
       # Copy all "_content.html.erb" parials on layouts/lato from gem to main application
+      ##
+
       gem_layout_path = Lato::Engine.root.join('app', 'views', 'layouts', 'lato').to_s
       app_layout_path = Rails.root.join('app', 'views', 'layouts', 'lato').to_s
 
@@ -23,6 +25,11 @@ namespace :lato do
 
         FileUtils.copy(src_file_path, dest_file_path) unless File.exist? dest_file_path
       end
+
+      # Copy "lato_user_application.rb" model concern from ghem to main application
+      gem_concern_path = Lato::Engine.root.join('app', 'models', 'concerns', 'lato_user_application.rb').to_s
+      app_concern_path = Rails.root.join('app', 'models', 'concerns', 'lato_user_application.rb').to_s
+      FileUtils.copy(gem_concern_path, app_concern_path) unless File.exist? app_concern_path
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lato
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Gregorio Galante
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: browser
+  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'
 description: A Rails engine that includes what you need to build a new project!
 email:
 - me@gregoriogalante.com
@@ -117,6 +131,7 @@ files:
 - app/jobs/lato/application_job.rb
 - app/mailers/lato/application_mailer.rb
 - app/mailers/lato/user_mailer.rb
+- app/models/concerns/lato_user_application.rb
 - app/models/lato/application_record.rb
 - app/models/lato/operation.rb
 - app/models/lato/session.rb