mumuki-laboratory 8.6.0 → 9.0.3

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

@@ -31,11 +31,19 @@
   }
 }
 
+.mu-profile-info {
+  display: flex;
+  flex-wrap: wrap;
+
+  margin-top: 20px;
+}
+
 .mu-profile-info-left {
   display: flex;
   flex-direction: column;
   align-items: center;
   text-align: center;
+  flex-grow: 1;
 
   .mu-level-progress {
     position: relative;
@@ -62,8 +70,11 @@
 }
 
 .mu-profile-info-right {
+  flex-grow: 2;
+
   font-size: 20px;
   margin-top: 5px;
+
   div {
     margin-bottom: 15px;
     .italic {

data/app/controllers/api/base_controller.rb

@@ -5,7 +5,6 @@ module Api
     protect_from_forgery with: :null_session
 
     include Mumuki::Laboratory::Controllers::DynamicErrors
-    include WithAuthorization
     include Mumuki::Laboratory::Controllers::CurrentOrganization
 
     before_action :set_current_organization!

data/app/controllers/api/courses_controller.rb

@@ -18,7 +18,7 @@ module Api
       @course = Course.new course_params
     end
 
-    def protection_slug
+    def authorization_slug
       @course.slug
     end
   end

data/app/controllers/api/organizations_controller.rb

@@ -2,8 +2,7 @@ module Api
   class OrganizationsController < BaseController
     include OrganizationsControllerTemplate
 
-    before_action :authorize_janitor!, only: [:show, :index]
-    before_action :authorize_admin!, only: [:update, :create]
+    before_action :authorize_admin!
 
     def index
       render json: { organizations: Organization.accessible_as(current_user, :janitor) }
@@ -22,6 +21,10 @@ module Api
       @organization.update! organization_params
       render json: @organization.to_resource_h
     end
+
+    def authorization_slug
+      '_/_'
+    end
   end
 
 end

data/app/controllers/api/roles_controller.rb

@@ -48,6 +48,10 @@ module Api
     def set_slug!
       @slug = Mumukit::Auth::Slug.join_s params.to_unsafe_h
     end
+
+    def authorization_slug
+      @slug
+    end
   end
 
 end

data/app/controllers/api/users_controller.rb

@@ -9,8 +9,13 @@ module Api
     end
 
     def update
-      @user.update_and_notify! user_params.except([:email, :permissions, :uid])
+      @user.assign_attributes user_name_params
+      @user.verify_name!
       render json: @user.to_resource_h
     end
+
+    def authorization_slug
+      '_/_'
+    end
   end
 end

data/app/controllers/certificates_controller.rb

@@ -0,0 +1,28 @@
+class CertificatesController < ApplicationController
+  include WithCertificateRender
+
+  before_action :authorize_if_private!, only: [:show]
+  before_action :set_certificate!
+  before_action :validate_current_user!, only: [:download]
+
+  def verify
+  end
+
+  def show
+  end
+
+  def download
+    send_data pdf_for(@certificate), filename: @certificate.filename
+  end
+
+  private
+
+  def set_certificate!
+    @certificate = Certificate.find_by! code: params[:code]
+  end
+
+  def validate_current_user!
+    raise Mumuki::Domain::NotFoundError unless @certificate.for_user? current_user
+  end
+
+end

data/app/controllers/concerns/with_authorization.rb

@@ -1,27 +1,12 @@
 module WithAuthorization
   extend ActiveSupport::Concern
 
-  def authorize_janitor!
-    authorize! :janitor
-  end
-
-  def authorize_admin!
-    authorize! :admin
-  end
-
-  def authorize_owner!
-    authorize! :owner
-  end
-
-  def authorize_moderator!
-    authorize! :moderator
-  end
-
   def authorization_slug
     protection_slug || '_/_'
   end
 
   def protection_slug
+    warn "protection_slug is nil, which is not probably what you want" unless @slug
     @slug
   end
 end

data/app/controllers/concerns/with_certificate_render.rb

@@ -0,0 +1,25 @@
+require 'wicked_pdf'
+require 'rqrcode'
+
+module WithCertificateRender
+
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :qr_for
+  end
+
+  def qr_for(certificate)
+    qr = RQRCode::QRCode.new(verify_certificate_url certificate.code).as_svg(color: '0B465D')
+    "data:image/svg+xml,#{URI.encode(qr)}"
+  end
+
+  def pdf_for(certificate)
+    pdf_html = render_to_string(partial: 'certificates/download', locals: { certificate: certificate })
+    WickedPdf.new.pdf_from_string pdf_html,
+                                  orientation: 'Landscape',
+                                  page_size: 'A5',
+                                  margin: { top: 0.5, left: 1, bottom: 0.5, right: 1 }
+
+  end
+end

data/app/controllers/concerns/with_user_params.rb

@@ -5,6 +5,10 @@ module WithUserParams
     params.require(:user).permit(*permissible_params).to_h
   end
 
+  def user_name_params
+    params.require(:user).permit(:first_name, :last_name).to_h
+  end
+
   def permissible_params
     User.profile_fields
   end

data/app/controllers/discussions_messages_controller.rb

@@ -1,5 +1,4 @@
 class DiscussionsMessagesController < AjaxController
-  include WithAuthorization
   include WithUserDiscussionValidation
 
   before_action :set_discussion!, only: [:create, :destroy]

data/app/controllers/faqs_controller.rb

@@ -0,0 +1,6 @@
+class FAQsController < ApplicationController
+  def index
+    @faqs = Organization.current.faqs_html
+    raise Mumuki::Domain::NotFoundError unless @faqs.present?
+  end
+end

data/app/controllers/users_controller.rb

@@ -5,11 +5,6 @@ class UsersController < ApplicationController
   before_action :set_user!
   skip_before_action :validate_accepted_role_terms!
 
-  def show
-    @messages = current_user.messages.to_a
-    @watched_discussions = current_user.watched_discussions_in_organization
-  end
-
   def update
     current_user.update_and_notify! user_params
     current_user.accept_profile_terms!
@@ -27,6 +22,18 @@ class UsersController < ApplicationController
     @profile_terms ||= Term.profile_terms_for(current_user)
   end
 
+  def messages
+    @messages ||= current_user.messages_in_organization
+  end
+
+  def discussions
+    @watched_discussions = current_user.watched_discussions_in_organization
+  end
+
+  def certificates
+    @certificates ||= current_user.certificates_in_organization
+  end
+
   def unsubscribe
     user_id = User.unsubscription_verifier.verify(params[:id])
     User.find(user_id).unsubscribe_from_reminders!

data/app/helpers/breadcrumbs_helper.rb

@@ -41,6 +41,10 @@ module BreadcrumbsHelper
     discussion.friendly.truncate_words(4)
   end
 
+  def breadcrumbs_for_my_account
+    header_breadcrumbs + breadcrumb_list_item(t(:my_account), 'last')
+  end
+
   private
 
   def breadcrumbs_for_linkable(e, extra=nil, last='')

data/app/helpers/certificate_helper.rb

@@ -0,0 +1,13 @@
+module CertificateHelper
+  def linkedin_post_url(certificate)
+    URI::HTTPS.build host: 'www.linkedin.com',
+                     path: '/profile/add',
+                     query: Rack::Utils.build_query(startTask: 'CERTIFICATION_NAME',
+                                                    name: certificate.title,
+                                                    organizationId: ENV['MUMUKI_LINKEDIN_ORGANIZATION_ID'],
+                                                    issueYear: certificate.created_at.year,
+                                                    issueMonth: certificate.created_at.month,
+                                                    certUrl: verify_certificate_url(certificate.code),
+                                                    certId: certificate.code)
+  end
+end

data/app/helpers/content_view_helper.rb

@@ -0,0 +1,19 @@
+module ContentViewHelper
+  def full_title_for(content)
+    "#{t(content_type_number(content), number: content.number)}: #{content.name}"
+  end
+
+  def short_title_for(content)
+    content.name
+  end
+
+  private
+
+  def content_type_number(content)
+    "#{content_type(content)}_number"
+  end
+
+  def content_type(content)
+    content.model_name.element
+  end
+end

data/app/helpers/exercise_input_helper.rb

@@ -53,12 +53,11 @@ module ExerciseInputHelper
     waiting_text = t(options.waiting_t) if options.waiting_t.present?
     %Q{
       <div class="btn-submit-container">
-        <#{options.tag} for="#{options.for}"
-                       class="btn btn-success btn-block btn-submit #{options.classes}"
+        <button class="btn btn-success btn-block btn-submit #{options.classes}"
                        data-waiting="#{waiting_text}">
-          #{fa_icon options.fa_icon}
+          #{fa_icon 'play'}
           #{text} #{remaining_attempts_text(assignment)}
-       </#{options.tag}>
+       </button>
       </div>
     }.html_safe
   end
@@ -92,26 +91,18 @@ module ExerciseInputHelper
 
   def submit_button_options(exercise)
     if exercise.upload?
-      struct for: 'upload-input',
-             tag: :label,
+      struct classes: 'disabled',
              waiting_t: :uploading_solution,
-             fa_icon: :upload,
-             t: :upload_solution
+             t: :create_submission
     elsif exercise.hidden?
-      struct tag: :button,
-             classes: 'submission_control',
+      struct classes: 'submission_control',
              waiting_t: :working,
-             fa_icon: :play,
              t: :continue_exercise
     elsif exercise.input_kids?
-      struct tag: :button,
-             classes: 'submission_control',
-             fa_icon: :play
+      struct classes: 'submission_control'
     else
-      struct tag: :button,
-             classes: 'submission_control',
+      struct classes: 'submission_control',
              waiting_t: :sending_solution,
-             fa_icon: :play,
              t: :create_submission
     end
   end

data/app/helpers/links_helper.rb

@@ -26,7 +26,7 @@ module LinksHelper
     if current_user&.teacher_here? && item.teacher_info.present?
       %Q{
         <a
-          class="mu-content-toolbar-item mu-popover"
+          class="mu-popover"
           data-toggle="popover"
           data-html="true"
           title="#{t :teacher_info}"
@@ -59,10 +59,18 @@ module LinksHelper
     link_to t(:forum_terms), discussions_terms_path, target: '_blank'
   end
 
+  def link_to_faqs
+    link_to t(:faqs), faqs_path, target: '_blank' if faqs_enabled_here?
+  end
+
   def turbolinks_enable_for(exercise)
     %Q{data-turbolinks="#{!exercise.input_kids?}"}.html_safe
   end
 
+  def faqs_enabled_here?
+    Organization.current.faqs.present?
+  end
+
   private
 
   def extract_name(named, options)
@@ -80,10 +88,10 @@ module LinksHelper
     return unless current_user&.writer?
 
     url = yield
-    link_to fixed_fa_icon('pencil-alt'), url, class: "mu-content-toolbar-item", target: "_blank", title: t(:edit)
+    link_to fixed_fa_icon('pencil-alt'), url, target: "_blank", title: t(:edit)
   end
 
   def url_for_bibliotheca_guide(guide)
-    "#{url_for_application(:bibliotheca_ui)}/#/guides/#{guide.slug}"
+    "#{url_for_application(:bibliotheca_ui).chomp('/')}/guides/#{guide.slug}"
   end
 end

data/app/helpers/menu_bar_helper.rb

@@ -1,9 +1,9 @@
 module MenuBarHelper
   def menu_bar_links
     [
-      link_to_profile,
-      link_to_classroom,
-      link_to_bibliotheca,
+      menu_link_to_profile,
+      menu_link_to_classroom,
+      menu_link_to_bibliotheca,
       solve_discussions_link,
       user_discussions_link
     ]
@@ -17,25 +17,25 @@ module MenuBarHelper
     content_tag :li, link
   end
 
-  def link_to_profile
-    menu_item('user', :profile, user_path)
+  def menu_link_to_profile
+    menu_item('user', :my_account, user_path)
   end
 
-  def link_to_classroom
-    link_to_application 'graduation-cap', :classroom_ui, :teacher_here?
+  def menu_link_to_classroom
+    menu_link_to_application 'graduation-cap', :classroom_ui, :teacher_here?
   end
 
-  def link_to_bibliotheca
-    link_to_application :book, :bibliotheca_ui, :writer?
+  def menu_link_to_bibliotheca
+    menu_link_to_application :book, :bibliotheca_ui, :writer?
   end
 
-  def link_to_application(icon, app_name, minimal_permissions)
+  def menu_link_to_application(icon, app_name, minimal_permissions)
     return unless current_user&.send(minimal_permissions)
     url = url_for_application(app_name)
     menu_item icon, app_name, url
   end
 
-  def logout_link
+  def logout_menu_link
     li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for))
   end
 
@@ -46,4 +46,8 @@ module MenuBarHelper
   def any_menu_bar_links?
     menu_bar_links.any?
   end
+
+  def menu_link_to_faqs
+    li_tag menu_item('question', :faqs, faqs_path)
+  end
 end

data/app/helpers/user_menu_helper.rb

@@ -0,0 +1,36 @@
+module UserMenuHelper
+  def user_menu_header
+    content_tag :div, user_menu_header_icon, class: 'mu-user-menu-header'
+  end
+
+  def user_menu_divider
+    content_tag :div, '', class: 'mu-user-menu-divider horizontal'
+  end
+
+  def profile_user_menu_link
+    user_menu_item t(:my_profile), user_path, 'show'
+  end
+
+  def messages_user_menu_link
+    user_menu_item t(:messages), messages_user_path, 'messages'
+  end
+
+  def discussions_user_menu_link
+    user_menu_item t(:discussions), discussions_user_path, 'discussions' if current_user&.can_discuss_here?
+  end
+
+  def certificates_user_menu_link
+    user_menu_item t(:certificates), certificates_user_path, 'certificates'
+  end
+
+  private
+
+  def user_menu_item(label, path, active_on)
+    link_klass = 'active' if action_name == active_on
+    content_tag :div, link_to(label, path, { class: link_klass }.compact), class: 'mu-user-menu-item'
+  end
+
+  def user_menu_header_icon
+    fa_icon('chevron-down', text: t(:my_account), id: 'mu-user-menu-header-icon', right: true)
+  end
+end