biovision 0.0.200518.1 → 0.12.211124.0

data/app/assets/stylesheets/biovision/components/toggleable.scss

@@ -0,0 +1,71 @@
+$toggleable-active: #34c749 !default;
+$toggleable-inactive: #fc605c !default;
+$toggleable-switch: #fdbc40 !default;
+$toggleable-unknown: #c0c0c0 !default;
+$toggleable-background: #fff !default;
+
+.toggleable {
+  font-size: var(--font-size-decreased);
+  margin: .8rem;
+
+  /**
+   * Радиус границы в ::before должен быть чуть меньше, чтобы не было щелей,
+   * потому что span фактически толще на две толщины границы
+   */
+  > span {
+    background-color: $toggleable-background;
+    border: .1rem solid;
+    border-radius: .8rem;
+    cursor: pointer;
+    display: inline-block;
+    line-height: 1.8;
+    margin: .4rem;
+    padding: 0 var(--spacer-s) 0 0;
+
+    &::before {
+      border-radius: .8rem 0 0 .8rem;
+      display: inline-block;
+      line-height: 1.8;
+      margin: 0 .4rem 0 0;
+      text-align: center;
+      width: 2.2rem;
+    }
+  }
+
+  .active {
+    border-color: $toggleable-active;
+
+    &::before {
+      background-color: $toggleable-active;
+      content: '\2611';
+    }
+  }
+
+  .inactive {
+    border-color: $toggleable-inactive;
+
+    &::before {
+      background-color: $toggleable-inactive;
+      content: '\2610';
+    }
+  }
+
+  .switch {
+    border-color: $toggleable-switch;
+    cursor: not-allowed;
+
+    &::before {
+      background-color: $toggleable-switch;
+      content: '\231B';
+    }
+  }
+
+  .unknown {
+    border-color: $toggleable-unknown;
+
+    &::before {
+      background-color: $toggleable-unknown;
+      content: '\26A0';
+    }
+  }
+}

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

@@ -0,0 +1,7 @@
+@import "biovision/components/buttons";
+@import "biovision/components/forms";
+@import "biovision/components/hamburger";
+@import "biovision/components/lists";
+@import "biovision/components/messages";
+@import "biovision/components/pagination";
+@import "biovision/components/breadcrumbs";

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

@@ -41,10 +41,10 @@ $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;
+$layout-bg-body: #f4f4f4 linear-gradient(to top, #f4f4f4, #dfdedc) no-repeat center / cover !default;
+$layout-bg-header: #fff !default;
+$layout-bg-main: #fff !default;
+$layout-bg-footer: #fff !default;
 
 $link-color: rgb(20, 127, 255) !default;
 $link-color-visited: rgb(20, 77, 250) !default;

data/app/assets/stylesheets/biovision/themes/default_theme/components/users/dashboard.scss

@@ -0,0 +1,4 @@
+.my__component {
+  border-top: var(--border-secondary);
+  margin: var(--spacer-m) auto;
+}

data/app/assets/stylesheets/biovision/themes/default_theme/components/users/form_tabs.scss

@@ -0,0 +1,101 @@
+$users-tab-color: hsl(220, 75%, 50%) !default;
+$users-tab-color-hover: hsl(220, 100%, 95%) !default;
+
+.users__form-tabs {
+  box-shadow: var(--block-shadow);
+  margin: 0 auto var(--spacer-m);
+  max-width: 40rem;
+  padding-top: var(--spacer-xs);
+
+  .errors {
+    margin: 0 var(--spacer-xs);
+  }
+
+  .labels {
+    align-items: center;
+    border: .1rem solid $users-tab-color;
+    display: flex;
+    margin: 0 var(--spacer-xs);
+
+    label {
+      color: $users-tab-color;
+      cursor: pointer;
+      display: block;
+      flex: 1;
+      padding: var(--spacer-xs) var(--spacer-s);
+      text-align: center;
+      transition: .25s;
+
+      &:hover {
+        background-color: $users-tab-color-hover;
+      }
+    }
+  }
+
+  .tabs {
+    .tab {
+      display: none;
+    }
+
+    .login {
+      form {
+        margin: 0 auto;
+      }
+    }
+  }
+
+  .tab-control-login {
+    &:checked {
+      ~ .labels {
+        .login {
+          background: $users-tab-color;
+          color: var(--text-color-inverted-primary);
+        }
+      }
+
+      ~ .tabs {
+        .login {
+          display: block;
+        }
+      }
+    }
+  }
+
+  .tab-control-join {
+    &:checked {
+      ~ .labels {
+        .join {
+          background: $users-tab-color;
+          color: var(--text-color-inverted-primary);
+        }
+      }
+
+      ~ .tabs {
+        .join {
+          display: block;
+        }
+      }
+    }
+  }
+
+  .fields {
+    > div:not(:last-of-type) {
+      margin-bottom: 0;
+    }
+  }
+
+  .actions {
+    align-items: center;
+    display: flex;
+    justify-content: space-between;
+    padding: var(--spacer-xs);
+  }
+
+  .flags {
+    font-weight: 300;
+
+    li {
+      padding: var(--spacer-xxs) var(--spacer-xs);
+    }
+  }
+}

data/app/assets/stylesheets/biovision/themes/default_theme/components/users/profile.scss

@@ -0,0 +1,77 @@
+.users__profile {
+  --avatar-size: 36rem;
+  align-items: flex-start;
+  display: flex;
+
+  .avatar {
+    flex: none;
+    padding: var(--spacer-xs) var(--spacer-xxs);
+    width: calc(var(--avatar-size) + var(--spacer-xxs) * 2 + var(--spacer-s));
+
+    .image {
+      max-width: 100%;
+      height: var(--avatar-size);
+      width: var(--avatar-size);
+    }
+
+    img {
+      box-shadow: var(--block-shadow);
+      height: 100%;
+      object-fit: contain;
+      width: 100%;
+    }
+  }
+}
+
+@media (max-width: 850px) {
+  .users__profile {
+    display: block;
+  }
+}
+
+@media (max-width: 375px) {
+  .users__profile {
+    --avatar-size: 30rem;
+
+    .avatar {
+      width: 100%;
+
+      .image {
+        margin: 0 auto;
+      }
+    }
+  }
+}
+
+.users__profile-aside {
+  margin: var(--spacer-s) 0;
+  padding: 0 var(--spacer-xs);
+}
+
+.users__profile-form {
+  background: #f7f7f7;
+  border: var(--border-secondary);
+  margin: var(--spacer-s) auto;
+  padding: var(--spacer-xs);
+
+  img {
+    box-shadow: var(--block-shadow);
+  }
+
+  h3 {
+    margin-bottom: var(--spacer-s);
+  }
+
+  .hint {
+    background: #fff;
+    box-shadow: var(--block-shadow);
+    font-size: var(--font-size-increased);
+    font-weight: 300;
+    padding: var(--spacer-xs);
+
+    &::before {
+      content: '☝';
+      margin-right: var(--spacer-xxs);
+    }
+  }
+}

data/app/assets/stylesheets/biovision/themes/default_theme/components/users.scss

@@ -0,0 +1,3 @@
+@import "biovision/themes/default_theme/components/users/form_tabs";
+@import "biovision/themes/default_theme/components/users/profile";
+@import "biovision/themes/default_theme/components/users/dashboard";

data/app/assets/stylesheets/biovision/themes/default_theme/components.scss

@@ -1,3 +1,2 @@
-@import "biovision/components/forms";
-@import "biovision/components/hamburger";
-@import "biovision/components/lists";
+@import "biovision/components";
+@import "biovision/themes/default_theme/components/users";

data/app/assets/stylesheets/biovision/themes/default_theme/layout/footer.scss

@@ -0,0 +1,3 @@
+.main-footer {
+  background: var(--layout-bg-footer);
+}

data/app/assets/stylesheets/biovision/themes/default_theme/layout/header.scss

@@ -1,4 +1,6 @@
 .main-header {
+  background: var(--layout-bg-header);
+
   .content-wrapper {
     align-items: center;
     display: flex;
@@ -23,11 +25,13 @@
 .header-authentication {
   align-items: center;
   display: flex;
+  gap: var(--spacer-xxs);
   margin: 0 0 0 auto;
 
   .avatar {
     display: inline-block;
     height: 2.4rem;
+    overflow: hidden;
     width: 2.4rem;
 
     img {
@@ -36,4 +40,12 @@
       width: 100%;
     }
   }
+
+  .current-user {
+    align-items: center;
+    color: inherit;
+    display: flex;
+    font-size: var(--font-size-decreased);
+    gap: var(--spacer-xs);
+  }
 }

data/app/assets/stylesheets/biovision/themes/default_theme/layout.scss

@@ -1,36 +1,21 @@
-@import "biovision/themes/default_theme/components";
-@import "biovision/themes/default_theme/layout/header";
-
 //* { outline: solid pink 1px }
 
 html {
-  height: 100%;
+  //height: 100%;
 }
 
 body {
+  background: var(--layout-bg-body);
   display: flex;
   flex-direction: column;
-  height: 100%;
+  //height: 100%;
 }
 
 #main {
+  background: var(--layout-bg-main);
   flex: 1;
 }
 
-.breadcrumbs {
-  a {
-    background: image_url('biovision/icons/breadcrumb.svg') no-repeat bottom .1rem right / .6rem 1.2rem;
-    padding-right: 1rem;
-    transition: background .25s;
-
-    &:active,
-    &:focus,
-    &:hover {
-      background-image: image_url('biovision/icons/breadcrumb-hover.svg');
-    }
-  }
-}
-
 .content-wrapper {
   padding: var(--spacer-xs);
 }
@@ -42,3 +27,7 @@ body {
   width: 100%;
   z-index: 5;
 }
+
+@import "biovision/themes/default_theme/components";
+@import "biovision/themes/default_theme/layout/header";
+@import "biovision/themes/default_theme/layout/footer";

data/app/assets/stylesheets/biovision/themes/default_theme.scss

@@ -1,2 +1 @@
-@import "biovision/vars";
 @import "biovision/themes/default_theme/layout";

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

@@ -50,4 +50,9 @@
   --input-border-focus: #{$input-border-focus};
   --input-border-invalid: #{$input-border-invalid};
   --input-border-invalid-focus: #{$input-border-invalid-focus};
+
+  --layout-bg-body: #{$layout-bg-body};
+  --layout-bg-footer: #{$layout-bg-footer};
+  --layout-bg-header: #{$layout-bg-header};
+  --layout-bg-main: #{$layout-bg-main};
 }

data/app/controllers/admin/biovision_components_controller.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Managing component list
+class Admin::BiovisionComponentsController < AdminController
+  include CrudEntities
+  include EntityPriority
+  include ToggleableEntity
+
+  before_action :set_entity, except: %i[index]
+end

data/app/controllers/admin/components_controller.rb

@@ -2,117 +2,48 @@
 
 # Handling components
 class Admin::ComponentsController < AdminController
-  before_action :set_handler, except: :index
+  include ProcessedForms
+
+  # skip_before_action :restrict_access, only: :index
   skip_before_action :verify_authenticity_token, only: :ckeditor
 
   # get /admin/components
   def index
-    @collection = BiovisionComponent.list_for_administration
+    @collection = BiovisionComponent.active.list_for_administration
   end
 
   # get /admin/components/:slug
   def show
     error = 'Viewing component is not allowed'
-    handle_http_401(error) unless @handler.allow?
+    handle_http_401(error) unless @handler.permit?('view')
   end
 
   # get /admin/components/:slug/settings
   def settings
-    error = 'Viewing settings is not allowed'
-    handle_http_401(error) unless @handler.allow?('settings')
   end
 
   # patch /admin/components/:slug/settings
   def update_settings
-    if @handler.allow?('settings')
-      new_settings = params.dig(:component, :settings).permit!
-      @handler.settings = new_settings.to_h
-      flash[:success] = t('.success')
-      redirect_to(admin_component_settings_path(slug: params[:slug]))
-    else
-      handle_http_401('Changing settings is not allowed')
-    end
+    new_settings = params.dig(:component, :settings).permit!
+    @handler.settings = new_settings.to_h
+    flash[:success] = t('.success')
+    redirect_to(admin_component_settings_path(slug: params[:slug]))
   end
 
   # patch /admin/components/:slug/parameters
   def update_parameter
-    if @handler.allow?('settings')
-      slug = param_from_request(:key, :slug).downcase
-      value = param_from_request(:key, :value)
+    slug = param_from_request(:key, :slug).downcase
+    value = param_from_request(:key, :value)
 
-      @handler[slug] = value
-    end
+    @handler[slug] = value
 
     head :no_content
   end
 
   # delete /admin/components/:slug/parameters/:parameter_slug
   def delete_parameter
-    if @handler.allow?('settings')
-      @handler.component.parameters.delete(params[:parameter_slug])
-      @handler.component.save
-    end
-
-    head :no_content
-  end
-
-  # get /admin/components/:slug/privileges
-  def privileges
-    error = 'Viewing privileges is not allowed'
-    handle_http_401(error) unless @handler.administrator?
-  end
-
-  # patch /admin/components/:slug/privileges
-  def update_privileges
-    if @handler.administrator?
-      user = User.find_by(id: params[:user_id])
-
-      if user.nil?
-        handle_http_404('Cannot find user') if user.nil?
-      else
-        @entity = @handler.user_link!(true)
-      end
-    else
-      handle_http_401('Updating privileges is not allowed')
-    end
-  end
-
-  # put /admin/components/:slug/administrators/:user_id
-  def add_administrator
-    if @handler.administrator?
-      @handler.user = User.find_by(id: params[:user_id])
-      @handler.privilege_handler.administrator!
-    end
-
-    head :no_content
-  end
-
-  # put /admin/components/:slug/administrators/:user_id
-  def remove_administrator
-    if @handler.administrator?
-      @handler.user = User.find_by(id: params[:user_id])
-      @handler.privilege_handler.not_administrator!
-    end
-
-    head :no_content
-  end
-
-  # put /admin/components/:slug/users/:user_id/privileges/:privilege_slug
-  def add_privilege
-    if @handler.administrator?
-      @handler.user = User.find_by(id: params[:user_id])
-      @handler.privilege_handler.add_privilege(params[:privilege_slug])
-    end
-
-    head :no_content
-  end
-
-  # put /admin/components/:slug/users/:user_id/privileges/:privilege_slug
-  def remove_privilege
-    if @handler.administrator?
-      @handler.user = User.find_by(id: params[:user_id])
-      @handler.privilege_handler.remove_privilege(params[:privilege_slug])
-    end
+    @handler.component.parameters.delete(params[:parameter_slug])
+    @handler.component.save
 
     head :no_content
   end
@@ -120,13 +51,14 @@ class Admin::ComponentsController < AdminController
   # get /admin/components/:slug/images
   def images
     list = SimpleImage.in_component(@handler.component).list_for_administration
-    @collection = @handler.allow? ? list.page(current_page) : []
+    @collection = list.page(current_page)
   end
 
+  # post /admin/components/:slug/images
   def create_image
-    if @handler.allow?
-      @entity = @handler.component.simple_images.new(image_parameters)
-      if @entity.save
+    if @handler.permit?('simple_images.create')
+      @entity = @handler.upload_image(image_parameters)
+      if @entity
         render 'image', formats: :json
       else
         form_processed_with_error(:new_image)
@@ -143,7 +75,7 @@ class Admin::ComponentsController < AdminController
       biovision_component: @handler.component
     }.merge(owner_for_entity(true))
 
-    @entity = SimpleImage.create!(parameters)
+    @entity = @handler.upload_image(parameters)
 
     render json: {
       uploaded: 1,
@@ -154,21 +86,29 @@ class Admin::ComponentsController < AdminController
 
   private
 
-  def set_handler
+  def restrict_access
     slug = params[:slug]
     @handler = Biovision::Components::BaseComponent.handler(slug, current_user)
-  end
-
-  def restrict_access
-    return if current_user&.super_user?
+    role = action_name == 'index' ? 'components.view' : role_end_from_action
+    role_name = "#{@handler.slug}.#{role}"
+    error = t('admin.errors.unauthorized.missing_role', role: role_name)
 
-    links_exist = BiovisionComponentUser.where(user: current_user).exists?
-    handle_http_401('User has no component privileges') unless links_exist
+    handle_http_401(error) unless @handler.permit?(role)
   end
 
   def image_parameters
     permitted = SimpleImage.entity_parameters
-    params.require(:simple_image).permit(permitted)
-    permitted.merge(owner_for_entity(true))
+    parameters = params.require(:simple_image).permit(permitted)
+    parameters.merge(owner_for_entity(true))
+  end
+
+  def action_to_role_map
+    super.merge(
+      %w[images] => 'simple_images.view',
+      %w[create_image ckeditor] => 'simple_images.create',
+      %w[settings] => 'settings.view',
+      %w[update_settings update_parameter delete_parameter] => 'settings.edit',
+      %w[show] => 'view'
+    )
   end
 end

data/app/controllers/admin/dynamic_blocks_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Administrative part for handling dynamic_blocks
+class Admin::DynamicBlocksController < AdminController
+  include CrudEntities
+  include ToggleableEntity
+
+  before_action :set_entity, except: %i[check create index new]
+
+  private
+
+  def component_class
+    Biovision::Components::ContentComponent
+  end
+end

data/app/controllers/admin/dynamic_pages_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Administrative part for handling dynamic_pages
+class Admin::DynamicPagesController < AdminController
+  include CrudEntities
+  include ToggleableEntity
+
+  before_action :set_entity, except: %i[check create index new search]
+
+  private
+
+  def component_class
+    Biovision::Components::ContentComponent
+  end
+end

data/app/controllers/admin/index_controller.rb

@@ -4,8 +4,14 @@
 class Admin::IndexController < AdminController
   # get /admin
   def index
-    return if Biovision::Components::BaseComponent.privileged?(current_user)
+  end
+
+  private
+
+  def restrict_access
+    role_name = "#{component_handler.slug}.admin"
+    error = t('admin.errors.unauthorized.missing_role', role: role_name)
 
-    handle_http_401
+    handle_http_401(error) unless component_handler.permit?('admin')
   end
 end