biovision-base 0.11.180127 → 0.14.180326

data/app/views/my/index/index/_dashboard.html.erb

@@ -0,0 +1,12 @@
+<section class="summary">
+  <h1><%= t('my.index.index.heading') %></h1>
+
+  <figure>
+    <%= user_image_profile(current_user) %>
+    <figcaption><%= current_user.profile_name %></figcaption>
+  </figure>
+
+  <nav>
+
+  </nav>
+</section>

data/app/views/my/index/index/_sidebar.html.erb

@@ -0,0 +1,11 @@
+<nav>
+  <ul>
+    <li><%= render 'my/profiles/nav_item' %></li>
+    <li><%= render 'my/tokens/nav_item' %></li>
+    <li><%= render 'my/login_attempts/nav_item' %></li>
+    <% if UserPrivilege.user_has_any_privilege?(current_user) %>
+      <li><%= link_to t('admin.index.index.heading'), admin_path %></li>
+    <% end %>
+    <li><%= link_to t(:logout), logout_path, method: :delete %></li>
+  </ul>
+</nav>

data/app/views/my/login_attempts/index.html.erb

@@ -1,6 +1,6 @@
 <% content_for :meta_title, t('.title', page: current_page) %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('my.profiles.nav_item.text'), my_profile_path) %>
+    <%= link_to(t('my.profiles.nav_item.text'), my_path) %>
     <span><%= t('my.login_attempts.nav_item.text') %></span>
 <% end %>
 

data/app/views/my/profiles/_nav_item.html.erb

@@ -1,5 +1,5 @@
 <div>
-  <%= link_to t('.text'), my_profile_path %>
+  <%= link_to t('.text'), user_profile_path(slug: current_user.screen_name) %>
 </div>
 <div class="description">
   <%= t('.description') %>

data/app/views/my/profiles/edit.js.erb

@@ -0,0 +1 @@
+<%= render partial: 'shared/forms/list_of_errors', locals: { entity: current_user, form_id: 'my-profile-form' } %>

data/app/views/my/profiles/edit/_form.html.erb

@@ -1,117 +1,131 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
-
-<%= form_tag my_profile_path, method: :patch, multipart: true do %>
-    <section>
-      <h2><%= t('.common_parameters') %></h2>
-
-      <dl>
-        <dt>
-          <%= t('activerecord.attributes.user.image') %>
-        </dt>
-        <dd>
-          <figure id="user-image">
-            <%= label_tag(:user_image, image_tag(entity.image.profile.url, alt: t(:current_image))) %>
-            <figcaption><%= file_field_tag 'user[image]', accept: 'image/jpeg,image/png', data: { image: 'user-image' } %></figcaption>
-          </figure>
-        </dd>
-
-        <dt>
-          <%= label_tag :user_profile_name, t('activerecord.attributes.user_profile.name') %>
-        </dt>
-        <dd>
-          <%= text_field_tag 'user_profile[name]', entity.user_profile.name, size: nil, maxlength: UserProfile::NAME_LIMIT %>
-        </dd>
-
-        <dt>
-          <%= label_tag :user_profile_patronymic, t('activerecord.attributes.user_profile.patronymic') %>
-        </dt>
-        <dd>
-          <%= text_field_tag 'user_profile[patronymic]', entity.user_profile.patronymic, size: nil, maxlength: UserProfile::NAME_LIMIT %>
-        </dd>
-
-        <dt>
-          <%= label_tag :user_profile_surname, t('activerecord.attributes.user_profile.surname') %>
-        </dt>
-        <dd>
-          <%= text_field_tag 'user_profile[surname]', entity.user_profile.surname, size: nil, maxlength: UserProfile::NAME_LIMIT %>
-        </dd>
-
-        <dt>
-          <%= label_tag :user_profile_gender, t('activerecord.attributes.user_profile.gender') %>
-        </dt>
-        <dd>
-          <%= select_tag 'user_profile[gender]', options_for_select(genders_for_select, selected: entity.user_profile.gender) %>
-        </dd>
-
-        <dt>
-          <%= label_tag :user_profile_birthday, t('activerecord.attributes.user_profile.birthday') %>
-        </dt>
-        <dd>
-          <%= date_field_tag 'user_profile[birthday]', entity.user_profile.birthday, size: 10 %>
-        </dd>
-
-        <dt>
-          <%= t('.flags') %>
-        </dt>
-        <dd>
-          <ul>
-            <li>
-              <%= hidden_field_tag 'user[allow_mail]', '0', id: 'user_allow_mail_0' %>
-              <%= check_box_tag 'user[allow_mail]', '1', entity.allow_mail %>
-              <%= label_tag :user_allow_mail, t('activerecord.attributes.user.allow_mail') %>
-            </li>
-          </ul>
-        </dd>
-      </dl>
-    </section>
-
-    <section>
-      <h2><%= t('.sensitive_parameters') %></h2>
-
-      <div class="guideline"><%= t('.sensitive_parameters_notice') %></div>
-
-      <dl>
-        <dt>
-          <%= label_tag :password, t('.current_password') %>
-        </dt>
-        <dd>
-          <%= password_field_tag 'password', '' %>
-        </dd>
-
-        <dt>
-          <%= label_tag :user_email, t('activerecord.attributes.user.email') %>
-        </dt>
-        <dd>
-          <%= email_field_tag 'user[email]', entity.email, size: nil, maxlength: User::EMAIL_LIMIT %>
-        </dd>
-
-        <dt>
-          <%= label_tag :user_phone, t('activerecord.attributes.user.phone') %>
-        </dt>
-        <dd>
-          <%= telephone_field_tag 'user[phone]', entity.phone, size: nil, maxlength: User::PHONE_LIMIT %>
-        </dd>
-      </dl>
-
-      <div class="guideline"><%= t('.leave_blank_if_necessary') %></div>
-      <dl>
-        <dt>
-          <%= label_tag :profile_password, t('.new_password') %>
-        </dt>
-        <dd>
-          <%= password_field_tag 'user[password]', '', size: nil, maxlength: 70 %>
-        </dd>
-
-        <dt>
-          <%= label_tag :profile_password_confirmation, t('activerecord.attributes.user.password_confirmation') %>
-        </dt>
-        <dd>
-          <%= password_field_tag 'user[password_confirmation]', '', size: nil, maxlength: 70 %>
-        </dd>
-      </dl>
-    </section>
-
-    <div>
-      <%= button_tag t('.update'), type: :submit %>
-    </div>
+<%=
+  form_with(
+      url: my_profile_path,
+      method: :patch,
+      multipart: true,
+      id: 'my-profile-form'
+  ) do
+%>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+  <section>
+    <h2><%= t('.common_parameters') %></h2>
+
+    <dl>
+      <dt>
+        <%= t('activerecord.attributes.user.image') %>
+      </dt>
+      <dd>
+        <figure id="user-image" role="group" class="preview">
+          <%=
+            label_tag(
+                :user_image,
+                image_tag(entity.image.profile.url, alt: t(:current_image))
+            )
+          %>
+          <figcaption>
+            <%=
+              file_field_tag(
+                  'user[image]',
+                  accept: 'image/jpeg,image/png',
+                  data: { image: 'user-image' }
+              )
+            %>
+          </figcaption>
+        </figure>
+      </dd>
+
+      <dt>
+        <%= label_tag :user_profile_birthday, t('activerecord.attributes.user.birthday') %>
+      </dt>
+      <dd>
+        <%=
+          date_field_tag(
+              'user[birthday]',
+              entity.birthday,
+              size: 10
+          )
+        %>
+      </dd>
+
+      <%= render partial: 'my/profiles/edit/form/profile_data', locals: { data: entity.profile_data } %>
+
+      <dt>
+        <%= t('.flags') %>
+      </dt>
+      <dd>
+        <ul>
+          <li>
+            <%= hidden_field_tag 'user[allow_mail]', '0', id: 'user_allow_mail_0' %>
+            <%= check_box_tag 'user[allow_mail]', '1', entity.allow_mail %>
+            <%= label_tag :user_allow_mail, t('activerecord.attributes.user.allow_mail') %>
+          </li>
+        </ul>
+      </dd>
+    </dl>
+  </section>
+
+  <section>
+    <h2><%= t('.sensitive_parameters') %></h2>
+
+    <div class="guideline"><%= t('.sensitive_parameters_notice') %></div>
+
+    <dl>
+      <dt>
+        <%= label_tag :password, t('.current_password') %>
+      </dt>
+      <dd>
+        <%= password_field_tag 'password', '' %>
+      </dd>
+
+      <dt>
+        <%= label_tag :user_email, t('activerecord.attributes.user.email') %>
+      </dt>
+      <dd>
+        <%=
+          email_field_tag(
+              'user[email]',
+              entity.email,
+              size: nil,
+              maxlength: User::EMAIL_LIMIT,
+              required: true
+          )
+        %>
+      </dd>
+
+      <dt>
+        <%= label_tag :user_phone, t('activerecord.attributes.user.phone') %>
+      </dt>
+      <dd>
+        <%=
+          telephone_field_tag(
+              'user[phone]',
+              entity.phone,
+              size: nil,
+              maxlength: User::PHONE_LIMIT
+          )
+        %>
+      </dd>
+    </dl>
+
+    <div class="guideline"><%= t('.leave_blank_if_necessary') %></div>
+    <dl>
+      <dt>
+        <%= label_tag :profile_password, t('.new_password') %>
+      </dt>
+      <dd>
+        <%= password_field_tag 'user[password]', '', size: nil, maxlength: 70 %>
+      </dd>
+
+      <dt>
+        <%= label_tag :profile_password_confirmation, t('activerecord.attributes.user.password_confirmation') %>
+      </dt>
+      <dd>
+        <%= password_field_tag 'user[password_confirmation]', '', size: nil, maxlength: 70 %>
+      </dd>
+    </dl>
+  </section>
+
+  <div>
+    <%= button_tag t('.update'), type: :submit, class: 'button-save' %>
+  </div>
 <% end %>

data/app/views/my/profiles/edit/form/_profile_data.html.erb

@@ -0,0 +1,53 @@
+<dt>
+  <%= label_tag(:user_profile_name, t('activerecord.attributes.user_profile.name')) %>
+</dt>
+<dd>
+  <%=
+    text_field_tag(
+        'user_profile[name]',
+        data['name'],
+        size: nil,
+        maxlength: 50
+    )
+  %>
+</dd>
+
+<dt>
+  <%= label_tag :user_profile_patronymic, t('activerecord.attributes.user_profile.patronymic') %>
+</dt>
+<dd>
+  <%=
+    text_field_tag(
+        'user_profile[patronymic]',
+        data['patronymic'],
+        size: nil,
+        maxlength: 50
+    )
+  %>
+</dd>
+
+<dt>
+  <%= label_tag :user_profile_surname, t('activerecord.attributes.user_profile.surname') %>
+</dt>
+<dd>
+  <%=
+    text_field_tag(
+        'user_profile[surname]',
+        data['surname'],
+        size: nil,
+        maxlength: 50
+    )
+  %>
+</dd>
+
+<dt>
+  <%= label_tag :user_profile_gender, t('activerecord.attributes.user_profile.gender') %>
+</dt>
+<dd>
+  <%=
+    select_tag(
+        'user_profile[gender]',
+        options_for_select(genders_for_select, selected: data['gender'])
+    )
+  %>
+</dd>

data/app/views/my/profiles/new.js.erb

@@ -0,0 +1 @@
+<%= render partial: 'shared/forms/list_of_errors', locals: { entity: @user, form_id: 'new-profile-form' } %>

data/app/views/my/profiles/new/_form.html.erb

@@ -1,60 +1,107 @@
-<section>
+<%=
+  form_with(
+      model: entity,
+      scope: 'user',
+      url:   my_profile_path,
+      class: 'new-my-profile',
+      id:    'new-profile-form',
+      data:  { check_url: check_users_path }
+  ) do |f|
+%>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+  <dl>
+    <dt>
+      <%= f.label :screen_name, t('activerecord.attributes.user.screen_name') %>
+    </dt>
+    <dd>
+      <%=
+        f.text_field(
+            :screen_name,
+            id:        :user_screen_name,
+            required:  true,
+            maxlength: User::SCREEN_NAME_LIMIT,
+            pattern:   User::SCREEN_NAME_PATTERN_HTML,
+            title:     t('.guidelines.screen_name'),
+            data:      { check: :screen_name }
+        )
+      %>
+      <div class="check-result-error hidden" data-field="screen_name"></div>
+      <div class="guideline"><%= t('.guidelines.screen_name') %></div>
+    </dd>
 
-  <%= form_tag my_profile_path, class: 'new-my-profile' do %>
-      <dl>
-        <dt>
-          <%= label_tag :user_screen_name, t('activerecord.attributes.user.screen_name') %>
-        </dt>
-        <dd>
-          <%= text_field_tag 'user[screen_name]', entity.screen_name, required: true, size: 30, maxlength: 30 %>
-          <div class="guideline"><%= t('.guidelines.screen_name') %></div>
-        </dd>
+    <dt>
+      <%= f.label :password, t('activerecord.attributes.user.password') %>
+    </dt>
+    <dd>
+      <%=
+        f.password_field(
+            :password,
+            id:        :user_password,
+            required:  true,
+            size:      nil,
+            maxlength: 70,
+            data:      { check: :password }
+        )
+      %>
+      <div class="check-result-error hidden" data-field="password"></div>
+      <div class="guideline"><%= t('.guidelines.password') %></div>
+    </dd>
 
-        <dt>
-          <%= label_tag :user_password, t('activerecord.attributes.user.password') %>
-        </dt>
-        <dd>
-          <%= password_field_tag 'user[password]', '', required: true, size: nil, maxlength: 70 %>
-          <div class="guideline"><%= t('.guidelines.password') %></div>
-        </dd>
+    <dt>
+      <%= f.label :password_confirmation, t('activerecord.attributes.user.password_confirmation') %>
+    </dt>
+    <dd>
+      <%=
+        f.password_field(
+            :password_confirmation,
+            id:        :user_password_confirmation,
+            required:  true,
+            size:      nil,
+            maxlength: 70,
+            data:      { check: :password_confirmation }
+        )
+      %>
+      <div class="check-result-error hidden" data-field="password_confirmation"></div>
+      <div class="guideline"><%= t('.guidelines.password_confirmation') %></div>
+    </dd>
 
-        <dt>
-          <%= label_tag :user_password_confirmation, t('activerecord.attributes.user.password_confirmation') %>
-        </dt>
-        <dd>
-          <%= password_field_tag 'user[password_confirmation]', '', required: true, size: nil, maxlength: 70 %>
-          <div class="guideline"><%= t('.guidelines.password_confirmation') %></div>
-        </dd>
+    <dt>
+      <%= f.label :email, t('activerecord.attributes.user.email') %>
+    </dt>
+    <dd>
+      <%=
+        f.email_field(
+            :email,
+            id:        :user_email,
+            size:      nil,
+            maxlength: User::EMAIL_LIMIT,
+            required:  true,
+            data:      { check: :email }
+        )
+      %>
+      <div class="check-result-error hidden" data-field="email"></div>
+      <div class="guideline"><%= t('.guidelines.email') %></div>
+    </dd>
+  </dl>
 
-        <dt>
-          <%= label_tag :user_email, t('activerecord.attributes.user.email') %>
-        </dt>
-        <dd>
-          <%= email_field_tag 'user[email]', entity.email, size: nil, maxlength: User::EMAIL_LIMIT, required: true %>
-          <div class="guideline"><%= t('.guidelines.email') %></div>
-        </dd>
-      </dl>
+  <ul class="flags">
+    <li>
+      <%= check_box_tag 'user[consent]', '1', false, required: true %>
+      <%= label_tag :user_consent, t('.consent') %>
+    </li>
+    <li>
+      <%= f.check_box :allow_mail, id: :user_allow_mail %>
+      <%= f.label :allow_mail, t('activerecord.attributes.user.allow_mail') %>
+    </li>
+  </ul>
 
-      <ul class="flags">
-        <li>
-          <%= check_box_tag 'user[consent]', '1', false, required: true %>
-          <%= label_tag :user_consent, t('.consent') %>
-        </li>
-        <li>
-          <%= check_box_tag 'user[allow_mail]', '1', entity.allow_mail %>
-          <%= label_tag :user_allow_mail, t('activerecord.attributes.user.allow_mail') %>
-        </li>
-      </ul>
+  <div class="trap">
+    <%= check_box_tag :agree, '1', false, tabindex: '-1' %>
+    <%= label_tag :agree, t('.i_am_bot') %>
+  </div>
 
-      <div class="trap">
-        <%= check_box_tag :agree, '1', false, tabindex: '-1' %>
-        <%= label_tag :agree, t('.i_am_bot') %>
-      </div>
-
-      <div class="actions">
-        <%= button_tag t('.join'), type: :submit, name: 'button' %>
-        <%= link_to t('authentication.nav_item.log_in'), login_path, class: 'button-nav' %>
-      </div>
-  <% end %>
-</section>
+  <div class="actions">
+    <%= button_tag t('.join'), type: :submit, class: 'button-action' %>
+    <%= link_to t('authentication.nav_item.log_in'), login_path, class: 'button-nav' %>
+  </div>
+<% end %>