From a3d478d3137f5f8a227cb2d98f906fb04e62e7bb Mon Sep 17 00:00:00 2001 From: Rotimi Best Date: Sun, 29 Sep 2024 04:49:28 +0100 Subject: [PATCH] fix: move all static env to dynamic --- .../StudentCertificate/UnlockedCertificate.svelte | 4 ++-- .../components/Lesson/Materials/Video/LocalVideo.svelte | 6 +++--- .../lib/components/Course/components/Settings/index.svelte | 6 +++--- apps/dashboard/src/lib/config.ts | 6 +++--- apps/dashboard/src/lib/utils/functions/tinymce/plugins.ts | 4 ++-- apps/dashboard/src/mail/sendEmail.ts | 4 ++-- .../courses/[id]/lessons/[...lessonParams]/+page.svelte | 6 +++--- apps/dashboard/src/routes/onboarding/+page.svelte | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/dashboard/src/lib/components/Course/components/Ceritficate/StudentCertificate/UnlockedCertificate.svelte b/apps/dashboard/src/lib/components/Course/components/Ceritficate/StudentCertificate/UnlockedCertificate.svelte index 07cc5b08..08920b05 100644 --- a/apps/dashboard/src/lib/components/Course/components/Ceritficate/StudentCertificate/UnlockedCertificate.svelte +++ b/apps/dashboard/src/lib/components/Course/components/Ceritficate/StudentCertificate/UnlockedCertificate.svelte @@ -2,7 +2,7 @@ import { onMount } from 'svelte'; import Download from 'carbon-icons-svelte/lib/Download.svelte'; - import { PUBLIC_SERVER_URL } from '$env/static/public'; + import { PUBLIC_SERVER_URL } from '$env/dynamic/public'; import { course } from '$lib/components/Course/store'; import { currentOrg } from '$lib/utils/store/org'; import { profile } from '$lib/utils/store/user'; @@ -23,7 +23,7 @@ isLoading = true; try { - const response = await fetch(PUBLIC_SERVER_URL + '/downloadCertificate', { + const response = await fetch(env.PUBLIC_SERVER_URL + '/downloadCertificate', { method: 'POST', headers: { Accept: 'application/json', diff --git a/apps/dashboard/src/lib/components/Course/components/Lesson/Materials/Video/LocalVideo.svelte b/apps/dashboard/src/lib/components/Course/components/Lesson/Materials/Video/LocalVideo.svelte index 1e7e1e04..06fa4af3 100644 --- a/apps/dashboard/src/lib/components/Course/components/Lesson/Materials/Video/LocalVideo.svelte +++ b/apps/dashboard/src/lib/components/Course/components/Lesson/Materials/Video/LocalVideo.svelte @@ -1,6 +1,6 @@ ($uploadCourseVideoStore.isModalOpen = false)}> diff --git a/apps/dashboard/src/lib/components/Course/components/Settings/index.svelte b/apps/dashboard/src/lib/components/Course/components/Settings/index.svelte index 818e05d4..d04f3846 100644 --- a/apps/dashboard/src/lib/components/Course/components/Settings/index.svelte +++ b/apps/dashboard/src/lib/components/Course/components/Settings/index.svelte @@ -10,7 +10,7 @@ RadioButton } from 'carbon-components-svelte'; import { Restart, ArrowUpRight } from 'carbon-icons-svelte'; - import { PUBLIC_SERVER_URL } from '$env/static/public'; + import { env } from '$env/dynamic/public'; import SectionTitle from '$lib/components/Org/SectionTitle.svelte'; import TextField from '$lib/components/Form/TextField.svelte'; @@ -68,7 +68,7 @@ slideUrl: lesson.slide_url || '', video: lesson.videos || '' })); - const response = await fetch(PUBLIC_SERVER_URL + '/downloadCourse', { + const response = await fetch(env.PUBLIC_SERVER_URL + '/downloadCourse', { method: 'POST', headers: { Accept: 'application/json', @@ -311,7 +311,7 @@ variant={VARIANTS.OUTLINED} label={$t('course.navItem.settings.download')} onClick={downloadCourse} - isDisabled={isLoading || !PUBLIC_SERVER_URL} + isDisabled={isLoading || !env.PUBLIC_SERVER_URL} {isLoading} /> {/if} diff --git a/apps/dashboard/src/lib/config.ts b/apps/dashboard/src/lib/config.ts index 525cbfef..7cb4e6d8 100644 --- a/apps/dashboard/src/lib/config.ts +++ b/apps/dashboard/src/lib/config.ts @@ -1,9 +1,9 @@ -import { PUBLIC_SUPABASE_ANON_KEY, PUBLIC_SUPABASE_URL } from '$env/static/public'; +import { env } from '$env/dynamic/public'; import type { ConfigType } from '$lib/utils/types/config'; export const config: ConfigType = { supabaseConfig: { - url: PUBLIC_SUPABASE_URL || 'http://localhost:54321', - anonKey: PUBLIC_SUPABASE_ANON_KEY || 'anon-key' + url: env.PUBLIC_SUPABASE_URL || 'http://localhost:54321', + anonKey: env.PUBLIC_SUPABASE_ANON_KEY || 'anon-key' } }; diff --git a/apps/dashboard/src/lib/utils/functions/tinymce/plugins.ts b/apps/dashboard/src/lib/utils/functions/tinymce/plugins.ts index 0598f497..88289752 100644 --- a/apps/dashboard/src/lib/utils/functions/tinymce/plugins.ts +++ b/apps/dashboard/src/lib/utils/functions/tinymce/plugins.ts @@ -1,4 +1,4 @@ -import { PUBLIC_SERVER_URL } from '$env/static/public'; +import { env } from '$env/dynamic/public'; var win, output, textarea; @@ -89,7 +89,7 @@ export const addMathPlugin = (tinymce: any) => { if (srcMatch) { // 2. Point the formula to our server - const customAPI = PUBLIC_SERVER_URL + '/katex'; + const customAPI = env.PUBLIC_SERVER_URL + '/katex'; const url = srcMatch[1]?.replaceAll('https://latex.codecogs.com/svg.image', customAPI); // 3. Fetch the HTML from the server diff --git a/apps/dashboard/src/mail/sendEmail.ts b/apps/dashboard/src/mail/sendEmail.ts index ce4e87ab..4d54a61b 100644 --- a/apps/dashboard/src/mail/sendEmail.ts +++ b/apps/dashboard/src/mail/sendEmail.ts @@ -1,4 +1,4 @@ -import { PUBLIC_SERVER_URL } from '$env/static/public'; +import { env } from '$env/dynamic/public'; const sendEmail = async ( emailDataArray: { @@ -11,7 +11,7 @@ const sendEmail = async ( }[] ) => { try { - const response = await fetch(`${PUBLIC_SERVER_URL}/sendEmail`, { + const response = await fetch(`${env.PUBLIC_SERVER_URL}/sendEmail`, { method: 'POST', headers: { 'Content-Type': 'application/json' diff --git a/apps/dashboard/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte b/apps/dashboard/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte index 8e20c98a..993c8a1b 100644 --- a/apps/dashboard/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte +++ b/apps/dashboard/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte @@ -2,7 +2,7 @@ import { goto } from '$app/navigation'; import { page } from '$app/stores'; import CourseContainer from '$lib/components/CourseContainer/index.svelte'; - import { PUBLIC_SERVER_URL } from '$env/static/public'; + import { env } from '$env/dynamic/public'; import { fetchLesson, updateLessonCompletion } from '$lib/utils/services/courses'; import CheckmarkOutlineIcon from 'carbon-icons-svelte/lib/CheckmarkOutline.svelte'; import CheckmarkFilledIcon from 'carbon-icons-svelte/lib/CheckmarkFilled.svelte'; @@ -145,7 +145,7 @@ const lessonNumber = getLessonOrder(currentLesson.id); const slideUrl = $lesson.materials.slide_url || ''; - const response = await fetch(PUBLIC_SERVER_URL + '/downloadLesson', { + const response = await fetch(env.PUBLIC_SERVER_URL + '/downloadLesson', { method: 'POST', headers: { Accept: 'application/json', @@ -369,7 +369,7 @@ {/if} - {#if $course.metadata.lessonDownload && !!PUBLIC_SERVER_URL} + {#if $course.metadata.lessonDownload && !!env.PUBLIC_SERVER_URL} - import { PUBLIC_IP_REGISTRY_KEY } from '$env/static/public'; + import { env } from '$env/dynamic/public'; import { goto } from '$app/navigation'; import { Dropdown } from 'carbon-components-svelte'; import TextField from '$lib/components/Form/TextField.svelte'; @@ -103,9 +103,9 @@ } async function setMetaData() { - if (!PUBLIC_IP_REGISTRY_KEY) return; + if (!env.PUBLIC_IP_REGISTRY_KEY) return; - const response = await fetch(`https://api.ipregistry.co/?key=${PUBLIC_IP_REGISTRY_KEY}`); + const response = await fetch(`https://api.ipregistry.co/?key=${env.PUBLIC_IP_REGISTRY_KEY}`); const payload = await response.json(); fields.metadata = payload; }