mumuki-laboratory 8.4.0 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5768156d24f254cf945c99755c091bc65af815819018e30c862ca29c3c5f853
-  data.tar.gz: d6e5afe45c48ff78d0fb091f50474c2c2b26ea1862eedf1c10989d6b931f73ea
+  metadata.gz: d4fc890303f1598f34b8258b73ca92a3beb1d594cbdb7f00d729401df4e44f89
+  data.tar.gz: 8ad9aba5c0b5d11251a972f2f5354f6f3ee6c6fcb3ef62d72b592e0d6e78b66f
 SHA512:
-  metadata.gz: 8d8948197c3172881c4e633432bf60f87228085c7154c458c3169fe4762a789ec6a1c5ecac5def061059d545ed52d3f3a2f9d72415c9b2fce15e24b3c5cb3683
-  data.tar.gz: 4da96aac20c1f2b16f87dbf87d117d3845c30b58f17c3e8a6b16bd6a7bd18a644ccce006a591b47a9e3c5fbb07f9013472bd3dab6171ab4d17f347bdff934eba
+  metadata.gz: 3f44cc0d2df94e3b613abea57d4ff8a1c48628a2d3fbc1797cb2a2fdca1d54c1c639c8da8e19ddfb65c581f874927758cb1fbf673cd9cf66ed8c1b9186a5d9ca
+  data.tar.gz: c5e6c4b580ec812c0ff84290558f6439fab546dc2be009da77c032b9059700230da3db4e1fc0765a4560d846d6409d4e6a17f79dbbff830a10199ad4ae25a6ec

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

@@ -1,17 +1,72 @@
+mumuki.upload = (() => {
+  class FileUploader {
+    constructor(file) {
+      this.file = file;
+    }
+
+    uploadFileIfValid() {
+      if (!this.file) return;
+
+      let maxFileSize = $('#mu-upload-input').attr("mu-upload-file-limit");
+      if (this.file.size > maxFileSize) {
+        return mumuki.upload.ui.showFileExceedsMaxSize();
+      }
+
+      mumuki.upload.ui.allowSubmissionFor(this.file.name);
+
+      const reader = new FileReader();
+      reader.onload = function (e) {
+        const contents = e.target.result;
+        $('#solution_content').html(contents);
+      };
+      reader.readAsText(this.file);
+
+      return reader;
+    }
+  }
+
+  class UI {
+    constructor() {
+      this.$uploadFileLimitExceeded = $('#mu-upload-file-limit-exceeded');
+      this.$uploadLabel = $('#mu-upload-label span');
+      this.$uploadLabelText = this.$uploadLabel.text();
+      this.$uploadIcon = $('#mu-upload-icon');
+      this.$btnSubmit = $('.btn-submit');
+    }
+
+    showFileExceedsMaxSize() {
+      this.$uploadFileLimitExceeded.removeClass('hidden');
+      this.$uploadLabel.text(this.$uploadLabelText);
+      this.$uploadIcon.addClass('fa-upload').removeClass('fa-file-alt');
+      this.$btnSubmit.addClass('disabled');
+    }
+
+    allowSubmissionFor(filename) {
+      this.$uploadFileLimitExceeded.addClass('hidden');
+      this.$uploadLabel.text(filename);
+      this.$uploadIcon.removeClass('fa-upload').addClass('fa-file-alt');
+      this.$btnSubmit.removeClass('disabled');
+    }
+  }
+
+  function _setUI() {
+    mumuki.upload.ui = new UI();
+  }
+
+  return {
+    FileUploader,
+    UI,
+
+    _setUI,
+
+    /** @type {UI} */
+    ui: null
+  };
+})();
+
 mumuki.load(() => {
-  $('#upload-input').change(function (evt) {
-    var file = evt.target.files[0];
-    if (!file) return;
-
-    var reader = new FileReader();
-    reader.onload = function (e) {
-      var contents = e.target.result;
-      $('#solution_content').html(contents);
-      $(evt.target).val("");
-      $('form.new_solution').submit();
-    };
-    reader.readAsText(file);
-    return false;
+  $('#mu-upload-input').change(function (evt) {
+    if (!mumuki.upload.ui) mumuki.upload._setUI();
+    return new mumuki.upload.FileUploader(evt.target.files[0]).uploadFileIfValid();
   });
 });
-

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 p {
-  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/_discussion.scss

@@ -5,7 +5,7 @@ $discussion-toolbar-color: #f6f6fa;
 $message-divider-color: #ecf0f1;
 $discussion-button-color: #fafafa;
 $toolbar-filter-color: #808080;
-$moderator-star-color: #dd9900;
+$moderator-badge-color: #dd9900;
 
 .discussions-list {
   margin: 30px 0;
@@ -177,8 +177,17 @@ $moderator-star-color: #dd9900;
   width: 100%;
 }
 
-.moderator-star {
-  color: $moderator-star-color;
+.moderator-badge {
+  position: relative;
+  top: -2px;
+  margin: 2px;
+  font-size: 12px;
+  text-transform: uppercase;
+  color: white;
+  background-color: $moderator-badge-color;
+  border: solid $moderator-badge-color 1px;
+  border-radius: 5px;
+  padding-inline: 5px;
 }
 
 .discussion-user-menu {
@@ -326,12 +335,15 @@ summary.discussion-summary {
       .actions {
         float: right;
         a {
-          margin-left: 5px;
+          margin-left: 20px;
           cursor: pointer;
         }
         .discussion-message-approved {
           text-decoration: none;
-          &.selected {
+          i {
+            transition: color 0.3s;
+          }
+          &:hover, &.selected {
             i {
               color: $brand-success;
             }
@@ -341,17 +353,20 @@ summary.discussion-summary {
           text-decoration: none;
           i {
             position: relative;
+            transition: color 0.3s;
             &:after {
               position: absolute;
-              left: 6px;
+              left: 10px;
+              top: -6px;
               content: ' ';
-              height: 19px;
+              height: 30px;
               width: 2px;
               transform: rotate(-45deg);
               background-color: #aaaaaa;
+              transition: background-color 0.3s;
             }
           }
-          &.selected {
+          &:hover, &.selected {
             i {
               color: $brand-primary;
               &:after {
@@ -360,6 +375,14 @@ summary.discussion-summary {
             }
           }
         }
+        .discussion-delete-message {
+          i {
+            transition: color 0.3s;
+            &:hover {
+              color: black;
+            }
+          }
+        }
         i {
           color: #aaaaaa
         }

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/application_controller.rb

@@ -34,8 +34,8 @@ class ApplicationController < ActionController::Base
   helper_method :current_workspace,
                 :login_button,
                 :notifications_count,
-                :user_notifications_path,
                 :has_notifications?,
+                :notifications,
                 :subject,
                 :should_choose_organization?,
                 :current_immersive_organizations,

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/exam_authorization_requests_controller.rb

@@ -0,0 +1,26 @@
+class ExamAuthorizationRequestsController < ApplicationController
+  def show
+    @authorization_request = ExamAuthorizationRequest.find(params[:id])
+    current_user.read_notification! @authorization_request
+  end
+
+  def create
+    authorization_request = ExamAuthorizationRequest.create! authorization_request_params
+    current_user.read_notification! authorization_request.exam_registration
+    flash.notice = I18n.t :exam_authorization_request_created
+  end
+
+  def update
+    ExamAuthorizationRequest.update params[:id], authorization_request_params
+    flash.notice = I18n.t :exam_authorization_request_saved
+    redirect_to root_path
+  end
+
+  private
+
+  def authorization_request_params
+    params
+        .require(:exam_authorization_request).permit(:exam_id, :exam_registration_id)
+        .merge(user: current_user, organization: Organization.current)
+  end
+end