mumuki-laboratory 7.12.1 → 8.1.2

data/app/controllers/chapters_controller.rb

@@ -2,6 +2,7 @@ require 'addressable/uri'
 
 class ChaptersController < ApplicationController
   include Mumuki::Laboratory::Controllers::Content
+  include Mumuki::Laboratory::Controllers::ImmersiveNavigation
 
   def show
   end

data/app/controllers/concerns/with_user_discussion_validation.rb

@@ -2,12 +2,18 @@ module WithUserDiscussionValidation
   extend ActiveSupport::Concern
 
   included do
+    # users are not allowed to access discussions during exams
+    before_action :validate_not_blocked_in_forum!
     # discussions are not enabled for all organizations nor all users
     before_action :validate_user_can_discuss!
   end
 
   private
 
+  def validate_not_blocked_in_forum!
+    raise Mumuki::Domain::BlockedForumError if current_user&.currently_in_exam?
+  end
+
   def validate_user_can_discuss!
     raise Mumuki::Domain::NotFoundError unless current_user&.can_discuss_here?
   end

data/app/controllers/discussions_controller.rb

@@ -1,8 +1,6 @@
 class DiscussionsController < ApplicationController
   include Mumuki::Laboratory::Controllers::Content
   include WithUserDiscussionValidation
-  # users are not allowed to access discussions during exams
-  before_action :validate_not_in_exam!
 
   before_action :set_debatable, except: [:subscription]
   before_action :authenticate!, only: [:update, :create]
@@ -46,6 +44,10 @@ class DiscussionsController < ApplicationController
 
   private
 
+  def default_immersive_path_for(context)
+    context.forum_enabled? ? discussions_path : root_path
+  end
+
   def current_content_discussions
     @debatable.discussions_in_organization
   end
@@ -70,8 +72,4 @@ class DiscussionsController < ApplicationController
   def discussion_filter_params
     @filter_params ||= params.permit(Discussion.permitted_query_params)
   end
-
-  def validate_not_in_exam!
-    raise Mumuki::Domain::BlockedForumError if current_user&.currently_in_exam?
-  end
 end

data/app/controllers/exercises_controller.rb

@@ -1,6 +1,7 @@
 class ExercisesController < ApplicationController
   include Mumuki::Laboratory::Controllers::Content
   include Mumuki::Laboratory::Controllers::ExerciseSeed
+  include Mumuki::Laboratory::Controllers::ImmersiveNavigation
 
   before_action :set_guide!, only: :show
   before_action :set_assignment!, only: :show, if: :current_user?

data/app/controllers/guides_controller.rb

@@ -1,4 +1,6 @@
 class GuidesController < ApplicationController
+  include Mumuki::Laboratory::Controllers::ImmersiveNavigation
+
   def show
     redirect_to_usage Guide.find_by!(id: params[:id])
   end

data/app/controllers/invitations_controller.rb

@@ -6,6 +6,7 @@ class InvitationsController < ApplicationController
   before_action :set_user!
 
   skip_before_action :validate_user_profile!
+  skip_before_action :validate_accepted_role_terms!
   skip_before_action :authorize_if_private!
   skip_before_action :validate_active_organization!
 
@@ -15,8 +16,7 @@ class InvitationsController < ApplicationController
 
   def join
     current_user.accept_invitation! @invitation
-    current_user.update! user_params
-    current_user.notify!
+    current_user.update_and_notify! user_params
     redirect_to_organization!
   end
 

data/app/controllers/lessons_controller.rb

@@ -1,4 +1,5 @@
 class LessonsController < GuideContainerController
+  include Mumuki::Laboratory::Controllers::ImmersiveNavigation
 
   private
 

data/app/controllers/login_controller.rb

@@ -3,6 +3,7 @@ class LoginController < ApplicationController
 
   skip_before_action :verify_authenticity_token, if: lambda { Rails.env.development? }
   skip_before_action :validate_user_profile!
+  skip_before_action :validate_accepted_role_terms!
   skip_before_action :validate_active_organization!
 
   private

data/app/controllers/users_controller.rb

@@ -3,6 +3,7 @@ class UsersController < ApplicationController
 
   before_action :authenticate!, except: :terms
   before_action :set_user!
+  skip_before_action :validate_accepted_role_terms!
 
   def show
     @messages = current_user.messages.to_a
@@ -12,7 +13,14 @@ class UsersController < ApplicationController
   def update
     current_user.update_and_notify! user_params
     current_user.accept_profile_terms!
-    redirect_to user_path, notice: I18n.t(:user_data_updated)
+    flash.notice = I18n.t(:user_data_updated)
+    redirect_after! :profile_completion, fallback_location: user_path
+  end
+
+  def accept_profile_terms
+    current_user.accept_profile_terms!
+    flash.notice = I18n.t(:terms_accepted)
+    redirect_after! :terms_acceptance, fallback_location: root_path
   end
 
   def terms

data/app/helpers/assistance_box_helper.rb

@@ -1,9 +1,11 @@
 module AssistanceBoxHelper
   def assistance_box(assignment)
-    if assignment.tips.present?
-      %Q{<div class="mu-tips-box">
-        #{Mumukit::Assistant::Narrator.random.compose_explanation_html assignment.tips}
-      </div>}.html_safe
-    end
+    %Q{<div class="mu-tips-box">
+      #{Mumukit::Assistant::Narrator.random.compose_explanation_html assignment.tips}
+    </div>}.html_safe
+  end
+
+  def should_display_assistance_box?(assignment)
+    assignment.tips.present? && !assignment.solved?
   end
 end

data/app/helpers/gamification_helper.rb

@@ -0,0 +1,5 @@
+module GamificationHelper
+  def in_gamified_context?
+    Organization.current.gamification_enabled?
+  end
+end

data/app/helpers/links_helper.rb

@@ -52,11 +52,11 @@ module LinksHelper
   end
 
   def link_to_profile_terms
-    link_to t(:terms_and_conditions).downcase, user_terms_path, target: '_blank'
+    link_to t(:terms_and_conditions), terms_user_path, target: '_blank'
   end
 
   def link_to_forum_terms
-    link_to t(:forum_terms).downcase, discussions_terms_path, target: '_blank'
+    link_to t(:forum_terms), discussions_terms_path, target: '_blank'
   end
 
   def turbolinks_enable_for(exercise)

data/app/views/exercise_solutions/_assistant_rules_box.html.erb

@@ -0,0 +1,13 @@
+<% if should_display_assistance_box? assignment %>
+  <hr>
+  <%= assistance_box assignment %>
+  <a data-toggle="collapse" href="#assistance-details-section" class="example-see-more">
+    <%= t :view_details %>
+  </a>
+  <div id="assistance-details-section" class="<%= 'collapse' if should_display_assistance_box?(assignment) %> in results-item">
+    <hr>
+    <%= yield %>
+  </div>
+<% else %>
+  <%= yield %>
+<% end %>

data/app/views/exercise_solutions/_contextualization_results_container.html.erb

@@ -1,4 +1,13 @@
 <div class="<%= "bs-callout bs-callout-#{icon_class_for contextualization.submission_status}" %>">
   <%= render partial: 'exercise_solutions/results_title', locals: {contextualization: contextualization} %>
+
+  <% if in_gamified_context? %>
+    <div id="mu-exp-earned-message" class="hidden">
+      <span><%= t(:you_earned) %></span>
+      <strong><span id="mu-exp-points"></span></strong>
+      <span><%= t(:exp_points) %></span>
+    </div>
+  <% end %>
+
   <%= yield %>
 </div>

data/app/views/exercise_solutions/_kids_level_up.html.erb

@@ -0,0 +1,11 @@
+<div>
+  <h3 class="text-center">
+    <%= t :level_up %>
+  </h3>
+  <div class="text-center mu-level">
+    <i class="fa fa-star fa-fw fa-4x"></i>
+    <span class="mu-level-number"></span>
+    <p></p>
+    <p id="mu-solve-more-exercises"> <%= (t :solve_more_exercises_to_level_up).html_safe %></p>
+  </div>
+</div>

data/app/views/exercise_solutions/_results.html.erb

@@ -11,24 +11,26 @@
   <%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: assignment} do %>
     <%= manual_evaluation_comment assignment %>
     <% unless assignment.manual_evaluation_comment? %>
-      <%= render partial: 'exercise_solutions/contextualization_results_body', locals: {contextualization: assignment} %>
-      <% if should_render_need_help_dropdown?(assignment) %>
-        <div class="notify-problem-box">
-          <div class="dropdown">
-            <%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-toggle': 'dropdown'} %>
-            <ul class="dropdown-menu" aria-labelledby="helpDropdown">
-              <li>
-                <%= read_discussions_link(@exercise) %>
-              </li>
-              <li>
-                <%= render_community_link %>
-              </li>
-              <li>
-                <%= report_bug_link(assignment) %>
-              </li>
-            </ul>
+      <%= render layout: 'exercise_solutions/assistant_rules_box', locals: {assignment: assignment } do %>
+        <%= render partial: 'exercise_solutions/contextualization_results_body', locals: {contextualization: assignment} %>
+        <% if should_render_need_help_dropdown?(assignment) %>
+          <div class="notify-problem-box">
+            <div class="dropdown">
+              <%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-toggle': 'dropdown'} %>
+              <ul class="dropdown-menu" aria-labelledby="helpDropdown">
+                <li>
+                  <%= read_discussions_link(@exercise) %>
+                </li>
+                <li>
+                  <%= render_community_link %>
+                </li>
+                <li>
+                  <%= report_bug_link(assignment) %>
+                </li>
+              </ul>
+            </div>
           </div>
-        </div>
+        <% end %>
       <% end %>
     <% end %>
     <%= solution_download_link assignment %>
@@ -36,8 +38,6 @@
 
   <% if assignment.passed? %>
     <%= corollary_box @exercise %>
-  <% else %>
-    <%= assistance_box assignment %>
   <% end %>
 <% end %>
 

data/app/views/exercise_solutions/_results_title.html.erb

@@ -1,3 +1,8 @@
 <h4 class="text-<%= icon_class_for(contextualization.submission_status) %>">
   <strong><%= fa_icon icon_type_for(contextualization.submission_status) %> <%= t_contextualization_status contextualization %></strong>
+  <% if in_gamified_context? %>
+    <strong><small class="text-success">
+      <span class="mu-experience"></span>
+    </small></strong>
+  <% end %>
 </h4>

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

@@ -48,7 +48,6 @@
 <%= hidden_field_tag "mu-exercise-id", @exercise.id %>
 <%= hidden_field_tag "mu-exercise-layout", @exercise.layout %>
 <%= hidden_field_tag "mu-exercise-settings", @exercise.settings.to_json %>
-<%= hidden_field_tag "mu-current-exp", UserStats.exp_for(@current_user) %>
 
 <div style="display: none" id="processing-template">
   <div class="bs-callout bs-callout-info">
@@ -62,6 +61,10 @@
     <%= render partial: 'layouts/exercise_skipped' %>
   <% end %>
 
+  <% if in_gamified_context? %>
+    <%= render partial: 'layouts/modals/level_up' %>
+  <% end %>
+
   <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} %>
   <%= render partial: 'layouts/modals/new_message', locals: {exercise: @exercise} if should_render_message_input?(@exercise) %>
 <% end if current_user? %>

data/app/views/layouts/_copyright.html.erb

@@ -1,2 +1,2 @@
-&copy; Copyright 2015-<%= DateTime.now.year %>
+&copy; 2015-<%= DateTime.now.year %>
 <a href="http://mumuki.org/" class="mu-org-link"><span class="da da-mumuki-circle"></span> Mumuki</a>

data/app/views/layouts/_kindergarten.html.erb

@@ -4,7 +4,7 @@
     <div class="mu-kindergarten-character-speech-bubble">
       <span class="mu-kindergarten-exercise-description"><%= exercise.description_task %></span>
       <div class="mu-kindergarten-buttons">
-        <button class="mu-kindergarten-show-context" onclick="mumuki.kids.context.showContext()">
+        <button class="mu-kindergarten-show-context" onclick="mumuki.kids.context.show()">
           <img class="mu-kindergarten-button-image" src="https://mumuki.io/static/show-context.svg" alt="">
         </button>
         <button class="mu-kindergarten-play-description" onclick="mumuki.kids.speech.click('.mu-kindergarten-exercise-description', '<%= exercise.locale %>')">

data/app/views/layouts/_organizations_listing.html.erb

@@ -1,14 +1,10 @@
-<% if current_user.student_granted_organizations.empty? %>
-  <%= t :not_in_any_organizations %>
-<% else %>
-  <% organizations_for(current_user).each do |org| %>
-      <div class="row">
-        <div class="col-md-6 organization-row">
-          <%= image_tag(org.banner_url, height: 50, class: 'pull-left') %>
-        </div>
-        <div class="col-md-6 organization-row">
-          <%= link_to(t(:go_to, organization: org.name), org.url, class: 'btn btn-success pull-right') %>
-        </div>
+<% current_immersive_organizations.each do |organization| %>
+    <div class="row">
+      <div class="col-md-6 organization-row">
+        <%= image_tag(organization.banner_url, height: 50, class: 'pull-left') %>
       </div>
-  <% end %>
+      <div class="col-md-6 organization-row">
+        <%= link_to(t(:go_to, organization: organization.name), current_immersive_path(organization), class: 'btn btn-success pull-right') %>
+      </div>
+    </div>
 <% end %>

data/app/views/layouts/application.html.erb

@@ -1,4 +1,5 @@
 <%= content_for :navbar do %>
+  <%= hidden_field_tag("mu-current-exp", UserStats.exp_for(@current_user)) if in_gamified_context? %>
   <div class="<%= exercise_container_type %>">
     <nav class="mu-navbar">
       <div class="mu-navbar-breadcrumb hidden-xs">
@@ -18,16 +19,20 @@
       </div>
       <div class="mu-navbar-avatar">
         <% if current_logged_user? %>
+          <% if in_gamified_context? %>
+            <i class="fa fa-star fa-fw fa-2x navbar-icon mu-level-tooltip" data-toggle="tooltip" data-placement="bottom" level="<%= t(:level) %>"></i>
+            <span class="mu-level-number"></span>
+          <% end %>
           <div class="dropdown">
             <span>
               <a class="notifications-box <%= has_notifications? ? '' : 'notifications-box-empty' %>" href=<%= "#{user_notifications_path}" %>>
-                <i class="fa fa-bell fa-fw fa-lg"></i>
+                <i class="fa fa-bell fa-fw fa-2x navbar-icon"></i>
                   <span class="badge badge-notifications"><%= notifications_count %></span>
               </a>
             </span>
           </div>
           <div class="dropdown">
-            <div id="profileDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
+            <div id="profileDropdown" class="profile-dropdown navbar-icon" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
               <%= profile_picture_for current_user %>
               <span class="caret"></span>
             </div>
@@ -47,32 +52,35 @@
 
 <% content_for :footer do %>
   <footer class="footer">
-    <div class="<%= exercise_container_type %>">
-      <hr>
-
-      <div class="row">
-        <div class="col-md-12">
+    <div class="mu-footer <%= exercise_container_type %>">
+      <div class="mu-footer-row">
+        <div class="mu-footer-authoring">
           <%= yield :authoring %>
         </div>
       </div>
 
-      <div id="footer-copyright" class="row">
-        <div class="col-md-4 text-left">
-          <p>
-            <%= render partial: 'layouts/copyright' %>
-          </p>
+      <div class="mu-footer-row">
+        <div class="mu-footer-copyright">
+          <%= render partial: 'layouts/copyright' %>
         </div>
 
-        <div class="col-md-4 text-center">
-          <%= login_form.footer_html %>
+        <div class="mu-footer-terms">
+          <div><%= link_to_profile_terms %></div>
+          <% if current_user&.can_discuss_here? %>
+            <div><%= link_to_forum_terms %></div>
+          <% end %>
         </div>
 
-        <div id="footer-social" class="col-md-4 text-right" lang="en">
+        <%= login_form.footer_html %>
+
+        <div id="footer-social" class="mu-footer-social" lang="en">
           <%= render partial: 'layouts/social_media' %>
         </div>
       </div>
+
     </div>
   </footer>
 <% end %>
 
 <%= render partial: 'layouts/main' %>
+

data/app/views/layouts/embedded.html.erb

@@ -1,22 +1,25 @@
 <% content_for :footer do %>
   <footer class="footer">
-    <div class="<%= exercise_container_type %>">
-      <hr>
-
-      <div class="row">
-        <div class="col-md-12">
+    <div class="mu-footer <%= exercise_container_type %>">
+      <div class="mu-footer-row">
+        <div class="mu-footer-authoring">
           <%= yield :authoring %>
         </div>
       </div>
 
-      <div id="footer-copyright" class="row hidden-xs hidden-sm">
-        <div class="col-sm-8 text-left">
-          <p>
-            <%= render partial: 'layouts/copyright' %>
-          </p>
+      <div class="mu-footer-row">
+        <div class="mu-footer-copyright">
+          <%= render partial: 'layouts/copyright' %>
+        </div>
+
+        <div class="mu-footer-terms">
+          <div><%= link_to_profile_terms %></div>
+          <% if current_user&.can_discuss_here? %>
+            <div><%= link_to_forum_terms %></div>
+          <% end %>
         </div>
 
-        <div id="footer-social" class="col-sm-4 text-right" lang="en">
+        <div id="footer-social" class="mu-footer-social" lang="en">
           <%= render partial: 'layouts/social_media' %>
         </div>
       </div>