From da9c323bbfd1913e93c895c0809ddd886cbf3639 Mon Sep 17 00:00:00 2001 From: Monica Sommer <91235141+msommersun@users.noreply.github.com> Date: Wed, 11 Dec 2024 10:06:20 -0800 Subject: [PATCH 1/2] 15 second disclaimer that users can dismiss regarding course list --- package-lock.json | 1 - .../DraggableCards/DragDropCourses.tsx | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index d20e862..83a5799 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8278,7 +8278,6 @@ "version": "1.8.10", "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.10.tgz", "integrity": "sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==", - "license": "MIT", "dependencies": { "@babel/runtime": "^7.0.0", "memoize-one": ">=3.1.1 <6" diff --git a/src/components/DraggableCards/DragDropCourses.tsx b/src/components/DraggableCards/DragDropCourses.tsx index 28c18f4..d22069b 100644 --- a/src/components/DraggableCards/DragDropCourses.tsx +++ b/src/components/DraggableCards/DragDropCourses.tsx @@ -6,6 +6,7 @@ import CourseCard from "./CourseCards"; import DroppableQuarter from "./DroppableQuarter"; import {DragDropCardProps} from "@/app/utils/interfaces"; import {Accordion, AccordionContent, AccordionItem, AccordionTrigger} from "@/components/ui/accordion"; +import React, { useState, useEffect } from "react"; const DragDropCourses: React.FC = ({ setSelectedQuarter, @@ -17,6 +18,17 @@ const DragDropCourses: React.FC = ({ onSubmit, availableCourses, }) => { + const [isDisclaimerVisible, setIsDisclaimerVisible] = useState(true); // Initialize the disclaimer state + + useEffect(() => { + // Set a timer to hide the disclaimer after 30 seconds + const timer = setTimeout(() => { + setIsDisclaimerVisible(false); + }, 15000); // 15 seconds in milliseconds + + return () => clearTimeout(timer); // Clear the timer if the component unmounts + }, []); + const handleDragEnd = (event: DragEndEvent) => { const {active, over} = event; if (!over || !active.data.current) return; @@ -53,6 +65,8 @@ const DragDropCourses: React.FC = ({ } }; + + const handleRemoveClass = ( courseId: string, season: string, @@ -182,6 +196,24 @@ const DragDropCourses: React.FC = ({ ); })} + {/* Add Disclaimer at the Bottom */} + {isDisclaimerVisible && ( +
+ + + Disclaimer: Courses listed may not be offered during the selected quarters or may be subjected to change. + +
+ )} + ); From 6a21a8c3458f9d49a6d193a2e8f6747943bc6301 Mon Sep 17 00:00:00 2001 From: Monica Sommer <91235141+msommersun@users.noreply.github.com> Date: Wed, 11 Dec 2024 10:39:01 -0800 Subject: [PATCH 2/2] save button UI now in line with rest of dropdowns --- src/components/UserData/ChangeMajorMinor.tsx | 2 +- src/components/ui/button.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/UserData/ChangeMajorMinor.tsx b/src/components/UserData/ChangeMajorMinor.tsx index 71357fb..83e2b2d 100644 --- a/src/components/UserData/ChangeMajorMinor.tsx +++ b/src/components/UserData/ChangeMajorMinor.tsx @@ -134,7 +134,7 @@ const ChangeYearMajorMinorPathStand = () => {