mumuki-laboratory 7.5.0 → 7.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df24c3f8b39eefd6008a045943cc58656920835a5e6b0f45b08653404e710ba0
-  data.tar.gz: 746a6eae36dff89eacc230c06373f385186c949b64c311176d16180e4299e676
+  metadata.gz: fecc1d7f623d854c2554619adfc59748ca2b048de16a11397189c951c6243212
+  data.tar.gz: d65801b409606fb0fdf446246ba28c0af7a264ab42377f4632300890a9ae66e6
 SHA512:
-  metadata.gz: 4af6a62459053087a8ee3fbfb9ed6f22020a1582a2c881955a0ec33b24ca9b0e18bd303d4a10ebac8766da507c2fe53f5b6c890b98126d033741fc39e058bdad
-  data.tar.gz: 57b0fe7c7338f7364a163cfcd7d278ddeb47d771ee43053507fd9c81da47ef08a19234af22fead4d0d4c73f10b9889b0ce695a61e331f8e0b0ad2c96d01da977
+  metadata.gz: 1f77c9e8dcf0c095871c903460ff37cfe6c3603a5855c31f1d02cafe97015a6e6bd5f884b51363e58bc8324cbc56e9b6aed654610275e141a444b01813d609e5
+  data.tar.gz: ecf2f4a616198b6cf6565a73d039c3bb88a421e25a644947ac2a3170f24c190901930ab354b2812eac01a843200dec6b6ebb9064469abe64677983e8f9e02e31

data/app/assets/javascripts/mumuki_laboratory/application/codemirror.js

@@ -85,12 +85,16 @@ var mumuki = mumuki || {};
     updateCodeMirrorLanguage();
     onSelectUpdateCodeMirror();
 
-    $('.editor-reset').click(function () {
-      resetEditor();
+    $('.editor-reset').click(function (event) {
+      event.stopPropagation();
+      const selection = confirm(this.getAttribute('data-confirm'));
+      if(selection) resetEditor();
     });
+
     $('.editor-resize').click(function () {
       toggleFullscreen();
     });
+
     $('.editor-format').click(function (){
       formatContent();
     });

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

@@ -6,6 +6,7 @@ $da-font-path: asset-path('assets');
 @import "codemirror/codemirror.min";
 @import "codemirror/show-hint.min";
 @import "application/vendor";
+@import "application/locked";
 @import "application/tooltip";
 @import "application/hovers";
 @import "application/mixins";

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

@@ -107,10 +107,6 @@ h1 {
   margin-bottom: 20px;
 }
 
-.chapter {
-  margin: 35px 0;
-}
-
 pre {
   font-size: 14px;
   line-height: 1.4;

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

@@ -0,0 +1,29 @@
+.chapter-container {
+  position: relative;
+}
+
+.chapter {
+  position: relative;
+
+  margin: 35px 0;
+  padding-bottom: 15px;
+
+  &.mu-locked {
+    opacity: 20%;
+
+    user-select: none;
+    pointer-events: none;
+  }
+}
+
+.mu-lock {
+  position: absolute;
+
+  width: 100%;
+  height: 100%;
+
+  transform: translateY(20%);
+
+  top: 0px;
+  left: 0px;
+}

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

@@ -5,5 +5,5 @@
 }
 
 .popover {
-  max-width: 30%;
+  max-width: 50%;
 }

data/app/controllers/application_controller.rb

@@ -14,15 +14,22 @@ class ApplicationController < ActionController::Base
 
   before_action :set_current_organization!
   before_action :set_locale!
+
   before_action :ensure_user_enabled!, if: :current_user?
+  before_action :validate_active_organization!
+
   before_action :redirect_to_main_organization!, if: :should_redirect_to_main_organization?
+
   before_action :authorize_if_private!
+  before_action :validate_active_organization!
   before_action :validate_user_profile!, if: :current_user?
+
   before_action :visit_organization!, if: :current_user?
 
   after_action :leave_organization!
 
-  helper_method :login_button,
+  helper_method :current_workspace,
+                :login_button,
                 :notifications_count,
                 :user_notifications_path,
                 :has_notifications?,
@@ -51,8 +58,14 @@ class ApplicationController < ActionController::Base
     accessible_subject.validate_accessible_for! current_user
   end
 
+  def validate_active_organization!
+    return if current_user&.teacher_here?
+    Organization.current.validate_active!
+  end
+
+
   # required by Mumukit::Login
-  def login_button(options={})
+  def login_button(options = {})
     login_form.button_html I18n.t(:sign_in), options[:class]
   end
 
@@ -62,6 +75,10 @@ class ApplicationController < ActionController::Base
     raise Mumuki::Domain::NotFoundError unless content.usage_in_organization.try { |usage| redirect_to usage }
   end
 
+  def current_workspace
+    Mumuki::Domain::Workspace.new(current_user, Organization.current)
+  end
+
   private
 
   def from_sessions?

data/app/controllers/invitations_controller.rb

@@ -7,6 +7,7 @@ class InvitationsController < ApplicationController
 
   skip_before_action :validate_user_profile!
   skip_before_action :authorize_if_private!
+  skip_before_action :validate_active_organization!
 
   def show
     redirect_to_organization! if current_user.student_of? @invitation.course

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_active_organization!
 
   private
 

data/app/helpers/links_helper.rb

@@ -14,7 +14,7 @@ module LinksHelper
   end
 
   def link_to_status_codes(code)
-    "<a href='https://es.wikipedia.org/wiki/Anexo:C%C3%B3digos_de_estado_HTTP'> #{I18n.t("error_#{code}")} </a>"
+    "<a href='https://es.wikipedia.org/wiki/Anexo:C%C3%B3digos_de_estado_HTTP' target='_blank'> #{I18n.t("error_#{code}")} </a>"
   end
 
   def url_for_application(app_name)

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

@@ -32,13 +32,21 @@
 
   <h2><%= t(:chapters) %></h2>
 
-  <% @book.chapters.each do |it| %>
-    <div class="chapter">
-      <h3><%= it.number %>. <%= link_to_path_element it, mode: :plain %></h3>
-
-      <div class="text-box">
-        <%= it.description_teaser_html %>
+  <% @book.chapter_visibilities_in(current_workspace).each do |it, enabled| %>
+    <div class="chapter-container">
+      <div class="chapter <%= enabled ? '' : 'mu-locked' %>">
+        <h3><%= it.number %>. <%= link_to_path_element it, mode: :plain %></h3>
+        <div class="text-box" <%= 'aria-label=""' unless enabled %>%>
+          <%= it.description_teaser_html %>
+        </div>
       </div>
+
+      <% unless enabled  %>
+        <div class="text-center mu-lock">
+          <i class="fa fa-lock fa-5x"></i>
+          <p><%= t :locked_content %></p>
+        </div>
+      <% end %>
     </div>
   <% end %>
   <% if current_user? && @exams.present? %>

data/app/views/errors/gone.html.erb

@@ -4,7 +4,10 @@
     </div>
     <div class="body">
       <p>
-        <%= t(:gone_explanation, error: link_to_status_codes(410)).html_safe %>
+        <%= t(:error_description, error: link_to_status_codes(410)).html_safe %>
+      </p>
+      <p>
+        <%= Organization.current.explain_error(410, explanation).html_safe %>
       </p>
       <p>
         <a class="btn btn-success" href="/"> <%= t(:back_to_mumuki) %> </a>

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

@@ -17,7 +17,7 @@
     <div class="description"><%= exercise.description_task %></div>
     <div class="hint" style="display: none"><%= exercise.hint_html %></div>
   </div>
-  <div class="mu-kids-character-speech-bubble-failed <%= @assignment&.status %>" style="display: none"></div>
+  <div class="mu-kids-character-speech-bubble-failed <%= current_user? && @assignment.status %>" style="display: none"></div>
 </div>
 <div id="mu-kids-discussion-link-html" class="hidden">
   <%= kids_read_discussions_link(exercise) %>

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

@@ -1,4 +1,4 @@
-<a class="fa fa-facebook social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiProject" target="_blank"></a>
-<a class="fa fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/MumukiProject" target="_blank"></a>
+<a class="fa fa-facebook social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiOrg" target="_blank"></a>
+<a class="fa fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/MumukiOrg" target="_blank"></a>
 <a class="fa fa-github social-icon" aria-label="Github" href="https://github.com/mumuki" target="_blank"></a>
-<a class="fa fa-linkedin social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/mumuki-project" target="_blank"></a>
+<a class="fa fa-linkedin social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/mumukiorg" target="_blank"></a>

data/app/views/layouts/exercise_inputs/editors/_multiple_files.html.erb

@@ -26,14 +26,14 @@
       <% end %>
     </div>
 
-    <div class="mu-overlapped">
-      <a class="editor-resize multiple-files" title="<%= t(:fullscreen) %> (F11)">
+    <div class="mu-overlapped multiple-files">
+      <a class="editor-resize" title="<%= t(:fullscreen) %> (F11)">
         <span class="fa-stack fa-lg">
           <i class="fa fa-square-o fa-stack-2x"></i>
           <i class="fa fa-expand fa-stack-1x"></i>
         </span>
       </a>
-      <a class="editor-reset submission-reset" data-confirm="<%= t(:confirm_reset) %>"><%= restart_icon %></a>
+      <!--<a class="editor-reset submission-reset" data-confirm="<%= t(:confirm_reset) %>"><%= restart_icon %></a> -->
     </div>
 
   </div>

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

@@ -9,7 +9,7 @@
             <div class="col-md-12">
               <div class="row">
                 <div class="col-md-12 submission-results">
-                  <% if @assignment.solved? %>
+                  <% if current_user? && @assignment.solved? %>
                     <%= render partial: 'exercise_solutions/kids_results',
                                  locals: {assignment: @assignment, guide_finished_by_solution: false} %>
                   <% end %>

data/app/views/user_mailer/1st_reminder.html.erb

@@ -180,7 +180,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.facebook.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.facebook.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 
@@ -212,7 +212,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.twitter.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.twitter.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 

data/app/views/user_mailer/2nd_reminder.html.erb

@@ -180,7 +180,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.facebook.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.facebook.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 
@@ -212,7 +212,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.twitter.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.twitter.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 

data/app/views/user_mailer/3rd_reminder.html.erb

@@ -180,7 +180,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.facebook.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.facebook.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 
@@ -212,7 +212,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.twitter.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.twitter.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 

data/app/views/user_mailer/no_submissions_reminder.html.erb

@@ -180,7 +180,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.facebook.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.facebook.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 
@@ -212,7 +212,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.twitter.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.twitter.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 

data/config/initializers/session_store.rb

@@ -1 +1 @@
-Rails.application.config.session_store :cookie_store, key: '_mumuki_laboratory_session', same_site: Mumukit::Login::Mucookie.cookie_same_site
+Rails.application.config.session_store Mumukit::Login::Mucookie::Store, key: '_mumuki_laboratory_session', same_site: :lax

data/lib/mumuki/laboratory/controllers/dynamic_errors.rb

@@ -16,6 +16,8 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
     rescue_from Mumuki::Domain::BlockedForumError, with: :blocked_forum
     rescue_from Mumuki::Domain::DisabledError, with: :disabled
     rescue_from ActiveRecord::RecordInvalid, with: :bad_record
+    rescue_from Mumuki::Domain::UnpreparedOrganizationError, with: :unprepared_organization
+    rescue_from Mumuki::Domain::DisabledOrganizationError, with: :disabled_organization
   end
 
   def bad_record(exception)
@@ -51,7 +53,15 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
   end
 
   def gone
-    render_error 'gone', 410
+    render_error 'gone', 410, locals: { explanation: :gone_explanation }
+  end
+
+  def unprepared_organization
+    render_error 'forbidden', 403, locals: { explanation: :unprepared_organization_explanation }
+  end
+
+  def disabled_organization
+    render_error 'gone', 410, locals: { explanation: :disabled_organization_explanation }
   end
 
   def render_error(template, status, options={})

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

@@ -57,6 +57,7 @@ en:
   destroy_message: delete the message
   destroy: Destroy
   disabled_explanation: You are trying to visit a permamently disabled or deleted resource
+  disabled_organization_explanation: This path has already finished.
   discussion_updated: Discussion updated
   discussions: Discussions
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
@@ -121,6 +122,7 @@ en:
   let_us_know: please let us know!
   loading: Loading
   load_solution_into_console: Load your solution into the console
+  locked_content: 'This content will be unlocked when you finish previous chapters'
   male: Male
   manual_evaluation_pending: Thanks for submitting your solution! It will be revised by the course teachers soon
   message_count:
@@ -227,7 +229,6 @@ en:
   tell_us_if_our_error: If you think this is our fault, %{issues}
   terms_and_conditions: Terms and conditions
   test_results: Test results
-  test_results: Tests results
   time_ago: "%{time} ago"
   time_left: You have
   title: Title
@@ -237,7 +238,9 @@ en:
   to_solved: Mark as solved
   unauthorized_explanation: You have no permissions for this content. Maybe you logged in with another account.
   undo_upvote: Undo upvote
+  unspecified: I'd rather not say
   unmeet_expectations: "Goals that weren't met"
+  unprepared_organization_explanation: This path hasn't started yet.
   unsubscribe: Unsubscribe
   unsubscribed_successfully: You have successfully unsubscribed from reminders.
   upload_solution: Upload Solution

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

@@ -64,6 +64,7 @@ es:
   destroy: Eliminar
   details: Detalles
   disabled_explanation: Estás intentando acceder a un recurso que fue deshabilitado o eliminado de forma permamente
+  disabled_organization_explanation: ¡Este recorrido ha finalizado!
   discussion_updated: Consulta actualizada
   discussions: Consultas
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tenés que seguir practicando.
@@ -98,7 +99,7 @@ es:
   format: Dar formato
   gender: Género
   go_to: 'Ir a %{organization}'
-  gone_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que ya no podés ver este contenido.
+  gone_explanation: Este contenido ya no está disponible.
   guide: Lección
   guide_created: Guía creada exitosamente
   guide_finished: ¡Terminaste %{guide}!
@@ -131,6 +132,7 @@ es:
   let_us_know: ¡Por favor avisanos!
   loading: Cargando
   load_solution_into_console: Cargar la solución en la consola
+  locked_content: 'Este contenido se desbloqueará cuando termines los capítulos anteriores'
   male: Hombre
   manual_evaluation_pending: ¡Gracias por enviar tu solución! Tus docentes la corregirán pronto
   message_count:
@@ -260,7 +262,9 @@ es:
   unauthorized_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que no iniciaste sesión.
   uncategorized: No categorizado
   undo_upvote: No es útil
+  unspecified: Prefiero no decirlo
   unmeet_expectations: Objetivos que no se cumplieron
+  unprepared_organization_explanation: ¡Este recorrido aún no ha comenzado!
   unsubscribe: Dejar de recibir notificaciones
   unsubscribed_successfully: Te desuscribiste exitosamente de los recordatorios.
   upload_solution: "Subir solución"

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

@@ -61,6 +61,7 @@ pt:
   destroy: Excluir
   details: Detalhes
   disabled_explanation: Você está tentando acessar um recurso que foi desativado ou removido permanentemente
+  disabled_organization_explanation: Este curso terminou!
   discussion_updated: Consulta actualizada
   discussions: Consultas
   download: Faça o download do que você fez
@@ -96,7 +97,7 @@ pt:
   gender: Gênero
   get_messages: Ver mensagens
   go_to: Vá para %{organization}
-  gone_explanation: Opa! Isto é o que é conhecido como %{error}, ou seja, você não pode mais ver esse conteúdo.
+  gone_explanation: Parece que você não pode mais acessar esse conteúdo.
   guide: Lição
   guide_created: Guia criado com sucesso
   guide_finished: Você terminou %{guide}!
@@ -127,6 +128,7 @@ pt:
   let_us_know: Por favor, avise-nos!
   loading: Carregando
   load_solution_into_console: Carregue a solução no console
+  locked_content: 'Este conteúdo será desbloqueado quando você terminar os capítulos anteriores'
   male: Masculino
   manual_evaluation_pending: Obrigado por enviar sua solução! Seus professores irão corrigi-lo em breve
   message_count:
@@ -248,7 +250,9 @@ pt:
   to_solved: Marcar como resolvida
   unauthorized_explanation: Opa! Isso é o que é conhecido como %{error}, ou seja, você não fez logon.
   uncategorized: Não classificado
+  unspecified: Eu preferiria não dizer
   unmeet_expectations: Objetivos que não foram atendidos
+  unprepared_organization_explanation: Este curso ainda não começou!
   unsubscribe: Cancelar subscrição
   upload_solution: Carregar solução
   uploading_solution: Uploading solution