thecore_ui_commons 2.1.7 → 2.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4143e4e7f04c0e8f7c20087478451c3d21a23159f9a46c7d1538a9116fdca4a
-  data.tar.gz: d87ab5529a8abc0289a51fb72cd0989e3ef13678e24acfcd4d9b1a46fec08474
+  metadata.gz: d9f7aac2f4ddbb633d8dcb66dcddcbad97048fc61465a795485e54b1ea046dcc
+  data.tar.gz: f1bcb8e2baaa71d7c51eb480d5f7ce830612691d486f4077918ffa98867b8044
 SHA512:
-  metadata.gz: c3a89897b04d5c57d7c441b8e374e5995f9e9cc97ec361d0d87f3328f2900905d6d2e746e3bcee42bbca815d8702ba70104ed353d14189382059f3bd982d2afe
-  data.tar.gz: ecd1c9c5c3040ec9c30b26174ecd8b1dd9ba6a6b95bfac301f837ef548b1ccd409a78e318c60cac3e2fb24be63570c7e276ea6235cd053597ca53ff60b894b3d
+  metadata.gz: 0001dd702d33688143879408db4cdc08c0009405b9f1c23bbed90d02c33abc210f3c5f6f4e1ccaf57eb27b927efbee4cd5f6818c5224772825579c89ce97ce4e
+  data.tar.gz: b529965589247146cf64fd6fa4075fa8bc2fc5ea63b5f6376cfc3ac5617c6ff80d3f9c18a56aa6c80dac6bc33d716cd8d21c70e31bb29554ccd6af12e10c325f

data/app/assets/javascripts/thecore_ui_commons/thecore.js

@@ -5,5 +5,4 @@
 //= require bootstrap
 //= require ie
 //= require timer
-//= require trix
-//= require_tree .
+//= require apexcharts

data/app/assets/stylesheets/thecore_ui_commons/actiontext.scss

@@ -3,7 +3,7 @@
 // the trix-editor content (whether displayed or under editing). Feel free to incorporate this
 // inclusion directly in any other asset bundle and remove this file.
 //
-//= require trix
+//= require trix/dist/trix
 
 // We need to override trix.css’s image gallery styles to accommodate the
 // <action-text-attachment> element we wrap around attachments. Otherwise,

data/app/assets/stylesheets/thecore_ui_commons/thecore.scss

@@ -16,3 +16,7 @@
  *= require_self
 */
 @import 'actiontext.scss';
+
+#new_user div {
+    margin-bottom: .5em;
+}

data/app/views/devise/sessions/new.html.erb

@@ -1,13 +1,11 @@
 <div class="col-md-4 col-md-offset-4">
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="field">
-    <%= f.label :login %><br />
-    <%= f.text_field :login, autofocus: true, :class => "form-control" %>
+    <%= f.text_field :login, autofocus: true, :class => "form-control", placeholder: t("devise.sessions.new.login") %>
   </div>
 
   <div class="field">
-    <%= f.label :password %><br />
-    <%= f.password_field :password, autocomplete: "off", :class => "form-control" %>
+    <%= f.password_field :password, autocomplete: "off", :class => "form-control", placeholder: t("devise.sessions.new.password") %>
   </div>
 
   <% if devise_mapping.rememberable? -%>
@@ -20,7 +18,7 @@
   <% end -%>
 
   <div class="actions">
-    <%= f.submit t("devise.sessions.new.sign_in"), :class => "btn btn-warning" %>
+    <%= f.submit t("devise.sessions.new.sign_in"), :class => "btn" %>
 
     <%= render "devise/shared/links" %>
   </div>

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

@@ -10,13 +10,10 @@
     <%= tag("link", rel: "manifest", href: asset_path("manifest.json", skip_pipeline: true)) %>
     <meta name="turbolinks-cache-control" content="no-cache">
 
-    <%-Rails.application.config.assets.paths.each do |p| %>
     <%# Getting all the assets needed by thecore from all the gems %>
-    <%= stylesheet_link_tag("#{p.to_s.split("/").last}/thecore", media: 'all', 'data-turbolinks-track' => true) if File.exists?("#{p}/thecore.scss") %>
-    <%= javascript_include_tag("#{Dir["#{p}/**/thecore.js"].first.split("/")[-2]}/thecore", 'data-turbolinks-track' => true) if Dir["#{p}/**/thecore.js"].any? %>
-    <%-end%>
-    <%= stylesheet_link_tag('application', media: 'all', 'data-turbolinks-track' => true) if ::Rails.application.assets.find_asset("application.css")%>
-    <%= javascript_include_tag('application', 'data-turbolinks-track' => true) if ::Rails.application.assets.find_asset("application.js") %>
+    <%= get_asset_tags_for("thecore")%>
+    <%= stylesheet_link_tag('application', media: 'all', 'data-turbolinks-track' => true) if (Rails.application.assets || ::Sprockets::Railtie.build_environment(Rails.application)).find_asset("application.css")%>
+    <%= javascript_include_tag('application', 'data-turbolinks-track' => true) if (Rails.application.assets || ::Sprockets::Railtie.build_environment(Rails.application)).find_asset("application.js") %>
     
     <%= favicon_link_tag 'apple-touch-icon.png', rel: 'apple-touch-icon', sizes: "180x180" %>
     <%= favicon_link_tag 'favicon-32x32.png', rel: 'icon', sizes: "32x32" %>

data/config/initializers/charts_helper.rb

@@ -0,0 +1,45 @@
+require 'date'
+module Helpers
+    module ChartsHelper
+        def candlestick_data
+            @acc = rand(6570..6650)
+            60.times.map {|i| [Date.today - 60 + i, ohlc] }.to_h
+        end
+        
+        def ohlc
+            open = @acc + rand(-20..20)
+            high = open + rand(0..100)
+            low = open - rand(0..100)
+            @acc = close = open + rand(-((high-low)/3)..((high-low)/2))
+            [open, high, low, close]
+        end
+
+        ### HIGH PRIORITY CHARTS
+        def charts_high_pie_demo
+            pie_chart([{name: "Series A", data: 25},{name: "Series B", data: 100},{name: "Series C", data: 200},{name: "Series D", data: 125}], legend: "left")
+        end
+
+        def charts_high_candlestick_demo
+            candlestick_options = {plot_options: {candlestick: {colors: {upward: '#3C90EB',downward: '#DF7D46'}}}}
+            candlestick_chart(candlestick_data, candlestick_options)
+        end
+        
+        ### MEDIUM PRIORITY CHARTS
+        def charts_medium_radar_demo
+            radar_series = [{name: "What it should be",data: { "Code review"=>10, "Issues"=>5, "Pull request"=>25, "Commits"=>60 }},{name: "What it really is",data: { "Code review"=>1, "Issues"=>3, "Pull request"=>7, "Commits"=>89 }}]
+            radar_chart(radar_series,{title: "GitHub Radar", markers: {size: 4}, theme: 'palette4'})
+        end
+
+        def charts_medium_bubble_demo
+            bubble_series = (1..4).map do |n|{name: "Bubble#{n}",data: 20.times.map{[rand(750),rand(10..60),rand(70)]}}end
+            bubble_chart(bubble_series, data_labels: false, theme: 'palette6')
+        end
+
+        def charts_medium_range_demo
+            range_bar_series = [{name: "Series A",data: {'A' => [1, 5],'B' => [4, 6],'C' => [5, 8],'D' => [3, 11]}}, {name: "Series B",data: {'A' => [2, 6],'B' => [1, 3],'C' => [7, 8],'D' => [5, 9]}}]
+            range_bar_chart(range_bar_series, theme: 'palette3')
+        end
+    end
+end
+
+ActiveSupport.on_load(:action_view) { include Helpers::ChartsHelper }

data/config/initializers/thecore_ui_commons_application_config.rb

@@ -16,7 +16,17 @@ Rails.application.configure do
   config.assets.precompile += %w( browserconfig.xml )
   config.assets.precompile += %w( thecore_ui_commons/thecore.js )
   config.assets.precompile += %w( thecore_ui_commons/thecore.css )
-  config.assets.paths << Rails.root.join('node_modules')
+  # Very important, needed for trix (i.e.)
+  config.assets.paths << root.join('node_modules')
+  # To store D3 Data
+  # https://medium.com/@hguotblog/use-d3-js-for-data-visualisation-with-rails-69b4f030e366
+  config.assets.paths << root.join('data')
+  # Putting also a reference on the assets foldes in the paths, so to have the 
+  # stylesheet and javascript hack work proprly in layout
+  # config.assets.paths << 
+  # root.join("app", "assets", "stylesheets", "thecore_ui_commons")
+  # config.assets.paths << 
+  # root.join("app", "assets", "javascripts", "thecore_ui_commons")
   # config.action_controller.asset_host = if ENV['RAILS_URL'].blank? || ENV['RAILS_RELATIVE_URL_ROOT'].blank?
   #   "http://localhost:3000"
   # else

data/config/initializers/thecore_ui_commons_helper.rb

@@ -0,0 +1,22 @@
+module Helpers
+    module ThecoreUiCommonsHelper
+        def get_asset_tags_for(basename)
+            out = []
+            # Needs to reverse since Paths are traversed in the order they occur in the search path. By default, this means the files in app/assets take precedence, and will mask corresponding paths in lib and vendor.
+            Rails.application.config.assets.paths.reverse.each do |basedir|
+                base = "#{basedir}/**/#{basename}"
+                base_s = Dir["#{base}.scss"]
+                base_j = Dir["#{base}.js"]
+                out << stylesheet_link_tag("#{get_folder base_s}/#{basename}", media: 'all', 'data-turbolinks-track' => true) if base_s.any?
+                out << javascript_include_tag("#{get_folder base_j}/#{basename}", 'data-turbolinks-track' => true) if base_j.any?
+            end
+            out.join("\n    ").html_safe
+        end
+        
+        def get_folder(base)
+            base.first.split("/")[-2]
+        end
+    end
+end
+
+ActiveSupport.on_load(:action_view) { include Helpers::ThecoreUiCommonsHelper }

data/config/locales/en.ra_settings.yml

@@ -0,0 +1,4 @@
+en:
+    activerecord:
+        models:
+            rails_admin_settings/setting: Configurations

data/config/locales/en.yml

@@ -0,0 +1,49 @@
+en:
+  current_user: Current User
+  devise:
+    sessions:
+      new:
+        login: Login
+        password: Password
+  hello: Hello World
+  dashboard: Dashboard
+  contact: Help us
+  manage: Manage
+  sign_out: Sign Out 
+  advanced: Advanced
+  main_records: Registries
+  errors:
+    messages:
+      invalid: Invalid characters
+  tiered_times:
+    dd:
+      zero: "0 Days"
+      one: "%{count} Day"
+      other: "%{count} Days"
+    hh:
+      zero: "0 Hours"
+      one: "%{count} Hour"
+      other: "%{count} Hours"
+    mm:
+      zero: "0 Minutes"
+      one: "%{count} Minute"
+      other: "%{count} Minutes"
+    ss:
+      zero: "0 Seconds"
+      one: "%{count} Second"
+      other: "%{count} Seconds"
+  admin:
+    links:
+      label: Links
+    tools:
+      label: Tools
+    settings:
+      label: Settings
+      advanced: Advanced
+      registries: Registries
+      operations: Operations
+    actions:
+      charts:
+        menu: Analisys
+        title: Charts
+        breadcrumb: Charts

data/config/locales/it.ra_settings.yml

@@ -0,0 +1,4 @@
+it:
+    activerecord:
+        models:
+            rails_admin_settings/setting: Configurations

data/config/locales/it.yml

@@ -0,0 +1,49 @@
+it:
+  current_user: Utente corrente
+  hello: "Ciao Mondo"
+  dashboard: "Pannello di controllo"
+  contact: "Aiutaci a Migliorare"
+  manage: "Gestione"
+  sign_out: "Uscita"
+  advanced: Impostazioni
+  main_records: Anagrafiche
+  devise:
+    sessions:
+      new:
+        login: Login
+        password: Password
+  errors:
+    messages:
+      invalid: contiene caratteri invalidi
+  tiered_times:
+    dd:
+      zero: "0 Giorni"
+      one: "%{count} Giorno"
+      other: "%{count} Giorni"
+    hh:
+      zero: "0 Ore"
+      one: "%{count} Ora"
+      other: "%{count} Ore"
+    mm:
+      zero: "0 Minuti"
+      one: "%{count} Minuto"
+      other: "%{count} Minuti"
+    ss:
+      zero: "0 Secondi"
+      one: "%{count} Secondo"
+      other: "%{count} Secondi"
+  admin:
+    links:
+      label: Collegamenti
+    tools:
+      label: "Strumenti"
+    settings:
+      label: Impostazioni
+      advanced: Avanzate
+      registries: Anagrafiche
+      operations: Operatività
+    actions:
+      charts:
+        menu: Analisi
+        title: Grafici
+        breadcrumb: Grafici

data/db/migrate/20200515070620_add_username_to_user.rb

@@ -1,4 +1,43 @@
 class AddUsernameToUser < ActiveRecord::Migration[6.0]
+  class User < ApplicationRecord
+    # Include default devise modules. Others available are:
+    # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
+    devise :database_authenticatable, :trackable, :validatable
+    # TODO: If it works, these must be added to another gem one which deal 
+    # more with sessions
+    # devise :database_authenticatable
+    # devise :rememberable
+    # devise :trackable
+    # devise :validatable
+    # devise :timeoutable, timeout_in: 30.minutes 
+    # REFERENCES
+    has_many :role_users, dependent: :destroy, inverse_of: :user
+    has_many :roles, through: :role_users, inverse_of: :users
+    # VALIDATIONS
+    validates :email, uniqueness: { case_sensitive: false }, presence: true, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i }
+    validates :password, presence: true, on: :create
+    validates :password_confirmation, presence: true, on: :create
+    validate :check_password_and_confirmation_equal
+    validates_each :admin do |record, attr, value|
+      # Don't want admin == false if the current user is the only admin
+      record.errors.add(attr, I18n.t("validation.errors.cannot_unadmin_last_admin")) if record.admin_changed? && record.admin_was == true && User.where(admin: true).count == 1
+    end
+  
+    def display_name
+      email
+    end
+  
+    def has_role? role
+      roles.include? role
+    end
+  
+    protected
+  
+    def check_password_and_confirmation_equal
+      errors.add(:password, I18n.t("validation.errors.password_and_confirm_must_be_the_same")) unless password == password_confirmation
+    end
+  end
+  
   def change
     add_column :users, :username, :string
     add_index :users, :username

data/lib/concerns/thecore_ui_commons_user.rb

@@ -5,6 +5,8 @@ module ThecoreUiCommonsUser
     
     included do
         devise :database_authenticatable, :trackable, :validatable, :rememberable, :timeoutable, timeout_in: 30.minutes, authentication_keys: [:login]
+        validates :username, uniqueness: { case_sensitive: false }, presence: true, length: { in: 4..15 }
+        validates_format_of :username, with: /\A[a-zA-Z0-9]*\z/, on: :create, message: "can only contain letters and digits"
         
         attr_writer :login
         
@@ -13,7 +15,6 @@ module ThecoreUiCommonsUser
         end
         # Use login
         def self.find_first_by_auth_conditions(warden_conditions)
-            puts "################################ VIENE USATO? #####################################################"
             conditions = warden_conditions.dup
             if login = conditions.delete(:login)
                 where(conditions.to_h).where(["lower(username) = :value OR lower(email) = :value", { :value => login.downcase }]).first

data/lib/thecore_ui_commons.rb

@@ -1,9 +1,14 @@
-require 'thecore_backend_commons'
+require 'thecore_background_jobs' # This brings backend commons also.
 # Rails
 require 'serviceworker-rails'
+require "groupdate"
+require "apexcharts"
 
 require 'concerns/thecore_ui_commons_user'
 
+# require 'helpers/thecore_ui_commons_helper'
+# require 'helpers/charts_helper'
+
 require "thecore_ui_commons/engine"
 
 module ThecoreUiCommons

data/lib/thecore_ui_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreUiCommons
-  VERSION = '2.1.7'
+  VERSION = '2.1.12'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ui_commons
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.12
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-17 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thecore_backend_commons
+  name: thecore_background_jobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: serviceworker-rails
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: groupdate
+  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: apexcharts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Engine to serve configurations and rails module useful for all the UIs.
 email:
 - gabriele.tassoni@gmail.com
@@ -65,11 +93,8 @@ files:
 - app/assets/javascripts/pages.coffee
 - app/assets/javascripts/thecore_ui_commons/thecore.js
 - app/assets/javascripts/timer.js
-- app/assets/javascripts/trix-core.js
-- app/assets/javascripts/trix.js
 - app/assets/stylesheets/thecore_ui_commons/actiontext.scss
 - app/assets/stylesheets/thecore_ui_commons/thecore.scss
-- app/assets/stylesheets/trix.css
 - app/controllers/application_controller.rb
 - app/views/active_storage/blobs/_blob.html.erb
 - app/views/contact_mailer/contact_message.html.erb
@@ -100,11 +125,16 @@ files:
 - app/views/layouts/mailer.html.erb
 - app/views/layouts/mailer.text.erb
 - app/views/layouts/thecore.html.erb
+- config/initializers/charts_helper.rb
 - config/initializers/thecore_ui_commons_application_config.rb
+- config/initializers/thecore_ui_commons_helper.rb
+- config/locales/en.ra_settings.yml
 - config/locales/en.simple_form.yml
+- config/locales/en.yml
+- config/locales/it.ra_settings.yml
 - config/locales/it.simple_form.yml
+- config/locales/it.yml
 - config/routes.rb
-- db/migrate/20190920115550_create_action_text_tables.action_text.rb
 - db/migrate/20200515070620_add_username_to_user.rb
 - db/migrate/20200515132932_add_rememberable_to_user.rb
 - lib/concerns/thecore_ui_commons_user.rb