mumuki-laboratory 9.0.2 → 9.1.0

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

@@ -31,6 +31,9 @@
 }
 .terms-card-body {
   padding: 1.25rem;
+  p {
+    text-align: justify;
+  }
 }
 
 .terms-acceptance {
@@ -41,5 +44,3 @@
     display: block
   }
 }
-
-

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

@@ -1,8 +1,6 @@
 .timer {
-  color: $brand-complementary;
+  color: $complementary;
   border-size: 0.1em;
   font-size: 1.25em;
   font-weight: bold;
-  color: $brand-complementary;
 }
-

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

@@ -1,12 +1,44 @@
 .mu-user-menu {
   display: flex;
+  margin-top: 25px;
+}
+
+.mu-user-menu-content {
+  flex-grow: 1;
 }
 
 .mu-user-menu-header {
   font-size: 15px;
   color: $mu-color-disabled;
   text-transform: uppercase;
-  margin-bottom: 30px;
+  cursor: pointer;
+
+  @include media-breakpoint-up(md) {
+    cursor: auto;
+
+    i {
+      display: none;
+    }
+
+    span {
+      padding-left: 0;
+    }
+  }
+}
+
+.mu-user-menu-items {
+  margin-top: 30px;
+
+  @include media-breakpoint-down(md) {
+    margin-left: 15px;
+    margin-right: 15px;
+  }
+
+  &.mu-hidden-sm-screen {
+    @include media-breakpoint-down(md) {
+      display: none;
+    }
+  }
 }
 
 .mu-user-menu-item {
@@ -14,7 +46,7 @@
   margin-bottom: 5px;
 
   a {
-    color: $brand-primary;
+    color: $primary;
     &.active {
       font-weight: bold;
     }
@@ -30,6 +62,9 @@
     border-top: 2px solid $mu-color-separator;
 
     margin: 25px 0;
-    width: 100%
+
+    @include media-breakpoint-up(md) {
+      margin-right: 15px;
+    }
   }
 }

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

@@ -6,12 +6,10 @@
 }
 
 .mu-profile-actions {
-  vertical-align: middle;
   margin-left: auto;
 
   .btn {
     width: 150px;
-    height: 55px;
     margin-left: 15px;
     transition: background-color 0.3s, border-color 0.3s;
 
@@ -82,3 +80,4 @@
     }
   }
 }
+

data/app/controllers/application_controller.rb

@@ -43,6 +43,8 @@ class ApplicationController < ActionController::Base
                 :extension_javascript_url,
                 :current_immersive_path
 
+  add_flash_types :info
+
   def immersive_context_wrong?
     current_immersive_context != Organization.current
   end
@@ -124,7 +126,7 @@ class ApplicationController < ActionController::Base
   def validate_user_profile!
     unless current_user.profile_completed?
       save_location_before! :profile_completion
-      flash.notice = I18n.t :please_fill_profile_data
+      flash[:info] = I18n.t :please_fill_profile_data
       redirect_to edit_user_path
     end
   end
@@ -132,7 +134,7 @@ class ApplicationController < ActionController::Base
   def validate_accepted_role_terms!
     if current_user&.has_role_terms_to_accept?
       save_location_before! :terms_acceptance
-      flash.notice = I18n.t :accept_terms_to_continue
+      flash[:info] = I18n.t :accept_terms_to_continue
       redirect_to terms_user_path
     end
   end

data/app/controllers/discussions_messages_controller.rb

@@ -3,7 +3,7 @@ class DiscussionsMessagesController < AjaxController
 
   before_action :set_discussion!, only: [:create, :destroy]
   before_action :authorize_user!, only: [:destroy]
-  before_action :authorize_moderator!, only: [:question, :approve]
+  before_action :authorize_moderator!, only: [:question, :approve, :preview]
 
   def create
     @discussion.submit_message! message_params, current_user
@@ -11,12 +11,18 @@ class DiscussionsMessagesController < AjaxController
   end
 
   def destroy
-    current_message.destroy!
+    authorize_moderator! unless params[:motive] == :self_deleted.to_s
+
+    current_message.soft_delete! params[:motive], current_user
     redirect_back(fallback_location: root_path)
   end
 
+  def preview
+    render json: { preview: Message.new(content: params[:content]).content_html }
+  end
+
   def approve
-    current_message.toggle_approved!
+    current_message.toggle_approved! current_user
     head :ok
   end
 

data/app/controllers/users_controller.rb

@@ -30,6 +30,10 @@ class UsersController < ApplicationController
     @watched_discussions = current_user.watched_discussions_in_organization
   end
 
+  def activity
+    @activity = UserStats.stats_for(current_user).activity date_range_params
+  end
+
   def certificates
     @certificates ||= current_user.certificates_in_organization
   end
@@ -54,4 +58,13 @@ class UsersController < ApplicationController
     @user = current_user
   end
 
+  def date_range_params
+    @date_from = params[:date_from].try { |it| Date.parse it }
+    to = params[:date_to].try { |it| Date.parse it }
+    if @date_from && to
+      @date_from.beginning_of_day..(to - 1.day).end_of_day
+    else
+      nil
+    end
+  end
 end

data/app/helpers/application_helper.rb

@@ -12,12 +12,12 @@ module ApplicationHelper
   end
 
   def avatar_image(avatar_url, **options)
-    options.merge!(class: "img-circle #{options[:class]}")
+    options.merge!(class: "rounded-circle #{options[:class]}")
     image_tag(image_url(avatar_url), options)
   end
 
   def paginate(object, options = {})
-    "<div class=\"text-center\">#{super(object, {theme: 'twitter-bootstrap-3'}.merge(options))}</div>".html_safe
+    super(object, {theme: 'bootstrap-5', pagination_class: 'flex-wrap justify-content-center'}.merge(options))
   end
 
   def last_box_class(trailing_boxes)
@@ -38,10 +38,10 @@ module ApplicationHelper
     t :chapter_finished_html, chapter: link_to_path_element(chapter) if chapter
   end
 
-  def span_toggle(hidden_text, active_text, active, **options)
+  def btn_toggle(hidden_text, active_text, active, **options)
     %Q{
-      <span class="#{'hidden' if active} #{options[:class]}">#{hidden_text}</span>
-      <span class="#{'hidden' unless active} #{options[:class]}">#{active_text}</span>
+      <button class="btn btn-complementary #{'d-none' if active} #{options[:class]}" onclick="#{options[:onclick]}">#{hidden_text}</button>
+      <button class="btn btn-secondary #{'d-none' unless active} #{options[:class]}" onclick="#{options[:onclick]}">#{active_text}</button>
     }.html_safe
   end
 

data/app/helpers/assignment_result_helper.rb

@@ -15,7 +15,8 @@ module AssignmentResultHelper
 
   def render_community_link
     if community_link?
-      link_to fa_icon('facebook-f', type: :brand, text: I18n.t(:ask_community), class: 'fa-fw'), community_link, target: '_blank'
+      link_to fa_icon('facebook-f', type: :brand, text: I18n.t(:ask_community), class: 'fa-fw'),
+              community_link, target: '_blank', class: 'dropdown-item'
     end
   end
 
@@ -25,7 +26,7 @@ module AssignmentResultHelper
         fa_icon(:bug, text: t(:notify_problem_with_exercise), class: 'fa-fw'),
         subject: t(:problem_with_exercise, title: @exercise.name),
         body: assignment_help_email_body(assignment),
-        class: 'warning'
+        class: 'dropdown-item'
     end
   end
 

data/app/helpers/assistance_box_helper.rb

@@ -1,6 +1,6 @@
 module AssistanceBoxHelper
   def assistance_box(assignment)
-    %Q{<div class="mu-tips-box">
+    %Q{<div class="mu-tips-box mb-3">
       #{Mumukit::Assistant::Narrator.random.compose_explanation_html assignment.tips}
     </div>}.html_safe
   end

data/app/helpers/concerns/with_student_path_navigation.rb

@@ -1,8 +1,7 @@
 module WithStudentPathNavigation
   def next_button(navigable)
     return unless navigable
-    ContinueNavigation.new(self).button(navigable) || RevisitNavigation.new(self).button(navigable) || FinishNavigation.new(self).button(navigable)
-    #TODO Refactor this
+    navigation_flows.lazy.map { |it| it.new(self).button(navigable) }.find(&:present?)
   end
 
   def next_lesson_button(guide)
@@ -14,6 +13,12 @@ module WithStudentPathNavigation
   end
 
   def close_modal_button
-    %Q{<button class="btn btn-success btn-block mu-close-modal">#{t :keep_learning}</button>}.html_safe
+    %Q{<button class="btn btn-complementary w-100 mu-close-modal">#{t :keep_learning}</button>}.html_safe
+  end
+
+  private
+
+  def navigation_flows
+    [ContinueNavigation, RevisitNavigation, NextParentNavigation, FinishNavigation]
   end
 end

data/app/helpers/concerns/with_student_path_navigation/continue_navigation.rb

@@ -13,7 +13,7 @@ module WithStudentPathNavigation
     end
 
     def clazz
-      'btn btn-success btn-block'
+      'btn btn-complementary w-100'
     end
 
     def sibling_for(navigable)

data/app/helpers/concerns/with_student_path_navigation/finish_navigation.rb

@@ -6,7 +6,7 @@ module WithStudentPathNavigation
     end
 
     def clazz
-      'btn btn-success btn-block'
+      'btn btn-complementary w-100'
     end
   end
 end

data/app/helpers/concerns/with_student_path_navigation/next_parent_navigation.rb

@@ -0,0 +1,7 @@
+module WithStudentPathNavigation
+  class NextParentNavigation < ContinueNavigation
+    def sibling_for(navigable)
+      super(navigable.navigable_parent)
+    end
+  end
+end

data/app/helpers/concerns/with_student_path_navigation/revisit_navigation.rb

@@ -13,7 +13,7 @@ module WithStudentPathNavigation
     end
 
     def clazz
-      'btn btn-warning btn-block'
+      'btn btn-warning w-100'
     end
 
     def sibling_for(navigable)

data/app/helpers/discussions_helper.rb

@@ -1,6 +1,6 @@
 module DiscussionsHelper
   def read_discussions_link(item)
-    discussions_link others_discussions_icon(t(:solve_your_doubts)), item_discussions_path(item, default_discussions_params)
+    discussions_link others_discussions_icon(t(:solve_your_doubts)), item_discussions_path(item, default_discussions_params), class: 'dropdown-item'
   end
 
   def kids_read_discussions_link(item)
@@ -8,11 +8,11 @@ module DiscussionsHelper
   end
 
   def solve_discussions_link
-    discussions_link others_discussions_icon(t(:solve_doubts)), discussions_path(solve_discussion_params_for(current_user))
+    discussions_link others_discussions_icon(t(:solve_doubts)), discussions_path(solve_discussion_params_for(current_user)), class: 'dropdown-item'
   end
 
   def user_discussions_link
-    discussions_link user_discussions_icon(t(:my_doubts)), user_path(anchor: 'discussions') if current_user.watched_discussions.present?
+    discussions_link(user_discussions_icon(t(:my_doubts)), discussions_user_path, class: 'dropdown-item') if current_user.watched_discussions.present?
   end
 
   def others_discussions_icon(text)
@@ -60,18 +60,6 @@ module DiscussionsHelper
     }.html_safe
   end
 
-  def discussions_link_with_teaser(item)
-    %Q{
-      <div>
-        <h3>#{t(:discussions)}</h3>
-        <p>
-          #{t(:solve_your_doubts_teaser)}
-          #{read_discussions_link(item)}
-        </p>
-      </div>
-    }.html_safe
-  end
-
   def discussion_messages_icon(discussion)
     %Q{
       <span class="discussion-icon fa-stack fa-xs">
@@ -148,7 +136,7 @@ module DiscussionsHelper
     if filters.present?
       %Q{
         <div class="dropdown discussions-toolbar-filter">
-          <a id="dropdown-#{label}" data-toggle="dropdown" role="menu">
+          <a id="dropdown-#{label}" data-bs-toggle="dropdown" role="menu">
             #{t label} #{fa_icon :'caret-down', class: 'fa-xs'}
           </a>
           <ul class="dropdown-menu" aria-labelledby="dropdown-#{label}">
@@ -161,17 +149,17 @@ module DiscussionsHelper
   end
 
   def discussion_filter_list(label, filters, &block)
-    filters.map { |it| discussion_filter_item(label, it, &block) }.join("\n")
+    filters.map { |it| discussion_filter_item(label, it, 'dropdown-item', &block) }.join("\n")
   end
 
-  def discussion_filter_item(label, filter, &block)
-    content_tag(:li, discussion_filter_link(label, filter, &block), class: ('selected' if discussion_filter_selected?(label, filter)))
+  def discussion_filter_item(label, filter, link_class=nil, &block)
+    content_tag(:li, discussion_filter_link(label, filter, link_class, &block), class: ('selected' if discussion_filter_selected?(label, filter)))
   end
 
   def discussion_filter_unselect_item(label, can_select_all)
     if can_select_all
       content_tag(:li,
-                  link_to(t(:all), discussion_filter_params_without_page.except(label)),
+                  link_to(t(:all), discussion_filter_params_without_page.except(label), class: 'dropdown-item'),
                   class: ('selected' unless discussion_filter_params.include?(label)))
     end
   end
@@ -180,12 +168,12 @@ module DiscussionsHelper
     filter.to_s == discussion_filter_params[label]
   end
 
-  def discussion_filter_link(label, filter, &block)
-    link_to capture(filter, &block), discussion_filter_params_without_page.merge(Hash[label, filter])
+  def discussion_filter_link(label, filter, clazz, &block)
+    link_to capture(filter, &block), discussion_filter_params_without_page.merge(Hash[label, filter]), class: clazz
   end
 
   def discussion_info(discussion)
-    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:message_count, count: discussion.messages.size)}"
+    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:message_count, count: discussion.visible_messages.size)}"
   end
 
   def discussion_filter_params_without_page
@@ -195,4 +183,57 @@ module DiscussionsHelper
   def should_show_approved_for?(user, message)
     !user&.moderator_here? && message.approved? && !message.from_moderator?
   end
+
+  def discussion_user_name(user)
+    user.abbreviated_name
+  end
+
+  def subscription_icon
+    fa_icon :bell, text: t(:subscribe)
+  end
+
+  def unsubscription_icon
+    fa_icon :bell, type: :regular, text: t(:unsubscribe)
+  end
+
+  def upvote_icon
+    fa_icon 'thumbs-up', text: t(:upvote)
+  end
+
+  def undo_upvote_icon
+    fa_icon 'thumbs-up', type: :regular, text: t(:undo_upvote)
+  end
+
+  def discussion_delete_message_link(discussion, message)
+    link_to fa_icon('trash-alt', type: :regular, class: 'fa-lg'), discussion_message_path(discussion, message, motive: :self_deleted),
+            method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) }, class: 'discussion-delete-message'
+  end
+
+  def discussion_delete_message_dropdown(discussion, message)
+    %Q{
+      <span class="dropdown">
+        #{content_tag :span, fa_icon('trash-alt', type: :regular, class: 'fa-lg'), role: 'menu', 'data-bs-toggle': 'dropdown',
+                      class: 'discussion-delete-message', id: 'deleteDiscussionDropdown'}
+        <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="deleteDiscussionDropdown">
+          #{discussion_delete_message_option discussion, message, :inappropriate_content, 'times-circle'}
+          #{discussion_delete_message_option discussion, message, :shares_solution, :code}
+          #{discussion_delete_message_option discussion, message, :discloses_personal_information, 'user-tag'}
+        </ul>
+      </span>
+    }.html_safe
+  end
+
+  def discussion_delete_message_option(discussion, message, motive, icon)
+    %Q{
+      <li>
+        #{link_to fa_icon(icon, text: t("deletion_motive.#{motive}.present"), class: 'fa-fw fixed-icon'),
+                  discussion_message_path(discussion, message, motive: motive), method: :delete, class: 'dropdown-item',
+                  role: 'menuitem', data: { confirm: t(:are_you_sure, action: t(:destroy_message)) } }
+      </li>
+    }.html_safe
+  end
+
+  def message_deleted_text(message)
+    t(:message_deleted, motive: t("deletion_motive.#{message.deletion_motive}.past").downcase, forum_terms: link_to_forum_terms).html_safe
+  end
 end