mumuki-laboratory 6.6.1 → 6.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5a23d1e0d46f76b2354b1cf7355f30a81aa42a803bfeb51ef2f9d6d05e0129e
-  data.tar.gz: dce90aac8effdd1aa4d5e2b54dc51f8b4e30ddaa18504f2c4cd4741248152db2
+  metadata.gz: '0847a01d85f5a6b32a8c181b47930d4bd8a4963844107befc5f327c762f5cbc7'
+  data.tar.gz: 37f4f2fb0551b55a5ff8bd5e7d63faf529a6cd34bc0a920a26b7a8492e28c270
 SHA512:
-  metadata.gz: d2feb8cd5973e1447e430abfde874918de914bc92638143fb313f9eff350dc282a01af534fdfebe9b0deb2a383730fa69066b98b2e2726509060f5d97e26e391
-  data.tar.gz: 983337746d5427068af046e152d3bbee98d631a842020992bb7160bde00179b40c5f5c57324b0eb19c12aeee7ff625af65325dfe21b7c7aee1f70620a54bf7bc
+  metadata.gz: b0669c5d38531eb94e9b84e8ab395d51e12014569f355448144aa39bf77786de1426d3231f6731acee57d7aa7b9dcae3ae2bf023f30b61e9e7cf51812049158c
+  data.tar.gz: 194ee095c0fefbdec24876a58c994115a064b97244e16847918d887c4e9a6a751e042c76cfcb57942822904b072d10d0e94c280e847e90e7ac648447935dc56e

data/README.md

@@ -36,8 +36,8 @@ echo 'eval "$(rbenv init -)"' >> ~/.bashrc # or .bash_profile
 > Now we have rbenv installed, we can install ruby and [bundler](http://bundler.io/)
 
 ```bash
-rbenv install 2.3.1
-rbenv global 2.3.1
+rbenv install 2.6.3
+rbenv global 2.6.3
 rbenv rehash
 gem install bundler
 ```
@@ -191,6 +191,11 @@ which are granted to be safe and stable.
   * `currentScenarioIndex`
   * `resetIndicators`
   * `updateIndicators`
+* `mumuki.multipleFileEditor`
+  * `setUpAddFile`
+  * `setUpDeleteFiles`
+  * `setUpDeleteFile`
+  * `updateButtonsVisibility`
 * `mumuki.version`
 
 ### Kids Call order
@@ -207,7 +212,7 @@ content URL in the current organization transparently:
 
 * `GET <organization-url>/topics/<organization>/<repository>`
 * `GET <organization-url>/guides/<organization>/<repository>`
-* `GET <organization-url>/exercies/<organization>/<repository>/<bibliotheca-id>`
+* `GET <organization-url>/exercises/<organization>/<repository>/<bibliotheca-id>`
 
 ## REST API Docs
 

data/app/assets/config/mumuki_laboratory_engine.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts/mumuki_laboratory.js
+//= link_directory ../stylesheets/mumuki_laboratory.css

data/app/assets/javascripts/{application → mumuki_laboratory/application}/characters.js

@@ -9,7 +9,7 @@ mumuki.load(() => {
   });
 
   function placeKidsAnimations() {
-    placeAnimation('.mu-kids-character-animation', 'talk');
+    placeAnimation('.mu-kids-character-animation', 'blink');
     placeAnimation('.mu-kids-character-context', 'context');
   }
 

data/app/assets/javascripts/{application → mumuki_laboratory/application}/kids.js

@@ -1,6 +1,5 @@
 mumuki.load(function () {
   var $bubble = $('.mu-kids-character-speech-bubble').children('.mu-kids-character-speech-bubble-normal');
-  if(!$bubble.length) return;
 
   var availableTabs = ['.description', '.hint'];
   var $speechParagraphs, paragraphHeight, scrollHeight, nextSpeechBlinking;
@@ -12,6 +11,9 @@ mumuki.load(function () {
   var $speechTabs = $('.mu-kids-character-speech-bubble-tabs > li:not(.separator)');
   var $defaultSpeechTabName = 'description';
   var $texts = $bubble.children(availableTabs.join(", "));
+  var $hint = $('.mu-kids-hint');
+  var discussionsLinkHtml = $('#mu-kids-discussion-link-html').html();
+  var $description = $('.mu-kids-description');
 
   function floatFromPx(value) {
     return parseFloat(value.substring(0, value.length - 2));
@@ -120,7 +122,7 @@ mumuki.load(function () {
       mumuki.kids._hideMessageOnCharacterBubble();
       var $bubble = mumuki.kids._getCharacterBubble();
       Object.keys(mumuki.kids.resultAction).forEach($bubble.removeClass.bind($bubble));
-      mumuki.presenterCharacter.playAnimation('talk', mumuki.kids._getCharaterImage());
+      mumuki.presenterCharacter.playAnimation('talk', mumuki.kids._getCharacterImage());
     },
 
     // ===========
@@ -139,7 +141,7 @@ mumuki.load(function () {
       return $('#kids-results-aborted');
     },
 
-    _getCharaterImage: function () {
+    _getCharacterImage: function () {
       return $('.mu-kids-character > img');
     },
 
@@ -156,6 +158,7 @@ mumuki.load(function () {
       $bubble.find('.mu-kids-character-speech-bubble-tabs').show();
       $bubble.find('.mu-kids-character-speech-bubble-normal').show();
       $bubble.find('.mu-kids-character-speech-bubble-failed').hide();
+      $bubble.find('.mu-kids-discussion-link').remove();
       Object.keys(mumuki.kids.resultAction).forEach($bubble.removeClass.bind($bubble));
       mumuki.kids._getOverlay().hide();
     },
@@ -169,12 +172,19 @@ mumuki.load(function () {
       if (data.status === 'passed_with_warnings') {
         $bubble.find('.mu-kids-character-speech-bubble-failed').append(data.expectations_html);
       }
+      if (this._shouldDisplayDiscussionsLink(data.status)) {
+        $bubble.append(discussionsLinkHtml);
+      }
       mumuki.kids._getOverlay().show();
     },
 
+    _shouldDisplayDiscussionsLink: function (status) {
+      return ['failed', 'passed_with_warnings'].some(it => it === status);
+    },
+
     _showOnSuccessPopup: function (data) {
       mumuki.kids._updateSubmissionResult(data.html);
-      mumuki.presenterCharacter.playAnimation('success_l', mumuki.kids._getCharaterImage());
+      mumuki.presenterCharacter.playAnimation('success_l', mumuki.kids._getCharacterImage());
       mumuki.kids._showMessageOnCharacterBubble(data);
       mumuki.presenterCharacter.playAnimation('success2_l', $('.mu-kids-character-success'));
       setTimeout(function () {
@@ -199,7 +209,7 @@ mumuki.load(function () {
     },
 
     _showOnCharacterBubble: function (data) {
-      mumuki.presenterCharacter.playAnimation('failure', mumuki.kids._getCharaterImage());
+      mumuki.presenterCharacter.playAnimation('failure', mumuki.kids._getCharacterImage());
       mumuki.kids._showMessageOnCharacterBubble(data);
     },
 
@@ -250,7 +260,11 @@ mumuki.load(function () {
   }
 
   function animateSpeech() {
-    mumuki.presenterCharacter.playAnimation('talk', mumuki.kids._getCharaterImage());
+    mumuki.presenterCharacter.playAnimation('talk', mumuki.kids._getCharacterImage());
+  }
+
+  function animateHint() {
+    mumuki.presenterCharacter.playAnimation('hint', mumuki.kids._getCharaterImage());
   }
 
   mumuki.kids.resultAction.passed = mumuki.kids._showOnSuccessPopup;
@@ -262,8 +276,13 @@ mumuki.load(function () {
   mumuki.kids.resultAction.errored = mumuki.kids._showOnCharacterBubble;
   mumuki.kids.resultAction.pending = mumuki.kids._showOnCharacterBubble;
 
+  $('.mu-kids-context').on('hidden.bs.modal', function () {
+    animateSpeech();
+  });
+
   $(document).ready(() => {
     // Speech initialization
+    if(!$bubble.length) return;
 
     availableTabs.forEach(function (tabSelector) {
       tabParagraphs(tabSelector).contents().unwrap().wrapAll('<p>');
@@ -290,6 +309,12 @@ mumuki.load(function () {
 
     $nextSpeech.click(showNextParagraph);
     $prevSpeech.click(showPrevParagraph);
+    $description.click(animateSpeech);
+
+    $hint.click(function () {
+      animateHint();
+      this.classList.remove('blink');
+    });
 
     // States initial resizing
 

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

@@ -23,6 +23,10 @@ mumuki.load(() => {
       return this.tab.find(File.NAME_CLASS).text(name);
     }
 
+    get deleteButton() {
+      return this.tab.find(File.DELETE_BUTTON_CLASS);
+    }
+
     get isSelected() {
       return this.tab.hasClass("active");
     }
@@ -71,7 +75,15 @@ mumuki.load(() => {
       this.MAX_TABS = 5;
 
       this._addFileButton = this.tabsContainer.siblings('.add-file-button');
-      this._updateButtonsVisibility();
+      this.updateButtonsVisibility();
+    }
+
+    get mainFile() {
+      return this._mainFile || '';
+    }
+
+    set mainFile(mainFile) {
+      this._mainFile = mainFile;
     }
 
     get files() {
@@ -111,7 +123,16 @@ mumuki.load(() => {
     }
 
     setUpDeleteFile(file) {
-      file.setUpOnRemove(this._deleteFile.bind(this));
+      file.setUpOnRemove(() => this._deleteFile(file));
+    }
+
+    updateButtonsVisibility() {
+      const filesCount = this._getFilesCount();
+
+      this._setVisibility(this._addFileButton, filesCount < this.MAX_TABS);
+      this.files.toArray().forEach(file => {
+        this._setVisibility(file.deleteButton, file.name !== this.mainFile && filesCount > 1)
+      });
     }
 
     _addFile() {
@@ -126,27 +147,19 @@ mumuki.load(() => {
       const file = this.files.last().get(0).initialize(name);
       this.setUpDeleteFile(file);
 
-      this._updateButtonsVisibility();
+      this.updateButtonsVisibility();
     }
 
     _deleteFile(file) {
-      const index  = this.files.toArray()
-        .map((file) => file.name)
+      const index = this.files.toArray()
+        .map(file => file.name)
         .indexOf(file.name);
       const previousIndex = Math.max(index - 1, 0);
 
       const wasSelected = file.remove();
       if (wasSelected) this.files[previousIndex].select();
 
-      this._updateButtonsVisibility();
-    }
-
-    _updateButtonsVisibility() {
-      const filesCount = this._getFilesCount();
-      const deleteButtons = this.tabs.find(File.DELETE_BUTTON_CLASS);
-
-      this._setVisibility(this._addFileButton, filesCount < this.MAX_TABS);
-      this._setVisibility(deleteButtons, filesCount > 1);
+      this.updateButtonsVisibility();
     }
 
     _createTab(name, id) {
@@ -212,16 +225,17 @@ mumuki.load(() => {
     }
   }
 
-
   const setUpTabsBehavior = () => {
     const tabsContainer = $('.nav-tabs').last();
     if (!tabsContainer.length) return;
     const editorsContainer = $('.tab-content');
 
     const multipleFileEditor = new MultipleFileEditor(tabsContainer, editorsContainer);
+    mumuki.multipleFileEditor = multipleFileEditor;
     multipleFileEditor.setUpAddFile();
     multipleFileEditor.setUpDeleteFiles();
   };
 
   $(document).ready(setUpTabsBehavior);
+
 });

data/app/assets/javascripts/{application.js → mumuki_laboratory/application.js}

@@ -24,7 +24,7 @@
 
 //= require codemirror.min
 //= require codemirror-autorefresh
-//= require_tree ../../../vendor/assets/javascripts/codemirror-modes
+//= require codemirror-modes
 //= require analytics
 //= require hotjar
 //= require muvment

data/app/assets/stylesheets/{application → mumuki_laboratory/application}/modules/_kids.scss

@@ -110,6 +110,18 @@ $kids-speech-tabs-width: 40px;
       height: 100%;
     }
     .mu-kids-character-speech-bubble {
+      &.failed, &.passed_with_warnings {
+        padding-right: 20px;
+      }
+      .mu-kids-discussion-link {
+        i {
+          width: 13px;
+          height: 13px;
+          line-height: 13px;
+          border-radius: 50%;
+        }
+
+      }
 
       @media screen and (max-width: $screen-sm-max) {
         h4 {
@@ -342,50 +354,111 @@ $kids-speech-tabs-width: 40px;
       }
     }
   }
+}
 
-  .mu-kids-blocks {
-    form,
-    [id*="custom-editor"],
-    gs-element-blockly,
-    #blocklyDiv,
-    .blocklySvg {
-      min-width: 100% !important;
-      min-height: 100% !important;
-      width: 100% !important;
-      height: 100% !important;
-    }
-    gs-element-blockly {
-      padding: 0;
-      margin: 0;
-    }
-    .blocklyMainBackground {
-      rx: 10px !important;
-      ry: 10px !important;
-    }
-    .blocklyScrollbarHandle {
-      fill: $kids-scrollbar-background-color !important;
-      stroke: $kids-speech-border-color !important;
-      stroke-width: 1px !important;
-    }
-    .blocklyMainWorkspaceScrollbar {
-      display: none;
+.mu-kids-blocks, .mu-read-only-editor {
+  form,
+  [id*="custom-editor"],
+  gs-element-blockly,
+  #blocklyDiv,
+  .blocklySvg {
+    min-width: 100% !important;
+    min-height: 100% !important;
+    width: 100% !important;
+    height: 100% !important;
+  }
+  gs-element-blockly {
+    padding: 0;
+    margin: 0;
+  }
+  .blocklyMainBackground {
+    rx: 10px !important;
+    ry: 10px !important;
+  }
+  .blocklyScrollbarHandle {
+    fill: $kids-scrollbar-background-color !important;
+    stroke: $kids-speech-border-color !important;
+    stroke-width: 1px !important;
+  }
+  .blocklyMainWorkspaceScrollbar {
+    display: none;
+  }
+  .blocklyScrollbarHorizontal {
+    display: none;
+  }
+  .blocklyToolboxDiv {
+    background-color: $kids-speech-background-color !important;
+    border: $kids-speech-border !important;
+    border-right: none !important;
+    border-top-left-radius: 10px !important;
+    border-bottom-left-radius: 10px !important;
+  }
+  .blocklyFlyoutBackground {
+    fill: $kids-speech-background-color !important;
+    border: $kids-speech-border !important;
+    border-right: none !important;
+  }
+}
+
+$statuses-glow-animation: (
+  failed: $mu-color-danger,
+  passed_with_warnings: $mu-color-warning
+);
+
+@each $status, $color in $statuses-glow-animation {
+  @keyframes glow-#{$status} {
+    0% {
+      box-shadow: 0 0 0 #ffff7f;
     }
-    .blocklyScrollbarHorizontal {
-      display: none;
+    50% {
+      box-shadow: 0 0 15px 4px $color;
+      color: darken($color, 10%);
+      transform: scale(1.2);
     }
-    .blocklyToolboxDiv {
-      background-color: $kids-speech-background-color !important;
-      border: $kids-speech-border !important;
-      border-right: none !important;
-      border-top-left-radius: 10px !important;
-      border-bottom-left-radius: 10px !important;
+    100% {
+      box-shadow: 0 0 25px 4px transparent;
     }
-    .blocklyFlyoutBackground {
-      fill: $kids-speech-background-color !important;
-      border: $kids-speech-border !important;
-      border-right: none !important;
+  }
+
+  .#{$status} .mu-kids-discussion-link {
+    color: $color;
+    i {
+      -webkit-animation: glow-#{$status} 1.5s ease infinite;
+      -moz-animation: glow-#{$status} 1.5s ease infinite;
+      animation: glow-#{$status} 1.5s ease infinite;
     }
   }
+
+}
+
+.mu-kids-hint.blink i {
+  width: 8px;
+  height: 8px;
+  line-height: 12px;
+  margin: 0 2px 4px 0;
+  -webkit-animation: hint-blink 1.5s ease infinite;
+  -moz-animation: hint-blink 1.5s ease infinite;
+  animation: hint-blink 1.5s ease infinite;
+}
+
+@keyframes hint-blink {
+ 50% {
+   color: #7f7f00;
+   background-color: rgba(255,255,0, 0.5);
+   transform: scale(1.2);
+ }
+}
+
+.mu-read-only-editor {
+  #blocklyDiv {
+    height: 400px !important;
+  }
+  #blocklyDiv {
+    border: $kids-speech-border !important;
+  }
+  .blocklyMainBackground {
+    stroke-width: 0px;
+  }
 }
 
 .mu-kids-landscape-support {

data/app/assets/stylesheets/{application.scss → mumuki_laboratory/application.scss}

@@ -1,6 +1,6 @@
-$icon-font-path: '../assets/bootstrap/';
-$fa-font-path: '../assets';
-$da-font-path: '../assets';
+$icon-font-path: asset-path('assets/bootstrap');
+$fa-font-path: asset-path('assets');
+$da-font-path: asset-path('assets');
 
 @import "scss/mumuki-styles";
 @import "codemirror/codemirror.min";

data/app/controllers/invitations_controller.rb

@@ -3,7 +3,7 @@ class InvitationsController < ApplicationController
   before_action :set_invitation!
 
   def show
-    redirect_to_organization! if current_user.student_of? @organization
+    redirect_to_organization! if current_user.student_of? @invitation.course
   end
 
   def join

data/app/helpers/assets_helper.rb

@@ -9,8 +9,8 @@ module AssetsHelper
 
   def laboratory_assets_include_tags
     %Q{
-      #{stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'}
-      #{javascript_include_tag 'application', 'data-turbolinks-track': 'reload'}
+      #{stylesheet_link_tag 'mumuki_laboratory/application', media: 'all', 'data-turbolinks-track': 'reload'}
+      #{javascript_include_tag 'mumuki_laboratory/application.js', 'data-turbolinks-track': 'reload'}
     }
   end
 

data/app/helpers/authors_helper.rb

@@ -0,0 +1,10 @@
+module AuthorsHelper
+
+  def attribution_caption(guide)
+    if guide.collaborators.present?
+      t(:authoring_note_with_collaborators_html, authors: guide.authors, collaborators: "https://raw.githubusercontent.com/#{guide.slug}/master/COLLABORATORS.txt")
+    else
+      t(:authoring_note_html, authors: guide.authors)
+    end
+  end
+end