mumuki-laboratory 5.0.12 → 5.1.0

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

@@ -59,7 +59,8 @@ var mumuki = mumuki || {};
 
     var bridge = new mumuki.bridge.Laboratory;
 
-    $('.btn-submit').on('click', function () {
+    $('.btn-submit').on('click', function (e) {
+      e.preventDefault();
       submitButton.disable();
       resultsBox.waiting();
 

data/app/assets/stylesheets/application/modules/_highlight.scss

@@ -134,3 +134,11 @@ $mu-color-highlight-prolog-atoms: $mu-color-primary;
   color: $mu-color-highlight-prolog-atoms !important;
   font-weight: normal !important;
 }
+
+$mu-color-highlight-css-literal: #b96dba;
+
+.css .m { color: $mu-color-highlight-literal !important; }
+.css .nc { color: $mu-color-highlight-identifier !important; font-weight: bold !important; }
+.css .nl { color: $mu-color-highlight-keyword !important; }
+.css .n { color: $mu-color-highlight-css-literal !important; }
+.css .nb { color: $mu-color-highlight-css-literal !important; }

data/app/assets/stylesheets/application/modules/_kids.scss

@@ -1,4 +1,5 @@
-$kids-height: calc(100vh - 80px - 30px);
+$kids-height: calc(100vh - 80px - 30px) !default;
+
 $kids-characters-height: 120px;
 $kids-speech-arrow-size: 10px;
 $kids-speech-border-color: lighten($mu-color-disabled, 20%);
@@ -24,22 +25,21 @@ $kids-speech-tabs-width: 40px;
   .mu-kids-exercise-description {
     padding-right: 15px;
   }
-  .mu-kids-exercise-board {
-    hr {
-      border-top: $kids-speech-border;
-    }
-  }
 
-  .mu-kids-character,
-  .mu-kids-state {
+  .mu-kids-states {
+    margin-bottom: 15px;
+  }
+  .mu-kids-character {
     padding: 15px;
   }
-  .mu-kids-blocks,
-  .mu-state-final {
+  .mu-kids-state {
+    padding: 0;
+  }
+  .mu-kids-blocks {
     margin-top: 15px;
   }
   .mu-kids-state {
-    height: calc(#{$kids-height} / 2 - 15px);
+    height: calc(#{$kids-height} / 2);
   }
   .mu-kids-character {
     height: $kids-characters-height;
@@ -49,19 +49,47 @@ $kids-speech-tabs-width: 40px;
     margin-left: 0;
     margin-right: 0;
     position: relative;
+    .mu-kids-overlay {
+      border-radius: 10px;
+      position: absolute;
+      z-index: 80;
+      background-color: white;
+      opacity: 0.50;
+      top: 0;
+      right: 0;
+      left: 0;
+      bottom: 0;
+      cursor: not-allowed;
+    }
+    .mu-kids-reset-button,
+    .mu-kids-compass-rose,
     .mu-kids-submit-button {
       position: absolute;
-      bottom: 15px;
       right: 15px;
-      width: 54px;
-      height: 54px;
-      z-index: 2;
+      width: 56px;
+      height: 56px;
+      z-index: 70; //Value defined by blockly
+    }
+    .mu-kids-compass-rose {
+      top: 15px;
+      opacity: 0.75;
+    }
+    .mu-kids-submit-button {
+      z-index: 90;
+      bottom: 15px;
       button {
         border-radius: 50%;
         width: 100%;
         height: 100%;
       }
     }
+    .mu-kids-reset-button {
+      bottom: 80px;
+      transform: scale(0.9);
+      paper-fab {
+        background-color: $mu-color-disabled;
+      }
+    }
 
   }
 
@@ -147,7 +175,7 @@ $kids-speech-tabs-width: 40px;
       border-radius: 10px;
       background: $kids-speech-background-color;
       border: $kids-speech-border;
-      height: 80px;
+      height: 90px;
       width: 100%;
       p {
         margin-bottom: 0;
@@ -173,6 +201,28 @@ $kids-speech-tabs-width: 40px;
         content: '';
         border-style: solid;
       }
+
+      $classes: (
+              failed: $mu-color-danger,
+              passed: $mu-color-success,
+              aborted: $mu-color-broken,
+              errored: $mu-color-broken,
+              passed_with_warnings: $mu-color-warning
+      );
+      @each $status, $class in $classes {
+        $lighten-class: lighten($class, 35%);
+        &.#{$status} {
+          border: none;
+          background: $lighten-class;
+          &:before {
+            border: none;
+          }
+          &:after {
+            border-color: transparent $lighten-class;
+          }
+        }
+      }
+
     }
 
   }
@@ -181,6 +231,12 @@ $kids-speech-tabs-width: 40px;
     display: flex;
     flex-direction: column;
     align-items: center;
+    strong {
+      margin-top: 7.5px;
+    }
+    #mu-actual-state-text {
+      display: none;
+    }
     .mu-kids-state-image {
       display: flex;
       flex-direction: column;
@@ -196,7 +252,6 @@ $kids-speech-tabs-width: 40px;
           border-radius: 12px;
         }
         display: flex;
-        margin-top: 15px;
         flex-direction: column;
         align-items: center;
         justify-content: center;
@@ -217,9 +272,6 @@ $kids-speech-tabs-width: 40px;
             background: rgba(221, 221, 136, 0.7) !important;
             outline: 3px solid $kids-speech-border-color !important;
           }
-          span {
-            vertical-align: middle;
-          }
         }
       }
     }
@@ -245,18 +297,14 @@ $kids-speech-tabs-width: 40px;
       ry: 10px !important;
     }
     .blocklyScrollbarHandle {
+      display: none;
       fill: $kids-speech-background-color !important;
       stroke: $kids-speech-border-color !important;
       stroke-width: 1px !important;
     }
-    .blocklyScrollbarVertical {
-      right: 0 !important;
-      transform: unset !important;
-    }
+    .blocklyScrollbarVertical,
     .blocklyScrollbarHorizontal {
-      right: 15px !important;
-      transform: translateY(0) !important;
-      bottom: 0 !important;
+      display: none;
     }
     .blocklyToolboxDiv {
       background-color: $kids-speech-background-color !important;
@@ -290,6 +338,7 @@ $kids-speech-tabs-width: 40px;
   .mu-kids-exercise {
     visibility: unset;
   }
+  .mu-kids-reset-button,
   .mu-kids-submit-button {
     display: block;
   }
@@ -302,7 +351,23 @@ $kids-speech-tabs-width: 40px;
   .mu-kids-exercise {
     visibility: hidden;
   }
+  .mu-kids-reset-button,
   .mu-kids-submit-button {
     display: none;
   }
 }
+
+@media screen and (max-height: $screen-xs-min) {
+  .mu-kids-exercise {
+    height: 100vh;
+    min-height: 100vh;
+    max-height: 100vh;
+
+    .mu-kids-state {
+      height: 50vh;
+    }
+    .mu-kids-blocks {
+      height: calc(100vh - #{$kids-characters-height} - 30px);
+    }
+  }
+}

data/app/controllers/api/base_controller.rb

@@ -0,0 +1,23 @@
+module Api
+  class BaseController < ActionController::Base
+    Mumukit::Login.configure_controller! self
+
+    protect_from_forgery with: :null_session
+
+    include WithApiErrors
+    include WithAuthorization
+    include Mumuki::Laboratory::Controllers::CurrentOrganization
+
+    before_action :set_current_organization!
+
+    include OnBaseOrganizationOnly
+
+    before_action :verify_api_client!
+
+    private
+
+    def verify_api_client!
+      ApiClient.verify_token! Mumukit::Auth::Token.extract_from_header(request.env['HTTP_AUTHORIZATION'])
+    end
+  end
+end

data/app/controllers/api/courses_controller.rb

@@ -0,0 +1,26 @@
+module Api
+  class CoursesController < BaseController
+    before_action :set_new_course!, only: :create
+    before_action :authorize_janitor!, only: :create
+
+    def create
+      @course.save!
+      @course.notify!
+      render json: @course
+    end
+
+    private
+
+    def course_params
+      params.require(:course).permit(:slug, :code, :period, :description, shifts: [], days: [])
+    end
+
+    def set_new_course!
+      @course = Course.new course_params
+    end
+
+    def protection_slug
+      @course.slug
+    end
+  end
+end

data/app/controllers/api/organizations_controller.rb

@@ -0,0 +1,28 @@
+module Api
+  class OrganizationsController < BaseController
+    include OrganizationsControllerTemplate
+
+    before_action :authorize_janitor!, only: [:show, :index]
+    before_action :authorize_owner!, only: [:update, :create]
+
+    def index
+      render json: { organizations: Organization.accessible_as(current_user, :janitor) }
+    end
+
+    def show
+      render json: @organization.as_platform_json
+    end
+
+    def create
+      @organization.save_and_notify!
+      render json: @organization.as_platform_json
+    end
+
+    def update
+      @organization.update_and_notify! organization_params
+
+      render json: @organization.as_platform_json
+    end
+  end
+
+end

data/app/controllers/api/roles_controller.rb

@@ -0,0 +1,47 @@
+module Api
+  class RolesController < BaseController
+    before_action :set_slug!
+    before_action :set_course!
+    before_action :set_user!, except: :create
+    before_action :authorize_janitor!
+
+    def create
+      @user = User.create_if_necessary(user_params)
+      @user.attach! role, @course
+      render json: @user
+    end
+
+    def attach
+      @user.attach! role, @course
+      head :ok
+    end
+
+    def detach
+      @user.detach! role, @course
+      head :ok
+    end
+
+    private
+
+    def role
+      raise 'Not Implemented'
+    end
+
+    def user_params
+      params.require(role).permit(:first_name, :last_name, :email, :uid, :image_url)
+    end
+
+    def set_course!
+      @course = Course.find_by!(slug: @slug)
+    end
+
+    def set_user!
+      @user = User.find_by!(uid: params[:uid])
+    end
+
+    def set_slug!
+      @slug = Mumukit::Auth::Slug.join_s params.to_unsafe_h
+    end
+  end
+
+end

data/app/controllers/api/students_controller.rb

@@ -0,0 +1,9 @@
+module Api
+  class StudentsController < RolesController
+    private
+
+    def role
+      :student
+    end
+  end
+end

data/app/controllers/api/teachers_controller.rb

@@ -0,0 +1,9 @@
+module Api
+  class TeachersController < RolesController
+    private
+
+    def role
+      :teacher
+    end
+  end
+end

data/app/controllers/api/users_controller.rb

@@ -0,0 +1,18 @@
+module Api
+  class UsersController < BaseController
+    include UsersControllerTemplate
+    before_action :authorize_janitor!
+
+    def create
+      @user.save!
+      @user.notify!
+      render json: @user.as_platform_json
+    end
+
+    def update
+      @user.update! user_params.except([:email, :permissions, :uid])
+      @user.notify!
+      render json: @user.as_platform_json
+    end
+  end
+end

data/app/controllers/assets_controller.rb

@@ -1,6 +1,7 @@
 class AssetsController < ApplicationController
 
-  skip_before_action :verify_authenticity_token, :authorize_if_private!
+  protect_from_forgery except: [:theme_stylesheet, :extension_javascript]
+  skip_before_action :authorize_if_private!
 
   def theme_stylesheet
     render inline: Organization.current.theme_stylesheet.to_s, content_type: 'text/css'

data/app/controllers/concerns/on_base_organization_only.rb

@@ -0,0 +1,11 @@
+module OnBaseOrganizationOnly
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :ensure_base_organization!
+  end
+
+  def ensure_base_organization!
+    raise ActionController::RoutingError, 'API must be called from base organization' unless Organization.current.base?
+  end
+end

data/app/controllers/concerns/organizations_controller_template.rb

@@ -0,0 +1,34 @@
+module OrganizationsControllerTemplate
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_organization!, only: [:show, :update, :edit]
+    before_action :set_new_organization!, only: :create
+  end
+
+  private
+
+  def set_new_organization!
+    @organization = Organization.new organization_params
+  end
+
+  def set_organization!
+    @organization = Organization.find_by! name: params[:id]
+  end
+
+  def protection_slug
+    @organization&.slug
+  end
+
+  def organization_params
+    params
+      .require(:organization)
+      .permit(:book,
+              :contact_email, :name, :locale, :description,
+              :logo_url, :banner_url, :open_graph_image_url, :favicon_url, :breadcrumb_image_url,
+              :raise_hand_enabled, :feedback_suggestions_enabled, :public, :immersive,
+              :theme_stylesheet, :extension_javascript,
+              :terms_of_service, :community_link, login_methods: [])
+      .tap { |it| it.merge!(book: Book.find_by!(slug: it[:book])) if it[:book] }
+  end
+end