diff --git a/package.json b/package.json index 710ddfb3..58030124 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "@sveltejs/adapter-auto": "^2.1.0", "@sveltejs/adapter-netlify": "^2.0.8", "@tailwindcss/forms": "^0.5.4", + "@tinymce/tinymce-svelte": "^1.0.1", "@types/marked": "^5.0.1", "@types/paystack": "^2.0.1", "@types/pluralize": "0.0.30", @@ -31,7 +32,6 @@ "axios": "^1.4.0", "body-parser": "^1.20.2", "canvas-confetti": "^1.6.0", - "cl-editor": "^2.3.0", "cookie-parser": "^1.4.6", "copy-to-clipboard": "^3.3.3", "form-data": "^4.0.0", @@ -42,7 +42,6 @@ "netlify": "^13.1.10", "openai-edge": "^1.2.2", "pluralize": "^8.0.0", - "quill": "^1.3.7", "sirv": "^2.0.3", "svelte-email": "^0.0.4", "wait-on": "^7.0.1", diff --git a/src/app.html b/src/app.html index c10fdbc4..63f9a6ef 100644 --- a/src/app.html +++ b/src/app.html @@ -1,52 +1,60 @@ - + + + + + - - - - + + + + + - ClassroomIO – The LMS with Superpowers - - - - - - - - - - - - - - + ClassroomIO – The LMS with Superpowers + + + + + + + + + + + + + + - - - - - - + + + + + - - - + - %sveltekit.head% - + %sveltekit.head% + - -
- %sveltekit.body% -
- - - \ No newline at end of file + +
%sveltekit.body%
+ + diff --git a/src/lib/components/Course/components/Lesson/Materials/index.svelte b/src/lib/components/Course/components/Lesson/Materials/index.svelte index 5debefa6..401ca0a5 100644 --- a/src/lib/components/Course/components/Lesson/Materials/index.svelte +++ b/src/lib/components/Course/components/Lesson/Materials/index.svelte @@ -1,4 +1,5 @@
- { - const _course = cloneDeep(course); - set(_course, 'metadata.description', html); - course = _course; - }} - /> +
diff --git a/src/lib/components/CourseLandingPage/components/Editor/GoalsForm.svelte b/src/lib/components/CourseLandingPage/components/Editor/GoalsForm.svelte index 15c28036..b3df59c0 100644 --- a/src/lib/components/CourseLandingPage/components/Editor/GoalsForm.svelte +++ b/src/lib/components/CourseLandingPage/components/Editor/GoalsForm.svelte @@ -5,15 +5,14 @@ import TextEditor from '$lib/components/TextEditor/index.svelte'; export let course; + + function handleChange(html) { + const _course = cloneDeep(course); + set(_course, 'metadata.goals', html); + course = _course; + }
- { - const _course = cloneDeep(course); - set(_course, 'metadata.goals', html); - course = _course; - }} - /> +
diff --git a/src/lib/components/CourseLandingPage/components/Editor/PricingForm.svelte b/src/lib/components/CourseLandingPage/components/Editor/PricingForm.svelte index d5510328..1120e981 100644 --- a/src/lib/components/CourseLandingPage/components/Editor/PricingForm.svelte +++ b/src/lib/components/CourseLandingPage/components/Editor/PricingForm.svelte @@ -4,8 +4,8 @@ import get from 'lodash/get'; import isEmpty from 'lodash/isEmpty'; import { Toggle } from 'carbon-components-svelte'; - import TextEditor from '$lib/components/TextEditor/index.svelte'; import TextField from '$lib/components/Form/TextField.svelte'; + import TextEditor from '$lib/components/TextEditor/index.svelte'; export let course = {}; @@ -34,6 +34,12 @@ course = _course; } + function handleChange(html) { + const _course = cloneDeep(course); + set(_course, 'metadata.reward.description', html); + course = _course; + } + $: setter(showDiscount, 'metadata.showDiscount'); $: setter(discount, 'metadata.discount'); $: setter(giftToggled, 'metadata.reward.show'); @@ -88,13 +94,6 @@

About Gift

- { - const _course = cloneDeep(course); - set(_course, 'metadata.reward.description', html); - course = _course; - }} - /> +
{/if} diff --git a/src/lib/components/CourseLandingPage/components/Editor/RequirementForm.svelte b/src/lib/components/CourseLandingPage/components/Editor/RequirementForm.svelte index 3d4ee299..c2df0439 100644 --- a/src/lib/components/CourseLandingPage/components/Editor/RequirementForm.svelte +++ b/src/lib/components/CourseLandingPage/components/Editor/RequirementForm.svelte @@ -5,15 +5,14 @@ import TextEditor from '$lib/components/TextEditor/index.svelte'; export let course; + + function handleChange(html) { + const _course = cloneDeep(course); + set(_course, 'metadata.requirements', html); + course = _course; + }
- { - const _course = cloneDeep(course); - set(_course, 'metadata.requirements', html); - course = _course; - }} - /> +
diff --git a/src/lib/components/TextEditor/index.svelte b/src/lib/components/TextEditor/index.svelte index 3a481464..d46f2790 100644 --- a/src/lib/components/TextEditor/index.svelte +++ b/src/lib/components/TextEditor/index.svelte @@ -1,130 +1,41 @@ -
-
- {#if errorMessage} -

- {errorMessage} -

- {/if} +
+
- - diff --git a/src/routes/lms/community/[slug]/+page.svelte b/src/routes/lms/community/[slug]/+page.svelte index 6470dd89..2930c8ec 100644 --- a/src/routes/lms/community/[slug]/+page.svelte +++ b/src/routes/lms/community/[slug]/+page.svelte @@ -10,7 +10,6 @@ import Vote from '$lib/components/Vote/index.svelte'; import PrimaryButton from '$lib/components/PrimaryButton/index.svelte'; import { VARIANTS } from '$lib/components/PrimaryButton/constants'; - import TextEditor from '$lib/components/TextEditor/index.svelte'; import Avatar from '$lib/components/Avatar/index.svelte'; import IconButton from '$lib/components/IconButton/index.svelte'; import CheckmarkOutlineIcon from 'carbon-icons-svelte/lib/CheckmarkOutline.svelte'; @@ -25,6 +24,7 @@ import { snackbarStore } from '$lib/components/Snackbar/store'; import TextField from '$lib/components/Form/TextField.svelte'; import DeleteCommentModal from '$lib/components/Org/Community/DeleteCommentModal.svelte'; + import TextEditor from '$lib/components/TextEditor/index.svelte'; dayjs.extend(relativeTime); @@ -47,6 +47,8 @@ body: '' }; + let editorInstance = false; + function mapResToQuestion(data) { return { id: data.id, @@ -211,6 +213,7 @@ } isEditMode = !isEditMode; + editorInstance = !editorInstance; if (!isEditMode) { const fields = { title: editContent.title, body: editContent.body }; @@ -334,14 +337,12 @@

- {#if isEditMode} + {#if isEditMode && editorInstance}
(editContent.body = c)} - placeholder="Update question" - errorMessage={errors.body} - docId={resetInput} + bind:value={editContent.body} + placeholder="Give an answer" + onChange={(html) => (editContent.body = html)} />
{:else} @@ -398,12 +399,13 @@
- (comment = c)} - placeholder="Give an answer" - errorMessage={errors.comment} - docId={resetInput} - /> + {#if !editorInstance} + (comment = html)} + /> + {/if}
diff --git a/src/routes/lms/community/ask/+page.svelte b/src/routes/lms/community/ask/+page.svelte index 14b21aef..c6505182 100644 --- a/src/routes/lms/community/ask/+page.svelte +++ b/src/routes/lms/community/ask/+page.svelte @@ -1,7 +1,6 @@