biovision-base 0.7.170709 → 0.8.170916

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

@@ -1,3 +1,137 @@
+$button-action-bg-a: #2e3c8e !default;
+$button-action-bg-b: #3d94f6 !default;
+$button-action-border-a: .1rem solid #2e3c8e !default;
+$button-action-border-b: .1rem solid #515da3 !default;
+$button-action-text-a: #fff !default;
+$button-action-text-b: #fff !default;
+
+$button-nav-bg-a: #fff !default;
+$button-nav-bg-b: #1e62d0 !default;
+$button-nav-border-a: .1rem solid #2e3c8e !default;
+$button-nav-border-b: .1rem solid #2e3c8e !default;
+$button-nav-text-a: #3d94f6 !default;
+$button-nav-text-b: #fff !default;
+
+$button-create-bg-a: #68a54b !default;
+$button-create-bg-b: #5ba337 !default;
+$button-create-border-a: .1rem solid #3b6e22 !default;
+$button-create-border-b: .1rem solid #3b6e22 !default;
+$button-create-text-a: #fff !default;
+$button-create-text-b: #fff !default;
+
+$button-destroy-bg-a: #a54b68 !default;
+$button-destroy-bg-b: #a3375b !default;
+$button-destroy-border-a: .1rem solid #6e223b !default;
+$button-destroy-border-b: .1rem solid #6e223b !default;
+$button-destroy-text-a: #fff !default;
+$button-destroy-text-b: #fff !default;
+
+@mixin button($bg-a, $text-a, $border-a, $bg-b, $text-b, $border-b) {
+  background: $bg-a;
+  border: $border-a;
+  border-radius: #{$font-size-normal * .375};
+  box-sizing: border-box;
+  color: $text-a;
+  cursor: pointer;
+  display: inline-block;
+  font: #{$font-size-normal}/1.5 $font-family-main;
+  padding: 0 $font-size-normal;
+  text-decoration: none;
+  transition: .125s;
+
+  &:active,
+  &:focus,
+  &:hover {
+    background: $bg-b;
+    border: $border-b;
+    color: $text-b;
+  }
+}
+
+@mixin button-action {
+  @include button(
+                  $button-action-bg-a, $button-action-text-a, $button-action-border-a,
+                  $button-action-bg-b, $button-action-text-b, $button-action-border-b
+  )
+}
+
+@mixin button-nav {
+  @include button(
+                  $button-nav-bg-a, $button-nav-text-a, $button-nav-border-a,
+                  $button-nav-bg-b, $button-nav-text-b, $button-nav-border-b
+  )
+}
+
+@mixin button-create {
+  @include button(
+                  $button-create-bg-a, $button-create-text-a, $button-create-border-a,
+                  $button-create-bg-b, $button-create-text-b, $button-create-border-b
+  )
+}
+
+@mixin button-destroy {
+  @include button(
+                  $button-destroy-bg-a, $button-destroy-text-a, $button-destroy-border-a,
+                  $button-destroy-bg-b, $button-destroy-text-b, $button-destroy-border-b
+  )
+}
+
+.button-action,
+a:link.button-action,
+a:visited.button-action {
+  @include button-action;
+}
+
+.button-nav,
+a:link.button-nav,
+a:visited.button-nav {
+  @include button-nav;
+}
+
+.button-create,
+a:link.button-create,
+a:visited.button-create {
+  @include button-create;
+}
+
+.button-destroy,
+a:link.button-destroy,
+a:visited.button-destroy {
+  @include button-destroy;
+}
+
+
+
+// То, что ниже, оставлено для обратной совместимости, но это нужно будет убрать
+
+$button-action-bg-c: #3d94f6 !default;
+$button-action-bg-d: #1e62d0 !default;
+$button-action-border-color-a: #2e3c8e !default;
+$button-action-border-color-b: #515da3 !default;
+$button-action-text-color-a: #fff !default;
+$button-action-text-color-b: #fff !default;
+
+$button-nav-bg-c: #1e62d0 !default;
+$button-nav-bg-d: #3d94f6 !default;
+$button-nav-border-color-a: #2e3c8e !default;
+$button-nav-border-color-b: #2e3c8e !default;
+$button-nav-text-color-a: #3d94f6 !default;
+$button-nav-text-color-b: #fff !default;
+
+$button-create-bg-c: #5ba337 !default;
+$button-create-bg-d: #59ab33 !default;
+$button-create-border-color-a: #3b6e22 !default;
+$button-create-border-color-b: #3b6e22 !default;
+$button-create-text-color-a: #fff !default;
+$button-create-text-color-b: #fff !default;
+
+$button-destroy-bg-c: #a3375b !default;
+$button-destroy-bg-d: #ab3359 !default;
+$button-destroy-border-color-a: #6e223b !default;
+$button-destroy-border-color-b: #6e223b !default;
+$button-destroy-text-color-a: #fff !default;
+$button-destroy-text-color-b: #fff !default;
+
 @mixin styled-button($bg-a, $bg-b, $bg-c, $bg-d, $border-a, $border-b, $text-a, $text-b) {
   background: $bg-a linear-gradient(to top, $bg-a, $bg-b);
   border: .1rem solid $border-a;
@@ -6,12 +140,10 @@
   color: $text-a;
   cursor: pointer;
   display: inline-block;
-  font: $font-size-decreased $font-family-main;
-  line-height: calc(#{$font-size-normal} * 1.5);
-  margin: 0;
+  font: $font-size-normal $font-family-main;
+  line-height: 1.5;
   padding: 0 1.6rem;
   text-decoration: none;
-  //transition: .25s;
 
   &:active,
   &:hover,
@@ -23,69 +155,41 @@
 }
 
 @mixin action-button {
-  @include styled-button(
-                  $button-action-bg-a,
-                  $button-action-bg-b,
-                  $button-action-bg-c,
-                  $button-action-bg-d,
-                  $button-action-border-color-a,
-                  $button-action-border-color-b,
-                  $button-action-text-color-a,
-                  $button-action-text-color-b
-  );
+  @include button-action;
 }
 
 @mixin nav-button {
-  @include styled-button(
-                  $button-nav-bg-a,
-                  $button-nav-bg-b,
-                  $button-nav-bg-c,
-                  $button-nav-bg-d,
-                  $button-nav-border-color-a,
-                  $button-nav-border-color-b,
-                  $button-nav-text-color-a,
-                  $button-nav-text-color-b
-  );
+  @include button-nav;
 }
 
 @mixin create-button {
-  @include styled-button(
-                  $button-create-bg-a,
-                  $button-create-bg-b,
-                  $button-create-bg-c,
-                  $button-create-bg-d,
-                  $button-create-border-color-a,
-                  $button-create-border-color-b,
-                  $button-create-text-color-a,
-                  $button-create-text-color-b
-  );
+  @include button-create;
 }
 
 @mixin destroy-button {
-  @include styled-button(
-                  $button-destroy-bg-a,
-                  $button-destroy-bg-b,
-                  $button-destroy-bg-c,
-                  $button-destroy-bg-d,
-                  $button-destroy-border-color-a,
-                  $button-destroy-border-color-b,
-                  $button-destroy-text-color-a,
-                  $button-destroy-text-color-b
-  );
+  @include button-destroy;
 }
 
-.action-button {
-  @include action-button;
+.action-button,
+a:link.action-button,
+a:visited.action-button {
+  @include button-action;
 }
 
-.nav-button {
-  @include nav-button;
+.nav-button,
+a:link.nav-button,
+a:visited.nav-button {
+  @include button-nav;
 }
 
-.create-button {
-  @include create-button;
+.create-button,
+a:link.create-button,
+a:visited.create-button {
+  @include button-create;
 }
 
-.destroy-button {
-  @include destroy-button;
+.destroy-button,
+a:link.destroy-button,
+a:visited.destroy-button {
+  @include button-destroy;
 }

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

@@ -1,5 +1,5 @@
 $font-family-heading: "Cormorant Garamond", serif !default;
-$font-family-main: "PT Sans", sans-serif !default;
+$font-family-main: "Roboto", sans-serif !default;
 
 $font-size-large: 2rem !default;
 $font-size-increased: 1.6rem !default;
@@ -20,6 +20,7 @@ $text-color-secondary: #777 !default;
 $block-shadow: 0 0 .2rem .2rem rgba(0, 0, 0, .25) !default;
 
 $border-primary: .1rem solid rgb(192, 192, 192) !default;
+$border-secondary: .1rem solid rgb(230, 230, 230) !default;
 
 $background-header: #fff !default;
 $background-main: #fff !default;
@@ -28,39 +29,3 @@ $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;
-
-$button-action-bg-a: #2e3c8e !default;
-$button-action-bg-b: #515da3 !default;
-$button-action-bg-c: #3d94f6 !default;
-$button-action-bg-d: #1e62d0 !default;
-$button-action-border-color-a: #2e3c8e !default;
-$button-action-border-color-b: #515da3 !default;
-$button-action-text-color-a: #fff !default;
-$button-action-text-color-b: #fff !default;
-
-$button-nav-bg-a: #fff !default;
-$button-nav-bg-b: #fafafa !default;
-$button-nav-bg-c: #1e62d0 !default;
-$button-nav-bg-d: #3d94f6 !default;
-$button-nav-border-color-a: #2e3c8e !default;
-$button-nav-border-color-b: #2e3c8e !default;
-$button-nav-text-color-a: #3d94f6 !default;
-$button-nav-text-color-b: #fff !default;
-
-$button-create-bg-a: #68a54b !default;
-$button-create-bg-b: #74ad5a !default;
-$button-create-bg-c: #5ba337 !default;
-$button-create-bg-d: #59ab33 !default;
-$button-create-border-color-a: #3b6e22 !default;
-$button-create-border-color-b: #3b6e22 !default;
-$button-create-text-color-a: #fff !default;
-$button-create-text-color-b: #fff !default;
-
-$button-destroy-bg-a: #a54b68 !default;
-$button-destroy-bg-b: #ad5a74 !default;
-$button-destroy-bg-c: #a3375b !default;
-$button-destroy-bg-d: #ab3359 !default;
-$button-destroy-border-color-a: #6e223b !default;
-$button-destroy-border-color-b: #6e223b !default;
-$button-destroy-text-color-a: #fff !default;
-$button-destroy-text-color-b: #fff !default;

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

@@ -1,3 +1,4 @@
+@import "biovision/base/toggleable";
 @import "biovision/base/buttons";
 @import "biovision/base/biovision";
 @import "biovision/base/admin";

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

@@ -1,3 +1,4 @@
+@import "biovision/base/toggleable";
 @import "biovision/base/buttons";
 @import "biovision/base/biovision";
 @import "biovision/base/tootik";

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

@@ -7,6 +7,10 @@ html {
   -ms-text-size-adjust: none;
 }
 
+* {
+  box-sizing: border-box;
+}
+
 h1, h2, h3, h4, h6, h6 {
   color: $text-color-heading;
   font-family: $font-family-heading;
@@ -35,6 +39,14 @@ a:hover {
   text-decoration: underline;
 }
 
+figure {
+  margin: 0;
+}
+
+img {
+  max-width: 100%;
+}
+
 body {
   color: $text-color-primary;
   display: flex;
@@ -61,14 +73,14 @@ body {
           &.links {
             a:link,
             a:visited {
-              @include nav-button;
+              @include button-nav;
               margin: 0 .4rem;
             }
           }
 
           &.plate {
             .logout {
-              @include action-button;
+              @include button-action;
               margin-left: 1rem;
             }
           }
@@ -98,8 +110,19 @@ body {
     margin: auto 0 0 0;
 
     > div {
+      align-items: center;
       color: $text-color-secondary;
+      display: flex;
+      flex-wrap: wrap;
       font-size: $font-size-decreased;
+
+      .copyright {
+        margin-right: auto;
+      }
+
+      nav {
+        margin: 0 auto;
+      }
     }
   }
 }
@@ -111,3 +134,42 @@ body {
   max-width: $content-width;
   padding: .8rem;
 }
+
+form {
+  dl {
+    dt {
+      font: 500 $font-size-increased $font-family-main;
+
+      &:not(:first-of-type) {
+        border-top: $border-secondary;
+        margin: .8rem 0 0 0;
+        padding: .4rem 0 0 0;
+      }
+    }
+
+    dd {
+      padding: .2rem 0;
+
+      ul {
+        margin: 0 auto;
+        padding: 0;
+
+        li {
+          list-style: none;
+          margin: 0;
+          padding: 0;
+          position: relative;
+        }
+      }
+    }
+  }
+
+  input {
+    font-size: $font-size-normal;
+  }
+
+  input:not([type=checkbox]):not([type=radio]):not([type=date]):not([size]),
+  textarea {
+    width: 100%;
+  }
+}

data/app/assets/stylesheets/biovision/base/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: $font-size-decreased;
+  margin: .8rem;
+
+  /**
+   * Радиус границы в ::before должен быть чуть меньше, чтобы не было щелей,
+   * потому что span фактически толще на две толщины границы
+   */
+  > span {
+    background-color: $toggleable-background;
+    border: .1rem solid;
+    border-radius: #{$font-size-decreased / 3 * 2};
+    cursor: pointer;
+    display: inline-block;
+    line-height: #{$font-size-decreased * 2};
+    margin: .4rem;
+    padding: 0 #{$font-size-decreased / 3 * 2} 0 0;
+
+    &::before {
+      border-radius: #{$font-size-decreased / 2} 0 0 #{$font-size-decreased / 2};
+      display: inline-block;
+      line-height: #{$font-size-decreased * 2};
+      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/base/users.scss

@@ -42,23 +42,87 @@ div.user-search {
 }
 
 .my-profile-new {
-  > section {
+  form {
+    max-width: 50rem;
+
+    .actions {
+      align-items: center;
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+    }
+  }
+
+  dl {
+    input {
+      max-width: 32rem;
+
+      &:not([size]) {
+        width: calc(100% - 1rem);
+      }
+    }
+  }
+
+  .trap {
+    height: .01rem;
+    left: -300rem;
+    overflow: hidden;
+    position: absolute;
+    width: .01rem;
+  }
+}
+
+.my-confirmation,
+.my-recovery {
+  section {
+    margin: 1.6rem 0;
+  }
+
+  form {
+    max-width: 32rem;
+
     dl {
       input {
-        max-width: 32rem;
-
-        &:not([size]) {
-          width: calc(100% - 1rem);
-        }
+        width: calc(100% - 1rem);
       }
     }
+  }
+}
+
+form.login {
+  max-width: 26rem;
+
+  .fields {
+    > div {
+      align-items: center;
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+
+  .actions {
+    align-items: center;
+    display: flex;
+    justify-content: space-between;
+    margin-top: .8rem;
+  }
+}
 
-    .trap {
-      width: .01rem;
-      height: .01rem;
-      overflow: hidden;
-      position: absolute;
-      left: -300rem;
+article.user {
+  figure {
+    max-width: 32rem;
+
+    figcaption {
+      font-size: $font-size-large;
+      text-align: center;
     }
   }
-}
+
+  form {
+    max-width: 40rem;
+  }
+
+  dl {
+    margin-bottom: 2.4rem;
+  }
+}

data/app/controllers/about_controller.rb

@@ -0,0 +1,15 @@
+class AboutController < ApplicationController
+  # get /about
+  def index
+    @editable_page = EditablePage.find_by(slug: 'about')
+
+    render :editable
+  end
+
+  # get /tos
+  def tos
+    @editable_page = EditablePage.find_by(slug: 'tos')
+
+    render :editable
+  end
+end

data/app/controllers/admin/stored_values_controller.rb

@@ -0,0 +1,25 @@
+class Admin::StoredValuesController < AdminController
+  before_action :set_entity, except: [:index]
+
+  # get /admin/stored_values
+  def index
+    @collection = StoredValue.page_for_administration
+  end
+
+  # get /admin/stored_values/:id
+  def show
+  end
+
+  protected
+
+  def restrict_access
+    require_privilege :administrator
+  end
+
+  def set_entity
+    @entity = StoredValue.find_by(id: params[:id])
+    if @entity.nil?
+      handle_http_404('Cannot find stored_value')
+    end
+  end
+end

data/app/controllers/concerns/toggleable_entity.rb

@@ -1,7 +1,23 @@
 module ToggleableEntity
   extend ActiveSupport::Concern
 
+  # Toggle entity flag when allowed
   def toggle
-    render json: { data: @entity.toggle_parameter(params[:parameter].to_s) }
+    if allow_toggle?
+      render json: { data: @entity.toggle_parameter(params[:parameter].to_s) }
+    else
+      head :unauthorized
+    end
+  end
+
+  private
+
+  # If entity responds to #editable_by?, it should be editable to be toggled
+  def allow_toggle?
+    if @entity.respond_to?(:editable_by?)
+      @entity.editable_by?(current_user)
+    else
+      true
+    end
   end
 end

data/app/controllers/index_controller.rb

@@ -1,5 +1,6 @@
 class IndexController < ApplicationController
   # get /
   def index
+    @editable_page = EditablePage.find_by(slug: 'index')
   end
 end

data/app/controllers/my/profiles_controller.rb

@@ -28,7 +28,8 @@ class My::ProfilesController < ApplicationController
 
   # patch /my/profile
   def update
-    if current_user.update user_parameters
+    if current_user.update(user_parameters)
+      current_user.user_profile.update(profile_parameters)
       redirect_to my_profile_path, notice: t('my.profiles.update.success')
     else
       render :edit, status: :bad_request
@@ -72,6 +73,10 @@ class My::ProfilesController < ApplicationController
     end
   end
 
+  def profile_parameters
+    params.require(:user_profile).permit(UserProfile.entity_parameters)
+  end
+
   def filter_parameters(parameters, sensitive)
     sensitive.each { |parameter| parameters.except! parameter if parameter.blank? }
     parameters[:email_confirmed] = false if parameters[:email] && parameters[:email] != current_user.email