Coursemology · ekowidianto · Jun 27, 2023 · May 19, 2023 · May 19, 2023 · May 29, 2023
diff --git a/.gitignore b/.gitignore
@@ -37,10 +37,6 @@
 /coverage/*
 /client/coverage/*
 
-# Ignore additional themes
-/app/themes/*
-!/app/themes/default/*
-
 # Ignore public download/upload folders
 /public/downloads/*
 /public/uploads/*

diff --git a/app/assets/stylesheets/breadcrumbs.scss b/app/assets/stylesheets/breadcrumbs.scss
diff --git a/app/assets/stylesheets/course/dangerously-fit-height-to-viewport.scss b/app/assets/stylesheets/course/dangerously-fit-height-to-viewport.scss
diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 class AnnouncementsController < ApplicationController
-  load_resource :announcement, class: GenericAnnouncement.name, only: :mark_as_read,
-                               id_param: :announcement_id
-
-  add_breadcrumb :index, :announcements_path
+  load_resource :announcement, class: GenericAnnouncement.name, only: :mark_as_read, id_param: :announcement_id
 
   def index
     respond_to do |format|
       format.html
       format.json do
-        @announcements = global_announcements.includes(:creator)
+        announcements = requesting_unread? ? unread_global_announcements : global_announcements
+        @announcements = announcements.includes(:creator)
       end
     end
   end
@@ -20,4 +18,16 @@ def mark_as_read
     @announcement.mark_as_read! for: current_user
     head :ok
   end
+
+  protected
+
+  def publicly_accessible?
+    requesting_unread?
+  end
+
+  private
+
+  def requesting_unread?
+    params[:unread] == 'true'
+  end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -7,9 +7,6 @@ class ApplicationController < ActionController::Base
   # Custom flash types. We follow Bootstrap's convention.
   add_flash_types :success, :info, :warning, :danger
 
-  # We allow views to add breadcrumbs
-  helper_method :add_breadcrumb
-
   include ApplicationControllerMultitenancyConcern
   include ApplicationComponentsConcern
   include ApplicationInternationalizationConcern

diff --git a/app/controllers/components/course/achievements_component.rb b/app/controllers/components/course/achievements_component.rb
@@ -14,7 +14,7 @@ def sidebar_items
     [
       {
         key: :achievements,
-        icon: 'trophy',
+        icon: :achievement,
         title: I18n.t('course.achievement.achievements.sidebar_title'),
         weight: 4,
         path: course_achievements_path(current_course),

diff --git a/app/controllers/components/course/announcements_component.rb b/app/controllers/components/course/announcements_component.rb
@@ -16,7 +16,7 @@ def main_sidebar_items
     [
       {
         key: :announcements,
-        icon: 'bullhorn',
+        icon: :announcement,
         title: settings.title || t('course.announcements.sidebar_title'),
         weight: 1,
         path: course_announcements_path(current_course),

diff --git a/app/controllers/components/course/assessments_component.rb b/app/controllers/components/course/assessments_component.rb
@@ -25,10 +25,10 @@ def assessment_categories
     current_course.assessment_categories.select(&:persisted?).map do |category|
       {
         key: "assessments_#{category.id}",
-        icon: 'plane', # TODO: category.icon in db that user can select and set
+        icon: :assessment, # TODO: category.icon in db that user can select and set
         title: category.title,
         weight: 2,
-        path: course_assessments_path(current_course, category: category, tab: category.tabs.first),
+        path: course_assessments_path(current_course, category: category),
         unread: 0
       }
     end
@@ -38,7 +38,7 @@ def assessment_submissions
     [
       {
         key: :assessments_submissions,
-        icon: 'upload',
+        icon: :submission,
         title: t('course.assessment.submissions.sidebar_title'),
         weight: 3,
         path: course_submissions_path(current_course),
@@ -53,7 +53,7 @@ def admin_sidebar_items
     [
       {
         key: :assessments_skills,
-        icon: 'bolt',
+        icon: :skills,
         title: t('course.assessment.skills.sidebar_title'),
         type: :admin,
         weight: 8,

diff --git a/app/controllers/components/course/discussion/topics_component.rb b/app/controllers/components/course/discussion/topics_component.rb
@@ -17,7 +17,7 @@ def main_sidebar_items
     [
       {
         key: :discussion_topics,
-        icon: 'comments',
+        icon: :comments,
         title: settings.title || t('course.discussion.topics.sidebar_title'),
         weight: 5,
         path: course_topics_path(current_course),

diff --git a/app/controllers/components/course/duplication_component.rb b/app/controllers/components/course/duplication_component.rb
@@ -12,7 +12,7 @@ def sidebar_items
     [
       {
         key: :duplication,
-        icon: 'clone',
+        icon: :duplication,
         title: t('layouts.duplication.title'),
         type: :admin,
         weight: 5,

diff --git a/app/controllers/components/course/experience_points_component.rb b/app/controllers/components/course/experience_points_component.rb
@@ -15,7 +15,8 @@ def sidebar_items
 
     [
       {
-        icon: 'magic',
+        key: :disburse_experience_points,
+        icon: :disbursement,
         title: t('course.experience_points.disbursement.sidebar_title'),
         type: :admin,
         weight: 4,

diff --git a/app/controllers/components/course/forums_component.rb b/app/controllers/components/course/forums_component.rb
@@ -16,7 +16,7 @@ def main_sidebar_items
     [
       {
         key: :forums,
-        icon: 'list-ul',
+        icon: :forum,
         title: settings.title || t('course.forum.forums.sidebar_title'),
         weight: 10,
         path: course_forums_path(current_course),

diff --git a/app/controllers/components/course/groups_component.rb b/app/controllers/components/course/groups_component.rb
@@ -13,7 +13,7 @@ def sidebar_items
     [
       {
         key: :groups,
-        icon: 'share-alt',
+        icon: :groups,
         title: I18n.t('course.groups.sidebar_title'),
         type: :admin,
         weight: 7,

diff --git a/app/controllers/components/course/leaderboard_component.rb b/app/controllers/components/course/leaderboard_component.rb
@@ -20,7 +20,7 @@ def main_sidebar_items
     [
       {
         key: :leaderboard,
-        icon: 'star',
+        icon: :leaderboard,
         title: settings.title || t('course.leaderboards.sidebar_title'),
         weight: 6,
         path: course_leaderboard_path(current_course)

diff --git a/app/controllers/components/course/learning_map_component.rb b/app/controllers/components/course/learning_map_component.rb
@@ -14,7 +14,7 @@ def sidebar_items
     [
       {
         key: :learning_map,
-        icon: 'map',
+        icon: :map,
         title: t('layouts.learning_map.title'),
         weight: 5,
         path: course_learning_map_path(current_course)

diff --git a/app/controllers/components/course/lesson_plan_component.rb b/app/controllers/components/course/lesson_plan_component.rb
@@ -20,7 +20,7 @@ def main_sidebar_items
     [
       {
         key: :lesson_plan,
-        icon: 'book',
+        icon: :lessonPlan,
         title: I18n.t('course.lesson_plan.items.sidebar_title'),
         weight: 8,
         path: course_lesson_plan_path(current_course)

diff --git a/app/controllers/components/course/levels_component.rb b/app/controllers/components/course/levels_component.rb
@@ -16,7 +16,7 @@ def sidebar_items
     [
       {
         key: :levels,
-        icon: 'star-half-o',
+        icon: :levels,
         title: I18n.t('course.levels.sidebar_title'),
         type: :admin,
         weight: 6,

diff --git a/app/controllers/components/course/materials_component.rb b/app/controllers/components/course/materials_component.rb
@@ -16,7 +16,7 @@ def main_sidebar_items
     [
       {
         key: :materials,
-        icon: 'folder-open',
+        icon: :material,
         title: settings.title || t('course.material.sidebar_title'),
         weight: 9,
         path: course_material_folder_path(current_course, current_course.root_folder),

diff --git a/app/controllers/components/course/multiple_reference_timelines_component.rb b/app/controllers/components/course/multiple_reference_timelines_component.rb
@@ -16,7 +16,7 @@ def sidebar_items
     [
       {
         key: :reference_timelines,
-        icon: 'random',
+        icon: :timelines,
         type: :admin,
         weight: 8,
         title: t('layouts.multiple_reference_timelines.timeline_designer'),

diff --git a/app/controllers/components/course/settings_component.rb b/app/controllers/components/course/settings_component.rb
@@ -22,7 +22,8 @@ def admin_sidebar_items
 
     [
       {
-        icon: 'gear',
+        key: :admin,
+        icon: :settings,
         title: t('layouts.course_admin.title'),
         type: :admin,
         weight: 9,

diff --git a/app/controllers/components/course/statistics_component.rb b/app/controllers/components/course/statistics_component.rb
@@ -12,7 +12,7 @@ def sidebar_items
     [
       {
         key: :statistics,
-        icon: 'bar-chart',
+        icon: :statistics,
         title: t('course.statistics.header'),
         type: :admin,
         weight: 2,

diff --git a/app/controllers/components/course/survey_component.rb b/app/controllers/components/course/survey_component.rb
@@ -14,7 +14,7 @@ def sidebar_items
     [
       {
         key: :surveys,
-        icon: 'pie-chart',
+        icon: :survey,
         title: I18n.t('course.surveys.sidebar_title'),
         weight: 11,
         path: course_surveys_path(current_course)

diff --git a/app/controllers/components/course/users_component.rb b/app/controllers/components/course/users_component.rb
@@ -20,7 +20,7 @@ def main_sidebar_items
     [
       {
         key: :users,
-        icon: 'group',
+        icon: :users,
         title: t('course.users.sidebar_title'),
         weight: 7,
         path: course_users_path(current_course)
@@ -39,7 +39,8 @@ def admin_sidebar_items
 
     [
       {
-        icon: 'user-plus',
+        key: :manage_users,
+        icon: :manageUsers,
         title: t('layouts.course_users.title'),
         type: :admin,
         weight: 1,

diff --git a/app/controllers/components/course/videos_component.rb b/app/controllers/components/course/videos_component.rb
@@ -24,7 +24,7 @@ def main_sidebar_items
     [
       {
         key: :videos,
-        icon: 'video-camera',
+        icon: :video,
         title: settings.title || t('course.video.videos.sidebar_title'),
         weight: 12,
         path: course_videos_path(current_course, tab: current_course.default_video_tab),

diff --git a/app/controllers/concerns/course/users_breadcrumb_concern.rb b/app/controllers/concerns/course/users_breadcrumb_concern.rb
diff --git a/app/controllers/course/achievement/controller.rb b/app/controllers/course/achievement/controller.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 class Course::Achievement::Controller < Course::ComponentController
   load_and_authorize_resource :achievement, through: :course, class: Course::Achievement.name
-  add_breadcrumb :index, :course_achievements_path
 
   helper name
 

diff --git a/app/controllers/course/admin/announcement_settings_controller.rb b/app/controllers/course/admin/announcement_settings_controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 class Course::Admin::AnnouncementSettingsController < Course::Admin::Controller
-  add_breadcrumb :edit, :course_admin_announcements_path
-
   def edit
     respond_to do |format|
       format.html { render 'course/admin/index' }

diff --git a/app/controllers/course/admin/assessment_settings_controller.rb b/app/controllers/course/admin/assessment_settings_controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 class Course::Admin::AssessmentSettingsController < Course::Admin::Controller
-  add_breadcrumb :index, :course_admin_assessments_path
-
   def edit
     respond_to do |format|
       format.html { render 'course/admin/index' }

diff --git a/app/controllers/course/admin/assessments/categories_controller.rb b/app/controllers/course/admin/assessments/categories_controller.rb
@@ -4,7 +4,6 @@ class Course::Admin::Assessments::CategoriesController < Course::Admin::Controll
                               through: :course,
                               through_association: :assessment_categories,
                               class: Course::Assessment::Category.name
-  add_breadcrumb :index, :course_admin_assessments_path
 
   def new
   end

diff --git a/app/controllers/course/admin/assessments/tabs_controller.rb b/app/controllers/course/admin/assessments/tabs_controller.rb
@@ -8,9 +8,6 @@ class Course::Admin::Assessments::TabsController < Course::Admin::Controller
                               through: :category,
                               class: Course::Assessment::Tab.name
 
-  add_breadcrumb :index, :course_admin_assessments_path
-  before_action :add_category_breadcrumb
-
   def new
   end
 
@@ -38,10 +35,6 @@ def tab_params
     params.require(:tab).permit(:title, :weight)
   end
 
-  def add_category_breadcrumb
-    add_breadcrumb @category.title, course_admin_assessments_path(current_course)
-  end
-
   # @return [Course::AssessmentsComponent]
   # @return [nil] If component is disabled.
   def component

diff --git a/app/controllers/course/admin/codaveri_settings_controller.rb b/app/controllers/course/admin/codaveri_settings_controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 class Course::Admin::CodaveriSettingsController < Course::Admin::Controller
-  add_breadcrumb :edit, :course_admin_codaveri_path
-
   def edit
     respond_to do |format|
       format.html { render 'course/admin/index' }

diff --git a/app/controllers/course/admin/component_settings_controller.rb b/app/controllers/course/admin/component_settings_controller.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 class Course::Admin::ComponentSettingsController < Course::Admin::Controller
   before_action :load_settings
-  add_breadcrumb :edit, :course_admin_components_path
 
   def edit
     respond_to do |format|

diff --git a/app/controllers/course/admin/controller.rb b/app/controllers/course/admin/controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 class Course::Admin::Controller < Course::ComponentController
-  add_breadcrumb :admin, :course_admin_path
-
   before_action :authorize_admin
 
   private

diff --git a/app/controllers/course/admin/discussion/topic_settings_controller.rb b/app/controllers/course/admin/discussion/topic_settings_controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 class Course::Admin::Discussion::TopicSettingsController < Course::Admin::Controller
-  add_breadcrumb :edit, :course_admin_topics_path
-
   def edit
     respond_to do |format|
       format.html { render 'course/admin/index' }

diff --git a/app/controllers/course/admin/forum_settings_controller.rb b/app/controllers/course/admin/forum_settings_controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 class Course::Admin::ForumSettingsController < Course::Admin::Controller
-  add_breadcrumb :edit, :course_admin_forums_path
-
   def edit
     respond_to do |format|
       format.html { render 'course/admin/index' }

diff --git a/app/controllers/course/admin/leaderboard_settings_controller.rb b/app/controllers/course/admin/leaderboard_settings_controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 class Course::Admin::LeaderboardSettingsController < Course::Admin::Controller
-  add_breadcrumb :edit, :course_admin_leaderboard_path
-
   def edit
     respond_to do |format|
       format.html { render 'course/admin/index' }

diff --git a/app/controllers/course/admin/lesson_plan_settings_controller.rb b/app/controllers/course/admin/lesson_plan_settings_controller.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 class Course::Admin::LessonPlanSettingsController < Course::Admin::Controller
   before_action :load_item_settings
-  add_breadcrumb :edit, :course_admin_lesson_plan_path
 
   def edit
     respond_to do |format|

diff --git a/app/controllers/course/admin/material_settings_controller.rb b/app/controllers/course/admin/material_settings_controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 class Course::Admin::MaterialSettingsController < Course::Admin::Controller
-  add_breadcrumb :edit, :course_admin_materials_path
-
   def edit
     respond_to do |format|
       format.html { render 'course/admin/index' }