thecore_ui_commons 2.2.6 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '044692e50388d2be1a07d5ecf256cb590bbaa227d78ad32e0885fc8859dac137'
-  data.tar.gz: 739c924a0eed89d69e51361edd060dee8b0af722565c21b09b3f07d55e18a05e
+  metadata.gz: ef99f016b67f373d5083fa6475a1f98dc01d7201273d0b76c5cb977e6057c4a0
+  data.tar.gz: b163f9c5037f6b96a54c9eba9a27e16f826c4cd869341a448e39aa992925b98f
 SHA512:
-  metadata.gz: bea19b48bc818c37da1df3be6d1d230dc1f20f929e89953c597219f3eb2ded0c5ddc8bb7de724e8f426407f84b0c07c8f63b490eeafc9ef43ce331c9281322af
-  data.tar.gz: 9ba335b796d5e6fc25d52ab5e1704597b32108f575ae1c6027b31001aea02b0685405dafc75c1705e57c0086f9015218a45992af5dba64ec9c34d089eb28aeb2
+  metadata.gz: 014d79daedc5d88bbe8441e7a3199267ca3ba7c37d2ee08c5c63c8f5fb435051cc787934f357f972077df84a9887933895477b8889ef893bf3db971c5028879f
+  data.tar.gz: '03800a14b23b6837defc2d65809e7c8338f31ba87a12481be79021c14d6534972a14cccd97e26c007210cb38fa65a44749a7c0521cf5a60fce37dd2a9df45907'

data/app/views/layouts/thecore.html.erb

@@ -31,7 +31,7 @@
         <div class="col-md-4 col-md-offset-4 text-center">
           <img class="main-menu-app-logo" style="width: 25%; max-width: 152px" src="<%= image_url('logo.png') %>"/>
         </div>
-        <%- unless flash.empty? %>
+        <%- unless flash.blank? %>
         <div class="col-md-4 col-md-offset-4" style="margin-top: 1em;">
           <%= render partial: 'shared/flash' %>
         </div>

data/app/views/thecore_utils/_drag_drop_uploader.html.erb

@@ -12,26 +12,32 @@
 =end%>
 
 <style>
-    /* layout.css Style */
     .upload-drop-zone {
+        display: flex;
+        align-items: center;
+        justify-content: center;
         height: 200px;
         border-width: 2px;
-        margin-bottom: 20px;
-    }
-
-    /* skin.css Style*/
-    .upload-drop-zone {
-        color: #ccc;
+        /* margin-bottom: 20px; */
+        color: #bbb;
         border-style: dashed;
         border-color: #ccc;
-        line-height: 200px;
-        text-align: center
+        /* line-height: 200px; */
+        text-align: center 
+    }
+    .upload-drop-zone i {
+        font-size: 8em
     }
 
     .upload-drop-zone.drop {
         color: #222;
         border-color: #222;
     }
+
+    .upload-drop-zone.disabledDnD {
+        background-color: darkred;
+        color: white;
+    }
 </style>
 
 <div class="panel panel-default">
@@ -46,7 +52,7 @@
 
         <!-- Drop Zone -->
         <div class="upload-drop-zone" id="<%=target%>">
-            <%=I18n.t :please_drag_and_drop_here%>
+            
         </div>
 
         <div id="upload-status">
@@ -55,12 +61,24 @@
 </div>
 
 <script>
+    // Enable D&D beahviour
+    function dndOn() {
+        $('#<%=target%>').on("drop", this.ondrop);
+        $('#<%=target%>').on("dragover", this.ondragover);
+        $('#<%=target%>').on("dragleave", this.ondragleave);
+        $('#<%=target%>').removeClass('disabledDnD');
+        $('#<%=target%>').html('<div><i class="fa fa-cloud-upload"></i><br/><span><%=I18n.t :please_drag_and_drop_here%></span></div>')
+    }
+    // Disable D&D beahviour
+    function dndOff() {
+        $('#<%=target%>').addClass('disabledDnD');
+        $('#<%=target%>').html('<div><i class="fa fa-ban"></i><br/><span><%=I18n.t :dont_leve_or_drag_here%></span></div>')
+        $('#<%=target%>').off("drop", this.ondrop);
+        $('#<%=target%>').off("dragover", this.ondragover);
+        $('#<%=target%>').off("dragleave", this.ondragleave);
+    }
     var fileupload = {
-        init: function () {
-            $('#<%=target%>').on("drop", this.ondrop);
-            $('#<%=target%>').on("dragover", this.ondragover);
-            $('#<%=target%>').on("dragleave", this.ondragleave);
-        },
+        init: dndOn,
 
         beforeSuccess: function(){
             console.log("beforeSuccess");
@@ -69,6 +87,7 @@
         ondrop: function (e) {
             // console.log(e)
             e.preventDefault();
+            dndOff();
             $('#<%=target%>').removeClass('drop');
             $("#<%=target%>-upload-drop-zone-feedback").html("<i class='fa fa-spinner fa-spin '></i>");
 
@@ -87,9 +106,11 @@
                 success: function () {
                     fileupload.beforeSuccess();
                     $("#<%=target%>-upload-drop-zone-feedback").html($('<i class="fa fa-check-square-o" aria-hidden="true"></i>').delay(3000).fadeOut(400));
+                    fileupload.init();
                 },
                 error: function () {
                     $("#<%=target%>-upload-drop-zone-feedback").html($('<i class="fa fa-exclamation-circle" aria-hidden="true"></i>').delay(3000).fadeOut(400));
+                    fileupload.init();
                 }
             });
             // startUpload(e.dataTransfer.files)

data/config/locales/en.yml

@@ -1,6 +1,7 @@
 en:
   file_upload: Upload description, please add a translation for the element called file_upload in your translation file.
   file_upload_subtitle: Descrizione aggiuntiva, prego aggiungere una traduzione per file_upload_subtitle al tuo file delle traduzioni.
+  dont_leve_or_drag_here: Uploading, please don't leave this page or Drag & Drop other files.
   loading: Caricamento
   please_drag_and_drop_here: Drag and Drop here the files to import
   import_success: Import Successful!

data/config/locales/it.yml

@@ -1,6 +1,7 @@
 it:
   file_upload: Descrizione della procedura, prego aggiungere una traduzione per file_upload al tuo file delle traduzioni.
   file_upload_subtitle: Descrizione aggiuntiva, prego aggiungere una traduzione per file_upload_subtitle al tuo file delle traduzioni.
+  dont_leve_or_drag_here: Upload in corso, si prega di non lasciare la pagina o trascinare qui altri file.
   loading: Caricamento
   run_import: Forza l'importazione
   please_drag_and_drop_here: Trascinare qui i file da importare

data/db/seeds.rb

@@ -0,0 +1,3 @@
+puts "Loading ThecoreUiCommons seeds"
+Settings.ns(:importer).import_from_folder = "tmp/imports"
+Settings.ns(:importer).extension = "txt"

data/lib/concerns/thecore_ui_commons_user.rb

@@ -11,7 +11,7 @@ module ThecoreUiCommonsUser
         attr_writer :login
         
         def login
-            @login || self.username || self.email
+            @login || (self.username rescue self.email)
         end
         # Use login
         def self.find_first_by_auth_conditions(warden_conditions)

data/lib/thecore_ui_commons.rb

@@ -3,6 +3,10 @@ require 'thecore_background_jobs' # This brings backend commons also.
 require 'serviceworker-rails'
 require "groupdate"
 require "apexcharts"
+# require "gtk3"
+require "cairo"
+require "poppler"
+require "image_processing"
 
 require 'concerns/thecore_ui_commons_user'
 

data/lib/thecore_ui_commons/engine.rb

@@ -1,6 +1,9 @@
 module ThecoreUiCommons
   class Engine < ::Rails::Engine
     initializer 'thecore_ui_commons.add_to_migrations' do |app|
+      # Adds the list of Thecore Engines, so to manage seeds loading, i.e.:
+      # Thecore::Base.thecore_engines.each { |engine| engine.load_seed }
+      Thecore::Base.thecore_engines << self.class
       unless app.root.to_s.match root.to_s
         # APPEND TO MAIN APP MIGRATIONS FROM THIS GEM
         config.paths['db/migrate'].expanded.each do |expanded_path|

data/lib/thecore_ui_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreUiCommons
-  VERSION = "#{`git describe --tags $(git rev-list --tags --max-count=1)`}"
+  VERSION = "#{`git describe --tags $(git rev-list --tags --max-count=1)`.chomp}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ui_commons
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.3.1
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_background_jobs
@@ -66,6 +66,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: cairo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: poppler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: image_processing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: Engine to serve configurations and rails module useful for all the UIs.
 email:
 - gabriele.tassoni@gmail.com
@@ -138,7 +180,7 @@ files:
 - config/routes.rb
 - db/migrate/20200515070620_add_username_to_user.rb
 - db/migrate/20200515132932_add_rememberable_to_user.rb
-- db/migrate/20210208142646_add_settings_for_uploader.rb
+- db/seeds.rb
 - lib/concerns/thecore_ui_commons_user.rb
 - lib/tasks/thecore_ui_commons_tasks.rake
 - lib/thecore_ui_commons.rb

data/db/migrate/20210208142646_add_settings_for_uploader.rb

@@ -1,6 +0,0 @@
-class AddSettingsForUploader < ActiveRecord::Migration[6.0]
-  def change
-    Settings.ns(:importer).import_from_folder = "tmp/imports"
-    Settings.ns(:importer).extension = "txt"
-  end
-end