biovision-base 0.15.180502 → 0.17.180619

data/app/models/foreign_site.rb

@@ -32,7 +32,7 @@ class ForeignSite < ApplicationRecord
       slug: data[:uid],
       name: data[:info][:name],
       email: data[:info][:email],
-      data: JSON.generate(data.dig(:extra, :raw_info))
+      data: JSON.generate(data)
     }.merge(tracking)
     foreign_users.create!(parameters).user
   end
@@ -53,19 +53,22 @@ class ForeignSite < ApplicationRecord
   # @param [Hash] tracking
   # @return [User]
   def create_native_user(data, tracking)
-    screen_name = data.dig(:info, :nickname)
+    screen_name = data.dig(:info, :nickname) || data.dig(:info, :name)
     image_url   = data.dig(:info, :image)
     password    = SecureRandom.urlsafe_base64(12)
     hash_salt   = BCrypt::Engine.generate_salt
     parameters  = {
       foreign_slug: true,
+      consent: true,
       slug: "#{slug}-#{data[:uid]}",
       email: data[:info][:email],
-      name: data[:info][:first_name],
-      surname: data[:info][:last_name],
       screen_name: screen_name.blank? ? data[:name] : screen_name,
       password_digest: BCrypt::Engine.hash_secret(password, hash_salt),
       email_confirmed: true,
+      profile_data: {
+        name: data[:info][:first_name],
+        surname: data[:info][:last_name]
+      }
     }.merge(tracking)
 
     parameters[:remote_image_url] = data[:info][:image] unless image_url.blank?

data/app/models/media_file.rb

@@ -22,7 +22,6 @@ class MediaFile < ApplicationRecord
   validates_presence_of :file
   validates_length_of :name, maximum: NAME_LIMIT
   validates_length_of :description, maximum: DESCRIPTION_LIMIT
-  validates_uniqueness_of :name, scope: [:media_folder_id]
   validates_uniqueness_of :uuid
 
   scope :ordered_by_name, -> { order('name asc') }

data/app/models/privilege.rb

@@ -6,7 +6,7 @@ class Privilege < ApplicationRecord
   SLUG_LIMIT        = 250
   PRIORITY_RANGE    = (1..32767)
 
-  toggleable :regional
+  toggleable :regional, :administrative
 
   belongs_to :parent, class_name: Privilege.to_s, optional: true
   has_many :children, class_name: Privilege.to_s, foreign_key: :parent_id
@@ -42,7 +42,7 @@ class Privilege < ApplicationRecord
   end
 
   def self.entity_parameters
-    %i(name slug priority description regional)
+    %i(administrative description name priority regional slug)
   end
 
   def self.creation_parameters

data/app/models/user.rb

@@ -40,11 +40,11 @@ class User < ApplicationRecord
   before_save :prepare_search_string
 
   validates_acceptance_of :consent
-  validates_presence_of :screen_name, :email
+  validates_presence_of :screen_name
   validates_format_of :screen_name, with: SCREEN_NAME_PATTERN, if: :native_slug?
-  validates_format_of :email, with: EMAIL_PATTERN
+  validates_format_of :email, with: EMAIL_PATTERN, allow_blank: true
   validates :screen_name, uniqueness: { case_sensitive: false }
-  validates :email, uniqueness: { case_sensitive: false }
+  validates :email, uniqueness: { case_sensitive: false }, allow_nil: true
   validates_length_of :slug, maximum: SLUG_LIMIT
   validates_length_of :screen_name, maximum: SLUG_LIMIT
   validates_length_of :email, maximum: EMAIL_LIMIT
@@ -83,7 +83,7 @@ class User < ApplicationRecord
   def self.entity_parameters
     flags = %i(bot allow_login email_confirmed phone_confirmed foreign_slug)
 
-    new_profile_parameters + flags + %i(screen_name notice)
+    new_profile_parameters + flags + %i(screen_name notice balance)
   end
 
   def self.ids_range

data/app/views/about/contact.html.erb

@@ -0,0 +1,24 @@
+<% unless @editable_page.nil? %>
+  <%=
+    render(
+        partial: 'editable_pages/entity/metadata',
+        locals: { entity: @editable_page }
+    )
+  %>
+<% end %>
+<% content_for :breadcrumbs do %>
+  <span><%= t('.nav_text') %></span>
+<% end %>
+
+<article class="editable-page">
+  <% unless @editable_page.nil? %>
+    <%=
+      render(
+          partial: 'editable_pages/entity/content',
+          locals: { entity: @editable_page }
+      )
+    %>
+  <% end %>
+
+  <%= render partial: 'feedback_requests/form' %>
+</article>

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

@@ -6,6 +6,11 @@
   <div class="info">
     <%= entity.slug %>
   </div>
+  <% unless entity.url.blank? %>
+    <div class="info">
+      URL: <%= entity.url %>
+    </div>
+  <% end %>
   <% unless entity.language.nil? %>
     <div class="secondary info">
       <%= t('activerecord.attributes.editable_page.language') %>:
@@ -15,5 +20,16 @@
 
   <ul class="actions">
     <li><%= edit_icon(edit_editable_page_path(id: entity.id)) %></li>
+    <% unless entity.url.blank? %>
+      <li><%= world_icon(entity.url, t(:view_as_visitor), locale: entity.language&.code) %></li>
+    <% end %>
+    <%=
+      render(
+          partial: 'shared/actions/priority_changer',
+          locals:  {
+              path: priority_admin_editable_page_path(id: entity.id)
+          }
+      )
+    %>
   </ul>
 </div>

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

@@ -10,5 +10,5 @@
     <li><%= create_icon(new_editable_page_path) %></li>
   </ul>
 
-  <%= render partial: 'shared/admin/list', locals: { collection: @collection } %>
+  <%= render partial: 'shared/admin/list_with_priority', locals: { collection: @collection } %>
 </article>

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

@@ -9,6 +9,9 @@
 
   <ul class="actions">
     <li><%= back_icon(admin_editable_pages_path) %></li>
+    <% unless @entity.url.blank? %>
+      <li><%= world_icon(@entity.url, t(:view_as_visitor), locale: @entity.language&.code) %></li>
+    <% end %>
     <li><%= edit_icon(edit_editable_page_path(id: @entity.id)) %></li>
   </ul>
 
@@ -21,8 +24,9 @@
     <% unless @entity.image.blank? %>
       <dt><%= t('activerecord.attributes.editable_page.image') %></dt>
       <dd>
-        <figure>
+        <figure role="group" class="preview">
           <%= editable_page_image_medium(@entity) %>
+          <figcaption><%= @entity.image_alt_text %></figcaption>
         </figure>
       </dd>
     <% end %>
@@ -30,6 +34,11 @@
     <dt><%= t('activerecord.attributes.editable_page.slug') %></dt>
     <dd><%= @entity.slug %></dd>
 
+    <% unless @entity.url.blank? %>
+      <dt><%= t('activerecord.attributes.editable_page.url') %></dt>
+      <dd><%= @entity.url %></dd>
+    <% end %>
+
     <dt><%= t(:created_at) %></dt>
     <dd><%= time_tag(@entity.created_at) %></dd>
 

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

@@ -4,6 +4,7 @@
 <%= render 'admin/index/dashboard/biovision_user' %>
 <%= render 'admin/index/dashboard/editorial' %>
 <%= render 'admin/index/dashboard/biovision_post' if Gem.loaded_specs.key?('biovision-post') %>
+<%= render 'admin/index/dashboard/biovision_vote' if Gem.loaded_specs.key?('biovision-vote') %>
 <%= render 'admin/index/dashboard/biovision_poll' if Gem.loaded_specs.key?('biovision-poll') %>
 <%= render 'admin/index/dashboard/biovision_courses' if Gem.loaded_specs.key?('biovision-courses') %>
 <%= render 'admin/index/dashboard/biovision_feedback' %>

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

@@ -8,17 +8,33 @@
   <% end %>
   <% unless entity.email.blank? %>
       <div class="info">
-        <div><%= t('activerecord.attributes.user.email') %>: <%= entity.email %></div>
+        <%= t('activerecord.attributes.user.email') %>: <%= entity.email %>
       </div>
   <% end %>
+  <div class="info">
+    <%= t('activerecord.attributes.user.balance') %>:
+    <%= entity.balance %>
+  </div>
   <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>
 
-  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_user_path(id: entity.id) } %>
+  <%=
+    render(
+        partial: 'shared/admin/toggleable',
+        locals: {
+            entity: entity,
+            url: toggle_admin_user_path(id: entity.id)
+        }
+    )
+  %>
+
   <ul class="actions">
     <li><%= edit_icon(edit_user_path(id: entity.id)) %></li>
     <li><%= world_icon(user_profile_path(slug: entity.screen_name)) %></li>

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

@@ -18,17 +18,23 @@
   </ul>
 
   <nav>
-    <ul>
-      <li><%= link_to t('.privileges'), privileges_admin_user_path(id: @entity.id) %></li>
-      <li><%= link_to t('admin.tokens.index.heading'), tokens_admin_user_path(id: @entity.id) %></li>
-      <li><%= link_to t('admin.codes.index.heading'), codes_admin_user_path(id: @entity.id) %></li>
-      <% unless @entity == current_user %>
-        <li><%= link_to t('.authenticate'), authenticate_admin_user_path(id: @entity.id), method: :post %></li>
-      <% end %>
-    </ul>
+    <%= link_to(t('.privileges'), privileges_admin_user_path(id: @entity.id), class: 'button-nav') %>
+    <%= link_to(t('admin.tokens.index.heading'), tokens_admin_user_path(id: @entity.id), class: 'button-nav') %>
+    <%= link_to(t('admin.codes.index.heading'), codes_admin_user_path(id: @entity.id), class: 'button-nav') %>
+    <%= render partial: 'admin/users/entity/custom_nav', locals: { entity: @entity } %>
+    <% unless @entity == current_user %>
+      <%=
+        link_to(
+            t('.authenticate'),
+            authenticate_admin_user_path(id: @entity.id),
+            method: :post,
+            class: 'button-action'
+        )
+      %>
+    <% end %>
   </nav>
 
-  <figure role="group">
+  <figure role="group" class="preview">
     <%= profile_avatar @entity %>
     <figcaption>
       <%= @entity.slug %>
@@ -54,6 +60,9 @@
       <dd><%= link_to @entity.phone, "tel:#{@entity.phone}" %></dd>
     <% end %>
 
+    <dt><%= t('activerecord.attributes.user.balance') %></dt>
+    <dd><%= @entity.balance %></dd>
+
     <%= render partial: 'admin/users/entity/profile', locals: { data: @entity.profile_data } %>
 
     <% unless @entity.ip.blank? %>

data/app/views/application/error.jbuilder

@@ -0,0 +1,3 @@
+json.errors do
+  json.message t('.message')
+end

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

@@ -1,7 +1,5 @@
 <%= render partial: 'editable_pages/entity/metadata', locals: { entity: entity } %>
 
-<article>
-  <h1><%= entity.title %></h1>
-
-  <%= raw entity.body %>
+<article class="editable-page">
+  <%= render partial: 'editable_pages/entity/content', locals: { entity: entity } %>
 </article>

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

@@ -1,8 +1,20 @@
-<% entity_name = entity.class.to_s.underscore %>
-<%= form_with(model: entity, html: { id: "#{entity_name}-form" }) do |f| %>
+<% 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 } %>
 
   <dl>
+    <dt><%= f.label :priority %></dt>
+    <dd>
+      <%=
+        f.number_field(
+            :priority,
+            id: "#{model_name}_priority",
+            in: EditablePage::PRIORITY_RANGE,
+            required: true
+        )
+      %>
+    </dd>
+
     <dt><%= f.label :language_id %></dt>
     <dd><%= f.select :language_id, languages_for_select %></dd>
 
@@ -11,7 +23,7 @@
       <%=
         f.text_field(
             :slug,
-            id:        :editable_page_slug,
+            id:        "#{model_name}_slug",
             size:      nil,
             maxlength: EditablePage::SLUG_LIMIT,
             required:  true
@@ -20,9 +32,23 @@
       <div class="guideline"><%= t('.guidelines.slug') %></div>
     </dd>
 
+    <dt><%= f.label :url %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :url,
+            id:        "#{model_name}_url",
+            size:      nil,
+            maxlength: EditablePage::META_LIMIT,
+            placeholder: t('.placeholders.url')
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.url') %></div>
+    </dd>
+
     <dt><%= f.label :image %></dt>
     <dd>
-      <figure class="preview" role="group" id="<%= entity_name %>-image">
+      <figure class="preview" role="group" id="<%= model_name %>-image">
         <% if entity.image.blank? %>
           <%= f.label :image, image_tag('biovision/base/placeholders/image.svg') %>
         <% else %>
@@ -32,9 +58,9 @@
           <%=
             f.file_field(
                 :image,
-                id:     "#{entity_name}_image",
+                id:     "#{model_name}_image",
                 accept: 'image/jpeg,image/png',
-                data:   { image: "#{entity_name}-image" }
+                data:   { image: "#{model_name}-image" }
             )
           %>
         </figcaption>
@@ -42,12 +68,25 @@
       <div class="guideline"><%= t('.guidelines.image') %></div>
     </dd>
 
+    <dt><%= f.label :image_alt_text %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :image_alt_text,
+            id:        "#{model_name}_image_alt_text",
+            size:      nil,
+            maxlength: EditablePage::META_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.image_alt_text') %></div>
+    </dd>
+
     <dt><%= f.label :name %></dt>
     <dd>
       <%=
         f.text_field(
             :name,
-            id:        :editable_page_name,
+            id:        "#{model_name}_name",
             size:      nil,
             maxlength: EditablePage::NAME_LIMIT,
             required:  true
@@ -61,7 +100,7 @@
       <%=
         f.text_field(
             :title,
-            id:        :editable_page_title,
+            id:        "#{model_name}_title",
             size:      nil,
             maxlength: EditablePage::META_LIMIT
         )
@@ -74,7 +113,7 @@
       <%=
         f.text_field(
             :keywords,
-            id:        :editable_page_keywords,
+            id:        "#{model_name}_keywords",
             size:      nil,
             maxlength: EditablePage::META_LIMIT
         )
@@ -87,7 +126,7 @@
       <%=
         f.text_field(
             :description,
-            id:        :editable_page_description,
+            id:        "#{model_name}_description",
             size:      nil,
             maxlength: EditablePage::META_LIMIT
         )
@@ -100,7 +139,7 @@
       <%=
         f.text_area(
             :body,
-            id:       :editable_page_body,
+            id:       "#{model_name}_body",
             cols:     80,
             rows:     25,
             required: true,

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

@@ -1,8 +1,8 @@
 <% content_for :meta_title, t('.title') %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('admin.editable_pages.nav_item.text'), admin_editable_pages_path) %>
-    <%= admin_editable_page_link(@entity) %>
-    <span><%= t(:edit) %></span>
+  <%= link_to(t('admin.editable_pages.nav_item.text'), admin_editable_pages_path) %>
+  <%= admin_editable_page_link(@entity) %>
+  <span><%= t(:edit) %></span>
 <% end %>
 
 <article>

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

@@ -0,0 +1,11 @@
+<h1><%= entity.title %></h1>
+
+<% if entity.editable_by?(current_user) %>
+  <ul class="actions">
+    <li><%= edit_icon(edit_editable_page_path(id: entity.id)) %></li>
+  </ul>
+<% end %>
+
+<div class="text">
+  <%= raw(entity.body) %>
+</div>