diff --git a/src/lib/components/Course/components/Settings/index.svelte b/src/lib/components/Course/components/Settings/index.svelte index e7ca01f7..e667f820 100644 --- a/src/lib/components/Course/components/Settings/index.svelte +++ b/src/lib/components/Course/components/Settings/index.svelte @@ -142,11 +142,20 @@ } isSaving = true; try { - const { course_title, course_description, image, tabs, grading, lesson_download } = $settings; + const { + course_title, + course_description, + image, + tabs, + grading, + lesson_download, + is_published + } = $settings; await updateCourse($course.id, avatar, { title: course_title, description: course_description, logo: image, + is_published, metadata: { ...(isObject($course.metadata) ? $course.metadata : {}), lessonTabsOrder: tabs, @@ -158,6 +167,7 @@ $course.title = course_title; $course.description = course_description; $course.logo = image; + $course.is_published = is_published; $course.metadata = { ...(isObject($course.metadata) ? $course.metadata : {}), lessonTabsOrder: tabs, @@ -173,6 +183,7 @@ }; function setDefault(course) { + console.log('course.is_published', course.is_published); if (course && Object.keys(course).length) { $settings = { course_title: course.title, @@ -180,7 +191,8 @@ image: course.logo, tabs: course.metadata.lessonTabsOrder || $settings.tabs, grading: course.metadata.grading, - lesson_download: course.metadata.lessonDownload + lesson_download: course.metadata.lessonDownload, + is_published: course.is_published }; } } @@ -305,6 +317,21 @@ /> + + + + + Publish Course +

This determines if your course displays on your landing page

+ + + + Unpublished + Published + + + + Delete course diff --git a/src/lib/components/Course/components/Settings/store.js b/src/lib/components/Course/components/Settings/store.js index 30ed1880..704c8a58 100644 --- a/src/lib/components/Course/components/Settings/store.js +++ b/src/lib/components/Course/components/Settings/store.js @@ -10,5 +10,6 @@ export const settings = writable({ { id: 2, name: 'Slide' }, { id: 3, name: 'Video' } ], - lesson_download: false + lesson_download: false, + is_published: false }); diff --git a/src/lib/components/Course/store.ts b/src/lib/components/Course/store.ts index bac17ea2..db4fe260 100644 --- a/src/lib/components/Course/store.ts +++ b/src/lib/components/Course/store.ts @@ -1,7 +1,6 @@ import { writable } from 'svelte/store'; import type { Writable } from 'svelte/store'; import { lessons } from './components/Lesson/store/lessons'; -//@ts-ignore import { ROLE } from '$lib/utils/constants/roles'; import type { Course } from '$lib/utils/types'; @@ -14,6 +13,9 @@ export const course: Writable = writable({ status: 'ACTIVE', is_certificate_downloadable: false, certificate_theme: 'professional', + is_published: false, + created_at: new Date().toDateString(), + updated_at: new Date().toDateString(), metadata: { requirements: '', description: '', diff --git a/src/lib/components/Courses/api.js b/src/lib/components/Courses/api.js index 7107fff8..93e927d5 100644 --- a/src/lib/components/Courses/api.js +++ b/src/lib/components/Courses/api.js @@ -6,7 +6,8 @@ export async function fetchCourses(profileId, orgId) { // Gets courses for a particular organisation where the current logged in user is a groupmember const { data: allCourses } = await supabase .rpc('get_courses', { - org_id_arg: orgId + org_id_arg: orgId, + profile_id_arg: profileId }) .eq('profile_id', profileId); diff --git a/src/lib/components/Courses/components/Card/index.svelte b/src/lib/components/Courses/components/Card/index.svelte index 2263f3e6..592aadde 100644 --- a/src/lib/components/Courses/components/Card/index.svelte +++ b/src/lib/components/Courses/components/Card/index.svelte @@ -1,50 +1,25 @@ -
-

{totalLessons} lessons

-

- {#if isOnLandingPage} - {!cost ? 'Free' : formatter.format(cost)} - {:else} - - {#if isPublished} - Published - {:else} - Unpublished - {/if} - - {/if} -

+
+
+

{totalLessons} lessons

+

+ {#if isOnLandingPage} + {!cost ? 'Free' : formatter.format(cost)} + {:else if isLMS} +

+
+
+
+

{progressRate}%

+
+ {:else} + + {#if isPublished} + Published + {:else} + Unpublished + {/if} + + {/if} +

+
+ + {#if isLMS} + + {/if}
@@ -97,7 +94,7 @@ } .title, .description { - height: 40px; + height: 42px; line-height: 20px; display: -webkit-box; -webkit-box-orient: vertical; diff --git a/src/lib/components/Courses/index.svelte b/src/lib/components/Courses/index.svelte index f52c8398..c2d712d2 100644 --- a/src/lib/components/Courses/index.svelte +++ b/src/lib/components/Courses/index.svelte @@ -3,14 +3,23 @@ import Card from './components/Card/index.svelte'; import CardLoader from './components/Card/Loader.svelte'; import CoursesEmptyIcon from '../Icons/CoursesEmptyIcon.svelte'; - import CopyCourseModal from './components/CopyCourseModal/index.svelte'; + // import CopyCourseModal from './components/CopyCourseModal/index.svelte'; import { courseMetaDeta } from './store'; import type { Course } from '$lib/utils/types'; + import { appStore } from '$lib/utils/store/app'; export let courses: Course[] = []; + + function calcProgressRate(progressRate?: number, totalLessons?: number): number { + if (!progressRate || !totalLessons) { + return 0; + } + + return Math.round((progressRate / totalLessons) * 100); + } - +
{#if $courseMetaDeta.isLoading} @@ -30,6 +39,8 @@ cost={courseData.cost} currency={courseData.currency} totalLessons={courseData.total_lessons} + isLMS={$appStore.isOrgSite} + progressRate={calcProgressRate(courseData.progress_rate, courseData.total_lessons)} /> {/key} {/each} diff --git a/src/lib/components/LMS/components/AllLearning.svelte b/src/lib/components/LMS/components/AllLearning.svelte deleted file mode 100644 index e849684f..00000000 --- a/src/lib/components/LMS/components/AllLearning.svelte +++ /dev/null @@ -1,69 +0,0 @@ - - -
- {#if mockData.length > 0} -
- {#each mockData as data} -
- course - -
-

- {data.title} -

-

- {data.description} -

-

By {data.author}

- - -

{data.lessons} lessons

- {#if data.inProgress} -
-
-
-
-

{data.progressRate}%

-
- {/if} - - gotoCourse(data.title)} - /> - -
-
- {/each} -
- {:else} - - -

You haven't started any course yet

-

- Once you start a course, your progress will reflect here -

- - {/if} -
diff --git a/src/lib/components/LMS/components/InProgress.svelte b/src/lib/components/LMS/components/InProgress.svelte index 9d2c53d6..ebef63ae 100644 --- a/src/lib/components/LMS/components/InProgress.svelte +++ b/src/lib/components/LMS/components/InProgress.svelte @@ -1,14 +1,8 @@
@@ -17,44 +11,16 @@ class="flex items-center justify-center md:justify-start flex-wrap gap-4 dark:text-white mt-2" > {#each courseInProgress as data} -
- course - -
-

- {data.title} -

-

- {data.description} -

-

By {data.author}

- - -

{data.lessons} lessons

- {#if data.inProgress} -
-
-
-
-

{data.progressRate}%

-
- {/if} - - gotoCourse(data.title)} - /> - -
-
+ {#key data.id} + + {/key} {/each}
{:else} diff --git a/src/lib/components/LMS/components/store.js b/src/lib/components/LMS/components/store.js index 0e659616..38891821 100644 --- a/src/lib/components/LMS/components/store.js +++ b/src/lib/components/LMS/components/store.js @@ -1,5 +1,6 @@ export const mockData = [ { + id: '1', title: 'Photo editing 101', description: 'Learn the different techniques to edit photos using Adobe Lightroom.Learn the basics of figma and start design web apps for the world ...Learn the basics of figma and start design web apps for the world ...', @@ -12,6 +13,7 @@ export const mockData = [ progressRate: 45 }, { + id: '2', title: 'Colorful digital painting', description: 'Learn the different techniques to edit photos using Adobe Lightroom.Learn the basics of figma and start design web apps for the world ...Learn the basics of figma and start design web apps for the world ...', @@ -24,6 +26,7 @@ export const mockData = [ progressRate: 45 }, { + id: '3', title: 'AI for dummys', description: 'Learn the different techniques to edit photos using Adobe Lightroom.Learn the basics of figma and start design web apps for the world ...Learn the basics of figma and start design web apps for the world ...', diff --git a/src/lib/components/Navigation/app.svelte b/src/lib/components/Navigation/app.svelte index b0a75187..e88fc7b0 100644 --- a/src/lib/components/Navigation/app.svelte +++ b/src/lib/components/Navigation/app.svelte @@ -8,7 +8,6 @@ import Close from 'carbon-icons-svelte/lib/Close.svelte'; import IconButton from '$lib/components/IconButton/index.svelte'; - import { course } from '$lib/components/Course/store'; import { appStore } from '$lib/utils/store/app'; import { currentOrgPath } from '$lib/utils/store/org'; import { toggleBodyByMode } from '$lib/utils/functions/app'; @@ -33,13 +32,7 @@ } } - function getPathName(_isCoursePage = false, slug = '') { - if (!_isCoursePage) { - return '/'; - } - - return slug ? `/course/${slug}` : `${$currentOrgPath}/courses`; - } + $: coursesPath = $appStore.isOrgSite ? '/lms/mylearning' : `${$currentOrgPath}/courses`;
{/if}