mumuki-laboratory 8.6.1 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 824e346e9d3113f3b3d48c8ed7e23c846e26a54fb5ed7e4c4bb5a9307323b4d7
-  data.tar.gz: e28b9bdf65007abda370a36b760adeaf7989ab9e4c94c52ebaa09bcd3f14fb79
+  metadata.gz: 96b344d472912c433732e101f0754c229aa8c406e47a2ff54503a9625bb78f5a
+  data.tar.gz: b73fba56c2c87069b1e402ce010eaa17d296220c92df9cc241d92e9aa92eb909
 SHA512:
-  metadata.gz: 46a32c31bb80eca3fa50fc45c37875a36894cf3fbc2192f339c138763afeac44a811ab336650460a7e7f150323601d92cab90c91e967668916462d21026eb72a
-  data.tar.gz: c9ecc5bd9523a72129d3914317fa29c596038b99f3733de72fc71c27b5c1be3295d9f79ddff39d3cf39c8cfb22bd873581442c4c9121680cdd68901990a11b54
+  metadata.gz: b2557a3374e33d3a273b4df24cdd5eb3e46d0e997af5a862c6b6a6cd792a63c4a78e6c248927efeaf964d275139923cea0292a204b92448a965614c2b1f0f82f
+  data.tar.gz: 2667001640a346bd3517445621adb899599b52a44d7c40625a6ae67e7a46e7c5c2d935501358b5a28e5ebeb6aa7a0da58cc4af0cf74fb2a7706d738577d47837

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

@@ -122,6 +122,9 @@ hr {
 
 /* TODO: move to mumuki-styles */
 .mu-inline-block-left {
+  display: flex;
+  align-items: center;
+
   margin-left: 15px;
 }
 

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

@@ -27,4 +27,5 @@
 @import "modules/terms";
 @import "modules/timer";
 @import "modules/upload";
+@import "modules/user_menu";
 @import "modules/user_profile";

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

@@ -1,3 +1,16 @@
-.chapter-description {
-  display: inline-block;
+.mu-chapter-description p {
+  display: inline-block
+}
+
+.mu-content-title-icons {
+  display: flex;
+  align-items: center;
+
+  font-size: 150%;
+  margin-left: 15px;
+  margin-right: 15px;
+
+  i {
+    margin-left: 5px;
+  }
 }

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

@@ -28,7 +28,7 @@
       left: 20px;
       top: 17px;
 
-      margin-right: 30px;
+      margin-right: 40px;
       margin-bottom: 15px;
     }
 

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

@@ -0,0 +1,35 @@
+.mu-user-menu {
+  display: flex;
+}
+
+.mu-user-menu-header {
+  font-size: 15px;
+  color: $mu-color-disabled;
+  text-transform: uppercase;
+  margin-bottom: 30px;
+}
+
+.mu-user-menu-item {
+  font-size: 17px;
+  margin-bottom: 5px;
+
+  a {
+    color: $brand-primary;
+    &.active {
+      font-weight: bold;
+    }
+  }
+}
+
+.mu-user-menu-divider {
+  &.vertical {
+    border-left: 2px solid $mu-color-separator;
+  }
+
+  &.horizontal {
+    border-top: 2px solid $mu-color-separator;
+
+    margin: 25px 0;
+    width: 100%
+  }
+}

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

@@ -31,11 +31,19 @@
   }
 }
 
+.mu-profile-info {
+  display: flex;
+  flex-wrap: wrap;
+
+  margin-top: 20px;
+}
+
 .mu-profile-info-left {
   display: flex;
   flex-direction: column;
   align-items: center;
   text-align: center;
+  flex-grow: 1;
 
   .mu-level-progress {
     position: relative;
@@ -62,8 +70,11 @@
 }
 
 .mu-profile-info-right {
+  flex-grow: 2;
+
   font-size: 20px;
   margin-top: 5px;
+
   div {
     margin-bottom: 15px;
     .italic {

data/app/controllers/api/base_controller.rb

@@ -5,7 +5,6 @@ module Api
     protect_from_forgery with: :null_session
 
     include Mumuki::Laboratory::Controllers::DynamicErrors
-    include WithAuthorization
     include Mumuki::Laboratory::Controllers::CurrentOrganization
 
     before_action :set_current_organization!

data/app/controllers/api/courses_controller.rb

@@ -18,7 +18,7 @@ module Api
       @course = Course.new course_params
     end
 
-    def protection_slug
+    def authorization_slug
       @course.slug
     end
   end

data/app/controllers/api/organizations_controller.rb

@@ -2,8 +2,7 @@ module Api
   class OrganizationsController < BaseController
     include OrganizationsControllerTemplate
 
-    before_action :authorize_janitor!, only: [:show, :index]
-    before_action :authorize_admin!, only: [:update, :create]
+    before_action :authorize_admin!
 
     def index
       render json: { organizations: Organization.accessible_as(current_user, :janitor) }
@@ -22,6 +21,10 @@ module Api
       @organization.update! organization_params
       render json: @organization.to_resource_h
     end
+
+    def authorization_slug
+      '_/_'
+    end
   end
 
 end

data/app/controllers/api/roles_controller.rb

@@ -48,6 +48,10 @@ module Api
     def set_slug!
       @slug = Mumukit::Auth::Slug.join_s params.to_unsafe_h
     end
+
+    def authorization_slug
+      @slug
+    end
   end
 
 end

data/app/controllers/api/users_controller.rb

@@ -9,8 +9,13 @@ module Api
     end
 
     def update
-      @user.update_and_notify! user_params.except([:email, :permissions, :uid])
+      @user.assign_attributes user_name_params
+      @user.verify_name!
       render json: @user.to_resource_h
     end
+
+    def authorization_slug
+      '_/_'
+    end
   end
 end

data/app/controllers/concerns/with_authorization.rb

@@ -1,27 +1,12 @@
 module WithAuthorization
   extend ActiveSupport::Concern
 
-  def authorize_janitor!
-    authorize! :janitor
-  end
-
-  def authorize_admin!
-    authorize! :admin
-  end
-
-  def authorize_owner!
-    authorize! :owner
-  end
-
-  def authorize_moderator!
-    authorize! :moderator
-  end
-
   def authorization_slug
     protection_slug || '_/_'
   end
 
   def protection_slug
+    warn "protection_slug is nil, which is not probably what you want" unless @slug
     @slug
   end
 end

data/app/controllers/concerns/with_user_params.rb

@@ -5,6 +5,10 @@ module WithUserParams
     params.require(:user).permit(*permissible_params).to_h
   end
 
+  def user_name_params
+    params.require(:user).permit(:first_name, :last_name).to_h
+  end
+
   def permissible_params
     User.profile_fields
   end

data/app/controllers/discussions_messages_controller.rb

@@ -1,5 +1,4 @@
 class DiscussionsMessagesController < AjaxController
-  include WithAuthorization
   include WithUserDiscussionValidation
 
   before_action :set_discussion!, only: [:create, :destroy]

data/app/controllers/users_controller.rb

@@ -5,11 +5,6 @@ class UsersController < ApplicationController
   before_action :set_user!
   skip_before_action :validate_accepted_role_terms!
 
-  def show
-    @messages = current_user.messages.to_a
-    @watched_discussions = current_user.watched_discussions_in_organization
-  end
-
   def update
     current_user.update_and_notify! user_params
     current_user.accept_profile_terms!
@@ -27,6 +22,14 @@ class UsersController < ApplicationController
     @profile_terms ||= Term.profile_terms_for(current_user)
   end
 
+  def messages
+    @messages ||= current_user.messages_in_organization
+  end
+
+  def discussions
+    @watched_discussions = current_user.watched_discussions_in_organization
+  end
+
   def unsubscribe
     user_id = User.unsubscription_verifier.verify(params[:id])
     User.find(user_id).unsubscribe_from_reminders!

data/app/helpers/breadcrumbs_helper.rb

@@ -41,6 +41,10 @@ module BreadcrumbsHelper
     discussion.friendly.truncate_words(4)
   end
 
+  def breadcrumbs_for_my_account
+    header_breadcrumbs + breadcrumb_list_item(t(:my_account), 'last')
+  end
+
   private
 
   def breadcrumbs_for_linkable(e, extra=nil, last='')

data/app/helpers/content_view_helper.rb

@@ -0,0 +1,19 @@
+module ContentViewHelper
+  def full_title_for(content)
+    "#{t(content_type_number(content), number: content.number)}: #{content.name}"
+  end
+
+  def short_title_for(content)
+    content.name
+  end
+
+  private
+
+  def content_type_number(content)
+    "#{content_type(content)}_number"
+  end
+
+  def content_type(content)
+    content.model_name.element
+  end
+end

data/app/helpers/links_helper.rb

@@ -26,7 +26,7 @@ module LinksHelper
     if current_user&.teacher_here? && item.teacher_info.present?
       %Q{
         <a
-          class="mu-content-toolbar-item mu-popover"
+          class="mu-popover"
           data-toggle="popover"
           data-html="true"
           title="#{t :teacher_info}"
@@ -80,7 +80,7 @@ module LinksHelper
     return unless current_user&.writer?
 
     url = yield
-    link_to fixed_fa_icon('pencil-alt'), url, class: "mu-content-toolbar-item", target: "_blank", title: t(:edit)
+    link_to fixed_fa_icon('pencil-alt'), url, target: "_blank", title: t(:edit)
   end
 
   def url_for_bibliotheca_guide(guide)

data/app/helpers/menu_bar_helper.rb

@@ -18,7 +18,7 @@ module MenuBarHelper
   end
 
   def link_to_profile
-    menu_item('user', :profile, user_path)
+    menu_item('user', :my_account, user_path)
   end
 
   def link_to_classroom

data/app/helpers/user_menu_helper.rb

@@ -0,0 +1,18 @@
+module UserMenuHelper
+  def profile_user_menu_link
+    user_menu_link t(:my_profile), user_path, 'show'
+  end
+
+  def messages_user_menu_link
+    user_menu_link t(:messages), messages_user_path, 'messages'
+  end
+
+  def discussions_user_menu_link
+    user_menu_link t(:discussions), discussions_user_path, 'discussions'
+  end
+
+  def user_menu_link(label, path, active_on)
+    link_klass = 'active' if action_name == active_on
+    link_to label, path, { class: link_klass }.compact
+  end
+end

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

@@ -2,26 +2,27 @@
   <%= breadcrumbs @chapter %>
 <% end %>
 
-<div class="chapter-description">
-  <h1 class="pull-left">
-    <span class="hidden-xs pull-left"><%= t(:chapter_number, number: @chapter.number) %>:&nbsp;</span>
-    <span class="pull-left"><%= @chapter.name %></span>
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1 class="hidden-xs"><%= full_title_for @chapter %></h1>
+    <h1 class="visible-xs"><%= short_title_for @chapter %></h1>
+
     <% if @chapter.monolesson? %>
-      <div class="mu-monolesson pull-left">
-        <%= render partial: 'layouts/guide_title_icons' %>
-      </div>
+      <%= render partial: 'guides/guide_title_icons' %>
     <% end %>
-  </h1>
-
-  <%= @chapter.description_html %>
-
+  </div>
+</div>
+<div class="row">
+  <div class="col-md-12">
+    <div class="text-box mu-chapter-description">
+      <%= @chapter.description_html %>
+    </div>
+  </div>
 </div>
 
 <% if @chapter.lessons.present? %>
   <% if @chapter.monolesson? %>
-    <div class="mu-monolesson">
-      <%= render partial: 'layouts/guide', locals: { subject: @monolesson } %>
-    </div>
+    <div> <%= render partial: 'guides/guide', locals: { subject: @monolesson } %> </div>
   <% else %>
     <div>
       <h3><%= t(:lessons) %></h3>

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

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

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,7 +55,7 @@
 
 <%= content_for :no_container do %>
   <% if @assignment.skipped? %>
-    <%= render partial: 'layouts/exercise_skipped' %>
+    <%= render partial: 'exercises/exercise_skipped' %>
   <% end %>
 
   <% if in_gamified_context? %>