feat: restrict access to courses

This commit is contained in:
Rotimi Best
2024-05-23 07:04:42 +01:00
parent 57e3b63588
commit 577937fda6
14 changed files with 94 additions and 32 deletions
@@ -13,6 +13,7 @@
handleSaveLesson
} from '$lib/components/Course/components/Lesson/store/lessons';
import PageBody from '$lib/components/PageBody/index.svelte';
import { globalStore } from '$lib/utils/store/app';
import NewLessonModal from '$lib/components/Course/components/Lesson/NewLessonModal.svelte';
import DeleteLessonConfirmation from '$lib/components/Course/components/Lesson/DeleteLessonConfirmation.svelte';
@@ -36,7 +37,6 @@
let lessonEditing: string | undefined;
let lessonToDelete: Lesson | undefined;
let isStudent: boolean = true;
let openDeleteModal: boolean = false;
let isFetching: boolean = false;
@@ -127,7 +127,7 @@
</script>
{#if $handleAddLessonWidget}
<NewLessonModal {isStudent} />
<NewLessonModal />
{/if}
<DeleteLessonConfirmation
@@ -136,8 +136,7 @@
deleteLesson={() => handleDelete(lessonToDelete?.id)}
/>
<!-- TODO: Refactor usage of two way binding isStudent, rather use $globalStore.isStudent -->
<CourseContainer bind:isFetching bind:isStudent bind:courseId={data.courseId}>
<CourseContainer bind:isFetching bind:courseId={data.courseId}>
<PageNav title={$t('course.navItem.lessons.heading')}>
<div slot="widget">
<RoleBasedSecurity allowedRoles={[1, 2]}>
@@ -168,7 +167,7 @@
use:dndzone={{
items: $lessons,
flipDurationMs,
dragDisabled: isStudent,
dragDisabled: $globalStore.isStudent,
dropTargetStyle: {
border: '2px #1d4ed8 solid',
'border-style': 'dashed'
@@ -204,10 +203,10 @@
{:else}
<h3 class="m-0 flex items-center text-lg dark:text-white">
<a
href={isStudent && !lesson.is_unlocked
href={$globalStore.isStudent && !lesson.is_unlocked
? $page.url.pathname
: '/courses/' + $course.id + '/lessons/' + lesson.id}
class="font-medium text-black no-underline hover:underline dark:text-white {isStudent &&
class="font-medium text-black no-underline hover:underline dark:text-white {$globalStore.isStudent &&
!lesson.is_unlocked
? 'cursor-not-allowed'
: ''}"
@@ -299,7 +298,7 @@
<RoleBasedSecurity allowedRoles={[1, 2]}>
<OverflowMenu size="xl" class={`absolute right-0 top-0`}>
<OverflowMenuItem
disabled={isStudent}
disabled={$globalStore.isStudent}
text={lesson.is_unlocked
? $t('course.navItem.lessons.add_lesson.lock')
: $t('course.navItem.lessons.add_lesson.unlock')}
@@ -7,6 +7,7 @@
import CheckmarkOutlineIcon from 'carbon-icons-svelte/lib/CheckmarkOutline.svelte';
import CheckmarkFilledIcon from 'carbon-icons-svelte/lib/CheckmarkFilled.svelte';
import ListChecked from 'carbon-icons-svelte/lib/ListChecked.svelte';
import { globalStore } from '$lib/utils/store/app';
import SendAlt from 'carbon-icons-svelte/lib/SendAlt.svelte';
import CourseIcon from '$lib/components/Icons/CourseIcon.svelte';
@@ -47,7 +48,6 @@
let isMarkingComplete = false;
let isLoading = false;
let isSaving = false;
let isStudent = true;
let isLessonComplete = false;
function getLessonOrder(id: string) {
@@ -250,16 +250,14 @@
$: isLessonComplete = getIsLessonComplete($lesson.lesson_completion, $profile.id);
</script>
<!-- TODO: Refactor usage of two way binding isStudent, rather use $globalStore.isStudent -->
<CourseContainer
bind:isStudent
{path}
isExercisePage={!data.isMaterialsTabActive && !!data.exerciseId}
bind:courseId={data.courseId}
containerClass="relative"
>
<PageNav
bind:hideOnMobile={isStudent}
bind:hideOnMobile={$globalStore.isStudent}
navItems={[
{
label: $t('course.navItem.lessons.lesson_nav.materials'),
@@ -325,15 +323,10 @@
</PageNav>
{#if !data.isMaterialsTabActive}
<Exercises
bind:isStudent
lessonId={data.lessonId}
exerciseId={data.exerciseId}
path={`${path}/exercises`}
/>
<Exercises lessonId={data.lessonId} exerciseId={data.exerciseId} path={`${path}/exercises`} />
{:else if !!data.lessonId}
<PageBody
bind:isPageNavHidden={isStudent}
bind:isPageNavHidden={$globalStore.isStudent}
onClick={() => {
$apps.open = false;
$apps.dropdown = false;
@@ -348,10 +341,10 @@
{prevMode}
{toggleMode}
bind:isSaving
{isStudent}
isStudent={$globalStore.isStudent}
/>
<!-- {#if isStudent}
<!-- {#if $globalStore.isStudent}
<div class="w-full hidden lg:flex flex-row-reverse mt-10">
<PrimaryButton
onClick={() => markLessonComplete(data.lessonId)}
@@ -399,7 +392,7 @@
<button
class="px-2 my-2 pr-4 border-t-0 border-b-0 border-l-0 border border-gray-300 flex items-center disabled:opacity-10 disabled:cursor-not-allowed"
on:click={() => handleAppClick(APPS_CONSTANTS.APPS.COMMENTS)}
disabled={isStudent && !$currentOrg.customization.apps.comments}
disabled={$globalStore.isStudent && !$currentOrg.customization.apps.comments}
>
<SendAlt size={24} class="carbon-icon" />
<span class="ml-1">{$lesson.totalComments}</span>