From 37847cd3f81f334743245389ac7c85c18f776280 Mon Sep 17 00:00:00 2001
From: ImJustChew <chewtzihwee@gmail.com>
Date: Sat, 4 Nov 2023 17:05:12 +0800
Subject: [PATCH] cds ui update and removed bottleneck

---
 src/app/[lang]/cds/CdsCourseForm.tsx    |  3 +--
 src/app/[lang]/cds/CdsFormContainer.tsx | 15 +++++++--------
 src/app/[lang]/cds/page.tsx             |  4 +++-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/[lang]/cds/CdsCourseForm.tsx b/src/app/[lang]/cds/CdsCourseForm.tsx
index cf4bb871..9bf7bf2a 100644
--- a/src/app/[lang]/cds/CdsCourseForm.tsx
+++ b/src/app/[lang]/cds/CdsCourseForm.tsx
@@ -80,8 +80,7 @@ type CdsCoursesFormFields = {
 
 const CdsCoursesForm: FC<{
     initialSubmission: { preferences: CdsCourseDefinition[] };
-    cdsCoursesList: CdsCourseDefinition[];
-}> = ({ initialSubmission, cdsCoursesList }) => {
+}> = ({ initialSubmission }) => {
     const supabase = useSupabaseClient();
     const [selectedCourses, setSelectedCourses] = useState<CdsCourseDefinition[]>(initialSubmission.preferences);
     const [open, setOpen] = useState(false);
diff --git a/src/app/[lang]/cds/CdsFormContainer.tsx b/src/app/[lang]/cds/CdsFormContainer.tsx
index 2e25633e..2c963924 100644
--- a/src/app/[lang]/cds/CdsFormContainer.tsx
+++ b/src/app/[lang]/cds/CdsFormContainer.tsx
@@ -6,20 +6,19 @@ import { useMemo } from 'react';
 
 const CdsFormContainer = () => {
     const supabase = useSupabaseClient();
-    const { data: courses, error, isLoading } = useSWR(['cds_courses'], async () => {
-        const { data = [], error } = await supabase.from('cds_courses').select('*');
-        if(error) throw error;
-        return data;
-    })
-    
     //assuming preferences is a string of raw_id
     const preferences: string[] = [];
-    const preferenceCourses = useMemo(() => courses?.filter(course => preferences.includes(course.raw_id!)) ?? [], [courses]);
+
+    const { data: preferenceCourses = [], error, isLoading } = useSWR(['cds_courses'], async () => {
+        const { data = [], error } = await supabase.from('cds_courses').select('*').in('raw_id', preferences);
+        if(error) throw error;
+        return data ?? [];
+    })
     
 
     if(isLoading) return <CircularProgress/>
     return ( <div className='p-4'>
-        <CdsCoursesForm initialSubmission={{ preferences: preferenceCourses }} cdsCoursesList={courses ?? []}/>
+        <CdsCoursesForm initialSubmission={{ preferences: preferenceCourses }}/>
     </div>)
 }
 
diff --git a/src/app/[lang]/cds/page.tsx b/src/app/[lang]/cds/page.tsx
index a730ebbc..849c4f21 100644
--- a/src/app/[lang]/cds/page.tsx
+++ b/src/app/[lang]/cds/page.tsx
@@ -8,6 +8,7 @@ import { signIn, useSession } from "next-auth/react"
 import { FC, useState } from "react"
 import useSWR from "swr";
 import CdsFormContainer from "./CdsFormContainer";
+import { useSettings } from "@/hooks/contexts/settings";
 
 const CdsFormBeforeSignIn: FC<{ isLoggingIn: boolean }> = ({ isLoggingIn }) => {
     return <div className="text-center space-y-3 py-4 w-full">
@@ -17,13 +18,14 @@ const CdsFormBeforeSignIn: FC<{ isLoggingIn: boolean }> = ({ isLoggingIn }) => {
 
 const CourseDemandSurvey = () => {
     const { data, status, update } = useSession();
+    const { darkMode } = useSettings();
 
     console.log(data, status);
 
 
     // if(true) return <CdsFormContainer/>
 
-    return <div className="flex flex-col items-center justify-center h-full w-full" style={{background: "radial-gradient(159.94% 110.75% at 82.76% -5.79%, #FBA5FF 0%, #FFF 51.64%)", backdropFilter: 'blur(4px)'}}>
+    return <div className="flex flex-col items-center justify-center h-full w-full" style={{background: darkMode ? "radial-gradient(213.94% 85.75% at 93.76% -9.79%, rgb(251, 165, 255) 0%, rgb(23, 23, 23) 29.64%)":"radial-gradient(213.94% 85.75% at 93.76% -9.79%, rgb(251, 165, 255) 0%, rgb(255, 255, 255) 29.64%)", backdropFilter: 'blur(4px)'}}>
         <div className="flex flex-col items-center justify-center max-w-xl space-y-2 w-[64rem]">
             <div className="text-left space-y-3 py-4 w-full text-gray-700">
                 <h1 className="text-4xl font-bold">選課意願調查</h1>