biovision-base 0.36.190526.0 → 0.37.190607.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25a60b6a83c799dd28363fb20c326010de89318358e923459eee1a952e5c4581
-  data.tar.gz: 21c006b675139987f71e209ee9b5e49026152a15d0f4a3f5ba9332d6aab4febb
+  metadata.gz: 53f6745ccdb17530c51d58bc412f980bb9ec1e47e54a858a5aa207b117c9f6c1
+  data.tar.gz: 4fb31a1e0780d1984c30225c05f74c24934d706350009a007bb24f8ded0f43e6
 SHA512:
-  metadata.gz: 480dc37953cba27517f9a99927ea704433a2af1241fe229c28d20a693b45cb8feea15ee39915a8639edebd1782c9a81ff80e01b4656c26da328d565483406425
-  data.tar.gz: b8a978a75a8be80078f11a3a6a57001eddf8a719ca97255b401420e09b79cb2848f7badcba3f512b35f027a094be0dffdcdddc551c2f820735d8d6ea0d123eb2
+  metadata.gz: 7b812126a16490736dda1d3af3b38fec3de5bbcaf674c603f571bee8db5274131c77ea6c6420593e1dc9d19a335d0197eb91daa210735935a45d06b075eaf929
+  data.tar.gz: 8d2efd4a4972f0e2a17a0f8fac8b4f403b5d495ef0c94c700914bd1bf5706bad0b901092c1ff591c8e04373f48c741288c731203812320c0bfb82420f787b8d8

data/app/assets/javascripts/biovision/base/components/carousel.js

@@ -168,19 +168,21 @@ Biovision.components.carousel = {
      */
     newOffset: function (slider) {
         const firstSlide = slider.container.querySelector(".carousel-item:first-of-type");
-        const rightMargin = window.getComputedStyle(firstSlide).marginRight;
-        const slideWidth = firstSlide.offsetWidth + parseInt(rightMargin);
-        let newMargin = -(slideWidth * slider.current);
-        const slidesLength = slideWidth * slider.items.length;
-        const maxOffset = slidesLength - slider.container.offsetWidth;
-        const delta = newMargin + maxOffset;
+        if (firstSlide) {
+            const rightMargin = window.getComputedStyle(firstSlide).marginRight;
+            const slideWidth = firstSlide.offsetWidth + parseInt(rightMargin);
+            let newMargin = -(slideWidth * slider.current);
+            const slidesLength = slideWidth * slider.items.length;
+            const maxOffset = slidesLength - slider.container.offsetWidth;
+            const delta = newMargin + maxOffset;
 
-        if (delta < 0) {
-            newMargin -= delta;
-            slider["current"] = slider["maxItem"];
-        }
+            if (delta < 0) {
+                newMargin -= delta;
+                slider["current"] = slider["maxItem"];
+            }
 
-        firstSlide.style.marginLeft = String(newMargin) + "px";
+            firstSlide.style.marginLeft = String(newMargin) + "px";
+        }
     },
     /**
      * Determine maximum item number so that right margin remains minimal
@@ -189,10 +191,12 @@ Biovision.components.carousel = {
      */
     setMaxItem: function (slider) {
         const firstSlide = slider.container.querySelector(".carousel-item:first-of-type");
-        const rightMargin = window.getComputedStyle(firstSlide).marginRight;
-        const slideWidth = firstSlide.offsetWidth + parseInt(rightMargin);
-        const maxCount = slider.container.offsetWidth / slideWidth;
-        slider["maxItem"] = slider.items.length - Math.floor(maxCount);
+        if (firstSlide) {
+            const rightMargin = window.getComputedStyle(firstSlide).marginRight;
+            const slideWidth = firstSlide.offsetWidth + parseInt(rightMargin);
+            const maxCount = slider.container.offsetWidth / slideWidth;
+            slider["maxItem"] = slider.items.length - Math.floor(maxCount);
+        }
     },
     /**
      * Handler for start of swipe

data/app/models/biovision_component.rb

@@ -42,9 +42,9 @@ class BiovisionComponent < ApplicationRecord
   end
 
   # @param [String] slug
-  # @param [String] value
+  # @param value
   def []=(slug, value)
-    parameters[slug.to_s] = value.to_s
+    parameters[slug.to_s] = value
     save!
   end
 end

data/app/services/biovision/components/registration_component.rb

@@ -7,7 +7,8 @@ module Biovision
       # @param [Hash] parameters
       # @param [Code] code
       def handle(parameters, code)
-        @user    = User.new(parameters)
+        @user = User.new(parameters)
+        set_email_as_login if email_as_login?
         @manager = CodeManager::Invitation.new(code)
 
         use_invites? ? use_code : persist_user
@@ -31,8 +32,12 @@ module Biovision
         @component.settings['confirm_email']
       end
 
+      def email_as_login?
+        @component.settings['email_as_login']
+      end
+
       def require_email?
-        @component.settings['require_email']
+        @component.settings['require_email'] || email_as_login?
       end
 
       protected
@@ -41,7 +46,10 @@ module Biovision
       # @return [Hash]
       def normalize_settings(data)
         result = {}
-        flags  = %w[open invite_only use_invites confirm_email require_email]
+        flags = %w[
+          open invite_only use_invites confirm_email email_as_login
+          require_email
+        ]
         flags.each { |f| result[f] = data[f].to_i == 1 }
         numbers = %w[invite_count]
         numbers.each { |f| result[f] = data[f].to_i }
@@ -88,11 +96,17 @@ module Biovision
 
         parameters = {
           code_type: CodeManager::Invitation.code_type,
-          user:      @user,
-          quantity:  quantity,
+          user: @user,
+          quantity: quantity,
         }
         Code.create(parameters)
       end
+
+      def set_email_as_login
+        @user.foreign_slug = true
+        @user.screen_name = @user.email
+        @user.slug = @user.email
+      end
     end
   end
 end

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

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

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

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

data/app/views/my/profiles/edit/_form.html.erb

@@ -1,9 +1,10 @@
 <%=
   form_with(
-      url:       my_profile_path,
-      method:    :patch,
+      url: my_profile_path,
+      method: :patch,
       multipart: true,
-      id:        'user-form'
+      id: 'user-form',
+      class: 'profile-form'
   ) do
 %>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
@@ -27,7 +28,7 @@
               file_field_tag(
                   'user[image]',
                   accept: 'image/jpeg,image/png',
-                  data:   { image: 'user-image' }
+                  data: { image: 'user-image' }
               )
             %>
           </figcaption>
@@ -85,9 +86,9 @@
           email_field_tag(
               'user[email]',
               entity.email,
-              size:      nil,
+              size: nil,
               maxlength: User::EMAIL_LIMIT,
-              required:  true
+              required: true
           )
         %>
       </dd>
@@ -100,7 +101,7 @@
           telephone_field_tag(
               'user[phone]',
               entity.phone,
-              size:      nil,
+              size: nil,
               maxlength: User::PHONE_LIMIT
           )
         %>

data/app/views/my/profiles/new/_form.html.erb

@@ -1,33 +1,57 @@
-<% model_name = entity.class.to_s.underscore %>
+<%
+  component_handler ||= Biovision::Components::BaseComponent.handler('registration')
+  model_name = entity.class.to_s.underscore
+%>
 <%=
   form_with(
       model: entity,
       scope: model_name,
-      url:   my_profile_path,
+      url: my_profile_path,
       class: 'new-my-profile',
-      id:    "#{model_name}-form",
-      data:  { check_url: check_my_profile_path }
+      id: "#{model_name}-form",
+      data: { check_url: check_my_profile_path }
   ) do |f|
 %>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
   <dl>
+    <% unless component_handler.email_as_login? %>
+      <dt>
+        <%= f.label :screen_name, t('activerecord.attributes.user.screen_name') %>
+      </dt>
+      <dd>
+        <%=
+          f.text_field(
+              :screen_name,
+              id: "#{model_name}_screen_name",
+              required: true,
+              maxlength: User::SCREEN_NAME_LIMIT,
+              pattern: User::SCREEN_NAME_PATTERN_HTML,
+              title: t('.guidelines.screen_name'),
+              data: { check: :screen_name }
+          )
+        %>
+        <div class="check-result-error" data-field="screen_name"></div>
+        <div class="guideline"><%= t('.guidelines.screen_name') %></div>
+      </dd>
+    <% end %>
     <dt>
-      <%= f.label :screen_name, t('activerecord.attributes.user.screen_name') %>
+      <%= f.label :email, t('activerecord.attributes.user.email') %>
     </dt>
     <dd>
       <%=
-        f.text_field(
-            :screen_name,
-            id:        "#{model_name}_screen_name",
-            required:  true,
-            maxlength: User::SCREEN_NAME_LIMIT,
-            pattern:   User::SCREEN_NAME_PATTERN_HTML,
-            title:     t('.guidelines.screen_name'),
-            data:      { check: :screen_name }
+        f.email_field(
+            :email,
+            id: "#{model_name}_email",
+            size: nil,
+            maxlength: User::EMAIL_LIMIT,
+            required: component_handler.require_email?,
+            data: { check: :email }
         )
       %>
-      <div class="check-result-error hidden" data-field="screen_name"></div>
-      <div class="guideline"><%= t('.guidelines.screen_name') %></div>
+      <div class="check-result-error" data-field="email"></div>
+      <% unless component_handler.email_as_login? %>
+        <div class="guideline"><%= t('.guidelines.email') %></div>
+      <% end %>
     </dd>
 
     <dt>
@@ -37,14 +61,14 @@
       <%=
         f.password_field(
             :password,
-            id:        "#{model_name}_password",
-            required:  true,
-            size:      nil,
+            id: "#{model_name}_password",
+            required: true,
+            size: nil,
             maxlength: 70,
-            data:      { check: :password }
+            data: { check: :password }
         )
       %>
-      <div class="check-result-error hidden" data-field="password"></div>
+      <div class="check-result-error" data-field="password"></div>
       <div class="guideline"><%= t('.guidelines.password') %></div>
     </dd>
 
@@ -55,36 +79,18 @@
       <%=
         f.password_field(
             :password_confirmation,
-            id:        "#{model_name}_password_confirmation",
-            required:  true,
-            size:      nil,
+            id: "#{model_name}_password_confirmation",
+            required: true,
+            size: nil,
             maxlength: 70,
-            data:      { check: :password_confirmation }
+            data: { check: :password_confirmation }
         )
       %>
-      <div class="check-result-error hidden" data-field="password_confirmation"></div>
+      <div class="check-result-error" data-field="password_confirmation"></div>
       <div class="guideline"><%= t('.guidelines.password_confirmation') %></div>
     </dd>
 
-    <dt>
-      <%= f.label :email, t('activerecord.attributes.user.email') %>
-    </dt>
-    <dd>
-      <%=
-        f.email_field(
-            :email,
-            id:        "#{model_name}_email",
-            size:      nil,
-            maxlength: User::EMAIL_LIMIT,
-            required:  local_assigns[:component_handler] && component_handler.require_email?,
-            data:      { check: :email }
-        )
-      %>
-      <div class="check-result-error hidden" data-field="email"></div>
-      <div class="guideline"><%= t('.guidelines.email') %></div>
-    </dd>
-
-    <% if local_assigns[:component_handler] && component_handler.use_invites? %>
+    <% if component_handler.use_invites? %>
       <dt>
         <%= label_tag :code, t('.invitation_code') %>
       </dt>
@@ -101,7 +107,7 @@
               }
           )
         %>
-        <div class="check-result-error hidden" data-field="code"></div>
+        <div class="check-result-error" data-field="code"></div>
       </dd>
     <% end %>
   </dl>

data/config/locales/components-ru.yml

@@ -40,10 +40,11 @@ ru:
       registration:
         name: "Регистрация"
         settings:
-          open: "Открыта"
-          invite_only: "Только по приглашениям"
           confirm_email: "Отправлять письмо для подтверждения почты сразу"
-          use_invites: "Использовать приглашения"
-          require_email: "Электронная почта обязательна при регистрации"
+          email_as_login: "Использовать электронную почту в качестве логина"
           invite_count: "Количество кодов приглашения после регистрации"
+          invite_only: "Только по приглашениям"
+          open: "Открыта"
+          require_email: "Электронная почта обязательна при регистрации"
+          use_invites: "Использовать приглашения"
         invalid_code: "указан неверно"

data/lib/biovision/base/version.rb

@@ -2,6 +2,6 @@
 
 module Biovision
   module Base
-    VERSION = '0.36.190526.0'
+    VERSION = '0.37.190607.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.36.190526.0
+  version: 0.37.190607.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails