RubyGems - mumuki-laboratory - Versions diffs - 7.11.1 → 8.1.0 - Mend

mumuki-laboratory 7.11.1 → 8.1.0

Files changed (636) hide show

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

@@ -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 CHANGED

@@ -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/invitations/_invitation_form.html.erb CHANGED

@@ -4,6 +4,7 @@
       <div class="row mu-tab-body">
         <div class="col-md-12">
           <%= render partial: 'users/profile_fields', locals: {form: f} %>
+          <%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
         </div>
       </div>
     </div>

data/app/views/layouts/_discussions.html.erb CHANGED

@@ -84,3 +84,7 @@
   <% end %>
 </div>
+<span>
+  <%= t(:forum_terms_link, terms_link: link_to_forum_terms).html_safe %>
+</span>

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

@@ -4,10 +4,10 @@
     <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.kindergarten.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.kindergarten.speech.click('.mu-kindergarten-exercise-description', '<%= exercise.locale %>')">
+        <button class="mu-kindergarten-play-description" onclick="mumuki.kids.speech.click('.mu-kindergarten-exercise-description', '<%= exercise.locale %>')">
           <img class="mu-kindergarten-button-image mu-kindergarten-play" src="https://mumuki.io/static/audio-play.svg" alt="">
           <img class="mu-kindergarten-button-image mu-kindergarten-stop hidden" src="https://mumuki.io/static/audio-stop.svg" alt="">
         </button>
@@ -16,14 +16,14 @@
   </div>
   <div class="mu-kindergarten-hint">
     <% if exercise.hint? %>
-      <button class="mu-hint-light" onclick="mumuki.kindergarten.hint.toggle()">
+      <button class="mu-hint-light" onclick="mumuki.kids.hint.toggle()">
         <img class="mu-hint-light on" src="https://mumuki.io/static/lamparita_on.svg" alt="">
       </button>
       <div class="mu-kindergarten-light-speech-bubble">
         <span class="mu-kindergarten-exercise-hint">
           <%= exercise.hint.markdownified %>
         </span>
-        <button class="expand-or-collapse-hint-media" onclick="mumuki.kindergarten.hint.toggleMedia()">
+        <button class="expand-or-collapse-hint-media" onclick="mumuki.kids.hint.toggleMedia()">
           <i class="fa fa-fw fa-2x fa-caret-up"></i>
         </button>
       </div>

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

@@ -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/_terms_acceptance_disclaimer.html.erb ADDED

@@ -0,0 +1,6 @@
+<% if user.has_profile_terms_to_accept? %>
+  <br>
+  <span>
+    <%= t(:terms_and_conditions_continue_disclaimer, terms_link: link_to_profile_terms).html_safe %>
+  </span>
+<% end %>

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

@@ -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" title="<%= 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>
@@ -76,3 +81,4 @@
 <% end %>
 <%= render partial: 'layouts/main' %>

data/app/views/layouts/modals/_guide_corollary.html.erb CHANGED

@@ -1,4 +1,4 @@
-<div class="modal fade guide-corollary" id="guide-done" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade guide-corollary mu-kids-modal-border" id="guide-done" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">

data/app/views/layouts/modals/_kids_context.html.erb CHANGED

@@ -1,4 +1,4 @@
-<div class="modal fade mu-kids-context" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-context mu-kids-modal-border" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">

data/app/views/layouts/modals/_kids_results.html.erb CHANGED

@@ -1,17 +1,27 @@
-<div class="modal fade mu-kids-results" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-results mu-kids-modal-border" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
+    <div class="modal-content success">
+      <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+        </span>
+      </button>
+      <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.resultsCarrousel.nextSlide()" aria-label="Next">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+        </span>
+      </button>
+      <div class="modal-header text-center">
       </div>
       <div class="modal-body">
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12">
-              <div class="row">
-                <div class="col-md-12 submission-results">
+              <div class="mu-kids-results-carrousel">
+                <div class="active submission-results">
                   <% if current_user? && @assignment.solved? %>
                     <%= render partial: 'exercise_solutions/kids_results',
-                                 locals: {assignment: @assignment, guide_finished_by_solution: false} %>
+                               locals: {assignment: @assignment, guide_finished_by_solution: false} %>
                   <% end %>
                 </div>
               </div>

data/app/views/layouts/modals/_kindergarten_context.html.erb CHANGED

@@ -1,22 +1,22 @@
-<div class="modal fade mu-kindergarten-context" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-modal-border" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <button type="button" class="mu-kindergarten-modal-button mu-close" data-waiting="<%= t :loading %>" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">
-              <i class="fa fa-fw fa-times fa-3x"></i>
-            </span>
+    <div class="modal-content kindergarten">
+      <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-times fa-3x"></i>
+        </span>
       </button>
-      <button type="button" class="mu-kindergarten-modal-button mu-previous hidden" onclick="mumuki.kindergarten.context.prevSlide()" aria-label="Previous">
-            <span aria-hidden="true">
-              <i class="fa fa-fw fa-arrow-left fa-3x"></i>
-            </span>
+      <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.context.prevSlide()" aria-label="Previous">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+        </span>
       </button>
-      <button type="button" class="mu-kindergarten-modal-button mu-next" onclick="mumuki.kindergarten.context.nextSlide()" aria-label="Next">
-            <span aria-hidden="true">
-              <i class="fa fa-fw fa-arrow-right fa-3x"></i>
-            </span>
+      <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.context.nextSlide()" aria-label="Next">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+        </span>
       </button>
-      <div class="modal-body">
+      <div class="modal-body mu-kids-context-body">
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12">

data/app/views/layouts/modals/_kindergarten_results.html.erb CHANGED

@@ -1,17 +1,30 @@
-<div class="modal fade mu-kids-results mu-kindergarten-context" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-results mu-kids-modal-border" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <button type="button" class="mu-kindergarten-modal-button mu-close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">
-              <i class="fa fa-fw fa-times fa-3x"></i>
-            </span>
+    <div class="modal-content kindergarten">
+      <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-times fa-3x"></i>
+        </span>
+      </button>
+      <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+        </span>
+      </button>
+      <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.resultsCarrousel.nextSlide()" aria-label="Next">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+        </span>
       </button>
       <div class="modal-header">
       </div>
       <div class="modal-body">
         <div class="container-fluid">
           <div class="row">
-            <div class="col-md-12 submission-results">
+            <div class="col-md-12">
+              <div class="mu-kids-results-carrousel">
+                <div class="active submission-results kindergarten"></div>
+              </div>
             </div>
           </div>
         </div>

data/app/views/layouts/modals/_kindergarten_results_aborted.html.erb CHANGED

@@ -1,20 +1,22 @@
-<div class="modal fade mu-kids-results-aborted mu-kindergarten-context" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-results-aborted mu-kids-modal-border" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <div class="modal-content danger">
-      <button type="button" class="mu-kindergarten-modal-button mu-close" data-dismiss="modal" aria-label="Close">
+    <div class="modal-content broken kindergarten">
+      <button type="button" class="mu-kids-modal-button mu-close" data-dismiss="modal" aria-label="Close" data-waiting="">
             <span aria-hidden="true">
               <i class="fa fa-fw fa-times fa-3x"></i>
             </span>
       </button>
-      <h4 class="modal-header text-broken">
-        <strong><%= t :errored %></strong>
-      </h4>
+      <div class="modal-header">
+        <h4 class="modal-title text-broken">
+          <strong><%= t :kindergarten_aborted %></strong>
+        </h4>
+      </div>
       <div class="modal-body">
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12">
-              <div class="mu-kids-character">
-                <img/>
+              <div class="mu-kids-character kindergarten">
+                <img class="mu-kids-character-result-aborted"/>
               </div>
             </div>
           </div>

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

@@ -0,0 +1,27 @@
+<div class="modal fade mu-level-up" id="mu-level-up" tabindex="-1" role="dialog" aria-hidden="true">
+  <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>
+      </div>
+      <div class="modal-body">
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-md-12">
+              <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>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -1,4 +1,4 @@
-<%= form_for :user, url: update_user_path, :html => { id: 'mu-user-form' }, method: :put do |f| %>
+<%= form_for :user, url: user_path, :html => { id: 'mu-user-form' }, method: :put do |f| %>
   <div class="mu-user-header">
     <h1><%= t(:edit_profile) %></h1>
     <div class="mu-profile-actions hidden-xs">
@@ -13,6 +13,7 @@
     </div>
     <div class="col-md-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">

data/app/views/users/_term.html.erb ADDED

@@ -0,0 +1,10 @@
+<div class="terms-card">
+  <details <%= 'open' unless collapsed %>>
+    <summary class="terms-card-header">
+      <h4><%= term.header %></h4>
+    </summary>
+    <div class="terms-card-body">
+      <%= term.content_html %>
+    </div>
+  </details>
+</div>

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

@@ -5,10 +5,20 @@
   </div>
 </div>
 <div class="row mu-tab-body">
-  <div class="col-md-4 text-center">
+  <div class="col-md-4 mu-profile-info-left">
     <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
+    <% if in_gamified_context? %>
+      <svg class="mu-level-progress" width="300" height="300" viewBox="0 0 100 100">
+        <path id="mu-level-progress" stroke-linecap="round" stroke="#24b8aa" stroke-width="4" stroke-dasharray="0, 999" fill="none" d="M50 10 a 40 40 0 0 1 0 80 a 40 40 0 0 1 0 -80"></path>
+      </svg>
+      <div class="mu-level">
+        <i class="fa fa-star fa-fw fa-4x"></i>
+        <span class="mu-level-number"></span>
+        <p><%= t :level %></p>
+      </div>
+    <% end %>
   </div>
-  <div class="col-md-8 mu-profile-info">
+  <div class="col-md-8 mu-profile-info-right">
     <% if @user.age.present? %>
       <div>
         <span> <strong><%= t :age %>:</strong> <%= "#{@user.age} #{t :years}" %> </span>

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

@@ -0,0 +1,30 @@
+<%= content_for :breadcrumbs do %>
+  <% if current_user? %>
+    <%= breadcrumbs @user %>
+  <% else %>
+    <%= header_breadcrumbs %>
+  <% end %>
+<% end %>
+<div class="mu-user-header">
+  <h1><%= t(:terms_and_conditions) %></h1>
+</div>
+<div>
+  <% @profile_terms.each do |term| %>
+    <%= render partial: 'term', locals: {term: term, collapsed: current_user&.has_accepted?(term)} %>
+  <% end %>
+</div>
+<% if @user&.has_role_terms_to_accept? %>
+  <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)}' : '')" %>
+        <%= t(:accept_terms) %>
+      </span>
+      <%= f.submit t(:accept), class: 'btn btn-success terms-acceptance-btn' %>
+    <% end %>
+  </div>
+<% end %>

data/config/routes.rb CHANGED

@@ -12,6 +12,7 @@ Rails.application.routes.draw do
       end
     end
+    get '/discussions/terms' => 'book_discussions#terms'
     concerns :debatable, controller: 'book_discussions', only: :index
     resources :discussions, only: [] do
@@ -51,10 +52,15 @@ Rails.application.routes.draw do
     resources :complements, only: :show
     resources :exams, only: :show
-    # All users
-    resource :user, only: [:show, :edit]
     # Current user
+    resource :user, only: [:show, :edit, :update] do
+      get :terms
+      post :terms, to: 'users#accept_profile_terms'
+      # Notification subscriptions
+      get :unsubscribe
+    end
     resources :messages, only: [:index, :create]
     get '/messages/errors' => 'messages#errors'
@@ -67,10 +73,6 @@ Rails.application.routes.draw do
     get '/join/:code' => 'invitations#show', as: :invitation
     post '/join/:code' => 'invitations#join'
-    # Notification subscriptions
-    get '/user/unsubscribe' => 'users#unsubscribe'
-    put '/user' => 'users#update', as: :update_user
     # Route for reading messages
     post '/messages/read_messages/:exercise_id' => 'messages#read_messages', as: :read_messages