mumuki-laboratory 7.7.6 → 7.10.0

data/app/helpers/avatar_helper.rb

@@ -0,0 +1,9 @@
+module AvatarHelper
+  def avatars_for(user)
+    (Avatar.with_current_audience_for(user) + [user.avatar]).compact.uniq
+  end
+
+  def show_avatar_item(item)
+    avatar_image(item.image_url, alt: item.description, 'mu-avatar-id': item.id, class: 'mu-avatar-item')
+  end
+end

data/app/helpers/discussions_helper.rb

@@ -48,8 +48,8 @@ module DiscussionsHelper
     {status: :solved, sort: :upvotes_count_desc}
   end
 
-  def user_avatar(user, image_class = '')
-    image_tag user.profile_picture, height: 40, class: "img-circle #{image_class}"
+  def user_avatar(user, image_class='')
+    profile_picture_for(user, class: image_class)
   end
 
   def discussions_link_with_teaser(item)

data/app/helpers/{locale_helper.rb → globals_helper.rb}

@@ -1,10 +1,14 @@
-module LocaleHelper
-  def locale_tags
+module GlobalsHelper
+  def globals_tags
     %Q{
       <script type="text/javascript">
         window.mumukiLocale = #{raw Organization.current.locale_json};
         mumuki.locale = '#{Organization.current.locale}';
         moment.locale('#{Organization.current.locale}');
+
+        mumuki.incognitoUser = #{current_incognito_user?};
+
+        mumuki.version = '#{Mumuki::Laboratory::VERSION}';
       </script>
     }.html_safe
   end

data/app/helpers/profile_helper.rb

@@ -0,0 +1,5 @@
+module ProfileHelper
+  def edit_profile_button
+    link_to t(:edit_profile), edit_user_path, class: 'btn btn-success'
+  end
+end

data/app/mailers/user_mailer.rb

@@ -1,24 +1,37 @@
 class UserMailer < ApplicationMailer
+  def welcome_email(user, organization)
+    with_locale(user, organization) do
+      organization_name = organization.display_name || t(:your_new_organization)
+      build_email t(:welcome, name: organization_name), { inline: organization.welcome_email_template }, from: organization.welcome_email_sender
+    end
+  end
 
   def we_miss_you_reminder(user, cycles)
-    send_reminder! user, :we_miss_you, "#{cycles.ordinalize}_reminder"
+    with_locale(user) do
+      build_email t(:we_miss_you), "#{cycles.ordinalize}_reminder"
+    end
   end
 
   def no_submissions_reminder(user)
-    send_reminder! user, :start_using_mumuki, "no_submissions_reminder"
+    with_locale(user) do
+      build_email t(:start_using_mumuki), 'no_submissions_reminder'
+    end
   end
 
-  private
-
-  def send_reminder!(user, subject, template_name)
+  def with_locale(user, organization = nil, &block)
     @user = user
     @unsubscribe_code = User.unsubscription_verifier.generate(user.id)
-    @organization = user.last_organization
+    @organization = organization || user.last_organization
 
-    I18n.with_locale(@organization.locale) do
-      mail to: user.email,
-           subject: t(subject),
-           template_name: template_name
-    end
+    I18n.with_locale(@organization.locale, &block)
+  end
+
+  private
+
+  def build_email(subject, template, **options)
+    mail options.compact.merge(to: @user.email,
+                               subject: subject,
+                               content_type: 'text/html',
+                               body: render(template))
   end
 end

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

@@ -36,7 +36,7 @@
     <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 %>%>
+        <div class="text-box" <%= 'aria-label=""' unless enabled %>>
           <%= it.description_teaser_html %>
         </div>
       </div>

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

@@ -45,6 +45,9 @@
 <%= render_exercise_input_layout(@exercise) %>
 
 <%= hidden_field_tag default_content_tag_id(@exercise), @default_content %>
+<%= 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 %>
 
 <div style="display: none" id="processing-template">
   <div class="bs-callout bs-callout-info">

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

@@ -11,8 +11,7 @@
   <%= open_graph_tags subject %>
   <%= assets_include_tags %>
   <%= csrf_meta_tags %>
-  <%= locale_tags %>
-  <%= version_tags %>
+  <%= globals_tags %>
 
   <%= login_form.header_html %>
 </head>

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

@@ -1 +1 @@
-<% content.completion_percentage_for(current_user) %>
+<% content.completion_percentage_for(current_user) if current_user? %>

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

@@ -1,6 +1,12 @@
 <div class="progress-list-flex">
   <% guide.exercises.each do |e| %>
-    <a <%= turbolinks_enable_for e %> href="<%= exercise_path(e)%>" aria-label="<%= e.navigable_name %>" title="<%= e.navigable_name %>" class="<%= class_for_progress_list_item(e, e == actual)%>">
+    <a
+      <%= turbolinks_enable_for e %>
+      href="<%= exercise_path(e)%>"
+      aria-label="<%= e.navigable_name %>"
+      title="<%= e.navigable_name %>"
+      data-mu-exercise-id="<%= e.id %>"
+      class="<%= class_for_progress_list_item(e, e == actual)%>">
     </a>
   <% end %>
 </div>

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

@@ -12,8 +12,7 @@
 
 <% if !loads_more_assets && show_loading_for?(language, assets_kind) %>
   <script id="<%= assets_kind %>-loading-script">
-    let assetsKind = '<%= assets_kind %>';
-    mumuki.load(() => mumuki.assetsLoaderFor(assetsKind));
+    mumuki.load(() => mumuki.assetsLoaderFor('<%= assets_kind %>'));
   </script>
 <% end %>
 

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

@@ -17,7 +17,7 @@
         <% end %>
       </div>
       <div class="mu-navbar-avatar">
-        <% if current_user? %>
+        <% if current_logged_user? %>
           <div class="dropdown">
             <span>
               <a class="notifications-box <%= has_notifications? ? '' : 'notifications-box-empty' %>" href=<%= "#{user_notifications_path}" %>>
@@ -28,7 +28,7 @@
           </div>
           <div class="dropdown">
             <span id="profileDropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
-              <%= profile_picture %>
+              <%= profile_picture_for current_user %>
             </span>
             <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
               <%= menu_bar_list_items %>

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

@@ -0,0 +1,16 @@
+<div class="modal fade" id="mu-avatar-picker" 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="modal-title">
+          <h3 class="text-left" id="gridSystemModalLabel"><%= t :choose_your_avatar %> </h3>
+        </div>
+      </div>
+      <div class="modal-body">
+        <%= render partial: 'avatar_list' %>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+<div class="row">
+  <div class="mu-avatar-list">
+    <% avatars_for(@user).sort_by(&:id).each do |avatar| %>
+      <%= show_avatar_item(avatar) %>
+    <% end %>
+
+    <% if @user.image_url %>
+      <%= avatar_image @user.image_url, class: 'mu-avatar-item', id: 'mu-user-image' %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,22 @@
+<%= form_for :user, url: update_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">
+      <%= link_to t(:cancel), :back, class: 'btn btn-default' if @user.profile_completed? %>
+      <%= f.submit t(:save), disabled: true, class: 'btn btn-success', id: 'mu-edit-profile-btn' %>
+    </div>
+  </div>
+  <div class="row mu-tab-body">
+    <div class="col-md-4 text-center">
+      <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
+      <i class="fa fa-pencil fa-2x pointer mu-edit-avatar" id="mu-edit-avatar-icon"></i>
+    </div>
+    <div class="col-md-8">
+      <%= render partial: 'profile_fields', locals: {form: f} %>
+    </div>
+  </div>
+<% end %>
+
+<%= content_for :no_container do %>
+  <%= render partial: 'layouts/modals/avatar_picker' %>
+<% end %>

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

@@ -1,11 +1,24 @@
-<%= form_for :user, url: update_user_path, method: :put do |f| %>
-  <div class="row mu-tab-body">
-    <div class="col-md-4 text-center">
-      <%= image_tag @user.profile_picture, size: '250x250', class: 'img-circle' %>
+<div class="mu-user-header">
+  <h1><%= @user.name %></h1>
+  <div class="mu-profile-actions">
+    <%= edit_profile_button %>
+  </div>
+</div>
+<div class="row mu-tab-body">
+  <div class="col-md-4 text-center">
+    <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
+  </div>
+  <div class="col-md-8 mu-profile-info">
+    <% if @user.age.present? %>
+      <div>
+        <span> <strong><%= t :age %>:</strong> <%= "#{@user.age} #{t :years}" %> </span>
+      </div>
+    <% end %>
+    <div>
+      <span> <strong><%= t :email %>:</strong> <%= @user.email %> </span>
     </div>
-    <div class="col-md-8">
-      <%= render partial: 'profile_fields', locals: {form: f} %>
-      <div><%= f.submit t(:save), class: 'btn btn-success btn-block' %></div>
+    <div>
+      <span> <strong><%= t :programming_since %>:</strong> <%= t(:time_since, time: time_ago_in_words(@user.created_at)) %> </span>
     </div>
   </div>
-<% end %>
+</div>

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

@@ -0,0 +1,5 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs @user %>
+<% end %>
+
+<%= render partial: 'edit_user_form' %>

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

@@ -2,10 +2,6 @@
     <%= breadcrumbs @user %>
 <% end %>
 
-<div>
-  <h1><%= @user.name %></h1>
-</div>
-
 <ul class="nav nav-tabs" role="tablist">
   <li role="presentation" class="active">
     <a data-target="#info" aria-controls="info" role="tab" data-toggle="tab"><%= t :profile %></a>

data/config/routes.rb

@@ -52,7 +52,7 @@ Rails.application.routes.draw do
     resources :exams, only: :show
 
     # All users
-    resource :user, only: :show
+    resource :user, only: [:show, :edit]
 
     # Current user
     resources :messages, only: [:index, :create]

data/lib/mumuki/laboratory/controllers.rb

@@ -7,6 +7,7 @@ require_relative './controllers/current_organization'
 require_relative './controllers/dynamic_errors'
 require_relative './controllers/notifications'
 require_relative './controllers/embedded_mode'
+require_relative './controllers/incognito_mode'
 require_relative './controllers/nested_in_exercise'
 require_relative './controllers/results_rendering'
 require_relative './controllers/exercise_seed'

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

@@ -0,0 +1,28 @@
+module Mumuki::Laboratory::Controllers::IncognitoMode
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :current_incognito_user?,
+                  :current_logged_user?
+  end
+
+  def current_user?
+    super || incognito_mode_enabled?
+  end
+
+  def current_user
+    @current_user ||= incognito_mode_enabled? ? (super rescue Mumuki::Domain::Incognito) : super
+  end
+
+  def current_incognito_user?
+    current_user? && current_user.incognito?
+  end
+
+  def current_logged_user?
+    current_user? && !current_user.incognito?
+  end
+
+  def incognito_mode_enabled?
+    !from_sessions? && Organization.current.incognito_mode_enabled?
+  end
+end

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

@@ -3,23 +3,23 @@ es:
   datetime:
     distance_in_words:
       about_x_hours:
-        one: Alrededor de 1 hora
-        other: Alrededor de %{count} horas
+        one: aproximadamente una hora
+        other: aproximadamente %{count} horas
       about_x_months:
-        one: Alrededor de 1 mes
-        other: Alrededor de %{count} meses
+        one: aproximadamente un mes
+        other: aproximadamente %{count} meses
       less_than_x_minutes:
-        one: Hace menos de 1 minuto
-        other: Hace menos de %{count} minutos
+        one: menos de un minuto
+        other: menos de %{count} minutos
       x_days:
-        one: Hace 1 dia
-        other: Hace %{count} dias
+        one: un día
+        other: '%{count} días'
       x_minutes:
-        one: Hace 1 minuto
-        other: Hace %{count} minutos
+        one: un minuto
+        other: '%{count} minutos'
       x_months:
-        one: Hace 1 mes
-        other: Hace %{count} meses
+        one: un mes
+        other: '%{count} meses'
       x_seconds:
-        one: Hace 1 segundo
-        other: Hace %{count} segundos
+        one: un segundo
+        other: '%{count} segundos'

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

@@ -7,6 +7,7 @@ en:
   actions: Actions
   activity: Activity
   actual_state: Obtained board
+  age: Age
   all: All
   appendix: "Appendix"
   appendix_teaser: Do you want to learn more? <a href="%{link}">Check this chapter's appendix</a>"
@@ -28,11 +29,13 @@ en:
   bibliotheca_ui: Bibliotheca
   birthdate: Birthdate
   blocked_forum_explanation: You are not allowed to see this content. <br> Are you in the middle of an exam right now?
+  cancel: Cancel
   cancel_subscription: Cancel your subscription.
   chapter: Chapter
   chapters: Chapters
   chapter_finished_html: You have finished %{chapter}!
   chapter_number: Chapter %{number}
+  choose_your_avatar: Choose your avatar
   classroom_ui: Classroom
   clear_console: Clear console
   closed: Closed
@@ -65,6 +68,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_profile: Edit profile
   editor_placeholder: "write your solution here..."
   email: Email
   error_description: This is known as a <span class="error-link">%{error}</span>.
@@ -93,7 +97,9 @@ en:
   first_name: First Name
   forbidden_explanation: You are not allowed to see this content.
   format: Format
+  fullscreen: "Fullscreen"
   gender: Gender
+  get_messages: "View messages"
   go_to: 'Go to %{organization}'
   gone_explanation: This content is no longer available.
   guide: Guide
@@ -162,6 +168,7 @@ en:
   not_in_any_organizations: It seems you aren't in any organizations yet!
   notify_problem_with_exercise: Report a bug
   office: Office
+  only_landscape_support: Please, rotate your tablet or cellphone to continue practicing
   opened: Open
   opened_count: '%{count} opened'
   other: Other
@@ -184,6 +191,7 @@ en:
   processing_your_solution: We are processing you solution
   profile: Profile
   profile_of: Profile of %{username}
+  programming_since: Started programming
   progress: Progresss
   read: Read
   refresh_or_wait: Please press F5 if results are not displayed after a few seconds
@@ -230,6 +238,7 @@ en:
   submissions_for: Submissions for %{exercise}
   subscribe: Subscribe
   tag: Tags
+  task: Task
   teacher_info: Information for teachers
   tell_us_how: Please tell us how this happened!
   tell_us_if_our_error: If you think this is our fault, %{issues}
@@ -260,11 +269,10 @@ en:
   view_details: View details
   want_permissions: The next user requires permissions
   we_miss_you: We miss you!
+  welcome: Welcome to %{name}!
   working: "Working"
   wrong_answer: The answer is wrong
+  years: years old
   you_must_sign_in_before_submitting: You must sign in before submitting your solutions
   you_never_submitted_solutions: It seems that you've never submitted solutions since you created your account.
-  fullscreen: "Fullscreen"
-  get_messages: "View messages"
-  task: Task
-  only_landscape_support: Please, rotate your tablet or cellphone to continue practicing
+  your_new_organization: your new organization

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

@@ -7,6 +7,7 @@ es:
   actions: Acciones
   activity: Actividad
   actual_state: Tablero obtenido
+  age: Edad
   all: Todos
   and: y
   appendix: "Apéndice"
@@ -29,11 +30,13 @@ es:
   bibliotheca_ui: Biblioteca
   birthdate: Fecha de nacimiento
   blocked_forum_explanation: Es decir que no tenés autorización para ver este contenido. <br> ¿Puede que estés en medio de un examen?
+  cancel: Cancelar
   cancel_subscription: Cancelá tu subscripción.
   chapter: Capítulo
   chapters: Capítulos
   chapter_finished_html: ¡Terminaste %{chapter}! ¡Felicitaciones!
   chapter_number: 'Capítulo %{number}'
+  choose_your_avatar: Elegí tu avatar
   classroom_ui: Aula
   clear_console: Reiniciar consola
   closed: Cerrada
@@ -72,6 +75,7 @@ es:
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tenés que seguir practicando.
   download: "Descargá lo que hiciste"
   edit: Editar
+  edit_profile: Editar perfil
   editor_placeholder: "...escribí tu solución acá..."
   email: Email
   error_description: ¡Ups! <br> Esto es lo que se conoce como <span class="error-link">%{error}</span>.
@@ -99,7 +103,9 @@ es:
   first_name: Nombre
   forbidden_explanation: Es decir que no tenés autorización para ver este contenido. <br> ¿Puede que hayas ingresado con una cuenta incorrecta?
   format: Dar formato
+  fullscreen: "Pantalla completa"
   gender: Género
+  get_messages: "Ver mensajes"
   go_to: 'Ir a %{organization}'
   gone_explanation: Este contenido ya no está disponible.
   guide: Lección
@@ -176,6 +182,7 @@ es:
   not_in_any_organizations: ¡Parece que no estás en ninguna organización todavía!
   notify_problem_with_exercise: Reportá un bug
   office: Secretaría
+  only_landscape_support: Por favor, rotá tu tablet o celular para realizar ejercicios
   opened: Abierta
   opened_count:
     one: '1 abierta'
@@ -201,6 +208,7 @@ es:
   processing_your_solution: Estamos procesando tu solución
   profile: Perfil
   profile_of: Perfil de %{username}
+  programming_since: Programando desde
   progress: Progreso
   read: Leido
   read_messages: Ver mensajes
@@ -253,6 +261,7 @@ es:
   submissions_count: Soluciones
   submissions_for: Soluciones para %{exercise}
   tag: Etiquetas
+  task: Consigna
   teacher_info: Información para docentes
   tell_us_how: ¡Contanos cómo te pasó esto!
   tell_us_if_our_error: Si pensás que es un error nuestro, %{issues}
@@ -284,15 +293,14 @@ es:
   view_details: Ver detalles
   want_permissions: El siguiente usuario requiere permisos
   we_miss_you: ¡Te extrañamos!
+  welcome: Te damos la bienvenida a %{name}!
   will_paginate:
     previous_label: "&#8592; Anterior"
     next_label: "Siguiente &#8594;"
     page_gap: "&hellip;"
   working: "Procesando"
   wrong_answer: La respuesta no es correcta
+  years: años
   you_must_sign_in_before_submitting: Tenés que iniciar sesión antes de empezar a enviar tus soluciones
   you_never_submitted_solutions: Parece que nunca enviaste soluciones desde que creaste tu cuenta.
-  fullscreen: "Pantalla completa"
-  get_messages: "Ver mensajes"
-  task: Consigna
-  only_landscape_support: Por favor, rotá tu tablet o celular para realizar ejercicios
+  your_new_organization: tu nueva organización