From 6f1a0e5eb23e7e4bd2d16d8b7b3f836eccfcfac8 Mon Sep 17 00:00:00 2001
From: Rotimi Best <best@classroomio.com>
Date: Fri, 17 Nov 2023 01:24:31 +0000
Subject: [PATCH] feat: move api url to env (#23)

---
 .env.example                                               | 5 ++++-
 .../StudentCertificate/UnlockedCertificate.svelte          | 4 +++-
 .../components/Lesson/Materials/Video/LocalVideo.svelte    | 5 +++--
 src/lib/components/Course/components/Settings/index.svelte | 5 +++--
 .../courses/[id]/lessons/[...lessonParams]/+page.svelte    | 7 ++++---
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.env.example b/.env.example
index 0535ad8f..1eacf78c 100644
--- a/.env.example
+++ b/.env.example
@@ -21,4 +21,7 @@ VITE_SENTRY_ORG_NAME=the-next-greats
 VITE_SENTRY_PROJECT_NAME=classroomio
 
 # OpenAI setup - Optional if you want to use OpenAI
-OPENAI_API_KEY=
\ No newline at end of file
+OPENAI_API_KEY=
+
+# Sever URL - Optional if you want to use video upload and pdf downloads
+PUBLIC_SERVER_URL=
\ No newline at end of file
diff --git a/src/lib/components/Course/components/Ceritficate/StudentCertificate/UnlockedCertificate.svelte b/src/lib/components/Course/components/Ceritficate/StudentCertificate/UnlockedCertificate.svelte
index 620a5e71..8c2e8655 100644
--- a/src/lib/components/Course/components/Ceritficate/StudentCertificate/UnlockedCertificate.svelte
+++ b/src/lib/components/Course/components/Ceritficate/StudentCertificate/UnlockedCertificate.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { PUBLIC_SERVER_URL } from '$env/static/public';
   import { course } from '$lib/components/Course/store';
   import { currentOrg } from '$lib/utils/store/org';
   import { profile } from '$lib/utils/store/user';
@@ -9,7 +10,7 @@
 
   const downLoadCertificate = async () => {
     isLoading = true;
-    const response = await fetch('https://classroomio-server.fly.dev/downloadCertificate', {
+    const response = await fetch(PUBLIC_SERVER_URL + '/downloadCertificate', {
       method: 'POST',
       headers: {
         Accept: 'application/json',
@@ -48,6 +49,7 @@
       label="DownLoad Certificate"
       className="rounded-md"
       onClick={downLoadCertificate}
+      isDisabled={!PUBLIC_SERVER_URL}
       {isLoading}
     />
   </div>
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 9e48a0e7..f3320c7f 100644
--- a/src/lib/components/Course/components/Lesson/Materials/Video/LocalVideo.svelte
+++ b/src/lib/components/Course/components/Lesson/Materials/Video/LocalVideo.svelte
@@ -1,5 +1,6 @@
 <script>
   import axios from 'axios';
+  import { PUBLIC_SERVER_URL } from '$env/static/public';
   import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
   import {
     lesson,
@@ -40,7 +41,7 @@
     try {
       const response = await axios({
         method: 'POST',
-        url: 'https://classroomio-server.fly.dev/uploadVideo?lessonId=' + lessonId,
+        url: PUBLIC_SERVER_URL + '/uploadVideo?lessonId=' + lessonId,
         data: formData,
         maxContentLength: Infinity,
         maxBodyLength: Infinity,
@@ -112,7 +113,7 @@
     type="button"
     on:click={() => (fileInput && !isLoading ? fileInput.click() : null)}
     class="w-full h-full"
-    disabled={isLoading}
+    disabled={isLoading || !PUBLIC_SERVER_URL}
   >
     <form
       class="h-full w-full flex flex-col items-center justify-center border border-primary-300 border-dashed rounded-xl"
diff --git a/src/lib/components/Course/components/Settings/index.svelte b/src/lib/components/Course/components/Settings/index.svelte
index 5ddf147c..7915bb0e 100644
--- a/src/lib/components/Course/components/Settings/index.svelte
+++ b/src/lib/components/Course/components/Settings/index.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
   import { CodeSnippet, Grid, Row, Column, Toggle } from 'carbon-components-svelte';
+  import { PUBLIC_SERVER_URL } from '$env/static/public';
 
   import SectionTitle from '$lib/components/Org/SectionTitle.svelte';
   import TextField from '$lib/components/Form/TextField.svelte';
@@ -53,7 +54,7 @@
         slideUrl: lesson.slide_url || '',
         video: lesson.videos || ''
       }));
-      const response = await fetch('https://classroomio-server.fly.dev/downloadCourse', {
+      const response = await fetch(PUBLIC_SERVER_URL + '/downloadCourse', {
         method: 'POST',
         headers: {
           Accept: 'application/json',
@@ -291,7 +292,7 @@
         variant={VARIANTS.OUTLINED}
         label="Download"
         onClick={downloadCourse}
-        isDisabled={isLoading}
+        isDisabled={isLoading || !PUBLIC_SERVER_URL}
         {isLoading}
       />
     </Column>
diff --git a/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte b/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte
index eee0d9de..f2d55e69 100644
--- a/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte
+++ b/src/routes/courses/[id]/lessons/[...lessonParams]/+page.svelte
@@ -2,7 +2,8 @@
   import { goto } from '$app/navigation';
   import { page } from '$app/stores';
   import CourseContainer from '$lib/components/CourseContainer/index.svelte';
-  import { fetchCourse, fetchLesson, updateLessonCompletion } from '$lib/utils/services/courses';
+  import { PUBLIC_SERVER_URL } from '$env/static/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';
   import ListChecked from 'carbon-icons-svelte/lib/ListChecked.svelte';
@@ -126,7 +127,7 @@
       const lessonNumber = getLessonOrder(currentLesson.id);
       const slideUrl = $lesson.materials.slide_url || '';
 
-      const response = await fetch('https://classroomio-server.fly.dev/downloadLesson', {
+      const response = await fetch(PUBLIC_SERVER_URL + '/downloadLesson', {
         method: 'POST',
         headers: {
           Accept: 'application/json',
@@ -253,7 +254,7 @@
                 : 'hidden'
             } lg:flex items-center`}
           >
-            {#if $course.metadata.lessonDownload}
+            {#if $course.metadata.lessonDownload && !!PUBLIC_SERVER_URL}
               <PrimaryButton
                 className="mb-2 lg:mb-0 mr-2"
                 variant={VARIANTS.OUTLINED}