mumuki-laboratory 8.3.0 → 9.0.0

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

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

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

@@ -0,0 +1,4 @@
+<div class="mu-content-title-icons">
+  <%= teacher_info_button @exercise %>
+  <%= link_to_bibliotheca_exercise @exercise %>
+</div>

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

@@ -18,12 +18,9 @@
       <h1><%= language_icon @exercise.language %></h1>
     </div>
     <div class="mu-inline-block-left">
-      <h1>
-        <span class="hidden-xs"><%= t(:exercise_number, number: @exercise.number) %>:&nbsp;</span>
-        <span><%= @exercise.name %></span>
-        <%= teacher_info_button @exercise %>
-        <%= link_to_bibliotheca_exercise @exercise %>
-      </h1>
+      <h1 class="hidden-xs"><%= full_title_for @exercise %></h1>
+      <h1 class="visible-xs"><%= short_title_for @exercise %></h1>
+      <%= render partial: 'exercises/exercise_title_icons' %>
     </div>
   </div>
 <% end %>
@@ -58,13 +55,13 @@
 
 <%= content_for :no_container do %>
   <% if @assignment.skipped? %>
-    <%= render partial: 'layouts/exercise_skipped' %>
+    <%= render partial: 'exercises/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/guide_corollary', locals: {guide: @guide} if @stats.almost_done? %>
   <%= render partial: 'layouts/modals/new_message', locals: {exercise: @exercise} if should_render_message_input?(@exercise) %>
 <% end if current_user? %>

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

@@ -2,7 +2,7 @@
 
 <%= render partial: 'layouts/authoring', locals: {guide: @guide} %>
 
-<% if subject.timed? && subject.started?(current_user) && !current_user.teacher? %>
+<% if subject.timed? && @stats.started? && !current_user.teacher? %>
   <%= render partial: 'layouts/timer', locals: {end_time: subject.real_end_time(current_user)} %>
 <% end %>
 
@@ -10,10 +10,10 @@
 
 <h3>
   <%= t :exercises %>
-  <%= restart_guide_link(@guide) if current_user && @guide.started?(current_user) && @guide.resettable? %>
+  <%= restart_guide_link(@guide) if current_user && @stats.started? && @guide.resettable? %>
 </h3>
 
-<%= render partial: 'layouts/progress_listing', locals: {exercises: @guide.exercises} %>
+<%= render partial: 'layouts/progress_listing', locals: { guide: @guide } %>
 
 <% if @stats&.done? %>
   <div class="text-box">

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_bar.html.erb

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

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

@@ -1,9 +1,9 @@
 <ul class="progress-listing">
-  <% exercises.each do |exercise| %>
-      <% cache [exercise, exercise.status_for(current_user), Organization.current] do %>
-          <li <%= turbolinks_enable_for(exercise) %>>
-            <%= exercise_status_icon exercise %>
-            <%= link_to_path_element(exercise) %>
+  <% guide.assignments_for(current_user).each do |assignment| %>
+      <% 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) %>
           </li>
       <% end %>
   <% end %>

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/layouts/application.html.erb

@@ -25,12 +25,7 @@
               <span class="mu-level-number"></span>
             </div>
           <% end %>
-          <div class="dropdown mu-navbar-element notifications-box <%= 'notifications-box-empty' unless has_notifications? %>">
-            <a href=<%= "#{user_notifications_path}" %>>
-              <i class="fas fa-bell fa-fw fa-2x mu-navbar-icon"></i>
-                <span class="badge badge-notifications"><%= notifications_count %></span>
-            </a>
-          </div>
+          <%= render partial: 'notifications/dropdown' %>
           <div class="dropdown mu-navbar-element">
             <div id="profileDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
               <%= profile_picture_for current_user %>

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

@@ -1,4 +1,13 @@
 <div class="form-group">
-  <textarea id="solution_content" type="text" name="solution[content]" style="display: none"></textarea>
-  <input id="upload-input" type="file" class="upload submission-control" size="5120" accept=".<%= @exercise.language.extension %>" />
+  <% @max_file_size = 256000 %>
+
+  <textarea id="solution_content" type="text" name="solution[content]" class="hidden"></textarea>
+  <input id="mu-upload-input" type="file" class="upload submission-control hidden" mu-upload-file-limit=<%= @max_file_size %> accept=".<%= @exercise.language.extension %>" />
+  <div>
+    <label id="mu-upload-label" for="mu-upload-input" class="btn btn-success">
+      <%= fa_icon(:upload, text: t(:select_file), id: "mu-upload-icon") %>
+    </label>
+    <div id="mu-upload-file-limit-exceeded" class="hidden">
+      <%= fa_icon("exclamation-triangle", text: t(:file_exceeds_max_size, size_kb: (@max_file_size / 1000))) %></div>
+  </div>
 </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/notifications/_discussion.html.erb

@@ -0,0 +1 @@
+<%= menu_item :comments, :new_discussion_message, url_for([target.item, target]), { title: target.item.name.truncate_words(3) } %>

data/app/views/notifications/_dropdown.html.erb

@@ -0,0 +1,13 @@
+<div class="dropdown mu-navbar-element notifications-box <%= 'notifications-box-empty' unless has_notifications? %>">
+  <div id="notificationsDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:notifications) %>" role="menu" tabindex="0">
+    <i class="fas fa-bell fa-fw fa-2x mu-navbar-icon"></i>
+    <span class="badge badge-notifications"><%= notifications_count %></span>
+  </div>
+  <ul id="notificationsPanel" class="dropdown-menu dropdown-menu-right" aria-labelledby="notificationsDropdown">
+    <% notifications.each do |it| %>
+      <li>
+        <%= notification_preview_for it.target %>
+      </li>
+    <% end %>
+  </ul>
+</div>

data/app/views/notifications/_exam_authorization_request.html.erb

@@ -0,0 +1 @@
+<%= menu_item :book_open, :exam_authorization_request_updated, url_for(target), { description: target.exam_registration.description } %>

data/app/views/notifications/_exam_registration.html.erb

@@ -0,0 +1 @@
+<%= menu_item :book_open, :exam_registration_open, url_for(target), { description: target.description } %>

data/app/views/notifications/_message.html.erb

@@ -0,0 +1 @@
+<%= menu_item :envelope, :new_message_received, url_for(target.exercise), { sender: target.sender } %>

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_user? %>
-    <%= breadcrumbs @user %>
+  <% if current_logged_user? %>
+    <%= breadcrumbs_for_my_account %>
   <% else %>
     <%= header_breadcrumbs %>
   <% end %>

data/config/routes.rb

@@ -22,6 +22,9 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :exam_registrations, only: [:show]
+    resources :exam_authorization_requests, only: [:show, :create, :update]
+
     resources :book, only: [:show]
     resources :chapters, only: [:show] do
       concerns :debatable, debatable_class: 'Chapter'
@@ -59,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/controllers/notifications.rb

@@ -1,32 +1,13 @@
 module Mumuki::Laboratory::Controllers::Notifications
-
-  def user_notifications_path
-    user_path(anchor: current_notifications_tab)
-  end
-
   def has_notifications?
     notifications_count > 0
   end
 
   def notifications_count
-    messages_count + discussions_count
-  end
-
-  private
-
-  def current_notifications_tab
-    has_messages? ? 'messages' : 'discussions'
-  end
-
-  def has_messages?
-    messages_count > 0
-  end
-
-  def messages_count
-    current_user.try(:unread_messages).try(:count) || 0
+    notifications.size
   end
 
-  def discussions_count
-    current_user.try(:unread_discussions).try(:count) || 0
+  def notifications
+    current_user.try(:unread_notifications) || []
   end
 end