mumuki-laboratory 8.6.1 → 9.0.0

data/app/views/guides/_guide_container.html.erb

@@ -0,0 +1,24 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs subject %>
+<% end %>
+
+<%= render layout: 'guides/guide', locals: { subject: subject } do %>
+
+  <div class="row">
+    <div class="mu-inline-block-right hidden-xs">
+      <h1><%= language_icon @guide.language %></h1>
+    </div>
+    <div class="mu-inline-block-left">
+      <h1><%= short_title_for @guide %></h1>
+      <%= render partial: 'guides/guide_title_icons' %>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <div class="text-box">
+        <%= @guide.description_html %>
+      </div>
+    </div>
+  </div>
+
+<% end %>

data/app/views/{layouts → guides}/_guide_title_icons.html.erb

@@ -1,8 +1,6 @@
-<div class="guide-title-icons pull-left">
+<div class="mu-content-title-icons">
   <% if current_user? && should_display_medal?(@guide, Organization.current) %>
-    <div class="pull-left">
       <%= content_medal_for(@guide, current_user) %>
-    </div>
   <% end %>
 <%= teacher_info_button @guide %>
 <%= link_to_bibliotheca_guide @guide %>

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

@@ -1,6 +1,6 @@
 <ul class="progress-listing">
   <% guide.assignments_for(current_user).each do |assignment| %>
-      <% cache [assignment.exercise, assignment.status, Organization.current] do %>
+      <% cache [assignment.exercise, assignment.status, Organization.current.name, current_user?] do %>
           <li <%= turbolinks_enable_for(assignment.exercise) %>>
             <%= assignment_status_icon assignment %>
             <%= link_to_path_element(assignment.exercise) %>

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

@@ -0,0 +1,21 @@
+<div class="col-md-3 mu-tab-body mu-user-menu">
+  <div class="col-md-12">
+    <div class="mu-user-menu-header">
+      <%= t(:my_account) %>
+    </div>
+    <div class="mu-user-menu-item">
+      <%= profile_user_menu_link %>
+    </div>
+    <div class="mu-user-menu-divider horizontal"></div>
+    <div class="mu-user-menu-item">
+      <%= messages_user_menu_link %>
+    </div>
+    <% if current_user&.can_discuss_here? %>
+      <div class="mu-user-menu-item">
+        <%= discussions_user_menu_link %>
+      </div>
+    <% end %>
+  </div>
+  <div class="mu-user-menu-divider vertical hidden-sm hidden-xs"></div>
+</div>
+<div class="mu-user-menu-divider horizontal visible-sm visible-xs"></div>

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

@@ -1 +1 @@
-<%= render partial: "layouts/guide_container", locals: { subject: @lesson }%>
+<%= render partial: "guides/guide_container", locals: { subject: @lesson }%>

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

@@ -1,11 +1,11 @@
 <div class="mu-user-header">
-  <h1><%= @user.name %></h1>
+  <h1><%= t(:my_profile) %></h1>
   <div class="mu-profile-actions hidden-xs">
     <%= edit_profile_button %>
   </div>
 </div>
-<div class="row mu-tab-body">
-  <div class="col-md-4 mu-profile-info-left">
+<div class="mu-profile-info">
+  <div class="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">
@@ -18,7 +18,10 @@
       </div>
     <% end %>
   </div>
-  <div class="col-md-8 mu-profile-info-right">
+  <div class="mu-profile-info-right">
+    <div>
+      <span> <strong><%= t :name %>:</strong> <%= "#{@user.name}" %> </span>
+    </div>
     <% if @user.age.present? %>
       <div>
         <span> <strong><%= t :age %>:</strong> <%= "#{@user.age} #{t :years}" %> </span>
@@ -31,8 +34,7 @@
       <span> <strong><%= t :programming_since %>:</strong> <%= t(:time_since, time: time_ago_in_words(@user.created_at)) %> </span>
     </div>
   </div>
-
-  <div class="mu-profile-actions mobile visible-xs">
-    <%= edit_profile_button %>
-  </div>
+</div>
+<div class="mu-profile-actions mobile visible-xs">
+  <%= edit_profile_button %>
 </div>

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

@@ -0,0 +1,28 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs_for_my_account %>
+<% end %>
+
+<%= render partial: 'layouts/user_menu' %>
+
+<div class="col-md-9 mu-tab-body">
+  <div class="mu-user-header">
+    <h1><%= t(:discussions) %></h1>
+  </div>
+  <% if @watched_discussions.empty? %>
+    <div class="mu-tab-body">
+      <%= t :discussions_will_be_here %>
+    </div>
+  <% else %>
+    <table class="table table-striped">
+      <% @watched_discussions.each do |discussion| %>
+        <tr>
+          <td>
+            <%= icon_for_read(discussion.read_by?(@user)) %>
+          </td>
+          <td><%= link_to discussion.item.name, item_discussion_path(discussion) %></td>
+          <td><%= time_ago_in_words discussion.last_message_date %></td>
+        </tr>
+      <% end %>
+    </table>
+  <% end %>
+</div>

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

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

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

@@ -0,0 +1,27 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs_for_my_account %>
+<% end %>
+
+<%= render partial: 'layouts/user_menu' %>
+
+<div class="col-md-9 mu-tab-body">
+  <div class="mu-user-header">
+    <h1><%= t(:messages) %></h1>
+  </div>
+  <% if @messages.empty? %>
+    <div class="mu-tab-body">
+      <%= t :no_messages %>
+    </div>
+  <% else %>
+    <table class="table table-striped">
+      <% @messages.each do |message| %>
+        <tr>
+          <td><%= icon_for_read(message.read?) %></td>
+          <td><%= link_to message.exercise.name, exercise_path(message.exercise.id) %></td>
+          <td><%= mail_to message.sender %></td>
+          <td><%= time_ago_in_words message.created_at %></td>
+        </tr>
+      <% end %>
+    </table>
+  <% end %>
+</div>

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

@@ -1,56 +1,9 @@
 <%= content_for :breadcrumbs do %>
-    <%= breadcrumbs @user %>
+  <%= breadcrumbs_for_my_account %>
 <% end %>
 
-<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>
-  </li>
-  <li role="presentation">
-    <a data-target="#messages" aria-controls="messages" role="tab" data-toggle="tab"><%= t :messages %></a>
-  </li>
-  <% if @watched_discussions.present? %>
-    <li role="presentation">
-      <a data-target="#discussions" aria-controls="discussions" role="tab" data-toggle="tab"><%= t :discussions %></a>
-    </li>
-  <% end %>
-</ul>
+<%= render partial: 'layouts/user_menu' %>
 
-<div class="tab-content">
-  <div role="tabpanel" class="tab-pane active" id="info">
-    <%= render partial: 'user_form' %>
-  </div>
-  <div role="tabpanel" class="tab-pane" id="messages">
-    <% if @messages.empty? %>
-        <div class="row mu-tab-body col-md-12">
-          <%= t :no_messages %>
-        </div>
-    <% else %>
-      <table class="table table-striped">
-        <% @messages.each do |message| %>
-            <tr>
-              <td><%= icon_for_read(message.read?) %></td>
-              <td><%= link_to message.exercise.name, exercise_path(message.exercise.id) %></td>
-              <td><%= mail_to message.sender %></td>
-              <td><%= time_ago_in_words message.created_at %></td>
-            </tr>
-        <% end %>
-      </table>
-    <% end %>
-  </div>
-  <% if @watched_discussions.present? %>
-    <div role="tabpanel" class="tab-pane" id="discussions">
-      <table class="table table-striped">
-        <% @watched_discussions.each do |discussion| %>
-          <tr>
-            <td>
-              <%= icon_for_read(discussion.read_by?(@user)) %>
-            </td>
-            <td><%= link_to discussion.item.name, item_discussion_path(discussion) %></td>
-            <td><%= time_ago_in_words discussion.last_message_date %></td>
-          </tr>
-        <% end %>
-      </table>
-    </div>
-  <% end %>
+<div class="col-md-9 mu-tab-body">
+  <%= render partial: 'user_form' %>
 </div>

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

@@ -1,6 +1,6 @@
 <%= content_for :breadcrumbs do %>
   <% if current_logged_user? %>
-    <%= breadcrumbs @user %>
+    <%= breadcrumbs_for_my_account %>
   <% else %>
     <%= header_breadcrumbs %>
   <% end %>

data/config/routes.rb

@@ -62,6 +62,9 @@ Rails.application.routes.draw do
 
       # Notification subscriptions
       get :unsubscribe
+
+      get :messages
+      get :discussions
     end
 
     resources :messages, only: [:index, :create]

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

@@ -68,6 +68,7 @@ en:
   new_discussion_message: New message on %{title}
   discussion_updated: Discussion updated
   discussions: Discussions
+  discussions_will_be_here: Your posts in the forum will appear here.
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
   download: Download your solution
   edit: Edit
@@ -170,7 +171,9 @@ en:
   moderation: Mentoring
   moderator: Mentor
   more_messages: More
+  my_account: My account
   my_doubts: My doubts
+  my_profile: My profile
   my_submissions: My Submissions
   name: Name
   navigation_continue: 'Next: %{sibling}'
@@ -217,7 +220,6 @@ en:
   previous_exercise: Previous
   problem_with_exercise: '[Mumuki] Problem with exercise: %{title}'
   processing_your_solution: We are processing you solution
-  profile: Profile
   profile_of: Profile of %{username}
   programming_since: Started programming
   progress: Progresss

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

@@ -68,6 +68,7 @@ es-CL:
   new_discussion_message: Mensaje nuevo en %{title}
   discussion_updated: Consulta actualizada
   discussions: Consultas
+  discussions_will_be_here: Las preguntas que realices en el espacio de consultas aparecerán aquí.
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tienes que seguir practicando.
   download: "Descarga lo que hiciste"
   edit: Editar
@@ -171,7 +172,9 @@ es-CL:
   moderation: Mentoría
   moderator: Mentor
   more_messages: Ver mensajes anteriores
+  my_account: Mi cuenta
   my_doubts: Mis consultas
+  my_profile: Mi perfil
   name: Nombre
   navigation_continue: 'Siguiente %{kind}: %{sibling}'
   navigation_next: Siguiente %{kind}
@@ -223,7 +226,6 @@ es-CL:
   previous_exercise: Anterior
   problem_with_exercise: '[Mumuki] Error con el ejercicio: %{title}'
   processing_your_solution: Estamos procesando tu solución
-  profile: Perfil
   profile_of: Perfil de %{username}
   progress: Progreso
   read: Leído

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

@@ -75,6 +75,7 @@ es:
   discussion_updated: Consulta actualizada
   new_discussion_message: Mensaje nuevo en %{title}
   discussions: Consultas
+  discussions_will_be_here: Las preguntas que realices en el espacio de consultas aparecerán aquí.
   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
@@ -182,7 +183,9 @@ es:
   moderation: Mentoría
   moderator: Mentor
   more_messages: Ver mensajes anteriores
+  my_account: Mi cuenta
   my_doubts: Mis consultas
+  my_profile: Mi perfil
   name: Nombre
   navigation_continue: 'Siguiente %{kind}: %{sibling}'
   navigation_next: Siguiente %{kind}
@@ -234,7 +237,6 @@ es:
   previous_exercise: Anterior
   problem_with_exercise: '[Mumuki] Error con el ejercicio: %{title}'
   processing_your_solution: Estamos procesando tu solución
-  profile: Perfil
   profile_of: Perfil de %{username}
   programming_since: Programando desde
   progress: Progreso

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

@@ -72,6 +72,7 @@ pt:
   new_discussion_message: Nova mensagem em %{title}
   discussion_updated: Consulta actualizada
   discussions: Consultas
+  discussions_will_be_here: As perguntas que você fizer no espaço de consulta aparecerão aqui.
   download: Faça o download do que você fez
   edit: Editar
   edit_profile: Editar perfil
@@ -176,7 +177,9 @@ pt:
   moderation: Mentoria
   moderator: Mentor
   more_messages: Ver as mensagens anteriores
+  my_account: Minha conta
   my_doubts: Minhas duvidas
+  my_profile: Meu perfil
   name: Nome
   navigation_continue: "Próximo %{kind}: %{sibling}"
   navigation_next: Próximo %{kind}
@@ -225,7 +228,6 @@ pt:
   previous_exercise: Anterior
   problem_with_exercise: '[Mumuki] Erro com exercício %{title}'
   processing_your_solution: Estamos processando sua solução
-  profile: Perfil
   profile_of: Perfil de %{username}
   programming_since: Sou programador
   progress: Progresso

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '8.6.1'
+    VERSION = '9.0.0'
   end
 end

data/spec/controllers/organizations_api_controller_spec.rb

@@ -34,7 +34,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
 
         context 'with wildcard permissions' do
           before { get :index }
-          let(:api_client) { create :api_client, role: :janitor, grant: '*' }
+          let(:api_client) { create :api_client, role: :admin, grant: '*' }
 
           it { check_status! 200 }
 
@@ -42,7 +42,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
         end
         context 'with non-wildcard permissions' do
           before { get :index }
-          let(:api_client) { create :api_client, role: :janitor, grant: 'public/*:private/*' }
+          let(:api_client) { create :api_client, role: :admin, grant: 'public/*:private/*' }
 
           it { check_status! 200 }
 
@@ -54,14 +54,14 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
         context 'with a public organization' do
           before { get :show, params: {id: 'public'} }
 
-          context 'with a user without janitor permissions' do
+          context 'with a user without admin permissions' do
             let(:api_client) { create :api_client, role: :editor, grant: 'another_organization/*' }
 
             it { check_status! 403 }
           end
 
-          context 'with a user with janitor' do
-            let(:api_client) { create :api_client, role: :janitor, grant: 'public/*' }
+          context 'with a user with admin' do
+            let(:api_client) { create :api_client, role: :admin, grant: 'public/*' }
 
             it { check_status! 200 }
           end
@@ -70,7 +70,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
         context 'with an organization that has a dot in its name' do
           before { get :show, params: {id: 'dot.org'} }
 
-          let(:api_client) { create :api_client, role: :janitor, grant: 'dot.org/*' }
+          let(:api_client) { create :api_client, role: :admin, grant: 'dot.org/*' }
           it { check_status! 200 }
         end
 
@@ -84,7 +84,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
           end
 
           context 'with a user with permissions' do
-            let(:api_client) { create :api_client, role: :janitor, grant: 'private/*' }
+            let(:api_client) { create :api_client, role: :admin, grant: 'private/*' }
 
             it { check_status! 200 }
             it { expect(response.body).to json_like(private_organization.to_resource_h) }
@@ -181,7 +181,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
       end
 
 
-      context 'with not-janitor permissions' do
+      context 'with non-admin permissions' do
         let(:api_client) { create :api_client, role: :editor, grant: '*' }
 
         it { check_status! 403 }
@@ -228,7 +228,14 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
         it { expect(updated_organizaton.contact_email).to eq 'second_email@gmail.com' }
       end
 
-      context 'with not-janitor permissions' do
+      context 'with janitor permissions' do
+        let(:api_client) { create :api_client, role: :janitor, grant: 'existing-organization/*' }
+        before { put :update, params: {id: 'existing-organization', organization: update_json} }
+
+        it { check_status! 403 }
+      end
+
+      context 'with non-admin permissions' do
         let(:api_client) { create :api_client, role: :teacher, grant: 'existing-organization/*' }
         before { put :update, params: {id: 'existing-organization', organization: update_json} }