biovision-base 0.19.180703.1 → 0.20.180731.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf92e00f9a0ab7e0f652c415e72aafc3366b9fc3bf66dfe3ffe53cc28ec4ed52
-  data.tar.gz: da76fa84f6d156b168cc9a00ef1a8ffaeca82a6bd88259039e91b5cea400e486
+  metadata.gz: 878d3c84e3d6e08ba4fa008b488ed44edd05a0da401a1845782c7f31a3fab464
+  data.tar.gz: f4e73e086c4fe87bf11f2c68e7ceb26daaeb0507e0699990cb0729a38758338a
 SHA512:
-  metadata.gz: f20c9f734d53640a9c4e7c34f28b439a273a9c1aa7ec61bab3b97182c6247783efad7a44db47de9bc2059e6d3b8e5adba325d31c5ea0873ac51178d328dd559b
-  data.tar.gz: e42080ee36e46275a170f0c75d082bc0e5da83df1604cd99d44148d9b8b0bcdc6dcf2ac2d354ae6c2542a38dc2103b17ca2ec48b375936a4e57b5967673b9e6e
+  metadata.gz: 2a1c30cb8db14f7831172840f86d9a05a4352e7d833e0c2b1e9e5d7c68515afe90aa499f9a9675478a46e572261a01e76f19ff4f9da6cf023d7155135f458781
+  data.tar.gz: 71512a52954db3ceb82eaa5fc64fa9b773b2388c8117940194e972106c973b67b9a2fb59714c1e5ff20eb6bf8da3df38255af27b5b1d7f64b8415eea08003d7a

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

@@ -151,7 +151,8 @@ const Biovision = {
             'о': 'o', 'п': 'p', 'р': 'r', 'с': 's', 'т': 't',
             'у': 'u', 'ф': 'f', 'х': 'kh', 'ц': 'c', 'ч': 'ch',
             'ш': 'sh', 'щ': 'shh', 'ъ': '', 'ы': 'y', 'ь': '',
-            'э': 'e', 'ю': 'yu', 'я': 'ya'
+            'э': 'e', 'ю': 'yu', 'я': 'ya',
+            'å': 'ao', 'ä': 'ae', 'ö': 'oe', 'é': 'e'
         };
         let string = input.toLowerCase();
 
@@ -255,8 +256,16 @@ const Biovision = {
             });
         }
     },
-    show_list_of_errors: function (entity_name, list) {
-        const form = document.getElementById(entity_name + '-form');
+    /**
+     * Показать список ошибок после обработки формы
+     *
+     * Используется в контроллерах при отправке форм через remote: true
+     *
+     * @param {string} model_name название модели
+     * @param {Array<string>} list список ошибок
+     */
+    showListOfErrors: function (model_name, list) {
+        const form = document.getElementById(model_name + '-form');
         if (form) {
             let errors = form.querySelector('ol.errors');
             let data = '';
@@ -302,12 +311,42 @@ const Biovision = {
                 request.send();
             }
         }
+    },
+    autoExpand: function () {
+        if (!this.hasOwnProperty('baseScrollHeight')) {
+            let savedValue = this.value;
+            this.value = '';
+            this.baseScrollHeight = this.scrollHeight;
+            this.value = savedValue;
+        }
+        const styles = getComputedStyle(this);
+        const ratio = styles.getPropertyValue('line-height').replace('px', '');
+        const minRows = this.getAttribute('data-min-rows') | 0;
+        const maxRows = this.hasAttribute('data-max-rows') ? parseInt(this.getAttribute('data-max-rows')) : 25;
+        const rows = Math.ceil((this.scrollHeight - this.baseScrollHeight) / ratio);
+
+        this.rows = minRows;
+        this.rows = minRows + rows;
+        if (this.rows > maxRows) {
+            this.rows = maxRows;
+        }
     }
 };
 
 document.addEventListener('DOMContentLoaded', function () {
     Biovision.csrf_token = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
 
+    const topLinker = document.getElementById('go-to-top');
+    if (topLinker) {
+        window.addEventListener('scroll', function () {
+            if (window.pageYOffset > 500) {
+                topLinker.classList.remove('inactive');
+            } else {
+                topLinker.classList.add('inactive');
+            }
+        });
+    }
+
     // Предварительный просмотр картинки при выборе файла
     document.addEventListener('change', function (event) {
         const input = event.target;
@@ -543,6 +582,11 @@ document.addEventListener('DOMContentLoaded', function () {
         button.addEventListener('click', Biovision.removeEntityImage);
     });
 
+    document.querySelectorAll('textarea.auto-expand').forEach(function (textarea) {
+        textarea.addEventListener('focus', Biovision.autoExpand);
+        textarea.addEventListener('input', Biovision.autoExpand);
+    });
+
     if (typeof jQuery !== 'undefined') {
         jQuery.ajaxSetup({
             headers: {

data/app/assets/stylesheets/biovision/base/biovision.scss

@@ -19,7 +19,7 @@ h4,
 h5,
 h6 {
   font-family: $font-family-heading;
-  font-weight: 500;
+  //font-weight: 500;
   margin: 0;
 }
 

data/app/assets/stylesheets/biovision/base/default.scss

@@ -33,10 +33,26 @@ $link-color: rgb(20, 127, 255) !default;
 $link-color-visited: rgb(20, 77, 250) !default;
 $link-color-hover: rgb(255, 77, 20) !default;
 
+$spacer-xxs: .4rem;
+$spacer-xs: .8rem;
+$spacer-s: 1.6rem;
+$spacer-m: 3.2rem;
+$spacer-l: 4.8rem;
+$spacer-xl: 6.4rem;
+$spacer-xxl: 9.6rem;
+
 :root {
   --font-size-large: #{$font-size-large};
   --font-size-increased: #{$font-size-increased};
   --font-size-normal: #{$font-size-normal};
   --font-size-decreased: #{$font-size-decreased};
   --font-size-small: #{$font-size-small};
+
+  --spacer-xxs: #{$spacer-xxs};
+  --spacer-xs: #{$spacer-xs};
+  --spacer-s: #{$spacer-s};
+  --spacer-m: #{$spacer-m};
+  --spacer-l: #{$spacer-l};
+  --spacer-xl: #{$spacer-xl};
+  --spacer-xxl: #{$spacer-xxl};
 }

data/app/controllers/codes_controller.rb

@@ -10,9 +10,9 @@ class CodesController < AdminController
   def create
     @entity = Code.new(creation_parameters)
     if @entity.save
-      redirect_to admin_code_path(id: @entity.id)
+      form_processed_ok(admin_code_path(id: @entity.id))
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
     end
   end
 
@@ -23,9 +23,10 @@ class CodesController < AdminController
   # patch /codes/:id
   def update
     if @entity.update(entity_parameters)
-      redirect_to admin_code_path(id: @entity.id), notice: t('codes.update.success')
+      flash[:notice] = t('codes.update.success')
+      form_processed_ok(admin_code_path(id: @entity.id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 

data/app/controllers/index_controller.rb

@@ -1,6 +1,19 @@
 class IndexController < ApplicationController
   # get /
   def index
-    @editable_page = EditablePage.find_localized('index', locale)
+    @editable_page = EditablePage.localized_page('index', locale)
+    check_referral_link if params.key?(:rl)
+  end
+
+  private
+
+  def check_referral_link
+    return if cookies['r']
+    cookies['r'] = {
+      value: param_from_request(:rl),
+      expires: 1.year.from_now,
+      domain: :all,
+      httponly: true
+    }
   end
 end

data/app/controllers/media_files_controller.rb

@@ -68,7 +68,7 @@ class MediaFilesController < ApplicationController
       render json: {
         uploaded: 1,
         fileName: File.basename(@entity.name),
-        url: @entity.file.medium.url
+        url: @entity.file.medium_2x.url
       }
     end
   end

data/app/controllers/my/profiles_controller.rb

@@ -51,10 +51,11 @@ class My::ProfilesController < ApplicationController
   end
 
   def create_user
-    @entity = User.new creation_parameters
+    @entity = User.new(creation_parameters)
     if @entity.save
       Metric.register(User::METRIC_REGISTRATION)
       create_token_for_user(@entity)
+      cookies.delete('r', domain: :all)
       redirect_after_creation
     else
       form_processed_with_error(:new)
@@ -63,7 +64,13 @@ class My::ProfilesController < ApplicationController
 
   def creation_parameters
     parameters = params.require(:user).permit(User.new_profile_parameters)
-    parameters.merge(tracking_for_entity).merge({ super_user: User.count < 1 })
+    parameters.merge!(tracking_for_entity)
+    parameters.merge!({ super_user: User.count < 1 })
+    if cookies['r']
+      parameters[:inviter] = User.find_by(referral_link: cookies['r'])
+    end
+
+    parameters
   end
 
   def user_parameters

data/app/helpers/languages_helper.rb

@@ -10,7 +10,7 @@ module LanguagesHelper
   def languages_for_select(include_blank = true)
     options = []
     options << [t(:not_set), ''] if include_blank
-    Language.ordered_by_priority.each do |language|
+    Language.active.ordered_by_priority.each do |language|
       options << ["#{language.code}: #{language_name(language)}", language.id]
     end
     options

data/app/models/language.rb

@@ -21,6 +21,7 @@ class Language < ApplicationRecord
   validates_uniqueness_of :slug
 
   scope :ordered_by_priority, -> { order('priority asc') }
+  scope :active, -> { where(active: true) }
 
   # @param [Integer] delta
   def change_priority(delta)

data/app/models/user.rb

@@ -38,6 +38,7 @@ class User < ApplicationRecord
 
   before_save :normalize_slug
   before_save :prepare_search_string
+  before_save { self.referral_link = SecureRandom.alphanumeric(12) if referral_link.blank? }
 
   before_validation { self.email = nil if email.blank? }
 

data/app/services/canonizer.rb

@@ -6,6 +6,7 @@ class Canonizer
       'с' => 's', 'т' => 't', 'у' => 'u', 'ф' => 'f', 'х' => 'kh', 'ц' => 'c',
       'ч' => 'ch', 'ш' => 'sh', 'щ' => 'shh', 'ъ' => '', 'ы' => 'y', 'ь' => '',
       'э' => 'e', 'ю' => 'yu', 'я' => 'ya',
+      'å' => 'ao', 'ä' => 'ae', 'ö' => 'oe', 'é' => 'e'
   }
 
   # @param [String] text

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

@@ -4,15 +4,15 @@
 <div class="data">
   <div><%= admin_user_link(entity) %></div>
   <% unless entity.notice.blank? %>
-      <div><%= entity.notice %></div>
+    <div><%= entity.notice %></div>
   <% end %>
   <div class="info">
     <%= entity.screen_name %>
   </div>
   <% unless entity.email.blank? %>
-      <div class="info">
-        <%= t('activerecord.attributes.user.email') %>: <%= entity.email %>
-      </div>
+    <div class="info">
+      <%= t('activerecord.attributes.user.email') %>: <%= entity.email %>
+    </div>
   <% end %>
   <div class="info">
     <%= t('activerecord.attributes.user.balance') %>:
@@ -21,19 +21,25 @@
   <div class="secondary info">
     <div><%= t(:created_at) %>: <%= time_tag entity.created_at %></div>
     <% unless entity.last_seen.nil? %>
-        <div>
-          <%= t('activerecord.attributes.user.last_seen') %>:
-          <%= time_tag entity.last_seen %>
-        </div>
+      <div>
+        <%= t('activerecord.attributes.user.last_seen') %>:
+        <%= time_tag entity.last_seen %>
+      </div>
     <% end %>
   </div>
+  <% unless entity.inviter_id.nil? %>
+    <div class="secondary info">
+      <%= t('activerecord.attributes.user.inviter') %>:
+      <%= admin_user_link(entity.inviter) %>
+    </div>
+  <% end %>
 
   <%=
     render(
         partial: 'shared/admin/toggleable',
-        locals: {
+        locals:  {
             entity: entity,
-            url: toggle_admin_user_path(id: entity.id)
+            url:    toggle_admin_user_path(id: entity.id)
         }
     )
   %>

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

@@ -28,7 +28,7 @@
             t('.authenticate'),
             authenticate_admin_user_path(id: @entity.id),
             method: :post,
-            class: 'button-action'
+            class:  'button-action'
         )
       %>
     <% end %>
@@ -37,7 +37,7 @@
   <figure role="group" class="preview">
     <%= profile_avatar @entity %>
     <figcaption>
-      <%= @entity.slug %>
+      <%= user_link(@entity) %>
     </figcaption>
   </figure>
 
@@ -48,7 +48,12 @@
     <% end %>
 
     <dt><%= t('activerecord.attributes.user.screen_name') %></dt>
-    <dd><%= user_link @entity %></dd>
+    <dd><%= @entity.screen_name %></dd>
+
+    <% unless @entity.inviter_id.nil? %>
+      <dt><%= t('activerecord.attributes.user.inviter') %></dt>
+      <dd><%= admin_user_link(@entity.inviter) %></dd>
+    <% end %>
 
     <% unless @entity.email.blank? %>
       <dt><%= t('activerecord.attributes.user.email') %></dt>
@@ -76,6 +81,9 @@
     <dt><%= t(:updated_at) %></dt>
     <dd><%= time_tag @entity.updated_at %></dd>
 
+    <dt><%= t('activerecord.attributes.user.referral_link') %></dt>
+    <dd><%= root_url(rl: @entity.referral_link) %></dd>
+
     <% unless @entity.last_seen.blank? %>
       <dt><%= t('activerecord.attributes.user.last_seen') %></dt>
       <dd><%= time_tag @entity.last_seen %></dd>

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

@@ -1,7 +1,7 @@
 <%= form_tag login_path, class: 'login' do %>
     <div class="fields">
       <div>
-        <%= label_tag :login, t('activerecord.attributes.user.screen_name') %>
+        <%= label_tag :login, t('.login') %>
         <%= text_field_tag :login, '', required: true, size: 18 %>
       </div>
       <div>

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

@@ -1,8 +1,9 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+<% model_name = entity.class.to_s.underscore %>
+<%= form_with(model: entity, html: { id: "#{model_name}-form" }) do |f| %>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
 
-<%= form_for entity do |f| %>
-    <dl>
-      <% if entity.id.blank? %>
+  <dl>
+      <% if entity.id.nil? %>
           <dt><%= f.label :code_type_id %></dt>
           <dd>
             <%= f.select :code_type_id, code_types_for_select, required: true %>
@@ -10,8 +11,19 @@
 
           <dt><%= f.label :user_id %></dt>
           <dd>
-            <%= f.number_field :user_id, in: User.ids_range %>
-            <%= render partial: 'admin/users/search', locals: { target_id: :code_user_id } %>
+            <%=
+              f.number_field(
+                  :user_id,
+                  id: "#{model_name}_user_id",
+                  in: User.ids_range
+              )
+            %>
+            <%=
+              render(
+                  partial: 'admin/users/search',
+                  locals: { target_id: "#{model_name}_user_id" }
+              )
+            %>
           </dd>
       <% else %>
           <dt><%= t('activerecord.attributes.code.code_type') %></dt>
@@ -27,19 +39,40 @@
 
       <dt><%= f.label :body %></dt>
       <dd>
-        <%= f.text_field :body, size: 25, maxlength: Code::BODY_LIMIT, required: true %>
+        <%=
+          f.text_field(
+              :body,
+              id: "#{model_name}_body",
+              size: 25,
+              maxlength: Code::BODY_LIMIT,
+              required: true
+          )
+        %>
         <div class="guideline"><%= t('.guidelines.body') %></div>
       </dd>
 
       <dt><%= f.label :payload %></dt>
       <dd>
-        <%= f.text_field :payload, size: 25, maxlength: Code::PAYLOAD_LIMIT %>
+        <%=
+          f.text_field(
+              :payload,
+              id: "#{model_name}_payload",
+              size: 25,
+              maxlength: Code::PAYLOAD_LIMIT
+          )
+        %>
         <div class="guideline"><%= t('.guidelines.payload') %></div>
       </dd>
 
       <dt><%= f.label :quantity %></dt>
       <dd>
-        <%= f.number_field :quantity, in: Code::QUANTITY_RANGE %>
+        <%=
+          f.number_field(
+              :quantity,
+              id: "#{model_name}_quantity",
+              in: Code::QUANTITY_RANGE
+          )
+        %>
       </dd>
     </dl>
 

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

@@ -2,8 +2,8 @@
 <%=
   form_with(
       model: entity,
-      html: {
-          id: "#{model_name}-form",
+      html:  {
+          id:   "#{model_name}-form",
           data: { check_url: check_editable_blocks_path }
       }
   ) do |f|
@@ -22,10 +22,10 @@
             id:        "#{model_name}_slug",
             size:      nil,
             maxlength: EditableBlock::SLUG_LIMIT,
-            pattern: EditableBlock::SLUG_PATTERN_HTML,
-            title: t('.guidelines.slug'),
+            pattern:   EditableBlock::SLUG_PATTERN_HTML,
+            title:     t('.guidelines.slug'),
             required:  true,
-            data: {
+            data:      {
                 check: :slug
             }
         )
@@ -42,8 +42,8 @@
             id:        "#{model_name}_name",
             size:      nil,
             maxlength: EditableBlock::TITLE_LIMIT,
-            required: true,
-            data: {
+            required:  true,
+            data:      {
                 check: :name
             }
         )
@@ -60,7 +60,7 @@
             id:        "#{model_name}_description",
             size:      nil,
             maxlength: EditableBlock::DESCRIPTION_LIMIT,
-            data: {
+            data:      {
                 check: :description
             }
         )
@@ -99,7 +99,7 @@
             id:        "#{model_name}_title",
             size:      nil,
             maxlength: EditableBlock::TITLE_LIMIT,
-            data: {
+            data:      {
                 check: :title
             }
         )
@@ -113,11 +113,12 @@
       <%=
         f.text_area(
             :lead,
-            id:       "#{model_name}_lead",
-            cols:     80,
-            rows:     5,
-            max_length: EditableBlock::TEXT_LIMIT,
-            data: {
+            id:        "#{model_name}_lead",
+            cols:      80,
+            rows:      5,
+            maxlength: EditableBlock::TEXT_LIMIT,
+            class:     'auto-expand',
+            data:      {
                 check: :lead
             }
         )
@@ -131,11 +132,12 @@
       <%=
         f.text_area(
             :body,
-            id:       "#{model_name}_body",
-            cols:     80,
-            rows:     5,
-            max_length: EditableBlock::TEXT_LIMIT,
-            data: {
+            id:        "#{model_name}_body",
+            cols:      80,
+            rows:      5,
+            maxlength: EditableBlock::TEXT_LIMIT,
+            class:     'auto-expand',
+            data:      {
                 check: :body
             }
         )
@@ -149,11 +151,12 @@
       <%=
         f.text_area(
             :footer,
-            id:       "#{model_name}_footer",
-            cols:     80,
-            rows:     5,
-            max_length: EditableBlock::TEXT_LIMIT,
-            data: {
+            id:        "#{model_name}_footer",
+            cols:      80,
+            rows:      5,
+            maxlength: EditableBlock::TEXT_LIMIT,
+            class:     'auto-expand',
+            data:      {
                 check: :footer
             }
         )
@@ -166,6 +169,7 @@
   </dl>
 
   <div class="buttons">
+    <%= hidden_field_tag :entity_id, entity.id %>
     <%= f.button t(:save), type: :submit, class: 'button-save' %>
   </div>
 <% end %>