thecore_ui_commons 2.2.5 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f96a230065dcec5fdb22b7959137e33b030af287152f1ef142f30830475908be
-  data.tar.gz: 5a01e066cb48e721f83a208a0cf5570140a02babf5dd14d730019198bef95e4b
+  metadata.gz: 03d1a89997f19015363818b765abead88599d37202e14d2595683bb89eec2da9
+  data.tar.gz: c5f39edc2f974aa2ab8961c1d35483d0df0d31d619845584b01933c64c30ec3f
 SHA512:
-  metadata.gz: 1aa2e381eb398e0b3fb29fc38ad3de5d2be9930afe486ac47352a45d76677a00317e883380bcb203c226351a409c60f4b4368bc6ce2ec6af95c272e122e5edb2
-  data.tar.gz: 14e72ad93387dd2600bcbb09cf54440c60857ae55c62b393b77a2a240ad3a1f9ccb271cacf42b3f94ae7591f08114665025c1d35b6352f1ea64cc92929f9bdf3
+  metadata.gz: 5570885cde77bb6df53798bd0e1b5ddee4640546bec226cf7c66c6e6b1fa64a2ffc0404aa353864ae9111495c5dc73342127acecee3f572e0718238e9a2be9ba
+  data.tar.gz: 5273adc7dc79d7b3055676b92c188480977b353b8b84b84e0ce356b528d086c6754fdf9b3347fe30bdf71e22665ed7a55536ce9c773ea9e12c0dd81c41afaca6

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,4 +1,10 @@
 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!
   current_user: Current User
   devise:
     sessions:

data/config/locales/it.yml

@@ -1,4 +1,10 @@
 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
   import_success: Importazione completata con successo
   current_user: Utente corrente
   hello: "Ciao Mondo"

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/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.5
+  version: 2.3.0
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-03-15 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