From 328eaa9b57049de63bf43e2e16faf9cd262c36c6 Mon Sep 17 00:00:00 2001 From: LEE BO HYUN <92661884+frombozztoang@users.noreply.github.com> Date: Tue, 20 Feb 2024 00:06:12 +0900 Subject: [PATCH] =?UTF-8?q?chore:#9=20=ED=8C=8C=EC=9D=BC=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/setting/profile/page.tsx | 2 +- .../molecules/modal/ModalContent.stories.tsx | 35 ------------- .../molecules/modal/ModalContent.tsx | 41 --------------- .../modal/AuthCheckingModalContent.tsx | 33 ------------ .../organisms/modal/AuthModal.stories.tsx | 18 ------- src/components/organisms/modal/AuthModal.tsx | 45 ---------------- .../organisms/modal/LetterModal.stories.tsx | 18 ------- .../organisms/modal/LetterModal.tsx | 51 ------------------- .../organisms/navigation/Navigation.tsx | 27 ++++++++-- .../organisms/navigation/NavigationList.tsx | 5 +- src/components/templates/login/Auth.tsx | 3 +- src/components/templates/login/Main.tsx | 1 - src/components/templates/main/Main.tsx | 2 +- src/components/templates/mypage/MyPage.tsx | 12 +---- src/components/templates/notice/Notice.tsx | 2 +- src/components/templates/setting/Setting.tsx | 2 +- src/types/Letter.ts | 9 ++++ src/types/Modal.ts | 2 +- 18 files changed, 44 insertions(+), 264 deletions(-) delete mode 100644 src/components/molecules/modal/ModalContent.stories.tsx delete mode 100644 src/components/molecules/modal/ModalContent.tsx delete mode 100644 src/components/organisms/modal/AuthCheckingModalContent.tsx delete mode 100644 src/components/organisms/modal/AuthModal.stories.tsx delete mode 100644 src/components/organisms/modal/AuthModal.tsx delete mode 100644 src/components/organisms/modal/LetterModal.stories.tsx delete mode 100644 src/components/organisms/modal/LetterModal.tsx create mode 100644 src/types/Letter.ts diff --git a/src/app/setting/profile/page.tsx b/src/app/setting/profile/page.tsx index a24c201..563ec39 100644 --- a/src/app/setting/profile/page.tsx +++ b/src/app/setting/profile/page.tsx @@ -1,7 +1,7 @@ "use client"; import ProfileSetting from "@/components/organisms/profileSetting/ProfileSetting"; import React from "react"; -import testProfile from "../../../../public/icons/testProfile.png"; +import testProfile '../../../' const page = () => { const test = () => { diff --git a/src/components/molecules/modal/ModalContent.stories.tsx b/src/components/molecules/modal/ModalContent.stories.tsx deleted file mode 100644 index f7ff817..0000000 --- a/src/components/molecules/modal/ModalContent.stories.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import type { Meta, StoryObj } from "@storybook/react"; - -import ModalContent from "./ModalContent"; - -const meta: Meta = { - title: "components/molecules/modal/ModalContent", - component: ModalContent, - tags: ["autodocs"], - argTypes: {}, -}; - -export default meta; - -type Story = StoryObj; - -export const twoBtn: Story = { - args: { - yesBtn: { - info: "확인", - }, - info: "안녕하십니까?", - noBtn: { - info: "취소", - }, - }, -}; - -export const oneBtn: Story = { - args: { - yesBtn: { - info: "확인", - }, - info: "안녕하십니까? \n 안녕하십니까", - }, -}; diff --git a/src/components/molecules/modal/ModalContent.tsx b/src/components/molecules/modal/ModalContent.tsx deleted file mode 100644 index 217e1d3..0000000 --- a/src/components/molecules/modal/ModalContent.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import { modalProps } from "@/types/Modal"; -import React from "react"; - -const ModalContent = ({ info, noBtn, yesBtn }: modalProps) => { - return ( -
-
- {info} -
- - {noBtn && yesBtn && ( -
- - -
- )} - {!noBtn && yesBtn && ( -
- -
- )} -
- ); -}; - -export default ModalContent; diff --git a/src/components/organisms/modal/AuthCheckingModalContent.tsx b/src/components/organisms/modal/AuthCheckingModalContent.tsx deleted file mode 100644 index fffb361..0000000 --- a/src/components/organisms/modal/AuthCheckingModalContent.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import React from "react"; - -interface authCheckingModalProps { - name: string; - major: string; - studentId: string; -} - -const AuthCheckingModal = ({ - name, - major, - studentId, -}: authCheckingModalProps) => { - return ( -
-

- 올바른 정보가 맞는지 확인해 주세요. -

-

이름: {name}

-

- 학과/학번: {major} {studentId} -

-

- * 정보가 다르다면 관리자에게 문의해 주세요. -

-

- mjuletter@gmail.com -

-
- ); -}; - -export default AuthCheckingModal; diff --git a/src/components/organisms/modal/AuthModal.stories.tsx b/src/components/organisms/modal/AuthModal.stories.tsx deleted file mode 100644 index 04448e5..0000000 --- a/src/components/organisms/modal/AuthModal.stories.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import type { Meta, StoryObj } from "@storybook/react"; - -import AuthModal from "./AuthModal"; - -const meta: Meta = { - title: "components/organisms/modal/AuthModal", - component: AuthModal, - tags: ["autodocs"], - argTypes: {}, -}; - -export default meta; - -type Story = StoryObj; - -export const Primary: Story = { - args: {}, -}; diff --git a/src/components/organisms/modal/AuthModal.tsx b/src/components/organisms/modal/AuthModal.tsx deleted file mode 100644 index 8bb4543..0000000 --- a/src/components/organisms/modal/AuthModal.tsx +++ /dev/null @@ -1,45 +0,0 @@ -import ModalContent from "@/components/molecules/modal/ModalContent"; -import ModalView from "@/components/molecules/modal/ModalView"; -import { AuthModalProps } from "@/types/Modal"; -import React from "react"; -import AuthCheckingModalContent from "./AuthCheckingModalContent"; - -const AuthModal = ({ authStatus }: AuthModalProps) => { - const handleYesClick = () => { - console.log("Yes button clicked!"); - }; - const handleNoClick = () => { - console.log("No button clicked!"); - }; - - return ( - <> - {authStatus === "proceeding" && ( - - - - )} - {authStatus === "checking" && ( - - - } - yesBtn={{ info: "확인", handler: handleYesClick }} - noBtn={{ info: "취소", handler: handleNoClick }} - /> - - )} - {authStatus === "failed" && ( - - - - )} - - ); -}; - -export default AuthModal; diff --git a/src/components/organisms/modal/LetterModal.stories.tsx b/src/components/organisms/modal/LetterModal.stories.tsx deleted file mode 100644 index 2fcbd10..0000000 --- a/src/components/organisms/modal/LetterModal.stories.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import type { Meta, StoryObj } from "@storybook/react"; - -import LetterModal from "./LetterModal"; - -const meta: Meta = { - title: "components/organisms/modal/LetterModal", - component: LetterModal, - tags: ["autodocs"], - argTypes: {}, -}; - -export default meta; - -type Story = StoryObj; - -export const Primary: Story = { - args: {}, -}; diff --git a/src/components/organisms/modal/LetterModal.tsx b/src/components/organisms/modal/LetterModal.tsx deleted file mode 100644 index 6cd3c20..0000000 --- a/src/components/organisms/modal/LetterModal.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import CheckBox from "@/components/atoms/button/letterWriting/CheckBox"; -import ColorPick from "@/components/atoms/button/letterWriting/ColorPick"; -import ModalContent from "@/components/molecules/modal/ModalContent"; -import ModalView from "@/components/molecules/modal/ModalView"; -import { COLORS } from "@/constants/letterColors"; -import React, { useState } from "react"; -import LetterModalContent from "./LetterModalContent"; - -interface letterModalProps { - isLetterModalOpened: boolean; - setIsLetterModalOpened: (isLetterModalOpened: boolean) => void; -} - -const LetterModal = ({ - isLetterModalOpened, - setIsLetterModalOpened, -}: letterModalProps) => { - const [selectedColor, setSelectedColor] = - useState("red"); - const [isChecked, setIsChecked] = useState(false); - const [textAreaValue, setTextAreaValue] = useState(""); - const handleYesClick = () => { - console.log("Yes button clicked!"); - setIsLetterModalOpened(!isLetterModalOpened); - }; - const handleNoClick = () => { - console.log("No button clicked!"); - setIsLetterModalOpened(!isLetterModalOpened); - }; - - return ( - - - } - yesBtn={{ info: "확인", handler: handleYesClick }} - noBtn={{ info: "취소", handler: handleNoClick }} - /> - - ); -}; - -export default LetterModal; diff --git a/src/components/organisms/navigation/Navigation.tsx b/src/components/organisms/navigation/Navigation.tsx index 2ce1cec..6ed8c48 100644 --- a/src/components/organisms/navigation/Navigation.tsx +++ b/src/components/organisms/navigation/Navigation.tsx @@ -23,12 +23,33 @@ const Navigation = () => { return ( <> - {isOpened && ( +
+ {isOpened && ( + + )} +
+ + logo + +
+ + + + menu +
+
+
+ {/* {isOpened && (
)} -
+
logo @@ -43,7 +64,7 @@ const Navigation = () => { alt="menu" />
-
+ */} ); }; diff --git a/src/components/organisms/navigation/NavigationList.tsx b/src/components/organisms/navigation/NavigationList.tsx index b1ea649..20655e3 100644 --- a/src/components/organisms/navigation/NavigationList.tsx +++ b/src/components/organisms/navigation/NavigationList.tsx @@ -4,7 +4,7 @@ import React from "react"; import close from "../../../../public/icons/close.png"; import openLink from "../../../../public/icons/openLink.png"; -interface NavigationListProps { +interface navigationListProps { user?: { major: string; studentId: string; @@ -18,7 +18,7 @@ const NavigationList = ({ user, isOpened, setIsOpened, -}: NavigationListProps) => { +}: navigationListProps) => { return (
@@ -28,6 +28,7 @@ const NavigationList = ({ > close
+ {user ? (
{user?.major} {user?.studentId} {user?.name} diff --git a/src/components/templates/login/Auth.tsx b/src/components/templates/login/Auth.tsx index ecfd60a..00c00be 100644 --- a/src/components/templates/login/Auth.tsx +++ b/src/components/templates/login/Auth.tsx @@ -3,9 +3,8 @@ import Image from "next/image"; import React, { useState } from "react"; import logo from "../../../../public/icons/logo.png"; import check from "../../../../public/icons/check.png"; -import Modal from "@/components/organisms/modal/Modal"; -import AuthModal from "@/components/organisms/modal/AuthModal"; import { AuthModalProps } from "@/types/Modal"; +import AuthModal from "@/components/organisms/modal/auth/AuthModal"; interface AuthTemplateProps { isUploaded: boolean; diff --git a/src/components/templates/login/Main.tsx b/src/components/templates/login/Main.tsx index 2f0c735..795099d 100644 --- a/src/components/templates/login/Main.tsx +++ b/src/components/templates/login/Main.tsx @@ -13,7 +13,6 @@ const Main = () => { 명지인들과 롤링페이퍼로 마음을 나눠요 - {" "} diff --git a/src/components/templates/main/Main.tsx b/src/components/templates/main/Main.tsx index b0ff0b0..7f01ee1 100644 --- a/src/components/templates/main/Main.tsx +++ b/src/components/templates/main/Main.tsx @@ -12,7 +12,7 @@ const Main = () => { const [selectedOption, setSelectedOption] = useState("이름"); return ( -
+
{ {selectedOption === "received" ? (
- - + +
) : (
diff --git a/src/components/templates/notice/Notice.tsx b/src/components/templates/notice/Notice.tsx index f5e2e31..c40c724 100644 --- a/src/components/templates/notice/Notice.tsx +++ b/src/components/templates/notice/Notice.tsx @@ -3,7 +3,7 @@ import React from "react"; const Notice = () => { return ( -
+
알림
diff --git a/src/components/templates/setting/Setting.tsx b/src/components/templates/setting/Setting.tsx index 79f55c2..d981493 100644 --- a/src/components/templates/setting/Setting.tsx +++ b/src/components/templates/setting/Setting.tsx @@ -8,7 +8,7 @@ import Link from "next/link"; const Setting = () => { const [isOn, setIsOn] = useState(false); return ( -
+

설정

diff --git a/src/types/Letter.ts b/src/types/Letter.ts new file mode 100644 index 0000000..d8b5910 --- /dev/null +++ b/src/types/Letter.ts @@ -0,0 +1,9 @@ +import { COLORS } from "@/constants/letterColors"; +import { StaticImageData } from "next/image"; + +export interface letterProps { + letterText: string; + user?: { name: string; profileImg: StaticImageData | string }; + backgroundColor: keyof typeof COLORS; + isMine: boolean; +} diff --git a/src/types/Modal.ts b/src/types/Modal.ts index 9bc31c2..4f444bc 100644 --- a/src/types/Modal.ts +++ b/src/types/Modal.ts @@ -1,5 +1,5 @@ export interface modalProps { - info: string | React.ReactNode; + info?: string | React.ReactNode; noBtn?: { info: string; handler?: () => void;