biovision-base 0.22.180920.0 → 0.34.190331.1

data/app/assets/stylesheets/biovision/base/buttons/buttons-common.scss

@@ -58,6 +58,18 @@ $button-destroy-text-b: $button-destroy-text-a !default;
     background: $bg-b;
     color: $text-b;
   }
+
+  &.inverted {
+    background: $bg-b;
+    color: $text-b;
+
+    &:active,
+    &:focus,
+    &:hover {
+      background: $bg-a;
+      color: $text-a;
+    }
+  }
 }
 
 @mixin border-button($border-a, $border-b) {
@@ -68,6 +80,16 @@ $button-destroy-text-b: $button-destroy-text-a !default;
   &:hover {
     border-color: $border-b;
   }
+
+  &.inverted {
+    border-color: $border-b;
+
+    &:active,
+    &:focus,
+    &:hover {
+      border-color: $border-a;
+    }
+  }
 }
 
 .button-action,

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

@@ -11,13 +11,13 @@ $font-size-decreased: 1.3rem !default;
 $font-size-small: 1.1rem !default;
 $font-size-xs: 1rem !default;
 
-$spacer-xxs: .4rem !default;
-$spacer-xs: .8rem !default;
 $spacer-s: 1.6rem !default;
-$spacer-m: 3.2rem !default;
-$spacer-l: 4.8rem !default;
-$spacer-xl: 6.4rem !default;
-$spacer-xxl: 9.6rem !default;
+$spacer-xxs: #{$spacer-s / 4} !default;
+$spacer-xs: #{$spacer-s / 2} !default;
+$spacer-m: #{$spacer-s * 2} !default;
+$spacer-l: #{$spacer-s * 3} !default;
+$spacer-xl: #{$spacer-s * 4} !default;
+$spacer-xxl: #{$spacer-s * 6} !default;
 
 $content-width: 100rem !default;
 $content-width-min: 32rem !default;

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

@@ -1,13 +1,25 @@
-$font-family-heading: "Cormorant Garamond", serif !default;
 $font-family-main: "Roboto", sans-serif !default;
+$font-family-heading: "Cormorant Garamond", serif !default;
 
-$font-size-large: 2rem !default;
-$font-size-increased: 1.6rem !default;
-$font-size-normal: 1.4rem !default;
-$font-size-decreased: 1.2rem !default;
-$font-size-small: 1rem !default;
-
-$content-width: 100rem !default;
+$font-size-xxxl: 4.5rem !default;
+$font-size-xxl: 3.6rem !default;
+$font-size-xl: 3.2rem !default;
+$font-size-large: 2.4rem !default;
+$font-size-increased: 1.8rem !default;
+$font-size-normal: 1.6rem !default;
+$font-size-decreased: 1.4rem !default;
+$font-size-small: 1.2rem !default;
+$font-size-xs: 1rem !default;
+
+$spacer-s: 1.6rem !default;
+$spacer-xxs: #{$spacer-s / 4} !default;
+$spacer-xs: #{$spacer-s / 2} !default;
+$spacer-m: #{$spacer-s * 2} !default;
+$spacer-l: #{$spacer-s * 3} !default;
+$spacer-xl: #{$spacer-s * 4} !default;
+$spacer-xxl: #{$spacer-s * 6} !default;
+
+$content-width: 120rem !default;
 $content-width-min: 32rem !default;
 
 $row-background-even: hsl(0, 0%, 95%) !default;
@@ -24,6 +36,11 @@ $border-color-secondary: rgb(230, 230, 230) !default;
 $border-primary: .1rem solid $border-color-primary !default;
 $border-secondary: .1rem solid $border-color-secondary !default;
 
+$background-body: #f4f4f4 linear-gradient(to top, #f4f4f4, #dfdedc) no-repeat center / cover !default;
+$background-header: #fff !default;
+$background-main: #fff !default;
+$background-footer: #fff !default;
+
 $link-color: rgb(20, 127, 255) !default;
 $link-color-visited: rgb(20, 77, 250) !default;
 $link-color-hover: rgb(255, 77, 20) !default;

data/app/assets/stylesheets/biovision/base/themes/simple-layout.scss

@@ -7,11 +7,8 @@ h1, h2, h3, h4, h5, h6 {
 body {
   background: $background-body;
   color: $text-color-primary;
-  font-size: $font-size-normal;
-  margin: 0;
   min-height: 100vh;
   min-width: $content-width-min;
-  padding: 0;
 
   > footer,
   > header {

data/app/controllers/admin/editable_pages_controller.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
+# Administrative part of editable_pages management
 class Admin::EditablePagesController < AdminController
   include EntityPriority
+  include ToggleableEntity
 
-  before_action :set_entity, except: [:index]
+  before_action :set_entity, except: :index
 
   # get /admin/editable_pages
   def index
@@ -20,8 +24,6 @@ class Admin::EditablePagesController < AdminController
 
   def set_entity
     @entity = EditablePage.find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404("Cannot find editable_page #{params[:id]}")
-    end
+    handle_http_404('Cannot find editable_page') if @entity.nil?
   end
 end

data/app/controllers/admin/privileges_controller.rb

@@ -1,5 +1,4 @@
 class Admin::PrivilegesController < AdminController
-  include LockableEntity
   include EntityPriority
   include ToggleableEntity
 
@@ -26,9 +25,9 @@ class Admin::PrivilegesController < AdminController
   end
 
   def set_entity
-    @entity = Privilege.find_by(id: params[:id], deleted: false)
+    @entity = Privilege.find_by(id: params[:id])
     if @entity.nil?
-      handle_http_404("Cannot find non-deleted privilege #{params[:id]}")
+      handle_http_404("Cannot find privilege #{params[:id]}")
     end
   end
 end

data/app/controllers/admin/settings_controller.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+# Administrative controller for managing component settings and parameters
+class Admin::SettingsController < AdminController
+  before_action :set_handler, except: :index
+
+  # get /admin/settings
+  def index
+    @collection = BiovisionComponent.pluck(:slug)
+  end
+
+  # get /admin/settings/:slug
+  def show
+  end
+
+  # patch /admin/settings/:slug
+  def update
+    new_settings      = params.dig(:component, :settings).permit!
+    @handler.settings = new_settings.to_h
+    flash[:notice]    = t('admin.settings.update.success')
+    redirect_to(admin_component_path(slug: params[:slug]))
+  end
+
+  # put /admin/settings/:slug/parameter
+  def set_parameter
+    slug        = param_from_request(:key, :slug).downcase
+    value       = param_from_request(:key, :value)
+    name        = param_from_request(:key, :name)
+    description = param_from_request(:key, :description)
+
+    if name.blank? && description.blank?
+      @handler[slug] = value
+    else
+      @handler.set_parameter(slug, value, name, description)
+    end
+
+    head :no_content
+  end
+
+  # delete /admin/settings/:slug/:parameter_slug
+  def delete_parameter
+    @handler.delete_parameter(params[:parameter_slug])
+
+    head :no_content
+  end
+
+  private
+
+  def set_handler
+    @handler = Biovision::Components::BaseComponent.handler(params[:slug])
+  end
+end

data/app/controllers/admin/simple_blocks_controller.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Administrative part of simple_blocks management
+class Admin::SimpleBlocksController < AdminController
+  include ToggleableEntity
+
+  before_action :set_entity, except: :index
+
+  # get /admin/simple_blocks
+  def index
+    @collection = SimpleBlock.list_for_administration
+  end
+
+  # get /admin/simple_blocks/:id
+  def show
+  end
+
+  private
+
+  def restrict_access
+    require_privilege :content_manager
+  end
+
+  def set_entity
+    @entity = SimpleBlock.find_by(id: params[:id])
+    handle_http_404('Cannot find simple_block') if @entity.nil?
+  end
+end

data/app/controllers/admin/users_controller.rb

@@ -79,7 +79,7 @@ class Admin::UsersController < AdminController
   end
 
   def set_privilege
-    @privilege = Privilege.find_by(id: params[:privilege_id], deleted: false)
+    @privilege = Privilege.find_by(id: params[:privilege_id])
     if @privilege.nil?
       handle_http_404("Cannot use privilege #{params[:privilege_id]}")
     end

data/app/controllers/agents_controller.rb

@@ -11,9 +11,9 @@ class AgentsController < AdminController
   def create
     @entity = Agent.new entity_parameters
     if @entity.save
-      redirect_to admin_agent_path(id: @entity.id)
+      form_processed_ok(admin_agent_path(id: @entity.id))
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
     end
   end
 
@@ -28,9 +28,9 @@ class AgentsController < AdminController
   # patch /agents/:id
   def update
     if @entity.update entity_parameters
-      redirect_to admin_agent_path(id: @entity.id), notice: t('agents.update.success')
+      form_processed_ok(admin_agent_path(id: @entity.id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 

data/app/controllers/authentication_controller.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
+# Authentication with form and OAuth
 class AuthenticationController < ApplicationController
   include Authentication
 
-  before_action :redirect_authenticated_user, except: [:new, :destroy]
-  before_action :set_foreign_site, only: [:auth_callback]
+  before_action :redirect_authenticated_user, except: %i[new destroy]
+  before_action :set_foreign_site, only: :auth_callback
 
   # get /login
   def new
@@ -10,7 +13,7 @@ class AuthenticationController < ApplicationController
 
   # post /login
   def create
-    @user    = User.find_by(slug: param_from_request(:login).downcase)
+    @user    = find_user
     @bouncer = UserBouncer.new(@user, tracking_for_entity)
     bounce_or_allow
   end
@@ -18,6 +21,8 @@ class AuthenticationController < ApplicationController
   # delete /logout
   def destroy
     deactivate_token if current_user
+
+    cleanup_after_destroy
     redirect_to root_path
   end
 
@@ -34,9 +39,8 @@ class AuthenticationController < ApplicationController
 
   def set_foreign_site
     @foreign_site = ForeignSite.with_slug(params[:provider]).first
-    if @foreign_site.nil?
-      handle_http_503('Cannot set foreign site')
-    end
+
+    handle_http_503('Cannot set foreign site') if @foreign_site.nil?
   end
 
   def bounce_or_allow
@@ -66,7 +70,25 @@ class AuthenticationController < ApplicationController
 
     respond_to do |format|
       format.json
+      format.js { render(js: "document.location.href = '#{@return_path}'") }
       format.html { redirect_to(@return_path) }
     end
   end
+
+  def find_user
+    login = param_from_request(:login).downcase
+    user  = User.find_by(slug: login)
+
+    # Try to authenticate by email, if login does not match anything
+    if user.nil? && login.index('@').to_i.positive?
+      user = User.with_email(login).first
+    end
+
+    user
+  end
+
+  # Clean obsolete cookies, session parameters, etc.
+  def cleanup_after_destroy
+    # this method can be redefined in decorators
+  end
 end

data/app/controllers/browsers_controller.rb

@@ -11,9 +11,9 @@ class BrowsersController < AdminController
   def create
     @entity = Browser.new entity_parameters
     if @entity.save
-      redirect_to admin_browser_path(id: @entity.id)
+      form_processed_ok(admin_browser_path(id: @entity.id))
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
     end
   end
 
@@ -24,9 +24,9 @@ class BrowsersController < AdminController
   # patch /browsers/:id
   def update
     if @entity.update entity_parameters
-      redirect_to admin_browser_path(id: @entity.id), notice: t('browsers.update.success')
+      form_processed_ok(admin_browser_path(id: @entity.id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 

data/app/controllers/concerns/authentication.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Adds methods for user authentication
 module Authentication
   extend ActiveSupport::Concern
 
@@ -18,17 +21,17 @@ module Authentication
   end
 
   def deactivate_token
-    token = Token.find_by token: cookies['token'].split(':').last
-    token.update active: false
+    token = Token.find_by(token: cookies['token'].split(':').last)
+    token&.update(active: false)
     pop_token
   end
 
   def pop_token
     if cookies['pt']
       cookies['token'] = {
-        value:    cookies['pt'],
-        expires:  1.year.from_now,
-        domain:   :all,
+        value: cookies['pt'],
+        expires: 1.year.from_now,
+        domain: :all,
         httponly: true
       }
       cookies.delete 'pt', domain: :all

data/app/controllers/concerns/entity_priority.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Adds method for changing entity priority
 module EntityPriority
   extend ActiveSupport::Concern
 

data/app/controllers/concerns/lockable_entity.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Adds methods for locking and unlocking entity
 module LockableEntity
   extend ActiveSupport::Concern
 
@@ -16,8 +19,8 @@ module LockableEntity
   protected
 
   def check_entity_lock
-    if @entity.locked?
-      render json: { errors: { locked: @entity.locked } }, status: :forbidden
-    end
+    return unless @entity.locked?
+
+    render json: { errors: { locked: @entity.locked? } }, status: :forbidden
   end
 end

data/app/controllers/concerns/removable_image.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Adds action for removing entity image in column "image"
 module RemovableImage
   extend ActiveSupport::Concern
 
@@ -24,10 +27,6 @@ module RemovableImage
   end
 
   def entity_image_is_locked?
-    if @entity.respond_to?(:locked?)
-      @entity.locked?
-    else
-      false
-    end
+    @entity.respond_to?(:locked?) ? @entity.locked? : false
   end
 end