mumuki-laboratory 9.0.2 → 9.1.0

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

@@ -6,7 +6,7 @@ mumuki.progress = (() => {
    * */
   function updateProgressBarAndShowModal(data) {
     $('.progress-list-item.active').attr('class', data.class_for_progress_list_item);
-    if(data.guide_finished_by_solution) $('#guide-done').modal();
+    if(data.guide_finished_by_solution) new bootstrap.Modal('#guide-done').show();
   }
 
   /**

data/app/assets/javascripts/mumuki_laboratory/application/speech-bubble-renderer.js

@@ -87,7 +87,7 @@ mumuki.renderers.speechBubble = (()=> {
     render() {
       this.$bubble.find('.mu-kids-character-speech-bubble-tabs').hide();
       this.$bubble.find('.mu-kids-character-speech-bubble-normal').hide();
-      this.$failedArea.show().html(this.responseData.title_html);
+      this.$failedArea.removeClass('d-none').addClass('d-block').html(this.responseData.title_html);
       this._addClass(this._responseStatus());
       this._chooseResultItem();
       this._appendDiscussionsLinkHtml();

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

@@ -20,7 +20,7 @@ mumuki.submission = (() => {
     }
     waiting() {
       this.submissionsResultsArea.html(this.processingTemplate.html());
-      this.submissionsErrorTemplate.hide();
+      this.submissionsErrorTemplate.addClass('d-none');
     }
     success(data, submitButton) {
       this.submissionsResultsArea.html(data.html);
@@ -30,7 +30,8 @@ mumuki.submission = (() => {
     }
     error(submitButton) {
       this.submissionsResultsArea.html('');
-      this.submissionsErrorTemplate.show();
+      this.submissionsErrorTemplate.addClass('d-block');
+      this.submissionsErrorTemplate.removeClass('d-none');
       animateTimeoutError(submitButton);
     }
     done(data, submitButton) {
@@ -69,7 +70,7 @@ mumuki.submission = (() => {
         .done((data) => resultsBox.success(data, this))
         .fail(() => resultsBox.error(this))
         .always((data) => {
-          $(document).renderMuComponents();
+          $(document).renderMuComponents({ webBrowser: { allowScript: true } });
           resultsBox.done(data, this);
         });
     }

data/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js

@@ -94,7 +94,7 @@ mumuki.SubmissionsStore = (() => {
     }
 
     _keyFor(exerciseId) {
-      return `/exercise/${exerciseId}/submission`;
+      return `/organization/${mumuki.organization.id}/user/${mumuki.user.id}/exercise/${exerciseId}/submission`;
     }
   }();
 

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

@@ -0,0 +1,3 @@
+mumuki.load(() => {
+  document.querySelectorAll('.toast').forEach((toast) => new bootstrap.Toast(toast).show());
+});

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

@@ -1,3 +1,3 @@
 mumuki.load(() => {
-    $('[title]').tooltip();
+  document.querySelectorAll('[data-bs-toggle="tooltip"]').forEach((tooltip) => new bootstrap.Tooltip(tooltip));
 });

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

@@ -35,14 +35,14 @@ mumuki.upload = (() => {
     }
 
     showFileExceedsMaxSize() {
-      this.$uploadFileLimitExceeded.removeClass('hidden');
+      this.$uploadFileLimitExceeded.removeClass('d-none');
       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.$uploadFileLimitExceeded.addClass('d-none');
       this.$uploadLabel.text(filename);
       this.$uploadIcon.removeClass('fa-upload').addClass('fa-file-alt');
       this.$btnSubmit.removeClass('disabled');

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

@@ -1,9 +1,53 @@
+ mumuki.user = {
+
+  /**
+   * The current user's id
+   *
+   * @type {number?}
+   * */
+  _id: null,
+
+  /**
+   * The current user's id
+   *
+   * @type {number?}
+   * */
+  get id() {
+    return this._id;
+  },
+
+  /**
+   * Set global current user information
+   */
+  load() {
+    const $muUserId = $('#mu-user-id');
+    if ($muUserId.length) {
+      this._id = $muUserId.val();
+    } else {
+      this._id = null;
+    }
+  }
+};
+
 mumuki.load(() => {
-  var hash = document.location.hash;
-  if (hash) {
-    $(".nav-tabs a[data-target='" + hash + "']").tab('show');
+  const $userMenuHeader = $('.mu-user-menu-header');
+  let onUserProfile = document.querySelector('.mu-profile-info') !== null;
+
+  $userMenuHeader.click(() => {
+    $('.mu-user-menu-items').toggleClass('mu-hidden-sm-screen');
+    $('#mu-user-menu-header-icon').toggleClass('fa-chevron-up fa-chevron-down');
+  });
+
+  if (onUserProfile) {
+    $userMenuHeader.click();
   }
-  $('a[data-toggle="tab"]').on('show.bs.tab', function (e) {
-    window.location.hash = $(e.target).attr('data-target');
+
+  $('.mu-user-menu-item .active').click((e) => {
+    if (onUserProfile) {
+      e.preventDefault();
+      $userMenuHeader.click();
+    }
   });
+
+  mumuki.user.load()
 });

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

@@ -8,7 +8,6 @@ $da-font-path: asset-path('assets');
 @import "application/vendor";
 @import "application/locked";
 @import "application/tooltip";
-@import "application/hovers";
 @import "application/mixins";
 @import "application/layout";
 @import "application/invitations";

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

@@ -19,7 +19,7 @@
         width: calc(100%);
         object-position: 50% 50%;
         overflow: hidden;
-        @media (max-width: $screen-lg) {
+        @include media-breakpoint-down(xl) {
           object-fit: none;
         }
       }

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

@@ -1,8 +1,3 @@
-html {
-  position: relative;
-  min-height: 100%;
-}
-
 .navbar-brand {
   padding-top: 0;
   padding-bottom: 0;
@@ -21,10 +16,6 @@ html {
   }
 }
 
-body {
-  margin-bottom: 110px;
-}
-
 .mu-footer {
   &.container {
     margin-top: 45px;
@@ -76,17 +67,12 @@ body {
 
 .editor-tab {
   padding: 5px 10px 5px 10px !important;
-  cursor: pointer;
 }
 
 .mu-input-panel {
   margin-top: 5px;
 }
 
-h1 {
-  margin-top: 10px;
-}
-
 .text-box {
   text-align: justify;
 
@@ -123,16 +109,8 @@ hr {
 /* TODO: move to mumuki-styles */
 .mu-inline-block-left {
   display: flex;
+  flex-grow: 1;
   align-items: center;
-
-  margin-left: 15px;
-}
-
-.mu-inline-block-right {
-  float: right !important;
-  display: inline-block;
-  margin-right: 15px;
-  margin-left: 10px;
 }
 
 .mu-org-link {
@@ -147,7 +125,3 @@ hr {
     padding: 0;
   }
 }
-
-h3 {
-  margin-top: 20px;
-}

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

@@ -1,8 +1,8 @@
+@import "modules/activity";
 @import "modules/avatar";
 @import "modules/book_header";
 @import "modules/breadcrumb";
 @import "modules/certificate";
-@import "modules/checkboxes";
 @import "modules/console";
 @import "modules/content_show";
 @import "modules/datepicker";
@@ -14,7 +14,6 @@
 @import "modules/faqs";
 @import "modules/flash";
 @import "modules/gs-board";
-@import "modules/guide_corollary";
 @import "modules/highlight";
 @import "modules/kids";
 @import "modules/kindergarten";

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

@@ -0,0 +1,14 @@
+.mu-user-activity-indicator {
+  text-align: center;
+  border-radius: 10px;
+
+  padding: 0.5em 0;
+  margin-bottom: 30px;
+}
+
+.mu-user-activity-week-selector {
+  &:hover {
+    background-color: $mu-color-separator;
+    text-decoration: none;
+  }
+}

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

@@ -1,3 +1,8 @@
+.mu-user-avatar-container {
+  text-align: center;
+  white-space: nowrap;
+}
+
 .mu-user-avatar {
   width: 250px;
   height: 250px;

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

@@ -10,7 +10,7 @@
   .brand {
     font-size: 38px;
     padding: 8px 3px 0;
-    color: $brand-primary;
+    color: $primary;
     &:hover, &:focus {
       text-decoration: none;
     }
@@ -52,7 +52,7 @@
 
 .mu-navbar-avatar {
   justify-self: flex-end;
-  .img-circle {
+  .rounded-circle {
     cursor: pointer;
   }
 }

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

@@ -6,8 +6,4 @@ input[type="date"] {
   &::-webkit-inner-spin-button {
     display: none;
   }
-
-  &.form-control {
-    line-height: 33px;
-  }
 }

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

@@ -7,6 +7,23 @@ $discussion-button-color: #fafafa;
 $toolbar-filter-color: #808080;
 $moderator-badge-color: #dd9900;
 
+.discussions {
+  margin-bottom: 20px;
+
+  a {
+    color: unset;
+    text-decoration: unset;
+  }
+}
+
+.mu-discussion-accordion button {
+  color: $primary;
+
+  &:not(.collapsed) {
+    background-color: $mu-color-highlight-background;
+  }
+}
+
 .discussions-list {
   margin: 30px 0;
   .discussion {
@@ -20,8 +37,6 @@ $moderator-badge-color: #dd9900;
     border: 1px solid $discussion-message-border-color;
   }
   a {
-    color: unset;
-    text-decoration: unset;
     &:not(:last-child) > .discussion {
       border-bottom: 0;
     }
@@ -42,17 +57,6 @@ $moderator-badge-color: #dd9900;
     justify-content: center;
   }
 
-  .discussion-pagination .pagination li {
-    a, span {
-      background-color: lighten($brand-primary, 10%);
-    }
-    &:hover, &.active, &.active:hover {
-      a, span {
-        background-color: $brand-primary;
-      }
-    }
-  }
-
   .discussion-language-icon {
     float: right;
     margin-right: 10px;
@@ -139,18 +143,24 @@ $moderator-badge-color: #dd9900;
   border-bottom: none;
   .discussions-toolbar-status {
     float: left;
+
+    a {
+      text-decoration: unset;
+    }
     li {
       text-decoration: none;
       display: inline;
       margin-right: 15px;
       &:not(.selected) .status-icon, span {
-        color: $toolbar-filter-color;
+        filter: contrast(0%);
       }
       &:hover span {
         color: darken($toolbar-filter-color, 20%);
+        filter: contrast(100%);
       }
       &.selected span {
         color: darken($toolbar-filter-color, 40%);
+        filter: contrast(100%);
         font-weight: bold;
       }
     }
@@ -159,6 +169,11 @@ $moderator-badge-color: #dd9900;
     float: right;
     margin-right: 20px;
     cursor: pointer;
+
+    > a {
+      text-decoration: unset;
+      color: $primary;
+    }
     li.selected {
       a {
         font-weight: bold;
@@ -190,26 +205,6 @@ $moderator-badge-color: #dd9900;
   padding-inline: 5px;
 }
 
-.discussion-user-menu {
-  a {
-    padding: 5px 10px;
-    font-size: 15px;
-    line-height: 20px;
-    border: 1px solid rgba(27, 31, 35, 0.2);
-    border-radius: 0.25em;
-    background-color: $discussion-button-color;
-    font-weight: bold;
-    color: black;
-    cursor: pointer;
-    margin-left: 10px;
-    &:hover {
-      text-decoration: none;
-      background-color: darken($discussion-button-color, 5%);
-      color: black;
-    }
-  }
-}
-
 .discussion-context {
   margin-top: 40px;
 }
@@ -233,10 +228,6 @@ $moderator-badge-color: #dd9900;
   }
 }
 
-.discussion-tabs {
-  margin-top: 20px;
-}
-
 .discussion-info {
   font-size: 18px;
 }
@@ -256,6 +247,7 @@ $moderator-badge-color: #dd9900;
 .discussion-new-message-content {
   resize: none;
   min-height: 150px;
+  padding: 0;
   border-radius: 0;
   border-color: transparent;
   overflow: hidden;
@@ -263,7 +255,7 @@ $moderator-badge-color: #dd9900;
   white-space: nowrap;
   .CodeMirror {
     border: unset;
-    color: $brand-primary;
+    color: $primary;
     font-family: $font-family-sans-serif;
     padding: 15px;
   }
@@ -277,19 +269,21 @@ $moderator-badge-color: #dd9900;
   }
 }
 
-summary.discussion-summary {
-  display: list-item;
-  font-size: 29px;
-  outline: 0;
-  cursor: pointer;
-  .discussion-exercise-title {
-    display: inline;
+.discussion-new-message-buttons {
+  display: flex;
+  margin: 0 -10px;
+
+  .btn {
+    margin: 15px 10px;
   }
 }
 
+.discussion-new-message-preview-button {
+  flex-grow: 0.2;
+}
+
 .discussion-new-message-button {
-  border-radius: 0;
-  margin-top: 15px;
+  flex-grow: 1;
 }
 
 .discussion-message {
@@ -334,7 +328,7 @@ summary.discussion-summary {
       }
       .actions {
         float: right;
-        a {
+        > a, .dropdown {
           margin-left: 20px;
           cursor: pointer;
         }
@@ -345,7 +339,7 @@ summary.discussion-summary {
           }
           &:hover, &.selected {
             i {
-              color: $brand-success;
+              color: $success;
             }
           }
         }
@@ -368,9 +362,9 @@ summary.discussion-summary {
           }
           &:hover, &.selected {
             i {
-              color: $brand-primary;
+              color: $primary;
               &:after {
-                background-color: $brand-primary;
+                background-color: $primary;
               }
             }
           }
@@ -401,10 +395,10 @@ summary.discussion-summary {
 }
 
 $statuses: (
-  closed: ($brand-danger white $brand-danger),
+  closed: ($danger white $danger),
   opened: (white #333333 #eaeaea),
-  solved: ($brand-success white $brand-success),
-  pending_review: ($brand-success white $brand-success)
+  solved: ($success white $success),
+  pending_review: ($success white $success)
 );
 
 @each $status, $style in $statuses {
@@ -425,10 +419,6 @@ $statuses: (
   }
 }
 
-.no-margin {
-  margin: 0 !important;
-}
-
 .discussion-requires-attention {
   margin-right: 20px;
   label {