diff --git a/src/app.html b/src/app.html index c29773a1..23a64582 100644 --- a/src/app.html +++ b/src/app.html @@ -24,7 +24,7 @@ %sveltekit.head% - +
%sveltekit.body%
diff --git a/src/app.postcss b/src/app.postcss index 30f1edea..e9aa82b3 100644 --- a/src/app.postcss +++ b/src/app.postcss @@ -91,10 +91,371 @@ code { fill: red; } -.dark :global(svg.carbon-icon) { - fill: #fff; -} - @tailwind components; @tailwind utilities; + +/** + Rose Theme +*/ +.theme-rose .bg-primary-50 { + background-color: #fff1f2; +} +.theme-rose .text-primary-50 { + color: #fff1f2; +} + +.theme-rose .bg-primary-100 { + background-color: #ffe4e7; +} +.theme-rose .text-primary-100 { + color: #ffe4e7; +} + +.theme-rose .bg-primary-200 { + background-color: #fecdd4; +} +.theme-rose .text-primary-200 { + color: #fecdd4; +} + +.theme-rose .bg-primary-300 { + background-color: #fda4b2; +} +.theme-rose .text-primary-300 { + color: #fda4b2; +} + +.theme-rose .bg-primary-400 { + background-color: #fb7189; +} +.theme-rose .text-primary-400 { + color: #fb7189; +} + +.theme-rose .bg-primary-500 { + background-color: #f43f63; +} +.theme-rose .text-primary-500 { + color: #f43f63; +} + +.theme-rose .bg-primary-600 { + background-color: #e21d4e; +} +.theme-rose .text-primary-600 { + color: #e21d4e; +} + +.theme-rose .bg-primary-700 { + background-color: #be1241; +} +.theme-rose .text-primary-700 { + color: #be1241; +} + +.theme-rose .bg-primary-800 { + background-color: #9f123d; +} +.theme-rose .text-primary-800 { + color: #9f123d; +} + +.theme-rose .bg-primary-900 { + background-color: #88133a; +} +.theme-rose .text-primary-900 { + color: #88133a; +} + +/** + Blue Theme +*/ +.bg-primary-50 { + background-color: #eff6ff; +} +.text-primary-50 { + color: #eff6ff; +} + +.bg-primary-100 { + background-color: #dbeafe; +} +.text-primary-100 { + color: #dbeafe; +} + +.bg-primary-200 { + background-color: #bfdafe; +} +.text-primary-200 { + color: #bfdafe; +} + +.bg-primary-300 { + background-color: #92c4fe; +} +.text-primary-300 { + color: #92c4fe; +} + +.bg-primary-400 { + background-color: #5fa3fb; +} +.text-primary-400 { + color: #5fa3fb; +} + +.bg-primary-500 { + background-color: #3a7ff7; +} +.text-primary-500 { + color: #3a7ff7; +} + +.bg-primary-600 { + background-color: #2460ec; +} +.text-primary-600 { + color: #2460ec; +} + +.bg-primary-700 { + background-color: #1d4ee2; +} +.text-primary-700 { + color: #1d4ee2; +} + +.bg-primary-800 { + background-color: #1d3eb0; +} +.text-primary-800 { + color: #1d3eb0; +} + +.bg-primary-900 { + background-color: #1d398b; +} +.text-primary-900 { + color: #1d398b; +} + +/** + Green Theme +*/ +.theme-green .bg-primary-50 { + background-color: #effef0; +} +.theme-green .text-primary-50 { + color: #effef0; +} + +.theme-green .bg-primary-100 { + background-color: #d9ffdc; +} +.theme-green .text-primary-100 { + color: #d9ffdc; +} + +.theme-green .bg-primary-200 { + background-color: #b6fcbc; +} +.theme-green .text-primary-200 { + color: #b6fcbc; +} + +.theme-green .bg-primary-300 { + background-color: #7df88a; +} +.theme-green .text-primary-300 { + color: #7df88a; +} + +.theme-green .bg-primary-400 { + background-color: #3deb51; +} +.theme-green .text-primary-400 { + color: #3deb51; +} + +.theme-green .bg-primary-500 { + background-color: #12bf26; +} +.theme-green .text-primary-500 { + color: #12bf26; +} + +.theme-green .bg-primary-600 { + background-color: #0aaf1d; +} +.theme-green .text-primary-600 { + color: #0aaf1d; +} + +.theme-green .bg-primary-700 { + background-color: #0c891b; +} +.theme-green .text-primary-700 { + color: #0c891b; +} + +.theme-green .bg-primary-800 { + background-color: #0f6c1b; +} +.theme-green .text-primary-800 { + color: #0f6c1b; +} + +.theme-green .bg-primary-900 { + background-color: #0f581a; +} +.theme-green .text-primary-900 { + color: #0f581a; +} + +/** + Orange Theme +*/ +.theme-orange .bg-primary-50 { + background-color: #fff8ec; +} +.theme-orange .text-primary-50 { + color: #fff8ec; +} + +.theme-orange .bg-primary-100 { + background-color: #fff0d3; +} +.theme-orange .text-primary-100 { + color: #fff0d3; +} + +.theme-orange .bg-primary-200 { + background-color: #ffdca5; +} +.theme-orange .text-primary-200 { + color: #ffdca5; +} + +.theme-orange .bg-primary-300 { + background-color: #ffc26d; +} +.theme-orange .text-primary-300 { + color: #ffc26d; +} + +.theme-orange .bg-primary-400 { + background-color: #ff9d32; +} +.theme-orange .text-primary-400 { + color: #ff9d32; +} + +.theme-orange .bg-primary-500 { + background-color: #ff7f0a; +} +.theme-orange .text-primary-500 { + color: #ff7f0a; +} + +.theme-orange .bg-primary-600 { + background-color: #ff6600; +} +.theme-orange .text-primary-600 { + color: #ff6600; +} + +.theme-orange .bg-primary-700 { + background-color: #cc4902; +} +.theme-orange .text-primary-700 { + color: #cc4902; +} + +.theme-orange .bg-primary-800 { + background-color: #a1390b; +} +.theme-orange .text-primary-800 { + color: #a1390b; +} + +.theme-orange .bg-primary-900 { + background-color: #82310c; +} +.theme-orange .text-primary-900 { + color: #82310c; +} + +/** + Violet Theme +*/ +.theme-violet .bg-primary-50 { + background-color: #fff2fe; +} +.theme-violet .text-primary-50 { + color: #fff2fe; +} + +.theme-violet .bg-primary-100 { + background-color: #ffe3fe; +} +.theme-violet .text-primary-100 { + color: #ffe3fe; +} + +.theme-violet .bg-primary-200 { + background-color: #ffc6fe; +} +.theme-violet .text-primary-200 { + color: #ffc6fe; +} + +.theme-violet .bg-primary-300 { + background-color: #ff99f7; +} +.theme-violet .text-primary-300 { + color: #ff99f7; +} + +.theme-violet .bg-primary-400 { + background-color: #ff5df2; +} +.theme-violet .text-primary-400 { + color: #ff5df2; +} + +.theme-violet .bg-primary-500 { + background-color: #ff21f5; +} +.theme-violet .text-primary-500 { + color: #ff21f5; +} + +.theme-violet .bg-primary-600 { + background-color: #fb00ff; +} +.theme-violet .text-primary-600 { + color: #fb00ff; +} + +.theme-violet .bg-primary-700 { + background-color: #cf00ce; +} +.theme-violet .text-primary-700 { + color: #cf00ce; +} + +.theme-violet .bg-primary-800 { + background-color: #a900a6; +} +.theme-violet .text-primary-800 { + color: #a900a6; +} + +.theme-violet .bg-primary-900 { + background-color: #890684; +} +.theme-violet .text-primary-900 { + color: #890684; +} diff --git a/src/error.html b/src/error.html index 7a7ad86c..d6a9465a 100644 --- a/src/error.html +++ b/src/error.html @@ -13,7 +13,7 @@ have gotten the error notification and will push a fix ASAP. In the meantime, take a short break and come back a bit later.

- Contact Us diff --git a/src/lib/components/Apps/components/Poll/components/Avatar.svelte b/src/lib/components/Apps/components/Poll/components/Avatar.svelte index 9b0b603a..d11f6620 100644 --- a/src/lib/components/Apps/components/Poll/components/Avatar.svelte +++ b/src/lib/components/Apps/components/Poll/components/Avatar.svelte @@ -4,8 +4,4 @@ export let className; -{name} +{name} diff --git a/src/lib/components/Apps/components/Poll/components/Poll.svelte b/src/lib/components/Apps/components/Poll/components/Poll.svelte index 6add5898..0cf7b851 100644 --- a/src/lib/components/Apps/components/Poll/components/Poll.svelte +++ b/src/lib/components/Apps/components/Poll/components/Poll.svelte @@ -30,9 +30,7 @@ const totalVoteOfAllOptions = getTotalVotes(options); const totalVotesOfCurrentOption = currentOption.selectedBy.length; - return ( - Math.round((totalVotesOfCurrentOption / totalVoteOfAllOptions) * 100) || 0 - ); + return Math.round((totalVotesOfCurrentOption / totalVoteOfAllOptions) * 100) || 0; } function didUserSelect(option) { @@ -52,10 +50,7 @@ {#if selectedOptionToView}
-
@@ -79,7 +74,7 @@

Created by @{poll.author.label} @@ -124,15 +119,12 @@

{#if option.selectedBy.length} - {/if} @@ -151,19 +143,17 @@ class="bg-white dark:bg-gray-800 rounded-md border-2 border-gray-500 {didUserSelect( option ) && - 'focus:border-blue-700 border-blue-700'} text-black p-2 w-full mb-3 text-left relative" + 'focus:border-primary-700 border-primary-700'} text-black p-2 w-full mb-3 text-left relative" on:click={handleSelect(index)} > {#if hasUserVoted} - {calculatePercent(poll.options, option)}% + {calculatePercent(poll.options, option)}% {/if} {option.label} @@ -182,7 +172,7 @@ {#if isAuthor}
-
diff --git a/src/lib/components/AuthUI/index.svelte b/src/lib/components/AuthUI/index.svelte index 6be3b372..8b13ffb7 100644 --- a/src/lib/components/AuthUI/index.svelte +++ b/src/lib/components/AuthUI/index.svelte @@ -75,9 +75,11 @@ {#if !showOnlyContent}
{#if isLogin} - Not registered yet? Sign up + Not registered yet? Sign up {:else} - Already have an account? Log In + Already have an account? Log In {/if}
{/if} diff --git a/src/lib/components/Avatar/index.svelte b/src/lib/components/Avatar/index.svelte index 472618ed..7ba647c9 100644 --- a/src/lib/components/Avatar/index.svelte +++ b/src/lib/components/Avatar/index.svelte @@ -7,8 +7,4 @@ export let height = 'h-10'; -{name} +{name} diff --git a/src/lib/components/Buttons/Close/index.svelte b/src/lib/components/Buttons/Close/index.svelte index 7a81c895..c2cb0d3f 100644 --- a/src/lib/components/Buttons/Close/index.svelte +++ b/src/lib/components/Buttons/Close/index.svelte @@ -4,7 +4,7 @@ export let onClick; export let contained; - export let color = 'text-blue-700 bg-blue-200 dark:bg-gray-500'; + export let color = 'text-primary-700 bg-primary-200 dark:bg-gray-500'; export let size = 'large'; @@ -15,4 +15,4 @@ {/if} - + diff --git a/src/lib/components/ComingSoon/index.svelte b/src/lib/components/ComingSoon/index.svelte index 7cc4df0e..2c86445a 100644 --- a/src/lib/components/ComingSoon/index.svelte +++ b/src/lib/components/ComingSoon/index.svelte @@ -3,7 +3,7 @@

{label}

diff --git a/src/lib/components/Course/components/Ceritficate/Reports.svelte b/src/lib/components/Course/components/Ceritficate/Reports.svelte index bac981f4..a1a72d0e 100644 --- a/src/lib/components/Course/components/Ceritficate/Reports.svelte +++ b/src/lib/components/Course/components/Ceritficate/Reports.svelte @@ -8,7 +8,7 @@ StructuredListRow, StructuredListCell, StructuredListBody, - Pagination, + Pagination } from 'carbon-components-svelte'; let searchValue = ''; @@ -17,9 +17,7 @@
{#each CertificateReportData as data (data.id)} -
+

{data.title}

{data.value}
@@ -39,22 +37,18 @@
- +
-

- Name of student -

+

Name of student

 -
+

Date issued

personalized

@@ -76,8 +70,8 @@

{item.issued}

{#if item.peronalized == true} - -

personalized

+ +

personalized

 {:else}

personalized

diff --git a/src/lib/components/Course/components/Ceritficate/certificates/Professional.svelte b/src/lib/components/Course/components/Ceritficate/certificates/Professional.svelte index f9b1d122..44d8b862 100644 --- a/src/lib/components/Course/components/Ceritficate/certificates/Professional.svelte +++ b/src/lib/components/Course/components/Ceritficate/certificates/Professional.svelte @@ -4,11 +4,13 @@ export let studentName; let borderwidth = 'border-l-8'; - let bordercolor = 'border-blue-800'; + let bordercolor = 'border-primary-800'; let logo = './logo-512.png'; -
+

@@ -24,7 +26,7 @@

{$course.title}

diff --git a/src/lib/components/Course/components/Lesson/Exercise/DeleteConfirmation.svelte b/src/lib/components/Course/components/Lesson/Exercise/DeleteConfirmation.svelte index 66dcef2f..84e2c779 100644 --- a/src/lib/components/Course/components/Lesson/Exercise/DeleteConfirmation.svelte +++ b/src/lib/components/Course/components/Lesson/Exercise/DeleteConfirmation.svelte @@ -21,9 +21,7 @@ modalHeading="Delete question" >
-

- Are you sure you want to delete this question? -

+

Are you sure you want to delete this question?

{ onDelete(); diff --git a/src/lib/components/Course/components/Lesson/Exercise/EditMode.svelte b/src/lib/components/Course/components/Lesson/Exercise/EditMode.svelte index 807c1626..41097a55 100644 --- a/src/lib/components/Course/components/Lesson/Exercise/EditMode.svelte +++ b/src/lib/components/Course/components/Lesson/Exercise/EditMode.svelte @@ -132,7 +132,7 @@ /> (shouldDelete = true)} /> diff --git a/src/lib/components/Course/components/Lesson/Exercise/MarkExerciseModal.svelte b/src/lib/components/Course/components/Lesson/Exercise/MarkExerciseModal.svelte index 430cc151..3dab291e 100644 --- a/src/lib/components/Course/components/Lesson/Exercise/MarkExerciseModal.svelte +++ b/src/lib/components/Course/components/Lesson/Exercise/MarkExerciseModal.svelte @@ -22,18 +22,12 @@ let maxPoints = 0; function getMaxPoints(questions) { - return (questions || []).reduce( - (acc, question) => acc + question.points, - 0 - ); + return (questions || []).reduce((acc, question) => acc + question.points, 0); } function calculateTotal(grades) { if (!grades) return 0; - return Object.values(grades).reduce( - (acc, grade) => acc + parseInt(grade), - 0 - ); + return Object.values(grades).reduce((acc, grade) => acc + parseInt(grade), 0); } function handleStatusChange() { @@ -41,7 +35,7 @@ submissionId: data.id, prevStatusId: data.status_id, nextStatusId: status.value, - total, + total }); $snackbarStore.open = true; @@ -49,9 +43,7 @@ } function setStatus(data) { - status = SELECTABLE_STATUS.find( - (status) => status.value === data.status_id - ); + status = SELECTABLE_STATUS.find((status) => status.value === data.status_id); } function getStatusColor(status) { @@ -62,7 +54,7 @@ // case STATUS.SUBMITTED: // return ''; // case STATUS.IN_PROGRESS: - // return 'text-white bg-blue-700'; + // return 'text-white bg-primary-700'; // case STATUS.GRADED: // return 'text-white bg-green-700'; // } @@ -91,7 +83,7 @@ : []} questionnaireMetaData={{ answers: data.answers || {}, - isFinished: true, + isFinished: true }} bind:grades={data.questionAnswerByPoint} /> @@ -121,17 +113,9 @@

Details {#if data.isEarly} - - early - + early {:else} - - late - + late {/if}

diff --git a/src/lib/components/Course/components/Lesson/Exercise/OrderModal.svelte b/src/lib/components/Course/components/Lesson/Exercise/OrderModal.svelte index 73754b0b..67bc8939 100644 --- a/src/lib/components/Course/components/Lesson/Exercise/OrderModal.svelte +++ b/src/lib/components/Course/components/Lesson/Exercise/OrderModal.svelte @@ -39,16 +39,14 @@ } }); }); - $questionnaire.questions = $questionnaire.questions.sort( - (a, b) => a.order - b.order - ); + $questionnaire.questions = $questionnaire.questions.sort((a, b) => a.order - b.order); $questionnaireOrder.open = false; } $: items = filterOutDeleted($questionnaire.questions).map((q) => ({ id: q.id, name: q.title, - type: q.question_type.id, + type: q.question_type.id })); @@ -64,8 +62,8 @@ flipDurationMs, dropTargetStyle: { border: '2px #1d4ed8 solid', - 'border-style': 'dashed', - }, + 'border-style': 'dashed' + } }} on:consider={handleDndConsider} on:finalize={handleDndFinalize} @@ -74,7 +72,7 @@ {#each items as item (item.id)}
{#if item.type === 1} diff --git a/src/lib/components/Course/components/Lesson/Exercise/ViewMode.svelte b/src/lib/components/Course/components/Lesson/Exercise/ViewMode.svelte index 3d37bcd7..50803a0e 100644 --- a/src/lib/components/Course/components/Lesson/Exercise/ViewMode.svelte +++ b/src/lib/components/Course/components/Lesson/Exercise/ViewMode.svelte @@ -173,7 +173,7 @@

No question added for this exercise

- Click the Edit button to add. + Click the Edit button to add.

diff --git a/src/lib/components/Course/components/Lesson/Materials/Video/LocalVideo.svelte b/src/lib/components/Course/components/Lesson/Materials/Video/LocalVideo.svelte index c4982cff..a8da41ee 100644 --- a/src/lib/components/Course/components/Lesson/Materials/Video/LocalVideo.svelte +++ b/src/lib/components/Course/components/Lesson/Materials/Video/LocalVideo.svelte @@ -115,7 +115,7 @@ disabled={isLoading} >
{#if isLoading} diff --git a/src/lib/components/Course/components/Navigation/index.svelte b/src/lib/components/Course/components/Navigation/index.svelte index 30e67658..43f08fbe 100644 --- a/src/lib/components/Course/components/Navigation/index.svelte +++ b/src/lib/components/Course/components/Navigation/index.svelte @@ -203,7 +203,7 @@ > diff --git a/src/lib/components/Course/components/Settings/index.svelte b/src/lib/components/Course/components/Settings/index.svelte index 1b7d8931..0bf445e4 100644 --- a/src/lib/components/Course/components/Settings/index.svelte +++ b/src/lib/components/Course/components/Settings/index.svelte @@ -28,7 +28,7 @@ $settingsDialog.open = false; const logo = await updateCourse($course.id, avatar, { title: $course.title, - description: $course.description, + description: $course.description }); if (logo) { @@ -100,7 +100,7 @@
(shouldDelete = true)} /> diff --git a/src/lib/components/CourseLandingPage/index.svelte b/src/lib/components/CourseLandingPage/index.svelte index 6a160d61..8018f47e 100644 --- a/src/lib/components/CourseLandingPage/index.svelte +++ b/src/lib/components/CourseLandingPage/index.svelte @@ -176,7 +176,7 @@ {navItem.label} @@ -229,7 +229,10 @@ {#each lessons as lesson, index}
- +

{lesson.title}

@@ -305,13 +308,13 @@
{#if !expandDescription[id] && review.description.split(' ').length > 9} {/if} {#if expandDescription[id]} {/if} @@ -400,7 +403,7 @@ {get(instructor, 'role', '')}

- + {get(instructor, 'courseNo', '')} courses

diff --git a/src/lib/components/Dropdown/index.svelte b/src/lib/components/Dropdown/index.svelte index 5965b2cf..92aaeff1 100644 --- a/src/lib/components/Dropdown/index.svelte +++ b/src/lib/components/Dropdown/index.svelte @@ -46,9 +46,8 @@ > {#each options as option, index}