mumuki-laboratory 9.0.2 → 9.1.0

data/app/views/layouts/modals/_level_up.html.erb

@@ -2,11 +2,8 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span></button>
-        <div class="guide-corollary-title">
-          <h3 class="text-left" id="gridSystemModalLabel"><%= t :level_up %></h3>
-        </div>
+        <h3 class="modal-title"><%= t :level_up %></h3>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body">
         <div class="container-fluid">

data/app/views/layouts/modals/_new_message.html.erb

@@ -1,4 +1,4 @@
-<div class="modal new-message-modal" tabindex="-1" role="dialog" aria-hidden="true" style="display:block">
+<div class="modal new-message-modal d-block" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <%= form_for(Message.new, html: {role: 'form'}) do |f| %>
         <div class="modal-content">
@@ -19,16 +19,16 @@
               </small>
             </div>
           </div>
-          <div class="modal-body hidden">
+          <div class="modal-body d-none">
             <div class="container-fluid">
               <div class="row">
                 <%= f.text_area :content, class: 'form-control mu-message-textarea', placeholder: t(:new_message_placeholder) %>
-                <%= f.text_field :exercise_id, value: exercise.id, class: 'hidden' %>
+                <%= f.text_field :exercise_id, value: exercise.id, class: 'd-none' %>
               </div>
             </div>
           </div>
-          <div class="modal-footer hidden">
-            <button class="btn btn-success btn-block"> <%= t :send %> </button>
+          <div class="modal-footer d-none">
+            <button class="btn btn-complementary w-100"> <%= t :send %> </button>
           </div>
         </div>
     <% end %>

data/app/views/notifications/_dropdown.html.erb

@@ -1,9 +1,9 @@
-<div class="dropdown mu-navbar-element notifications-box <%= 'notifications-box-empty' unless has_notifications? %>">
-  <div id="notificationsDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:notifications) %>" role="menu" tabindex="0">
+<div class="dropdown mu-navbar-element notifications-box <%= 'd-none' unless has_notifications? %>">
+  <div id="notificationsDropdown" class="profile-dropdown" data-bs-toggle="dropdown" aria-label="<%= t(:notifications) %>" role="menu" tabindex="0">
     <i class="fas fa-bell fa-fw fa-2x mu-navbar-icon"></i>
     <span class="badge badge-notifications"><%= notifications_count %></span>
   </div>
-  <ul id="notificationsPanel" class="dropdown-menu dropdown-menu-right" aria-labelledby="notificationsDropdown">
+  <ul id="notificationsPanel" class="dropdown-menu dropdown-menu-end" aria-labelledby="notificationsDropdown">
     <% notifications.each do |it| %>
       <li>
         <%= notification_preview_for it.target %>

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

@@ -0,0 +1,17 @@
+<div class="mb-3">
+  <div class="row">
+    <div class="col-md-12">
+      <h3><%= title %></h3>
+    </div>
+  </div>
+  <div class="row">
+    <% stats.each do |s| %>
+      <div class="col-md-6">
+        <div class="mu-user-activity-indicator bg-light">
+          <h1 class="display-1"><%= s[:value] %></h1>
+          <h4><%= s[:name].downcase %></h4>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

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

@@ -1,22 +1,22 @@
-<%= form_for :user, url: user_path, :html => { id: 'mu-user-form' }, method: :put do |f| %>
+<%= 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 hidden-xs">
+    <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-4 text-center">
+    <div class="col-md-6 col-lg-4 mu-user-avatar-container">
       <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
-      <i class="fas fa-pencil-alt fa-2x pointer mu-edit-avatar" id="mu-edit-avatar-icon" tabindex="0"></i>
+      <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-8">
+    <div class="col-md-6 col-lg-8">
       <%= render partial: 'profile_fields', locals: {form: f} %>
       <%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
     </div>
   </div>
-  <div class="mu-profile-actions mobile visible-xs">
+  <div class="mu-profile-actions mobile d-block d-md-none">
     <%= cancel_edit_profile_button %>
     <%= save_edit_profile_button f %>
   </div>

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

@@ -1,20 +1,20 @@
-<fieldset class="form-group">
+<fieldset>
   <div><%= form.label(t :first_name) %></div>
   <div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
 </fieldset>
-<fieldset class="form-group">
+<fieldset>
   <div><%= form.label(t :last_name) %></div>
   <div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
 </fieldset>
-<fieldset class="form-group">
+<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' %></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 class="form-group">
+<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>
-<fieldset class="form-group">
+<fieldset>
   <div><%= form.label(t :email) %></div>
   <div><%= form.text_field :email, readonly: true, class: 'form-control' %></div>
 </fieldset>

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

@@ -1,6 +1,6 @@
 <div class="mu-user-header">
   <h1><%= t(:my_profile) %></h1>
-  <div class="mu-profile-actions hidden-xs">
+  <div class="mu-profile-actions d-none d-md-block">
     <%= edit_profile_button %>
   </div>
 </div>
@@ -35,6 +35,6 @@
     </div>
   </div>
 </div>
-<div class="mu-profile-actions mobile visible-xs">
+<div class="mu-profile-actions mobile d-block d-md-none">
   <%= edit_profile_button %>
 </div>

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

@@ -0,0 +1,37 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs_for_my_account %>
+<% end %>
+
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
+
+  <div class="col-md-9">
+    <div class="mu-user-header">
+      <h1><%= t(:activity) %></h1>
+    </div>
+    <div class="row">
+      <div class="col-lg-8 mu-tab-body">
+        <%= render partial: 'activity_indicator',
+                   locals: {
+                     title: t(:exercises),
+                     stats: exercises_activity_stats
+                   } %>
+
+        <%= render partial: 'activity_indicator',
+                   locals: {
+                     title: t(:forum),
+                     stats: messages_activity_stats
+                   } %>
+      </div>
+      <div class="col-lg-4 mu-tab-body">
+        <div class="nav nav-pills flex-column">
+          <%= link_to t(:total), activity_user_path, class: "mu-user-activity-week-selector #{mark_period_if_active(nil)}" %>
+          <% activity_selector_week_range_for.each do |(week_start, week_end)| %>
+            <%= link_to t(:week_of, date: l(week_start)), activity_user_path(date_from: week_start, date_to: week_end),
+                        class: "mu-user-activity-week-selector #{mark_period_if_active(week_start)}" %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -2,31 +2,33 @@
   <%= breadcrumbs_for_my_account %>
 <% end %>
 
-<%= render partial: 'layouts/user_menu' %>
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
 
-<div class="mu-user-header">
-  <h1><%= t(:certificates) %></h1>
-</div>
-<% if @certificates.empty? %>
-  <div class="mu-tab-body">
-    <%= t :certificates_will_be_here %>
-  </div>
-<% else %>
   <div class="col-md-9 mu-tab-body">
-    <div class="col-md-12">
-      <div class="mu-list-group">
-        <% @certificates.each do |certificate| %>
-            <span class="mu-list-group-item">
-              <a href="<%= download_certificate_path certificate.code %>" target="_blank"><i class="fas fa-fw fa-download"></i></a>
-              <span class="mu-divider-vertical"></span>
-              <a href="<%= linkedin_post_url certificate %>" target="_blank"><i class="fab fa-fw fa-linkedin"></i></a>
-              <span class="mu-divider-vertical"></span>
-              <a href="<%= verify_certificate_path certificate.code %>" target="_blank">
-                <span class="mu-text-capitalize"><%= certificate.title %> - <%= certificate.description %></span>
-              </a>
-            </span>
-        <% end %>
-      </div>
+    <div class="mu-user-header">
+      <h1><%= t(:certificates) %></h1>
     </div>
+    <% if @certificates.empty? %>
+      <div class="mu-tab-body">
+        <%= t :certificates_will_be_here %>
+      </div>
+    <% else %>
+      <div class="col-md-12">
+        <div class="mu-list-group">
+          <% @certificates.each do |certificate| %>
+              <span class="mu-list-group-item">
+                <a href="<%= download_certificate_path certificate.code %>" target="_blank"><i class="fas fa-fw fa-download"></i></a>
+                <span class="mu-divider-vertical"></span>
+                <a href="<%= linkedin_post_url certificate %>" target="_blank"><i class="fab fa-fw fa-linkedin"></i></a>
+                <span class="mu-divider-vertical"></span>
+                <a href="<%= verify_certificate_path certificate.code %>" target="_blank">
+                  <span class="mu-text-capitalize"><%= certificate.title %> - <%= certificate.description %></span>
+                </a>
+              </span>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -2,27 +2,29 @@
   <%= breadcrumbs_for_my_account %>
 <% end %>
 
-<%= render partial: 'layouts/user_menu' %>
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
 
-<div class="col-md-9 mu-tab-body">
-  <div class="mu-user-header">
-    <h1><%= t(:discussions) %></h1>
-  </div>
-  <% if @watched_discussions.empty? %>
-    <div class="mu-tab-body">
-      <%= t :discussions_will_be_here %>
+  <div class="col-md-9 mu-tab-body">
+    <div class="mu-user-header">
+      <h1><%= t(:discussions) %></h1>
     </div>
-  <% else %>
-    <table class="table table-striped">
-      <% @watched_discussions.each do |discussion| %>
-        <tr>
-          <td>
-            <%= icon_for_read(discussion.read_by?(@user)) %>
-          </td>
-          <td><%= link_to discussion.item.name, item_discussion_path(discussion) %></td>
-          <td><%= time_ago_in_words discussion.last_message_date %></td>
-        </tr>
-      <% end %>
-    </table>
-  <% end %>
+    <% if @watched_discussions.empty? %>
+      <div class="mu-tab-body">
+        <%= t :discussions_will_be_here %>
+      </div>
+    <% else %>
+      <table class="table table-striped">
+        <% @watched_discussions.each do |discussion| %>
+          <tr>
+            <td>
+              <%= icon_for_read(discussion.read_by?(@user)) %>
+            </td>
+            <td><%= link_to discussion.item.name, item_discussion_path(discussion) %></td>
+            <td><%= time_ago_in_words discussion.last_message_date %></td>
+          </tr>
+        <% end %>
+      </table>
+    <% end %>
+  </div>
 </div>

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

@@ -2,26 +2,28 @@
   <%= breadcrumbs_for_my_account %>
 <% end %>
 
-<%= render partial: 'layouts/user_menu' %>
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
 
-<div class="col-md-9 mu-tab-body">
-  <div class="mu-user-header">
-    <h1><%= t(:messages) %></h1>
-  </div>
-  <% if @messages.empty? %>
-    <div class="mu-tab-body">
-      <%= t :no_messages %>
+  <div class="col-md-9 mu-tab-body">
+    <div class="mu-user-header">
+      <h1><%= t(:messages) %></h1>
     </div>
-  <% else %>
-    <table class="table table-striped">
-      <% @messages.each do |message| %>
-        <tr>
-          <td><%= icon_for_read(message.read?) %></td>
-          <td><%= link_to message.exercise.name, exercise_path(message.exercise.id) %></td>
-          <td><%= mail_to message.sender %></td>
-          <td><%= time_ago_in_words message.created_at %></td>
-        </tr>
-      <% end %>
-    </table>
-  <% end %>
+    <% if @messages.empty? %>
+      <div class="mu-tab-body">
+        <%= t :no_messages %>
+      </div>
+    <% else %>
+      <table class="table table-striped">
+        <% @messages.each do |message| %>
+          <tr>
+            <td><%= icon_for_read(message.read?) %></td>
+            <td><%= link_to message.exercise.name, exercise_path(message.exercise.id) %></td>
+            <td><%= mail_to message.sender %></td>
+            <td><%= time_ago_in_words message.created_at %></td>
+          </tr>
+        <% end %>
+      </table>
+    <% end %>
+  </div>
 </div>

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

@@ -2,8 +2,10 @@
   <%= breadcrumbs_for_my_account %>
 <% end %>
 
-<%= render partial: 'layouts/user_menu' %>
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
 
-<div class="col-md-9 mu-tab-body">
-  <%= render partial: 'user_form' %>
+  <div class="col-md-9 mu-tab-body">
+    <%= render partial: 'user_form' %>
+  </div>
 </div>

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

@@ -20,10 +20,12 @@
   <div class="terms-acceptance">
     <%= form_for :user, url: terms_user_path, method: :post  do |f| %>
       <span class="terms-acceptance-checkbox">
-        <%= f.check_box :terms_of_service, required: true, onInvalid: "this.setCustomValidity('#{t(:terms_and_conditions_must_be_accepted)}')", onChange: "this.setCustomValidity(validity.valueMissing ? '#{t(:terms_and_conditions_must_be_accepted)}' : '')" %>
+        <%= f.check_box :terms_of_service, required: true, class: 'form-check-input',
+                        onInvalid: "this.setCustomValidity('#{t(:terms_and_conditions_must_be_accepted)}')",
+                        onChange: "this.setCustomValidity(validity.valueMissing ? '#{t(:terms_and_conditions_must_be_accepted)}' : '')" %>
         <%= t(:accept_terms) %>
       </span>
-      <%= f.submit t(:accept), class: 'btn btn-success terms-acceptance-btn' %>
+      <%= f.submit t(:accept), class: 'btn btn-complementary terms-acceptance-btn' %>
     <% end %>
   </div>
 <% end %>

data/config/initializers/inflections.rb

@@ -0,0 +1,3 @@
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.acronym 'FAQs'
+end

data/config/routes.rb

@@ -21,6 +21,7 @@ Rails.application.routes.draw do
         post :question, on: :member
       end
     end
+    get '/discussions/messages/preview', to: 'discussions_messages#preview', as: :preview_discussion_message
 
     resources :exam_registrations, only: [:show]
     resources :exam_authorization_requests, only: [:show, :create, :update]
@@ -65,7 +66,9 @@ Rails.application.routes.draw do
 
       get :messages
       get :discussions
+      get :activity
       get :certificates
+
     end
 
     resources :faqs, only: [:index]

data/lib/mumuki/laboratory.rb

@@ -14,7 +14,7 @@ require 'mumukit/nuntius'
 require 'mumukit/platform'
 
 require 'kaminari'
-require 'bootstrap-kaminari-views'
+require 'bootstrap5-kaminari-views'
 
 Mumukit::Nuntius.configure do |config|
   config.app_name = 'laboratory'

data/lib/mumuki/laboratory/extensions.rb

@@ -1 +1,2 @@
+require_relative './extensions/date_and_time'
 require_relative './extensions/request'

data/lib/mumuki/laboratory/extensions/date_and_time.rb

@@ -0,0 +1,11 @@
+module DateAndTime
+  module Calculations
+    # Polyfill, already implemented on Rails 5.2
+    # https://api.rubyonrails.org/classes/DateAndTime/Calculations.html#method-i-prev_occurring
+    def prev_occurring(day_of_week)
+      ago = wday - DAYS_INTO_WEEK.fetch(day_of_week)
+      ago += 7 unless ago > 0
+      advance(days: -ago)
+    end
+  end
+end

data/lib/mumuki/laboratory/locales/en.yml

@@ -14,6 +14,8 @@ en:
   appendix: Appendix
   appendix_teaser: Do you want to learn more? <a href="%{link}">Check this chapter's appendix</a>"
   approved_message: Validated by mentor
+  approved_messages:
+    other: validated
   are_you_sure: Are you sure you want to %{action}?
   ask_a_question: Ask a question!
   ask_community: Ask community for help
@@ -64,6 +66,18 @@ en:
   create_submission: Submit
   created_at: Created at
   date: Date
+  deleted_by: Deleted by %{deleter}
+  deleted_message_warning: If you repeateadly violate these or other rules, you may be prohibited from accessing the forum or you may suffer more severe consequences, such as being expulsed from the course.
+  deletion_motive:
+    inappropriate_content:
+      present: Includes inappropriate content
+      past: Included inappropriate content
+    shares_solution:
+      present: Shares the correct solution
+      past: Shared the correct solution
+    discloses_personal_information:
+      present: Discloses personal information
+      past: Disclosed personal information
   description: Description
   destroy: Destroy
   destroy_message: delete the message
@@ -77,6 +91,7 @@ en:
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
   download: Download your solution
   edit: Edit
+  edit_message: Edit message
   edit_profile: Edit profile
   editor_placeholder: "write your solution here..."
   email: Email
@@ -173,9 +188,13 @@ en:
     one: 1 message
     other: '%{count} messages'
   message: Message
+  message_deleted: This message was deleted because it %{motive}, which violates the %{forum_terms}.
   messages: Messages
   messages_error: Previous messages are unavailable. Please try again later.
   moderation: Mentoring
+  messages_pluralized:
+    one: Message
+    other: Messages
   moderator: Mentor
   more_messages: More
   my_account: My account
@@ -224,6 +243,8 @@ en:
   permissions: Permissions
   please_fill_profile_data: Please complete your profile data to continue!
   please_validate: 'Please validate your data before continue:'
+  preview: Preview
+  preview_error: The preview cannot be shown. Check your internet connection or try with a shorter message.
   previous_exercise: Previous
   problem_with_exercise: '[Mumuki] Problem with exercise: %{title}'
   processing_your_solution: We are processing you solution
@@ -246,6 +267,7 @@ en:
   select_file: Select file
   sending_solution: Sending solution
   show: Show
+  show_message: Show message
   sign_in: Sign in
   sign_in_action: sign in
   sign_out: Sign Out
@@ -256,11 +278,13 @@ en:
   skipped_solve_anyway: Solve anyway
   solution: Solution
   solved: Solved
-  solved_count: '%{count} solved'
   solve_doubts: Solve other's doubts
   solve_more_exercises_to_level_up: Solve <span>number</span> more exercises to advance to the next level.
   solve_your_doubts: Solve your doubts
   solve_your_doubts_teaser: Do you have any doubts?
+  solved_count: '%{count} solved'
+  solved_exercises_count: solved
+  solved_exercises_percentage: done
   something_went_wrong: Something went wrong!
   sort: Sort
   sources: Sources
@@ -293,6 +317,7 @@ en:
   to_pending_review: Mark as solved
   to_solved: Mark as solved
   unauthorized_explanation: You have no permissions for this content. Maybe you logged in with another account.
+  total: Total
   undo_upvote: Undo upvote
   unlocked_medal_as_avatar: You earned this medal! You can now choose it as an avatar.
   unspecified: I'd rather not say
@@ -308,8 +333,9 @@ en:
   user_data_updated: Your data was updated successfully
   username: Username
   view_details: View details
-  want_permissions: The next user requires permissions
+  want_permissions: The following user requires permissions for the organization
   we_miss_you: We miss you!
+  week_of: Week of %{date}
   welcome: Welcome to %{name}!
   working: "Working"
   wrong_answer: The answer is wrong