mumuki-laboratory 9.0.1 → 9.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4fc890303f1598f34b8258b73ca92a3beb1d594cbdb7f00d729401df4e44f89
-  data.tar.gz: 8ad9aba5c0b5d11251a972f2f5354f6f3ee6c6fcb3ef62d72b592e0d6e78b66f
+  metadata.gz: 1923025a623999bd5e8c2c802f024660f71d980865e5b436cfdf7ee27a361445
+  data.tar.gz: 368eace9064bfe944f5abecce4f36c5b5f55e15f08f3d7ee949eca7033adb0c2
 SHA512:
-  metadata.gz: 3f44cc0d2df94e3b613abea57d4ff8a1c48628a2d3fbc1797cb2a2fdca1d54c1c639c8da8e19ddfb65c581f874927758cb1fbf673cd9cf66ed8c1b9186a5d9ca
-  data.tar.gz: c5e6c4b580ec812c0ff84290558f6439fab546dc2be009da77c032b9059700230da3db4e1fc0765a4560d846d6409d4e6a17f79dbbff830a10199ad4ae25a6ec
+  metadata.gz: 126c58ab5c3d42c0055c85886cfdb49ae6714b797c7b2fb206417f97cdfd3bf3edd14bd66f268acc1ad79fcb1f6fa659073522a8ed91726ceda9a84fbee7b4a2
+  data.tar.gz: 43e8f6368254c0dff68d2194a68d7a4511c2732226463d1a77ba6e0cfe76b6b0ee0610a096480fc116ad8feec491a457657296316ab2b4e6039e72b5ec7883d3

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

@@ -0,0 +1,17 @@
+mumuki.load(() => {
+  scaleCertificate();
+  mumuki.resize(scaleCertificate);
+
+  function scaleCertificate() {
+    const $certPreview = $('.certificate-preview');
+    const $muCertificate = $('.mu-certificate-box');
+    $muCertificate.css('transform', 'scale(1)');
+
+    const scaleWidth = $muCertificate.width() / $certPreview.width();
+    $muCertificate.css({
+      'transform': `scale(${1 / scaleWidth})`,
+      'transform-origin': `0 0`,
+    });
+    $certPreview.height($muCertificate.height());
+  }
+});

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

@@ -20,12 +20,20 @@ mumuki.page.editors = [];
     $("#exercise_language_id").change(updateCodeMirrorLanguage);
   }
 
-  function resetEditor() {
+  function resetSimpleEditor() {
     mumuki.page.dynamicEditors.forEach(function (e) {
       setDefaultContent(e, $('#default_content').val());
     });
   }
 
+  function resetEditor(isMultipleFiles) {
+    if (!isMultipleFiles) {
+      resetSimpleEditor();
+    } else {
+      mumuki.multipleFileEditor.resetEditor();
+    }
+  }
+
   function formatContent() {
     mumuki.page.editors.each(function (_, editor) {
       editor.setSelection({line: 0, ch: 0}, {line: editor.lineCount()});
@@ -87,7 +95,7 @@ mumuki.page.editors = [];
     $('.editor-reset').click(function (event) {
       event.stopPropagation();
       const selection = confirm(this.getAttribute('data-confirm'));
-      if(selection) resetEditor();
+      if (selection) resetEditor($(event.target).parent().data('multiple-files'));
     });
 
     $('.editor-resize').click(function () {

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

@@ -1,9 +1,13 @@
 mumuki.load(() => {
   var $subscriptionSpans = $('.discussion-subscription > span');
   var $upvoteSpans = $('.discussion-upvote > span');
+  let $messagePreviewButton = $('.discussion-new-message-preview-button.preview');
+  let $messageEditButton = $('.discussion-new-message-preview-button.edit');
+  let $newMessageContent = $('.discussion-new-message-content');
+  let $newMessagePreview = $('#discussion-new-message-preview');
 
   function createNewMessageEditor() {
-    var $textarea = $("#new-discussion-message");
+    var $textarea = $("#discussion-new-message");
     var textarea = $textarea[0];
     if (!textarea) return;
 
@@ -26,7 +30,7 @@ mumuki.load(() => {
   }
 
   createReadOnlyEditors();
-  createNewMessageEditor();
+  let editor = createNewMessageEditor();
 
   var Forum = {
     toggleButton: function (spans) {
@@ -67,9 +71,46 @@ mumuki.load(() => {
       const params = new URLSearchParams(location.search);
       elem.is(':checked') ? params.set(key, elem.val()) : params.delete(key);
       location.search = params.toString();
+    },
+    discussionMessagePreview: function (url) {
+      return Forum.tokenRequest({
+        url: url,
+        method: 'GET',
+        processData: false,
+        dataType: 'json',
+        data: new URLSearchParams({ content: editor.getValue() } ),
+        success: function (response) {
+          showPreview(response.preview);
+        },
+        error: function (e) {
+          error = $messagePreviewButton.attr('error-text');
+          showPreview(error);
+        },
+        xhrFields: {withCredentials: true}
+      });
+    },
+    hidePreviewAndShowEditor: function(elem) {
+      togglePreviewAndEditButtons();
+      togglePreviewAndContentMessage();
     }
   };
 
+  function showPreview(preview) {
+    $newMessagePreview.html($.parseHTML(preview));
+    togglePreviewAndEditButtons();
+    togglePreviewAndContentMessage();
+  }
+
+  function togglePreviewAndEditButtons() {
+    $messagePreviewButton.toggleClass('hidden');
+    $messageEditButton.toggleClass('hidden');
+  }
+
+  function togglePreviewAndContentMessage() {
+    $newMessagePreview.toggleClass('hidden');
+    $newMessageContent.toggleClass('hidden');
+  }
+
   mumuki.Forum = Forum;
 
 });

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

@@ -0,0 +1,90 @@
+mumuki.faqs = class {
+
+  constructor() {
+    this.faqs = $('.mu-faqs');
+    this.topHierarchyElem = "H2";
+  }
+
+  // ================
+  // == Public API ==
+  // ================
+
+  /**
+   * Actually setup the faqs page
+   */
+  load() {
+    if(!this.faqs) return;
+    this._createFaqsGroups();
+    this._createNavbar();
+  }
+
+  // =================
+  // == Private API ==
+  // =================
+
+  _createNavbar() {
+    const $faqsNavbar = $(".mu-faqs-navbar nav ul");
+    $('.mu-faqs-group').each((_index, faqGroup) => {
+      const $navItem = this._createNavbarItem($faqsNavbar, faqGroup)
+      const $faqGroup = $(faqGroup);
+      this._configureClickFor($navItem, $faqGroup, $faqsNavbar)
+    });
+  }
+
+  _createNavbarItem($faqsNavbar, faqGroup) {
+    const $navItem = $(`<li><a href="#${faqGroup.id}">`)
+      .html(`${faqGroup.querySelector('h2').textContent}`);
+    $faqsNavbar.append($navItem);
+    return $navItem;
+  }
+
+  _configureClickFor($navItem, $faqGroup, $faqsNavbar) {
+    $navItem.click(function(e){
+      e.preventDefault();
+      $faqsNavbar.find('li').removeClass('active');
+      $navItem.addClass('active');
+      $('html, body').animate({scrollTop: $faqGroup.offset().top}, 1000);
+    });
+  }
+
+  _createFaqsGroups() {
+    const elemsGroups = this._buildFaqsGroups();
+    elemsGroups.forEach((group, index) => {
+      $(group).wrapAll(`<div class='mu-faqs-group' id='mu-faqs-group-${index}'>`);
+    });
+    this._createFaqsIcons();
+  }
+
+  _createFaqsIcons() {
+    const $faqIcon = $('<i class="mu-faqs-group-icon fa fa-plus">');
+    $faqIcon.click(function(e){
+      const $elem = $(this);
+      $elem.toggleClass('fa-plus fa-minus');
+      $elem.closest('.mu-faqs-group').toggleClass('active');
+    })
+    $('.mu-faqs-group').prepend($faqIcon);
+  }
+
+  _buildFaqsGroups() {
+    let newGroup = [];
+    let elemsGroups = [];
+    let previousNodeName;
+    $(".mu-faqs-content").children().each((index, elem) => {
+      if(elem.nodeName === this.topHierarchyElem && newGroup.length) {
+        elemsGroups.push(newGroup);
+        newGroup = [];
+      }
+      newGroup.push(elem);
+      previousNodeName = elem.nodeName
+    });
+
+    elemsGroups.push(newGroup);
+
+    return elemsGroups;
+  }
+
+};
+
+mumuki.load(() => {
+  new mumuki.faqs().load();
+});

data/app/assets/javascripts/mumuki_laboratory/application/multiple-files.js

@@ -135,6 +135,13 @@ mumuki.load(() => {
       });
     }
 
+    resetEditor() {
+      const defaultContents = this._getDataFromHiddenInput('#multifile-default-content');
+      mumuki.page.editors.each(function (i, editor) {
+        editor.getDoc().setValue(defaultContents[i].content);
+      });
+    }
+
     _addFile() {
       let name = prompt(this.locales.insert_file_name);
       const alreadyExists = this.files.toArray().some(it => it.name === name);

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

@@ -0,0 +1,32 @@
+ mumuki.organization = {
+
+  /**
+   * The current organization's id
+   *
+   * @type {number?}
+   * */
+  _id: null,
+
+  /**
+   * The current organization's id
+   *
+   * @type {number?}
+   * */
+  get id() {
+    return this._id;
+  },
+
+  /**
+   * Set global current organization information
+   */
+  load() {
+    const $muOrganizationId = $('#mu-organization-id');
+    if ($muOrganizationId.length) {
+      this._id = $muOrganizationId.val();
+    } else {
+      this._id = null;
+    }
+  }
+};
+
+mumuki.load(() => mumuki.organization.load());

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

@@ -1,6 +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";
@@ -10,6 +12,7 @@
 @import "modules/editor";
 @import "modules/exercise_assignment";
 @import "modules/exercise_results";
+@import "modules/faqs";
 @import "modules/flash";
 @import "modules/gs-board";
 @import "modules/guide_corollary";

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

@@ -0,0 +1,12 @@
+.mu-user-activity-indicator {
+  text-align: center;
+  border-radius: 10px;
+
+  &.jumbotron {
+    padding: 0.5em 0;
+  }
+}
+
+.mu-user-activity-selector {
+  padding-top: 15px;
+}

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

@@ -0,0 +1,33 @@
+.mu-certificate {
+  border: 1px solid $mu-color-dark-separator;
+}
+
+.mu-certificate-name {
+  margin-top: 0;
+  margin-bottom: 1em;
+}
+
+.mu-certificate-data {
+  margin-top: 30px;
+}
+
+.mu-certificate-buttons {
+  margin-bottom: 30px;
+}
+
+.mu-certificate-download-btn {
+  height: 35px;
+  padding: 0;
+  width: 157px;
+  border: none;
+}
+.mu-certificate-download-btn-icon {
+  border-right: 1px solid darken($mu-color-complementary, 10%);
+  padding: 8px 6px 9px 6px;
+  width: 35px;
+}
+.mu-certificate-download-btn-text {
+  display: inline-block;
+  width: 115px;
+  text-align: center;
+}

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

@@ -287,9 +287,21 @@ summary.discussion-summary {
   }
 }
 
+.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 {

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

@@ -0,0 +1,84 @@
+.mu-faqs-container {
+  position: relative;
+  display: table;
+  width: 100%;
+
+  .mu-faqs-content {
+    padding-top: 50px;
+
+    width: 100%;
+
+    @media (min-width: 768px) {
+      width: 75%;
+      float: right;
+    }
+
+    .mu-faqs-group {
+      padding: 32px;
+      box-shadow: 0 0.375em 2.8125em 0 #d2d5d9;
+      margin-bottom: 32px;
+
+      @media (max-width: 767px) {
+        &:not(.active) {
+          h3, p {
+            display: none
+          }
+          h2 {
+            margin-bottom: 0px;
+          }
+        }
+      }
+
+      h2 {
+        margin-top: 0;
+        margin-bottom: 20px;
+      }
+
+      h3 {
+        color: #1A94A3; // should be $brand-secondary
+        margin-top: 40px;
+      }
+
+      .mu-faqs-group-icon {
+        float: right;
+        margin-top: 10px;
+        cursor: pointer;
+        display: none;
+        @media (max-width: 767px) {
+          display: unset;
+        }
+      }
+    }
+  }
+
+  .mu-faqs-navbar {
+    top: 0;
+    position: sticky;
+    width: 25%;
+    padding-top: 50px;
+
+    ul {
+      border-left: 1px solid $mu-color-disabled;
+      list-style: none;
+      padding-left: 0px;
+      li {
+        padding: 8px 10px 8px 15px;
+        cursor: pointer;
+        &.active {
+          border-left: 3px solid transparent;
+          border-color: darken($brand-primary, 5%);
+          margin-left: -3px;
+        }
+        a {
+          color: $brand-primary;
+          &:hover {
+            text-decoration: none;
+          }
+          @media (min-width: $container-lg) {
+            font-size: 1.1em;
+          }
+        }
+      }
+    }
+  }
+}