chore : 드롭다운 수정

DSM-PICK · Jul 8, 2024 · b5f64de · b5f64de
2 parents 1309714 + 50b69f6
commit b5f64de
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 31 deletions.
diff --git a/src/app/WeekendMeals/page.tsx b/src/app/WeekendMeals/page.tsx
@@ -131,8 +131,16 @@ const WeekendMeals: NextPage = () => {
             전체 학생 보기
           </Button>
           <div className=" flex gap-5">
-            <Dropdown type="grade" onChange={handleGradeChange} />
-            <Dropdown type="class" onChange={handleClassChange} />
+            <Dropdown
+              type="grade"
+              onChange={handleGradeChange}
+              homeRoom={true}
+            />
+            <Dropdown
+              type="class"
+              onChange={handleClassChange}
+              homeRoom={true}
+            />
           </div>
         </>
       }

diff --git a/src/app/classManage/page.tsx b/src/app/classManage/page.tsx
@@ -29,12 +29,8 @@ const ClassManage: React.FC = () => {
   const [selectedGrade, setSelectedGrade] = useState<number>(1);
   const [selectedClass, setSelectedClass] = useState<number>(1);
   const [data, setData] = useState<StudentData>();
-  const {
-    selectedStudents,
-    selectedStudentNames,
-    modifiedStudents,
-    handleManageListClick,
-  } = useManageListSelection();
+  const { selectedStudentNames, modifiedStudents, handleManageListClick } =
+    useManageListSelection();
   const { mutate: getStudentDataMutate } = GetStudentData();
   const { mutate: changestatusMutate } = ChangeStatus();
 
@@ -147,8 +143,16 @@ const ClassManage: React.FC = () => {
             </Button>
           )}
           <div className="flex gap-5">
-            <Dropdown type="grade" onChange={handleGradeChange} />
-            <Dropdown type="class" onChange={handleClassChange} />
+            <Dropdown
+              type="grade"
+              onChange={handleGradeChange}
+              homeRoom={true}
+            />
+            <Dropdown
+              type="class"
+              onChange={handleClassChange}
+              homeRoom={true}
+            />
           </div>
         </>
       }

diff --git a/src/app/components/common/dropdown/index.tsx b/src/app/components/common/dropdown/index.tsx
@@ -6,9 +6,10 @@ import downarrow from "@/assets/img/Icon/downarrow.svg";
 interface DropProps {
   type: "floor" | "grade" | "class" | "club" | "all";
   onChange?: (selectedOption: any, type: string) => void;
+  homeRoom?: boolean;
 }
 
-const Dropdown: React.FC<DropProps> = ({ type, onChange }) => {
+const Dropdown: React.FC<DropProps> = ({ type, onChange, homeRoom }) => {
   const [selectedGradeOption, setSelectedGradeOption] = useState<number>(1);
   const [selectedClassOption, setSelectedClassOption] = useState<number>(1);
   const [selectedFloorOption, setSelectedFloorOption] = useState<number>(5);
@@ -23,15 +24,17 @@ const Dropdown: React.FC<DropProps> = ({ type, onChange }) => {
   };
 
   useEffect(() => {
-    const grade = parseInt(localStorage.getItem("grade") || "1", 10);
-    const class_num = parseInt(localStorage.getItem("class_num") || "1", 10);
-    const setgrade = grade === 0 ? 1 : grade;
-    const setclass_num = class_num === 0 ? 1 : class_num;
-    if (type === "all") {
-      setSelectedAllOption(setgrade);
+    if (homeRoom) {
+      const grade = parseInt(localStorage.getItem("grade") || "1", 10);
+      const class_num = parseInt(localStorage.getItem("class_num") || "1", 10);
+      const setgrade = grade === 0 ? 1 : grade;
+      const setclass_num = class_num === 0 ? 1 : class_num;
+      if (type === "all") {
+        setSelectedAllOption(setgrade);
+      }
+      setSelectedGradeOption(setgrade);
+      setSelectedClassOption(setclass_num);
     }
-    setSelectedGradeOption(setgrade);
-    setSelectedClassOption(setclass_num);
 
     const handleClickOutside = (event: MouseEvent) => {
       if (

diff --git a/src/app/components/common/surveyModal/index.tsx b/src/app/components/common/surveyModal/index.tsx
@@ -27,15 +27,15 @@ const SurveyModal = ({ onClick }: SurveyProp) => {
             좀 더 좋은 PiCK으로 업데이트를 위해 만족도 조사를 하려고 합니다.
             <br />
             많은 참여 부탁드립니다
+            <a
+              href="https://forms.gle/fAQ9yoNTyQvdY4q59"
+              className="text-heading6-M select-none underline text-primary-400"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              만족도 조사하기
+            </a>
           </p>
-          <a
-            href="https://forms.gle/fAQ9yoNTyQvdY4q59"
-            className="text-heading6-M select-none underline text-primary-400"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            만족도 조사하기
-          </a>
         </div>
         <div className="flex items-center gap-1 mt-8 justify-end">
           <div>

diff --git a/src/app/outAccept/page.tsx b/src/app/outAccept/page.tsx
@@ -208,13 +208,29 @@ const OutAccept = () => {
           </Button>
           {selectedTab ? (
             <div className=" flex gap-5">
-              <Dropdown type="all" onChange={handleGradeChange} />
-              <Dropdown type="class" onChange={handleClassChange} />
+              <Dropdown
+                type="all"
+                onChange={handleGradeChange}
+                homeRoom={true}
+              />
+              <Dropdown
+                type="class"
+                onChange={handleClassChange}
+                homeRoom={true}
+              />
             </div>
           ) : (
             <div className=" flex gap-5">
-              <Dropdown type="all" onChange={handleGradeChange} />
-              <Dropdown type="class" onChange={handleClassChange} />
+              <Dropdown
+                type="all"
+                onChange={handleGradeChange}
+                homeRoom={true}
+              />
+              <Dropdown
+                type="class"
+                onChange={handleClassChange}
+                homeRoom={true}
+              />
             </div>
           )}
         </>