fix: move all static env to dynamic

This commit is contained in:
Rotimi Best
2024-09-29 04:49:28 +01:00
parent 73fefddcc3
commit a3d478d313
8 changed files with 21 additions and 21 deletions
@@ -2,7 +2,7 @@
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import Download from 'carbon-icons-svelte/lib/Download.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 { course } from '$lib/components/Course/store';
import { currentOrg } from '$lib/utils/store/org'; import { currentOrg } from '$lib/utils/store/org';
import { profile } from '$lib/utils/store/user'; import { profile } from '$lib/utils/store/user';
@@ -23,7 +23,7 @@
isLoading = true; isLoading = true;
try { try {
const response = await fetch(PUBLIC_SERVER_URL + '/downloadCertificate', { const response = await fetch(env.PUBLIC_SERVER_URL + '/downloadCertificate', {
method: 'POST', method: 'POST',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
@@ -1,6 +1,6 @@
<script lang="ts"> <script lang="ts">
import axios from 'axios'; import axios from 'axios';
import { PUBLIC_SERVER_URL } from '$env/static/public'; import { env } from '$env/dynamic/public';
import PrimaryButton from '$lib/components/PrimaryButton/index.svelte'; import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
import { import {
lesson, lesson,
@@ -49,7 +49,7 @@
try { try {
const response = await axios({ const response = await axios({
method: 'POST', method: 'POST',
url: PUBLIC_SERVER_URL + '/uploadVideo?lessonId=' + lessonId, url: env.PUBLIC_SERVER_URL + '/uploadVideo?lessonId=' + lessonId,
data: formData, data: formData,
maxContentLength: Infinity, maxContentLength: Infinity,
maxBodyLength: Infinity, maxBodyLength: Infinity,
@@ -119,7 +119,7 @@
} }
$: isDoneUploading(formRes); $: isDoneUploading(formRes);
$: isDisabled = isLoading || !PUBLIC_SERVER_URL || $isFreePlan; $: isDisabled = isLoading || !env.PUBLIC_SERVER_URL || $isFreePlan;
</script> </script>
<UpgradeBanner className="mb-3" onClick={() => ($uploadCourseVideoStore.isModalOpen = false)}> <UpgradeBanner className="mb-3" onClick={() => ($uploadCourseVideoStore.isModalOpen = false)}>
@@ -10,7 +10,7 @@
RadioButton RadioButton
} from 'carbon-components-svelte'; } from 'carbon-components-svelte';
import { Restart, ArrowUpRight } from 'carbon-icons-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 SectionTitle from '$lib/components/Org/SectionTitle.svelte';
import TextField from '$lib/components/Form/TextField.svelte'; import TextField from '$lib/components/Form/TextField.svelte';
@@ -68,7 +68,7 @@
slideUrl: lesson.slide_url || '', slideUrl: lesson.slide_url || '',
video: lesson.videos || '' video: lesson.videos || ''
})); }));
const response = await fetch(PUBLIC_SERVER_URL + '/downloadCourse', { const response = await fetch(env.PUBLIC_SERVER_URL + '/downloadCourse', {
method: 'POST', method: 'POST',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
@@ -311,7 +311,7 @@
variant={VARIANTS.OUTLINED} variant={VARIANTS.OUTLINED}
label={$t('course.navItem.settings.download')} label={$t('course.navItem.settings.download')}
onClick={downloadCourse} onClick={downloadCourse}
isDisabled={isLoading || !PUBLIC_SERVER_URL} isDisabled={isLoading || !env.PUBLIC_SERVER_URL}
{isLoading} {isLoading}
/> />
{/if} {/if}
+3 -3
View File
@@ -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'; import type { ConfigType } from '$lib/utils/types/config';
export const config: ConfigType = { export const config: ConfigType = {
supabaseConfig: { supabaseConfig: {
url: PUBLIC_SUPABASE_URL || 'http://localhost:54321', url: env.PUBLIC_SUPABASE_URL || 'http://localhost:54321',
anonKey: PUBLIC_SUPABASE_ANON_KEY || 'anon-key' anonKey: env.PUBLIC_SUPABASE_ANON_KEY || 'anon-key'
} }
}; };
@@ -1,4 +1,4 @@
import { PUBLIC_SERVER_URL } from '$env/static/public'; import { env } from '$env/dynamic/public';
var win, output, textarea; var win, output, textarea;
@@ -89,7 +89,7 @@ export const addMathPlugin = (tinymce: any) => {
if (srcMatch) { if (srcMatch) {
// 2. Point the formula to our server // 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); const url = srcMatch[1]?.replaceAll('https://latex.codecogs.com/svg.image', customAPI);
// 3. Fetch the HTML from the server // 3. Fetch the HTML from the server
+2 -2
View File
@@ -1,4 +1,4 @@
import { PUBLIC_SERVER_URL } from '$env/static/public'; import { env } from '$env/dynamic/public';
const sendEmail = async ( const sendEmail = async (
emailDataArray: { emailDataArray: {
@@ -11,7 +11,7 @@ const sendEmail = async (
}[] }[]
) => { ) => {
try { try {
const response = await fetch(`${PUBLIC_SERVER_URL}/sendEmail`, { const response = await fetch(`${env.PUBLIC_SERVER_URL}/sendEmail`, {
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
@@ -2,7 +2,7 @@
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import { page } from '$app/stores'; import { page } from '$app/stores';
import CourseContainer from '$lib/components/CourseContainer/index.svelte'; 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 { fetchLesson, updateLessonCompletion } from '$lib/utils/services/courses';
import CheckmarkOutlineIcon from 'carbon-icons-svelte/lib/CheckmarkOutline.svelte'; import CheckmarkOutlineIcon from 'carbon-icons-svelte/lib/CheckmarkOutline.svelte';
import CheckmarkFilledIcon from 'carbon-icons-svelte/lib/CheckmarkFilled.svelte'; import CheckmarkFilledIcon from 'carbon-icons-svelte/lib/CheckmarkFilled.svelte';
@@ -145,7 +145,7 @@
const lessonNumber = getLessonOrder(currentLesson.id); const lessonNumber = getLessonOrder(currentLesson.id);
const slideUrl = $lesson.materials.slide_url || ''; 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', method: 'POST',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
@@ -369,7 +369,7 @@
{/if} {/if}
</IconButton> </IconButton>
{#if $course.metadata.lessonDownload && !!PUBLIC_SERVER_URL} {#if $course.metadata.lessonDownload && !!env.PUBLIC_SERVER_URL}
<PrimaryButton <PrimaryButton
className="mr-" className="mr-"
variant={VARIANTS.OUTLINED} variant={VARIANTS.OUTLINED}
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { PUBLIC_IP_REGISTRY_KEY } from '$env/static/public'; import { env } from '$env/dynamic/public';
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import { Dropdown } from 'carbon-components-svelte'; import { Dropdown } from 'carbon-components-svelte';
import TextField from '$lib/components/Form/TextField.svelte'; import TextField from '$lib/components/Form/TextField.svelte';
@@ -103,9 +103,9 @@
} }
async function setMetaData() { 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(); const payload = await response.json();
fields.metadata = payload; fields.metadata = payload;
} }