diff --git a/src/api/main/index.ts b/src/api/main/index.ts index 1cb6bbb..f7a4fe1 100644 --- a/src/api/main/index.ts +++ b/src/api/main/index.ts @@ -7,6 +7,7 @@ export const GetName = () => { queryKey: ["name"], queryFn: async () => { const result = await instance.get("/admin/my-name"); + localStorage.setItem("name", result.data); return result.data.name; }, }); diff --git a/src/app/main/checkPage.tsx b/src/app/main/checkPage.tsx index e3fe349..f02d114 100644 --- a/src/app/main/checkPage.tsx +++ b/src/app/main/checkPage.tsx @@ -30,8 +30,8 @@ const CheckPage = ({ type }: checkPageType) => { return ( <> {type === "outGoing" ? ( -
-
+
+
현재 외출 중인 학생은 총{" "} {list.out}명입니다.
@@ -45,8 +45,8 @@ const CheckPage = ({ type }: checkPageType) => {
) : ( -
-
+
+
현재 외출/귀가 신청 학생은 총{" "} {list.request}명입니다.
diff --git a/src/app/main/page.tsx b/src/app/main/page.tsx index 2d12381..726b987 100644 --- a/src/app/main/page.tsx +++ b/src/app/main/page.tsx @@ -1,36 +1,32 @@ "use client"; import Header from "@/components/header"; import Button from "./button"; -import outAcceptImg from "@/assets/svg/outing.svg"; -import AfterManageImg from "@/assets/svg/afterManage.svg"; import { useEffect, useState } from "react"; import CheckPage from "./checkPage"; import { GetName, GetTodaydirector } from "@/api/main"; import { getToday, getWeekDay } from "@/util/date"; +import AfterManageImg from "@/assets/svg/aferManege.svg"; +import attendanceImg from "@/assets/svg/attendance.svg" +import outingImg from "@/assets/svg/outing.svg" +import moveClassImg from "@/assets/svg/moveClass.svg" + const Main = () => { - const [date, setDate] = useState(new Date().toLocaleTimeString()); const [floor, setFloor] = useState(); - const [name, setName] = useState(""); - const { data: getName } = GetName(); const { data: getDirector } = GetTodaydirector(); useEffect(() => { - if (getName) { - setName(getName); - localStorage.setItem("name", getName); - } if (getDirector) setFloor(getDirector); - }, [getName, getDirector]); + }, [getDirector]); return ( <>
-
+
-
diff --git a/src/assets/svg/aferManege.svg b/src/assets/svg/aferManege.svg new file mode 100644 index 0000000..4abc3e6 --- /dev/null +++ b/src/assets/svg/aferManege.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/svg/afterManage.svg b/src/assets/svg/afterManage.svg deleted file mode 100644 index bc86a66..0000000 --- a/src/assets/svg/afterManage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/svg/attendance.svg b/src/assets/svg/attendance.svg new file mode 100644 index 0000000..b1b2580 --- /dev/null +++ b/src/assets/svg/attendance.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/moveClass.svg b/src/assets/svg/moveClass.svg new file mode 100644 index 0000000..cd43cfd --- /dev/null +++ b/src/assets/svg/moveClass.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/outing.svg b/src/assets/svg/outing.svg index b30d020..12770e5 100644 --- a/src/assets/svg/outing.svg +++ b/src/assets/svg/outing.svg @@ -1,3 +1,4 @@ - - + + +