mumuki-laboratory 8.1.1 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5feda4ed95a66abdfc68c218f1d2b5752fe6fdd8d8da0a18cc7c968d90550bbd
-  data.tar.gz: '080a983c6f384a8568ba2c8e7f092fcab9afe2a82b728bdfcc1e66fb8256377f'
+  metadata.gz: 222bd258be2916956f315e5195ed53f60ff730f176852e7d52ae17194e789f06
+  data.tar.gz: d3e1701ba286cdfa8d7b44ad529c85df6b9b6fdbe3912fa77dfafab35f9a4545
 SHA512:
-  metadata.gz: f95a1a2057a7946e2f26589a50076ec7e3c0e3d538a3feeb75da6a7cd1e030598a048dbb2e8918f1dcf39aa6565bc22fec237c66c88ee6842503c4d0bf94947c
-  data.tar.gz: 006504d33b8cb9ea871cff01be16fbc9f4b9f89e8cab63f11e1bfcc41cb4384cf1aff2e6e501e053d9279a1dd3a2009ae0b6a5c242012ab311b0a1e1ed9702a5
+  metadata.gz: fb75e14d8e9da062677b7cfb5595ece2717f9b226f085c3432379c87a63acf80e905fda9d890a85bc3afd970d623029d729c86ffff35781fe5b6f1fc938ff92e
+  data.tar.gz: 531e671791fec8e27fb3694a7315eb444d1e3d790ba3186789616562b2b7d6ad609bb7bc1221c94a741c207f2a573aeae9427a1e68aa3d4e3d272ae6f3ce3480

data/README.md

@@ -1,6 +1,5 @@
-[![Build Status](https://travis-ci.com/mumuki/mumuki-laboratory.svg?branch=master)](https://travis-ci.com/mumuki/mumuki-laboratory)
+![Build status](https://github.com/mumuki/mumuki-laboratory/workflows/Test%20and%20deploy/badge.svg?branch=master)
 [![Code Climate](https://codeclimate.com/github/mumuki/mumuki-laboratory/badges/gpa.svg)](https://codeclimate.com/github/mumuki/mumuki-laboratory)
-[![Issue Count](https://codeclimate.com/github/mumuki/mumuki-laboratory/badges/issue_count.svg)](https://codeclimate.com/github/mumuki/mumuki-laboratory)
 
 <img width="60%" src="https://raw.githubusercontent.com/mumuki/mumuki-laboratory/master/laboratory-screenshot.png"></img>
 
@@ -286,6 +285,7 @@ which are granted to be safe and stable.
   * `updateButtonsVisibility`
 * `mumuki.submission`
   * `processSolution`
+  * `sendSolution`
   * `registerContentSyncer`
 * `mumuki.version`
 
@@ -482,16 +482,27 @@ mumuki.editors.addCustomSource({
 });
 ```
 
-#### 2.5 Optional: Sending your solution to the server programmatically
+#### 2.5 Optional: Triggering submission processing programmatically
 
-Your solution will be automatically sent to the client when the submit button is pressed. However,
-if you need to trigger submission process programmatically, call `mumuki.submission.processSolution`:
+Your solution will be automatically sent to the client and processed when the submit button is pressed.
+However, if you need to trigger the whole submission process programmatically,
+call `mumuki.submission.processSolution`:
 
 ```javascript
 mumuki.submission.processSolution({solution: {content: /* ... */}});
 ```
 
-#### 2.6 Optional: customizing your submit button
+#### 2.6 Optional: Sending your solution to the server programmatically
+
+Your solution will be automatically sent to the client when the submit button is pressed, as part of the
+solution processing. However, if you just need to send your submission to the server programmatically,
+call `mumuki.submission.sendSolution`:
+
+```javascript
+mumuki.submission.sendSolution({solution: {content: /* ... */}});
+```
+
+#### 2.7 Optional: customizing your submit button
 
 You can alternatively override the default submit button UI and behaviour, by replacing it with a custom component. In order to
 do that, override the `.mu-submit-button` or the kids-specific `.mu-kids-submit-button`:
@@ -506,7 +517,7 @@ However, doing this is tricky, since you will need to manually update the UI and
 * `mumuki.bridge.Laboratory.runTests`
 * `mumuki.updateProgressBarAndShowModal`
 
-#### 2.7 Register kids scalers
+#### 2.8 Register kids scalers
 
 Kids layouts have some special areas:
 
@@ -525,7 +536,7 @@ mumuki.kids.registerBlocksAreaScaler(($blocks) => {
 });
 ```
 
-#### 2.8 Notify when your assets have been loaded
+#### 2.9 Notify when your assets have been loaded
 
 In order to remove loading spinners, you will need to call `mumuki.assetsLoadedFor` when your code is ready.
 

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

@@ -113,7 +113,8 @@ mumuki.bridge = (() => {
      * @returns {SubmissionResult}
      */
     _preRenderResult(result) {
-      result.class_for_progress_list_item = mumuki.renderers.progressListItemClassForStatus(result.status, true)
+      result.class_for_progress_list_item = mumuki.renderers.results.progressListItemClassForStatus(result.status, true);
+      result.title_html = mumuki.renderers.results.translatedTitleHtml(result.status, result.in_gamified_context);
       return result;
     }
   }

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

@@ -36,7 +36,7 @@ mumuki.Button = class {
       e.preventDefault();
       main();
     };
-    this.$button.on('click', this.main)
+    this.$button.on('click', this.main);
   }
 
   // ==============
@@ -49,7 +49,6 @@ mumuki.Button = class {
    */
   wait() {
     this.$button.off('click');
-
     this.setWaiting();
   }
 
@@ -77,10 +76,9 @@ mumuki.Button = class {
    */
   continue() {
     this.$button.off('click');
-
     this.enable();
 
-    this.$button.on('click', this.main)
+    this.$button.on('click', this.main);
   }
 
   // =============
@@ -106,11 +104,11 @@ mumuki.Button = class {
   }
 
   setWaitingText () {
-    this.$button.html('<i class="fa fa-refresh fa-spin"></i> ' + this.$button.attr('data-waiting'));
+    this.$button.html('<i class="fas fa-sync-alt fa-spin"></i> ' + this.$button.attr('data-waiting'));
   }
 
   setRetryText() {
-    this.$button.html('<i class="fa fa-undo"></i>');
+    this.$button.html('<i class="fas fa-undo"></i>');
   }
 
   setOriginalContent () {

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

@@ -1,7 +1,7 @@
 (() => {
   function submit() {
     $('body').removeClass('fullscreen');
-    $('.editor-resize .fa-stack-1x').removeClass('fa-compress').addClass('fa-expand');
+    $('.editor-resize .fas').toggleClass('fa-expand fa-compress');
     $('.btn-submit').click();
   }
 
@@ -38,7 +38,7 @@
             mumuki.editor.toggleFullscreen();
           },
           'Tab': function (cm) {
-            mumuki.editor.indentWithSpaces(cm)
+            mumuki.editor.indentWithSpaces(cm);
           }
         }
       });
@@ -53,7 +53,7 @@
           'Cmd-Enter': submitMessage,
           'Ctrl-Enter': submitMessage,
           'Tab': function (cm) {
-            mumuki.editor.indentWithSpaces(cm)
+            mumuki.editor.indentWithSpaces(cm);
           }
         }
       });

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

@@ -23,20 +23,20 @@ mumuki.page.editors = [];
   function resetEditor() {
     mumuki.page.dynamicEditors.forEach(function (e) {
       setDefaultContent(e, $('#default_content').val());
-    })
+    });
   }
 
   function formatContent() {
     mumuki.page.editors.each(function (_, editor) {
-      editor.setSelection({line: 0, ch: 0}, {line: editor.lineCount()})
-      editor.indentSelection("smart")
-      editor.setSelection({line: 0})
+      editor.setSelection({line: 0, ch: 0}, {line: editor.lineCount()});
+      editor.indentSelection("smart");
+      editor.setSelection({line: 0});
     });
   }
 
   function toggleFullscreen() {
     $('body').toggleClass('fullscreen');
-    $('.editor-resize .fa-stack-1x').toggleClass('fa-expand').toggleClass('fa-compress');
+    $('.editor-resize .fas').toggleClass('fa-expand fa-compress');
   }
 
   function indentWithSpaces(cm) {
@@ -56,7 +56,7 @@ mumuki.page.editors = [];
     if (language !== undefined) {
       mumuki.page.dynamicEditors.forEach(function (e) {
         setEditorLanguage(e, language);
-      })
+      });
     }
   }
 

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

@@ -32,7 +32,7 @@
   function clearConsole() {
     $('.jquery-console-message-error').remove();
     $('.jquery-console-message-value').remove();
-    $('.jquery-console-prompt-box:not(:last)').remove()
+    $('.jquery-console-prompt-box:not(:last)').remove();
   }
 
   class QueryConsole {
@@ -134,7 +134,7 @@
         url: self._requestUrl,
         type: 'POST',
         data: self._requestData
-      })
+      });
     }
     get _requestUrl() {
       return this.console.endpoint;

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

@@ -34,33 +34,33 @@ mumuki.load(() => {
     },
     token: new mumuki.CsrfToken(),
     tokenRequest: function (data) {
-      return $.ajax(Forum.token.newRequest(data))
+      return $.ajax(Forum.token.newRequest(data));
     },
     discussionPost: function (url) {
       return Forum.tokenRequest({
         url: url,
         method: 'POST',
         xhrFields: {withCredentials: true}
-      })
+      });
     },
     discussionSubscription: function (url) {
-      Forum.discussionPostAndToggle(url, $subscriptionSpans)
+      Forum.discussionPostAndToggle(url, $subscriptionSpans);
     },
     discussionUpvote: function (url) {
-      Forum.discussionPostAndToggle(url, $upvoteSpans)
+      Forum.discussionPostAndToggle(url, $upvoteSpans);
     },
     discussionPostAndToggle: function (url, elem) {
-      Forum.discussionPost(url).done(Forum.toggleButton(elem))
+      Forum.discussionPost(url).done(Forum.toggleButton(elem));
     },
     discussionMessageToggleApprove: function (url, elem) {
       Forum.discussionPost(url).done(function () {
         elem.toggleClass("selected");
-      })
+      });
     },
     discussionMessageToggleNotActuallyAQuestion: function (url, elem) {
       Forum.discussionPost(url).done(function () {
         elem.toggleClass("selected");
-      })
+      });
     },
     discussionsToggleCheckbox: function (elem) {
       const key = elem.attr('name');

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

@@ -99,6 +99,6 @@ mumuki.editors = {
    * @param {CustomEditorSource} source
    */
   addCustomSource(source) {
-    mumuki.CustomEditor.addSource(source)
+    mumuki.CustomEditor.addSource(source);
   }
 };

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

@@ -21,7 +21,7 @@ mumuki.elipsis = (() => {
     $elipsis.each((it, e) =>  {
       let $e = $(e);
       $e.html(mumuki.elipsis($e.html()));
-    })
+    });
   };
 
   mumuki.load(() => {

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

@@ -34,7 +34,7 @@ mumuki.events = {
    */
   fire(eventName, value = null) {
     if (this._handlers[eventName]) {
-      this._handlers[eventName].forEach(it => it(value))
+      this._handlers[eventName].forEach(it => it(value));
     }
   },
 
@@ -48,4 +48,4 @@ mumuki.events = {
       this._handlers[eventName] = [];
     }
   }
-}
+};

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

@@ -63,6 +63,6 @@ mumuki.exercise = {
       this._current = null;
     }
   }
-}
+};
 
-mumuki.load(() => mumuki.exercise.load())
+mumuki.load(() => mumuki.exercise.load());

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

@@ -108,12 +108,22 @@ mumuki.gamification = (() => {
     }
 
     updateLevel() {
-      const $muLevelProgress = $('#mu-level-progress');
-
       $('#mu-solve-more-exercises span').text(this.exercisesToNextLevel());
       $('.mu-level-number').html(this.currentLevel());
-      $('.mu-level-tooltip').attr("title", (_, value) => `${value} ${this.currentLevel()}`);
 
+      this.updateTooltip();
+      this.animateProgressIfAny();
+    }
+
+    updateTooltip() {
+      const $muLevelTooltip = $('.mu-level-tooltip');
+
+      $muLevelTooltip.attr("data-original-title", `${$muLevelTooltip.attr("level")} ${this.currentLevel()}`);
+      $muLevelTooltip.attr("title", "");
+    }
+
+    animateProgressIfAny() {
+      const $muLevelProgress = $('#mu-level-progress');
       if (this.currentLevelProgress() === 0) {
         $muLevelProgress.attr("display", "none");
       }

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

@@ -0,0 +1,73 @@
+mumuki.I18n = (() => {
+
+  const translations = {
+    'es': {
+      aborted: () => "Ups, no pudimos evaluar tu solución",
+      errored: () => "¡Ups! Tu solución no se puede ejecutar",
+      failed: () => "Tu solución no pasó las pruebas",
+      passed: () => "¡Muy bien! Tu solución pasó todas las pruebas",
+      passed_with_warnings: () => "Tu solución funcionó, pero hay cosas que mejorar",
+      pending: () => "Pendiente",
+      skipped: () => "Venís aprendiendo muy bien, por lo que aprobaste este ejercicio",
+    },
+    'es-CL': {
+      aborted: () => "Ups, no pudimos evaluar tu solución",
+      errored: () => "¡Ups! Tu solución no se puede ejecutar",
+      failed: () => "Tu solución no pasó las pruebas",
+      passed: () => "¡Muy bien! Tu solución pasó todas las pruebas",
+      passed_with_warnings: () => "Tu solución funcionó, pero hay cosas que mejorar",
+      pending: () => "Pendiente",
+      skipped: () => "Vienes aprendiendo muy bien, por lo que aprobaste este ejercicio",
+    },
+    'en': {
+      aborted: () => "Oops, we couldn't evaluate your solution",
+      errored: () => "Oops, your solution didn't work",
+      failed: () => "Oops, something went wrong",
+      passed: () => "Everything is in order! Your solution passed all our tests!",
+      passed_with_warnings: () => "It worked, but you can do better",
+      pending: () => "Pending",
+      skipped: () => "You are doing very well, so you've passed this exercise",
+    },
+    'pt': {
+      aborted: () => "Opa, não pudemos avaliar sua solução",
+      errored: () => "Opa! Sua solução não pode ser executada",
+      failed: () => "Sua solução não passou as provas",
+      passed: () => "Muito bem! Sua solução passou todos os testes",
+      passed_with_warnings: () => "Sua solução funcionou, mas há coisas para melhorar",
+      pending: () => "Pendente",
+      skipped: () => "Você está aprendendo muito bem e passou neste exercício",
+    }
+  }
+
+  return new class {
+
+    translate(key, data = {}) {
+      const translationValue = this._translationValue(key);
+      switch (typeof(translationValue)) {
+        case 'string': return translationValue;
+        case 'function': return translationValue(data);
+        default: return `Translation missing: ${mumuki.locale}, \`${key}\``;
+      }
+    }
+
+    t(key, data = {}) {
+      return mumuki.I18n.translate(key, data);
+    }
+
+    register(translationsToOverride) {
+      const locales = Object.keys(translations);
+      locales.forEach((it) => translations[it] = Object.assign(translations[it], translationsToOverride[it]));
+    }
+
+    _prefixTranslationKey(key) {
+      this._prefix = $('[data-i18n-prefix]');
+      return this._prefix.get(0) ? `${this._prefix.data('i18n-prefix')}_${key}` : key;
+    }
+
+    _translationValue(key) {
+      let translationLocale = translations[mumuki.locale];
+      return translationLocale && (translationLocale[this._prefixTranslationKey(key)] || translationLocale[key]);
+    }
+
+  }
+})();

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

@@ -7,7 +7,7 @@ mumuki.onInputsReady = (() => {
 			if ($(inputsSelector).length === 0) return;
 
 			callback(event);
-		})
+		});
 	}
 
 	return onInputsReady;

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

@@ -1,3 +1,7 @@
+mumuki.load(() => {
+  mumuki.isKidsExercise = () => $('.mu-kids-exercise').length > 0;
+})
+
 mumuki.Kids = class {
 
   constructor() {
@@ -11,8 +15,9 @@ mumuki.Kids = class {
   // ================
 
   initialize() {
-    this.submitButton = new mumuki.submission.SubmitButton($('#kids-btn-retry'), $('.submission_control'));
+    this.submitButton = new mumuki.submission.KidsSubmitButton($('#kids-btn-retry'), $('.submission_control'));
     this.resultActions = {};
+    this.$overlay = $('.mu-kids-overlay');
     this.$states = $('.mu-kids-states');
     this.$state = $('.mu-kids-state');
     this.$blocks = $('.mu-kids-blocks');
@@ -27,6 +32,14 @@ mumuki.Kids = class {
     this.$submissionResult =  $('.submission-results');
     mumuki.gamification.currentLevelProgression.registerLevelUpAction(this.levelUpAction);
     mumuki.gamification.currentLevelProgression.registerGainedExperienceAction(this.gainedExperienceAction);
+    this.$resultsModal.on('hidden.bs.modal', this.resetExerciseIfSubmitless);
+    this.$resultsAbortedModal.on('hidden.bs.modal', this.resetExerciseIfSubmitless);
+  }
+
+  resetExerciseIfSubmitless() {
+    if ($('.mu-submitless-exercise').get(0)) {
+      mumuki.kids.submitButton.continue();
+    }
   }
 
   gainedExperienceAction() {
@@ -56,16 +69,24 @@ mumuki.Kids = class {
     this.$resultsAbortedModal.modal();
   }
 
+  showOverlay() {
+    this.$overlay.show();
+  }
+
+  hideOverlay() {
+    this.$overlay.hide();
+  }
+
   // ==================
   // == Hook Methods ==
   // ==================
 
   _showSuccessPopup() {
-    this._mustImplementThisMethod()
+    this._mustImplementThisMethod();
   }
 
   _showFailurePopup() {
-    this._mustImplementThisMethod()
+    this._mustImplementThisMethod();
   }
 
   // ====================
@@ -141,7 +162,7 @@ mumuki.Kids = class {
   // ============
 
   _mustImplementThisMethod() {
-    throw new Error('TODO: implement method')
+    throw new Error('TODO: implement method');
   }
 
   // ============
@@ -214,4 +235,4 @@ mumuki.Kids = class {
     $blockSvg.height($blocks.height());
   }
 
-}
+};