biovision-base 0.34.190331.1 → 0.36.190526.0

data/app/services/user_bouncer.rb

@@ -9,6 +9,7 @@ class UserBouncer
   # @param [String] password
   def let_user_in?(password)
     return false unless @user&.allow_login?
+
     @password = password
     too_many_attempts? ? (log_attempt && false) : try_password
   end
@@ -16,7 +17,7 @@ class UserBouncer
   private
 
   def too_many_attempts?
-    LoginAttempt.owned_by(@user).since(15.minutes.ago).count > 4
+    LoginAttempt.owned_by(@user).since(15.minutes.ago).count > 10
   end
 
   def log_attempt
@@ -30,8 +31,6 @@ class UserBouncer
 
   def count_attempt
     log_attempt
-    if too_many_attempts?
-      UserMailer.login_attempt(@user.id).deliver_later
-    end
+    UserMailer.login_attempt(@user.id).deliver_later if too_many_attempts?
   end
 end

data/app/uploaders/simple_file_uploader.rb

@@ -9,4 +9,19 @@ class SimpleFileUploader < CarrierWave::Uploader::Base
 
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{slug}"
   end
+
+  def extension_blacklist
+    %w[
+      htm html action apk app bat bin cmd com command cpl csh exe gadget inf ins
+      inx ipa isu job jse ksh lnk msc msi msp mst osx out paf pif prg ps1 reg
+      rgs run scr sct shb shs u3p vb vbe vbs vbscript workflow ws wsf wsh 0xe
+      73k 89k a6p ac acc acr actm ahk air app arscript as asb awk azw2 beam btm
+      cel celx chm cof crt dek dld dmc docm dotm dxl ear ebm ebs ebs2 ecf eham
+      elf es ex4 exopc ezs fas fky fpi frs fxp gs ham hms hpf hta iim ipf isp
+      jar js jsx kix lo ls mam mcr mel mpx mrc ms ms mxe nexe obs ore otm pex
+      plx potm ppam ppsm pptm prc pvd pwc pyc pyo qpx rbx rox rpj s2a sbs sca
+      scar scb script smm spr tcp thm tlb tms udf upx url vlx vpm wcm widget wiz
+      wpk wpm xap xbap xlam xlm xlsm xltm xqt xys zl9 dmg pkg php rb
+    ]
+  end
 end

data/app/views/admin/editable_pages/entity/_in_list.html.erb

@@ -1,5 +1,5 @@
 <div class="image">
-  <%= editable_page_image_preview(entity) %>
+  <%= simple_image_preview(entity) %>
 </div>
 <div class="data">
   <div><%= admin_editable_page_link(entity) %></div>

data/app/views/admin/editable_pages/show.html.erb

@@ -25,7 +25,7 @@
       <dt><%= t('activerecord.attributes.editable_page.image') %></dt>
       <dd>
         <figure role="group" class="preview">
-          <%= editable_page_image_medium(@entity) %>
+          <%= simple_image_medium(@entity) %>
           <figcaption><%= @entity.image_alt_text %></figcaption>
         </figure>
       </dd>
@@ -47,7 +47,7 @@
     <dt><%= t('activerecord.attributes.editable_page.body') %></dt>
     <dd>
       <div class="text">
-        <%= raw(@entity.body) %>
+        <%= raw @entity.text %>
       </div>
     </dd>
 

data/app/views/admin/index/_biovision_base.html.erb

@@ -2,8 +2,8 @@
 <%#= render 'admin/index/dashboard/biovision_track' %>
 <%= render 'admin/index/dashboard/biovision_user' %>
 <%= render 'admin/index/dashboard/editorial' %>
-<%= render 'admin/index/dashboard/biovision_links' if LinkBlock.any? %>
+<%= render 'admin/index/dashboard/biovision_links' if LinkBlock.table_exists? && LinkBlock.any? %>
 <%= render 'admin/index/dashboard/biovision_feedback' %>
-<% %w[regions post vote poll comment].each do |part| %>
+<% %w[partners post vote poll comment].each do |part| %>
   <%= render "admin/index/dashboard/biovision_#{part}" if Gem.loaded_specs.key?("biovision-#{part}") %>
 <% end %>

data/app/views/admin/settings/component/_new_parameter.html.erb

@@ -11,21 +11,17 @@
     ) do |f|
   %>
     <dl>
-      <dt>
-        <%=
-          f.label(:slug, t('activerecord.attributes.biovision_parameter.slug'))
-        %>
-      </dt>
+      <dt><%= f.label(:slug, t('.slug')) %></dt>
       <dd>
         <%=
           f.text_field(
               :slug,
               value:     '',
               required:  true,
-              pattern:   BiovisionParameter::SLUG_PATTERN_HTML,
+              pattern:   BiovisionComponent::SLUG_PATTERN_HTML,
               title:     t('.guidelines.slug'),
               size:      nil,
-              maxlength: BiovisionParameter::SLUG_LIMIT,
+              maxlength: BiovisionComponent::SLUG_LIMIT,
               data: {
                   field: :slug
               }
@@ -34,11 +30,7 @@
         <div class="guideline"><%= t('.guidelines.slug') %></div>
       </dd>
 
-      <dt>
-        <%=
-          f.label(:value, t('activerecord.attributes.biovision_parameter.value'))
-        %>
-      </dt>
+      <dt><%= f.label(:value, t('.value')) %></dt>
       <dd>
         <%=
           f.text_field(
@@ -46,7 +38,7 @@
               value:     '',
               required:  true,
               size:      nil,
-              maxlength: BiovisionParameter::VALUE_LIMIT,
+              maxlength: BiovisionComponent::VALUE_LIMIT,
               data: {
                   field: :value
               }

data/app/views/admin/settings/component/_parameters.html.erb

@@ -2,17 +2,17 @@
   <h2><%= t('.heading') %></h2>
 
   <ul id="biovision-component-parameters" data-url="<%= admin_set_parameter_path(slug: handler.slug) %>">
-    <% parameters.each do |parameter| %>
+    <% parameters.each do |parameter, value| %>
       <%
-        element_id = "parameter-#{parameter.id}"
-        description = t("biovision.components.#{parameter.biovision_component.slug}.parameters.#{parameter.slug}.description", default: '')
+        element_id = "parameter-#{parameter}"
+        description = t("biovision.components.#{handler.component.slug}.parameters.#{parameter}.description", default: '')
       %>
       <li>
         <div class="name">
-          <%= label_tag(element_id, parameter.slug) %>
+          <%= label_tag(element_id, parameter) %>
         </div>
         <div class="value">
-          <%= text_field_tag(:value, parameter.value, id: element_id) %>
+          <%= text_field_tag(:value, value, id: element_id) %>
           <%=
             button_tag(
                 '',
@@ -21,7 +21,7 @@
                 class: 'apply',
                 disabled: true,
                 data: {
-                    slug: parameter.slug
+                    slug: parameter
                 }
             )
           %>

data/app/views/admin/settings/show.html.erb

@@ -26,7 +26,7 @@
         partial: 'admin/settings/component/parameters',
         locals: {
             handler: @handler,
-            parameters: @handler.parameters
+            parameters: @handler.component.parameters
         }
     )
   %>

data/app/views/admin/users/entity/_in_list.html.erb

@@ -9,6 +9,9 @@
   <div class="info">
     <%= entity.screen_name %>
   </div>
+  <div class="info">
+    UUID: <%= entity.uuid %>
+  </div>
   <% unless entity.email.blank? %>
     <div class="info">
       <%= t('activerecord.attributes.user.email') %>: <%= entity.email %>

data/app/views/admin/users/show.html.erb

@@ -12,7 +12,7 @@
   <ul class="actions">
     <li><%= back_icon(admin_users_path) %></li>
     <% unless @entity.deleted? %>
-      <li><%= world_icon(user_profile_path(slug: @entity.screen_name)) %></li>
+      <li><%= world_icon(user_profile_path(slug: @entity.slug)) %></li>
       <li><%= edit_icon(edit_user_path(id: @entity.id)) %></li>
     <% end %>
   </ul>

data/app/views/editable_pages/_editable_page.html.erb

@@ -1,4 +1,4 @@
-<%= render partial: 'editable_pages/entity/metadata', locals: { entity: entity } %>
+<%= render partial: 'shared/entity/metadata', locals: { entity: entity } %>
 
 <article class="editable-page">
   <%= render partial: 'editable_pages/entity/content', locals: { entity: entity } %>

data/app/views/editable_pages/_form.html.erb

@@ -76,14 +76,14 @@
         <% if entity.image.blank? %>
           <%= f.label :image, image_tag('biovision/base/placeholders/16x9.svg', alt: '') %>
         <% else %>
-          <%= f.label :image, image_tag(entity.image.medium.url, alt: '') %>
+          <%= f.label :image, image_tag(entity.image.medium_url, alt: '') %>
         <% end %>
         <figcaption>
           <%=
             f.file_field(
                 :image,
                 id:     "#{model_name}_image",
-                accept: 'image/jpeg,image/png',
+                accept: 'image/jpeg,image/png,image/svg+xml',
                 data:   { image: "#{model_name}-image" }
             )
           %>

data/app/views/editable_pages/entity/_content.html.erb

@@ -7,5 +7,5 @@
 <% end %>
 
 <div class="text">
-  <%= raw(entity.body) %>
+  <%= raw entity.text %>
 </div>

data/app/views/editable_pages/entity/_metadata.html.erb

@@ -1,11 +1,13 @@
-<% content_for(:meta_title, entity.meta_title) unless entity.meta_title.blank? %>
-<% content_for(:meta_keywords, entity.meta_keywords) unless entity.meta_keywords.blank? %>
-<% content_for(:meta_description, entity.meta_description) unless entity.meta_description.blank? %>
-<% unless entity.image.blank? %>
-  <% content_for :meta_image, (request.protocol + request.host_with_port + entity.image.url) %>
-  <% content_for :meta_image_alt, entity.image_alt_text %>
-<% end %>
-<% content_for :meta_twitter do %>
-  <meta name="twitter:card" content="summary_large_image"/>
-  <meta name="twitter:description" content="<%= entity.meta_description %>"/>
+<% unless entity.nil? %>
+  <% content_for(:meta_title, entity.meta_title) unless entity.meta_title.blank? %>
+  <% content_for(:meta_keywords, entity.meta_keywords) unless entity.meta_keywords.blank? %>
+  <% content_for(:meta_description, entity.meta_description) unless entity.meta_description.blank? %>
+  <% unless entity.image.blank? %>
+    <% content_for :meta_image, (request.protocol + request.host_with_port + entity.image.url) %>
+    <% content_for :meta_image_alt, entity.image_alt_text %>
+  <% end %>
+  <% content_for :meta_twitter do %>
+    <meta name="twitter:card" content="summary_large_image"/>
+    <meta name="twitter:description" content="<%= entity.meta_description %>"/>
+  <% end %>
 <% end %>

data/app/views/index/index/_default_dashboard.html.erb

@@ -1,2 +1,4 @@
 <%= render 'index/index/custom_dashboard' %>
-<%= render 'index/dashboard/biovision_post' if Gem.loaded_specs.key?('biovision-post') %>
+<% %w[post partners].each do |component| %>
+  <%= render "index/dashboard/biovision_#{component}" if Gem.loaded_specs.key?("biovision-#{component}") %>
+<% end %>

data/app/views/my/index/index/_dashboard.html.erb

@@ -6,5 +6,21 @@
     <figcaption><%= current_user.profile_name %></figcaption>
   </figure>
 
+  <div class="sidebar">
+    <nav>
+      <ul>
+        <li><%= render 'my/profiles/nav_item' %></li>
+        <li><%= render 'my/tokens/nav_item' %></li>
+        <li><%= render 'my/login_attempts/nav_item' %></li>
+        <%= render 'my/index/sidebar/biovision_courses' if Gem.loaded_specs.key?('biovision-courses') %>
+        <%= render 'my/index/index/custom_sidebar' %>
+        <% if UserPrivilege.user_has_any_privilege?(current_user) %>
+          <li><%= link_to t('admin.index.index.heading'), admin_path %></li>
+        <% end %>
+        <li><%= link_to t(:logout), logout_path, method: :delete %></li>
+      </ul>
+    </nav>
+  </div>
+
   <%= render 'my/index/dashboard/biovision_post' if Gem.loaded_specs.key?('biovision-post') %>
 </section>

data/app/views/shared/_breadcrumbs.html.erb

@@ -1,6 +1,8 @@
 <% if content_for? :breadcrumbs %>
-    <nav class="breadcrumbs">
+  <nav class="breadcrumbs">
+    <div>
       <%= link_to(t(:home), root_path) %>
       <%= yield :breadcrumbs %>
-    </nav>
+    </div>
+  </nav>
 <% end %>

data/app/views/shared/_track.html.erb

@@ -1,10 +1,10 @@
 <% if current_user_has_privilege?(:administrator) %>
-    <div class="track">
-      <% if item.respond_to?(:agent) && !item.agent.nil? %>
-          <div class="agent"><%= item.agent.name %></div>
-      <% end %>
-      <% if item.respond_to?(:ip) && !item.ip.nil? %>
-          <div class="ip"><%= item.ip %></div>
-      <% end %>
-    </div>
+  <div class="track">
+    <% if item.respond_to?(:agent) && !item.agent.nil? %>
+      <div class="agent"><%= item.agent.name %></div>
+    <% end %>
+    <% if item.respond_to?(:ip) && !item.ip.nil? %>
+      <div class="ip"><%= item.ip %></div>
+    <% end %>
+  </div>
 <% end %>

data/app/views/shared/admin/_breadcrumbs.html.erb

@@ -1,6 +1,8 @@
 <% if content_for? :breadcrumbs %>
-    <nav class="breadcrumbs">
+  <nav class="breadcrumbs">
+    <div>
       <%= link_to(t('admin.index.index.heading'), admin_path) %>
       <%= yield :breadcrumbs %>
-    </nav>
+    </div>
+  </nav>
 <% end %>

data/app/views/shared/editable_pages/_body.html.erb

@@ -1,3 +1,3 @@
-<%= render partial: 'editable_pages/entity/metadata', locals: { entity: entity } %>
+<%= render partial: 'shared/entity/metadata', locals: { entity: entity } %>
 
-<%= raw entity.body %>
+<%= raw entity.parsed_body %>

data/app/views/shared/entity/_metadata.html.erb

@@ -0,0 +1,13 @@
+<% unless entity.nil? %>
+  <% content_for(:meta_title, entity.meta_title) unless entity.meta_title.blank? %>
+  <% content_for(:meta_keywords, entity.meta_keywords) unless entity.meta_keywords.blank? %>
+  <% content_for(:meta_description, entity.meta_description) unless entity.meta_description.blank? %>
+  <% unless entity.image.blank? %>
+    <% content_for :meta_image, (request.protocol + request.host_with_port + entity.image.url) %>
+    <% content_for :meta_image_alt, entity.image_alt_text if entity.respond_to?(:image_alt_text) %>
+  <% end %>
+  <% content_for :meta_twitter do %>
+    <meta name="twitter:card" content="summary_large_image"/>
+    <meta name="twitter:description" content="<%= entity.meta_description %>"/>
+  <% end %>
+<% end %>

data/app/views/shared/forms/_toggle_wysiwyg.html.erb

@@ -0,0 +1,24 @@
+<script src="https://cdn.ckeditor.com/ckeditor5/12.0.0/classic/ckeditor.js"></script>
+<script>
+    "use strict";
+    document.addEventListener("DOMContentLoaded", function () {
+        document.querySelectorAll("button.js-wysiwyg-toggle").forEach(function (button) {
+            button.addEventListener("click", function (event) {
+                const button = event.target;
+                button.classList.add("hidden");
+                const editor = document.getElementById(button.getAttribute("data-element"));
+                editor.required = false;
+                ClassicEditor
+                    .create(editor, {
+                        image: {
+                            toolbar: ['imageTextAlternative']
+                        },
+                        ckfinder: {
+                            uploadUrl: editor.getAttribute('data-upload-url')
+                        }
+                    })
+                    .catch(error => console.error(error));
+            });
+        });
+    });
+</script>

data/app/views/shared/forms/_wysiwyg.html.erb

@@ -1,4 +1,4 @@
-<script src="https://cdn.ckeditor.com/ckeditor5/11.0.1/classic/ckeditor.js"></script>
+<script src="https://cdn.ckeditor.com/ckeditor5/12.0.0/classic/ckeditor.js"></script>
 <script>
     'use strict';
     document.addEventListener('DOMContentLoaded', function () {

data/app/views/simple_blocks/_form.html.erb

@@ -51,6 +51,16 @@
 
     <dt><%= f.label :body %></dt>
     <dd>
+      <div class="wysiwyg-button-container">
+        <button
+          type="button"
+          class="js-wysiwyg-toggle button-action"
+          data-element="<%= model_name %>_body"
+          data-upload-url="/media_files/ckeditor"
+        >
+          WYSIWYG
+        </button>
+      </div>
       <%=
         f.text_area(
             :body,
@@ -118,3 +128,5 @@
     <%= f.button t(:save), type: :submit, class: 'button-save' %>
   </div>
 <% end %>
+
+<%= render 'shared/forms/toggle_wysiwyg' %>

data/app/views/users/_form.html.erb

@@ -11,9 +11,9 @@
           <%=
             f.file_field(
                 :image,
-                id:     "#{model_name}_image",
+                id: "#{model_name}_image",
                 accept: 'image/jpeg,image/png',
-                data:   { image: "#{model_name}-image" }
+                data: { image: "#{model_name}-image" }
             )
           %>
         </figcaption>
@@ -25,14 +25,14 @@
       <%=
         f.text_field(
             :screen_name,
-            id:        "#{model_name}_screen_name",
+            id: "#{model_name}_screen_name",
             maxlength: User::SCREEN_NAME_LIMIT,
-            pattern:   User::SCREEN_NAME_PATTERN_HTML,
-            title:     t('.guidelines.screen_name'),
-            required:  true
+            required: true
         )
       %>
-      <div class="guideline"><%= t('.guidelines.screen_name') %></div>
+      <% unless entity.foreign_slug? %>
+        <div class="guideline"><%= t('.guidelines.screen_name') %></div>
+      <% end %>
     </dd>
 
     <dt><%= f.label :email %></dt>
@@ -40,10 +40,10 @@
       <%=
         f.email_field(
             :email,
-            id:        "#{model_name}_email",
-            size:      nil,
+            id: "#{model_name}_email",
+            size: nil,
             maxlength: User::EMAIL_LIMIT,
-            readonly:  entity.super_user?
+            readonly: entity.super_user?
         )
       %>
     </dd>
@@ -53,10 +53,10 @@
       <%=
         f.phone_field(
             :phone,
-            id:        "#{model_name}_phone",
-            size:      15,
+            id: "#{model_name}_phone",
+            size: 15,
             maxlength: User::PHONE_LIMIT,
-            readonly:  entity.super_user?
+            readonly: entity.super_user?
         )
       %>
     </dd>
@@ -77,7 +77,7 @@
       <%=
         f.date_field(
             :birthday,
-            id:   "#{model_name}_birthday",
+            id: "#{model_name}_birthday",
             size: 10
         )
       %>
@@ -89,10 +89,10 @@
         <%=
           f.text_field(
               :password,
-              id:        "#{model_name}_password",
-              size:      nil,
+              id: "#{model_name}_password",
+              size: nil,
               maxlength: 70,
-              required:  entity.id.nil?
+              required: entity.id.nil?
           )
         %>
       </dd>
@@ -102,10 +102,10 @@
         <%=
           f.text_field(
               :password_confirmation,
-              id:        "#{model_name}_password_confirmation",
-              size:      nil,
+              id: "#{model_name}_password_confirmation",
+              size: nil,
               maxlength: 70,
-              required:  entity.id.nil?
+              required: entity.id.nil?
           )
         %>
       </dd>
@@ -118,8 +118,8 @@
       <%=
         f.text_field(
             :notice,
-            id:        "#{model_name}_notice",
-            size:      nil,
+            id: "#{model_name}_notice",
+            size: nil,
             maxlength: User::NOTICE_LIMIT
         )
       %>