From 54c4787f4f75631dac77350df8990f298bc122b6 Mon Sep 17 00:00:00 2001 From: heedda Date: Sat, 20 Apr 2024 15:43:49 +0900 Subject: [PATCH] =?UTF-8?q?main=20page=20=EC=95=BD=EA=B0=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/login/page.tsx | 2 +- src/app/main/button.tsx | 2 +- src/app/main/checkPage.tsx | 46 +++++++++++++++++++++- src/app/main/page.tsx | 27 +++++++++---- src/assets/{ => svg}/PiCKLogo.svg | 0 src/assets/svg/application.svg | 20 ++++++++++ src/assets/{Icon => svg}/chevron-right.svg | 0 src/assets/{Icon => svg}/downarrow.svg | 0 src/assets/{Icon => svg}/eye.svg | 0 src/assets/{Icon => svg}/eyeOff.svg | 0 src/assets/svg/outGoing.svg | 35 ++++++++++++++++ src/assets/{buttonImg => svg}/outing.svg | 0 src/components/button/index.tsx | 4 +- src/components/dropdown/index.tsx | 4 +- src/components/header.tsx | 2 +- src/components/input/index.tsx | 4 +- src/util/date.ts | 2 +- src/util/util.ts | 7 +++- 18 files changed, 134 insertions(+), 21 deletions(-) rename src/assets/{ => svg}/PiCKLogo.svg (100%) create mode 100644 src/assets/svg/application.svg rename src/assets/{Icon => svg}/chevron-right.svg (100%) rename src/assets/{Icon => svg}/downarrow.svg (100%) rename src/assets/{Icon => svg}/eye.svg (100%) rename src/assets/{Icon => svg}/eyeOff.svg (100%) create mode 100644 src/assets/svg/outGoing.svg rename src/assets/{buttonImg => svg}/outing.svg (100%) diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 4374d3e..6f54cbf 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -2,7 +2,7 @@ import Image from "next/image"; import Input from "@/components/input"; import Button from "@/components/button"; -import Logo from "@/assets/PiCKLogo.svg"; +import Logo from "@/assets/svg/PiCKLogo.svg"; import { useState } from "react"; import { useLogin } from "@/api/login"; import { useRouter } from "next/navigation"; diff --git a/src/app/main/button.tsx b/src/app/main/button.tsx index 4a110f0..fc7ac62 100644 --- a/src/app/main/button.tsx +++ b/src/app/main/button.tsx @@ -6,7 +6,7 @@ interface buttonProps { img: string; } -const Button: React.FC = ({ name, img }) => { +const Button = ({ name, img }: buttonProps) => { return (
= ({ type }) => { - return
{type === "outGoing" ? (
) : (
)}
; +const CheckPage = ({ type }: checkPageType) => { + const [out, setOut] = useState(0); + const [sum, setSum] = useState(0); + + return ( + <> + {type === "outGoing" ? ( +
+
+ 현재 외출 중인 학생은 총 {out}명입니다. +
+ + +
+ ) : ( +
+
+ 현재 외출 / 조기 귀가 신청 학생은 총 {sum}명입니다. +
+ + +
+ )} + + ); }; + +export default CheckPage; diff --git a/src/app/main/page.tsx b/src/app/main/page.tsx index 1f2e62d..f8ec53b 100644 --- a/src/app/main/page.tsx +++ b/src/app/main/page.tsx @@ -1,13 +1,15 @@ "use client"; import Header from "@/components/header"; import Button from "./button"; -import outAcceptImg from "@/assets/buttonImg/outing.svg"; +import outAcceptImg from "@/assets/svg/outing.svg"; import { useState } from "react"; +import CheckPage from "./checkPage"; +import { getFullToday, getToday, getWeekDay } from "@/util/date"; const Main = () => { const [date, setDate] = useState(new Date().toLocaleTimeString()); - const [name, setName] = useState("백승휘"); - const [floor, setFloor] = useState(2); + const [name, setName] = useState(null); + const [floor, setFloor] = useState(null); return (
@@ -17,16 +19,25 @@ const Main = () => {
-
-
{date}
+
+
+ {getToday()} {getWeekDay()}요일 +
{floor !== null ? ( -
- {name} 선생님은 {floor}층 자습감독입니다. +
+ {name} 선생님은{" "} + {floor}층 자습감독입니다.
) : ( -
{name} 선생님은 자습감독이 아닙니다.
+
+ {name} 선생님은 자습감독이 아닙니다. +
)}
+
+ + +
); }; diff --git a/src/assets/PiCKLogo.svg b/src/assets/svg/PiCKLogo.svg similarity index 100% rename from src/assets/PiCKLogo.svg rename to src/assets/svg/PiCKLogo.svg diff --git a/src/assets/svg/application.svg b/src/assets/svg/application.svg new file mode 100644 index 0000000..3fd7444 --- /dev/null +++ b/src/assets/svg/application.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/Icon/chevron-right.svg b/src/assets/svg/chevron-right.svg similarity index 100% rename from src/assets/Icon/chevron-right.svg rename to src/assets/svg/chevron-right.svg diff --git a/src/assets/Icon/downarrow.svg b/src/assets/svg/downarrow.svg similarity index 100% rename from src/assets/Icon/downarrow.svg rename to src/assets/svg/downarrow.svg diff --git a/src/assets/Icon/eye.svg b/src/assets/svg/eye.svg similarity index 100% rename from src/assets/Icon/eye.svg rename to src/assets/svg/eye.svg diff --git a/src/assets/Icon/eyeOff.svg b/src/assets/svg/eyeOff.svg similarity index 100% rename from src/assets/Icon/eyeOff.svg rename to src/assets/svg/eyeOff.svg diff --git a/src/assets/svg/outGoing.svg b/src/assets/svg/outGoing.svg new file mode 100644 index 0000000..3ff635a --- /dev/null +++ b/src/assets/svg/outGoing.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/buttonImg/outing.svg b/src/assets/svg/outing.svg similarity index 100% rename from src/assets/buttonImg/outing.svg rename to src/assets/svg/outing.svg diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx index c4002c4..24ca677 100644 --- a/src/components/button/index.tsx +++ b/src/components/button/index.tsx @@ -40,7 +40,7 @@ const Button: React.FC = ({ return " rounded-lg bg-secondary-200 text-secondary-1000 focus:bg-secondary-500 focus:border focus:border-secondary-800 active:bg-secondary-800"; case "tertiary": - return " rounded-lg bg-tertiary-200 text-tertiary-900 focus:bg-tertiary-500 focus:border focus:border-tertiary-800 active:bg-tertiary-800"; + return " rounded-lg bg-tertiary-500 text-tertiary-900 focus:bg-tertiary-500 focus:border focus:border-tertiary-800 active:bg-tertiary-800"; case "ghost": return " rounded-lg border bg-primary-1000 border-primary-200 focus:border-primary-800 focus:text-primary-500 active:border-primary-800 active:text-primary-800"; @@ -69,7 +69,7 @@ const Button: React.FC = ({ case "small": return "w-38 h-12 text-Button-S"; case "extraSmall": - return "w-30 h-9 text-Button-S"; + return "w-30 h-9 text-Button-ES"; case "extraSmall2": return "w-36 h-7.5 text-Button-S"; } diff --git a/src/components/dropdown/index.tsx b/src/components/dropdown/index.tsx index 7ee844d..8984f8a 100644 --- a/src/components/dropdown/index.tsx +++ b/src/components/dropdown/index.tsx @@ -1,8 +1,8 @@ "use client"; import Image from "next/image"; import React, { useEffect, useRef, useState } from "react"; -import arrow from "@/assets/Icon/chevron-right.svg"; -import downarrow from "@/assets/Icon/downarrow.svg"; +import arrow from "@/assets/svg/Icon/chevron-right.svg"; +import downarrow from "@/assets/svg/Icon/downarrow.svg"; interface DropdownProp { type: "grade" | "class" | "floor" | "classTime" | "club" | "all"; diff --git a/src/components/header.tsx b/src/components/header.tsx index 0b07e11..3413987 100644 --- a/src/components/header.tsx +++ b/src/components/header.tsx @@ -3,7 +3,7 @@ import { NextPage } from "next"; import Image from "next/image"; import Link from "next/link"; import React, { useEffect, useState } from "react"; -import pick from "@/assets/PiCKLogo.svg"; +import pick from "@/assets/svg/PiCKLogo.svg"; import { useRouter } from "next/navigation"; const Header: NextPage = ({}) => { diff --git a/src/components/input/index.tsx b/src/components/input/index.tsx index 9f42e74..b978652 100644 --- a/src/components/input/index.tsx +++ b/src/components/input/index.tsx @@ -2,8 +2,8 @@ import React, { useState } from "react"; import Image from "next/image"; -import eye from "@/assets/Icon/eye.svg"; -import eyeOff from "@/assets/Icon/eyeOff.svg"; +import eye from "@/assets/svg/Icon/eye.svg"; +import eyeOff from "@/assets/svg/eyeOff.svg" interface ChangeProps { text: string; diff --git a/src/util/date.ts b/src/util/date.ts index e6485a3..ff21fd7 100644 --- a/src/util/date.ts +++ b/src/util/date.ts @@ -37,5 +37,5 @@ export function getFullToday() { } export function getToday() { - return `${month}-${day}`; + return `${month}월 ${day}일`; } diff --git a/src/util/util.ts b/src/util/util.ts index ee543ed..0f058f5 100644 --- a/src/util/util.ts +++ b/src/util/util.ts @@ -48,6 +48,11 @@ export const ChangeOut = (type: "APPLICATION" | "EARLY_RETURN") => { if (type === "APPLICATION") { return "외출"; } else if (type === "EARLY_RETURN") { - return "조기귀가"; + return a["EARLY_RETURN"]; } }; + +enum a { + APPLICATION="외출", + EARLY_RETURN="조기귀가" +} \ No newline at end of file