mumuki-laboratory 9.19.0 → 9.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74909716a7b8701adb5f410a2fded18a19779547b107635965361cf2247c7595
-  data.tar.gz: ac32359e5add8298400567f10d1d1fcf191db92eeacaa258d33387b6d9433de9
+  metadata.gz: de7e211f8a772b15e0018a75d15c69f1fd455bf4794362235e236c06bc125d06
+  data.tar.gz: 91b6b7564068e6fac29130c62639a17c277d0954fbf3900e07e947ae3cdc6da0
 SHA512:
-  metadata.gz: 33cac73574865ca539d574765c2b85c57da593b11078e92f2c17cd47b51382f33840083458c396893ac3ed0227f068fdfab9e1fc83ab7556186ca901c2c6ba50
-  data.tar.gz: dae03d18dfd66681d899d3546bc98aa36b88e1d85947202f032f1a7972c8cc3adb33e4cda12795a46719445530fb1aeff4d2783cae4234836f234f163a45cacf
+  metadata.gz: 63dc960e1d91bd05a534d8ded2bfb9cfd13801ee2d3dfcb44da781642bcfa626f0bf80c7df642216bb7915a1ff2f32515668c6bb81b7615221e23ae44a3cd627
+  data.tar.gz: 7011fe8f2abadae8c93ac60192c0caa200a475a229183c257ccd74c0818291c9ced49507a75fc15f092405d9c10d8cad269b6723be45eac41dc022a120c7bd6e

data/app/assets/stylesheets/mumuki_laboratory/application/_layout.scss

@@ -34,14 +34,6 @@
   background-image: none;
 }
 
-.alert {
-  margin: 10px 50px 10px 15px;
-}
-
-.alert-danger a {
-  color: greenyellow;
-}
-
 .exercise-search-box {
   width: 263px;
   position: fixed

data/app/assets/stylesheets/mumuki_laboratory/application/modules/_user_profile.scss

@@ -7,6 +7,7 @@
 
 .mu-profile-actions {
   margin-left: auto;
+  text-align: center;
 
   .btn {
     width: 150px;
@@ -18,15 +19,6 @@
       border-color: lighten($mu-color-complementary, 15%);
     }
   }
-
-  &.mobile {
-    text-align: center;
-    margin: 20px 5px -20px -10px;
-
-    .btn {
-      width: calc(50% - 20px);
-    }
-  }
 }
 
 .mu-profile-info {

data/app/assets/stylesheets/mumuki_laboratory/application.scss

@@ -13,5 +13,4 @@ $da-font-path: asset-path('assets');
 @import "application/invitations";
 @import "application/modules";
 @import "application/errors";
-@import "application/alerts";
 @import "application/codemirror-themes";

data/app/controllers/application_controller.rb

@@ -129,7 +129,6 @@ class ApplicationController < ActionController::Base
   def validate_user_profile!
     unless current_user.profile_completed?
       save_location_before! :profile_completion
-      flash[:info] = I18n.t :please_fill_profile_data
       redirect_to edit_user_path
     end
   end

data/app/helpers/profile_helper.rb

@@ -4,7 +4,7 @@ module ProfileHelper
   end
 
   def cancel_edit_profile_button
-    link_to t(:cancel), :user, class: 'btn btn-secondary' if current_user.profile_completed?
+    link_to t(:cancel), :user, class: 'btn btn-outline-complementary' if current_user.profile_completed?
   end
 
   def save_edit_profile_button(form)

data/app/views/users/_basic_profile_fields.html.erb

@@ -1,19 +1,23 @@
-<fieldset>
-  <div><%= form.label(t :first_name) %></div>
-  <div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :last_name) %></div>
-  <div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :gender) %></div>
-  <div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control form-select' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :birthdate) %></div>
-  <div><%= form.date_field :birthdate, min: Date.new(1900), max: 3.years.ago.end_of_year, required: true, class: 'form-control' %></div>
-</fieldset>
+<div class="row">
+  <fieldset class="col-lg-6">
+    <div><%= form.label(t :first_name) %></div>
+    <div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
+  </fieldset>
+  <fieldset class="col-lg-6">
+    <div><%= form.label(t :last_name) %></div>
+    <div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
+  </fieldset>
+</div>
+<div class="row">
+  <fieldset class="col-lg-4">
+    <div><%= form.label(t :birthdate) %></div>
+    <div><%= form.date_field :birthdate, min: Date.new(1900), max: 3.years.ago.end_of_year, required: true, class: 'form-control' %></div>
+  </fieldset>
+  <fieldset class="col-lg-4 offset-lg-2">
+    <div><%= form.label(t :gender) %></div>
+    <div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control form-select' %></div>
+  </fieldset>
+</div>
 <fieldset>
   <div><%= form.label(t :email) %></div>
   <div><%= form.text_field :email, readonly: true, class: 'form-control' %></div>

data/app/views/users/_edit_user_form.html.erb

@@ -1,22 +1,24 @@
 <%= form_for :user, url: user_path, :html => { id: 'mu-user-form', class: 'mu-form' }, method: :put do |f| %>
   <div class="mu-user-header">
     <h1><%= t(:edit_profile) %></h1>
-    <div class="mu-profile-actions d-none d-md-block">
-      <%= cancel_edit_profile_button %>
-      <%= save_edit_profile_button f %>
-    </div>
   </div>
   <div class="row mu-tab-body">
-    <div class="col-md-6 col-lg-4 mu-user-avatar-container">
+    <div class="col-md-6 col-lg-4 mu-user-avatar-container mb-3">
       <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
       <button class="fas fa-pencil-alt fa-2x btn mu-edit-avatar" type="button" data-bs-toggle="modal" data-bs-target="#mu-avatar-picker" tabindex="0"></button>
     </div>
-    <div class="col-md-6 col-lg-8">
+    <div class="col-md-6 col-lg-8 mb-4">
+      <% unless current_user.profile_completed? %>
+        <div class="alert alert-info alert-dismissible fade show" role="alert">
+          <%= fa_icon 'info-circle', class: 'fa-lg me-2 align-middle', text: t(:please_fill_profile_data) %>
+          <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        </div>
+      <% end %>
       <%= render partial: 'profile_fields', locals: {form: f} %>
       <%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
     </div>
   </div>
-  <div class="mu-profile-actions mobile d-block d-md-none">
+  <div class="mu-profile-actions">
     <%= cancel_edit_profile_button %>
     <%= save_edit_profile_button f %>
   </div>

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.19.0'
+    VERSION = '9.20.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.19.0
+  version: 9.20.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -438,7 +438,6 @@ files:
 - app/assets/javascripts/mumuki_laboratory/application/upload.js
 - app/assets/javascripts/mumuki_laboratory/application/user.js
 - app/assets/stylesheets/mumuki_laboratory/application.scss
-- app/assets/stylesheets/mumuki_laboratory/application/_alerts.scss
 - app/assets/stylesheets/mumuki_laboratory/application/_codemirror-themes.scss
 - app/assets/stylesheets/mumuki_laboratory/application/_errors.scss
 - app/assets/stylesheets/mumuki_laboratory/application/_fonts.scss

data/app/assets/stylesheets/mumuki_laboratory/application/_alerts.scss

@@ -1,3 +0,0 @@
-.alert {
-  margin-right: 15px;
-}