fix: embed courses into the page

nthumodifications · Jun 1, 2024 · fb44072 · fb44072
1 parent 290c706
commit fb44072
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 27 deletions.
diff --git a/src/app/[lang]/(mods-pages)/courses/CourseSearchContainer.tsx b/src/app/[lang]/(mods-pages)/courses/CourseSearchContainer.tsx
@@ -131,10 +131,9 @@ const CourseSearchContainer = () => {
     indexName="nthu_courses"
     routing
   >
-    <div className="flex flex-col h-[100dvh] px-2 pt-6 md:p-8 gap-8">
-
+    <div className="flex flex-col h-full max-h-[100dvh] gap-4 md:gap-8">
       <div className="">
-        <div className="bg-neutral-100 dark:bg-neutral-950 rounded-2xl flex items-center p-4">
+        <div className="bg-neutral-100 dark:bg-neutral-950 rounded-2xl flex items-center py-2 md:p-4">
           <SemesterSelector />
           <Separator orientation="vertical" className='h-full'/>
           <HoverCard>

diff --git a/src/app/[lang]/(mods-pages)/courses/page.tsx b/src/app/[lang]/(mods-pages)/courses/page.tsx
@@ -5,30 +5,10 @@ import CourseSearchContainer from './CourseSearchContainer';
 import { useRouter } from "next/navigation";
 
 const CourseDialog = () => {
-  const [open, setOpen] = useState(true);
-  const router = useRouter();
-
-  //first load open dialog
-  useEffect(() => {
-    setOpen(true);
-  }, [])
-
-  //if closed, navigate to timetable page
-  useEffect(() => {
-    if (!open) {
-      router.push('/timetable')
-    }
-  }, [open])
 
-  return (
-    <Dialog open={open} onOpenChange={setOpen}>
-      <DialogTrigger>
-        Open
-      </DialogTrigger>
-      <DialogContent className="p-0 h-[100dvh] max-w-screen w-screen gap-0">
-        <CourseSearchContainer />
-      </DialogContent>
-    </Dialog>
+  return (<div className="max-h-[calc(var(--content-height)-36px)]">
+    <CourseSearchContainer />
+  </div>
   );
 }
 

diff --git a/src/components/Timetable/TimetableSidebar.tsx b/src/components/Timetable/TimetableSidebar.tsx
@@ -42,7 +42,7 @@ const TimetableSidebar = ({
                     {dict.course.item.add_to_semester}
                 </Button>
             </DialogTrigger>
-            <DialogContent className="p-0 h-[100dvh] max-w-screen w-screen gap-0">
+            <DialogContent className="p-0 h-[100dvh] max-w-screen w-screen gap-0 px-2 pt-6 md:p-8">
                 <CourseSearchContainerDynamic />
             </DialogContent>
         </Dialog>