mumuki-laboratory 8.3.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 222bd258be2916956f315e5195ed53f60ff730f176852e7d52ae17194e789f06
-  data.tar.gz: d3e1701ba286cdfa8d7b44ad529c85df6b9b6fdbe3912fa77dfafab35f9a4545
+  metadata.gz: 96b344d472912c433732e101f0754c229aa8c406e47a2ff54503a9625bb78f5a
+  data.tar.gz: b73fba56c2c87069b1e402ce010eaa17d296220c92df9cc241d92e9aa92eb909
 SHA512:
-  metadata.gz: fb75e14d8e9da062677b7cfb5595ece2717f9b226f085c3432379c87a63acf80e905fda9d890a85bc3afd970d623029d729c86ffff35781fe5b6f1fc938ff92e
-  data.tar.gz: 531e671791fec8e27fb3694a7315eb444d1e3d790ba3186789616562b2b7d6ad609bb7bc1221c94a741c207f2a573aeae9427a1e68aa3d4e3d272ae6f3ce3480
+  metadata.gz: b2557a3374e33d3a273b4df24cdd5eb3e46d0e997af5a862c6b6a6cd792a63c4a78e6c248927efeaf964d275139923cea0292a204b92448a965614c2b1f0f82f
+  data.tar.gz: 2667001640a346bd3517445621adb899599b52a44d7c40625a6ae67e7a46e7c5c2d935501358b5a28e5ebeb6aa7a0da58cc4af0cf74fb2a7706d738577d47837

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

@@ -62,7 +62,7 @@ mumuki.page.editors = [];
 
   function setEditorLanguage(editor, language) {
     editor.setOption("mode", language);
-    editor.setOption('theme', 'default ' + language);
+    editor.setOption('theme', 'mu-light ' + language);
   }
 
   function syncContent(){

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.scss

@@ -15,3 +15,4 @@ $da-font-path: asset-path('assets');
 @import "application/modules";
 @import "application/errors";
 @import "application/alerts";
+@import "application/codemirror-themes";

data/app/assets/stylesheets/mumuki_laboratory/application/_codemirror-themes.scss

@@ -0,0 +1 @@
+@import "codemirror-themes/mu-light";

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/codemirror-themes/_mu-light.scss

@@ -0,0 +1,3 @@
+.cm-s-mu-light .CodeMirror-code {
+  padding-right: 25px;
+}

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