From fe315809db0cb18d2587377c3f39c35fb8dd62f5 Mon Sep 17 00:00:00 2001 From: LEE BO HYUN <92661884+frombozztoang@users.noreply.github.com> Date: Tue, 20 Feb 2024 00:29:22 +0900 Subject: [PATCH] =?UTF-8?q?chore:#9=20=ED=8F=B4=EB=8D=94=EB=AA=85=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B5=AC=EC=A1=B0=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{(main)/test => (social)/detail}/page.tsx | 2 +- src/app/layout.tsx | 3 +-- src/app/login/auth/page.tsx | 2 +- src/app/login/page.tsx | 2 +- src/app/page.tsx | 2 +- .../{ => writeModal}/WriteModal.stories.tsx | 2 +- .../letter/{ => writeModal}/WriteModal.tsx | 0 .../{ => writeModal}/WriteModalContent.tsx | 0 .../{ => navigation}/Navigation.stories.tsx | 0 .../navigation/{ => navigation}/Navigation.tsx | 9 +++++---- .../NavigationList.stories.tsx | 0 .../{ => navigationList}/NavigationList.tsx | 4 ++-- .../templates/login/{ => auth}/Auth.stories.tsx | 0 .../templates/login/{ => auth}/Auth.tsx | 4 ++-- .../templates/login/{ => main}/Main.stories.tsx | 0 .../templates/login/{ => main}/Main.tsx | 4 ++-- .../{ => social}/main/Main.stories.tsx | 0 .../templates/{ => social}/main/Main.tsx | 17 +++++++++-------- .../mainDetail}/MainDetail.stories.tsx | 0 .../{main => social/mainDetail}/MainDetail.tsx | 5 +++-- 20 files changed, 29 insertions(+), 27 deletions(-) rename src/app/{(main)/test => (social)/detail}/page.tsx (62%) rename src/components/organisms/modal/letter/{ => writeModal}/WriteModal.stories.tsx (83%) rename src/components/organisms/modal/letter/{ => writeModal}/WriteModal.tsx (100%) rename src/components/organisms/modal/letter/{ => writeModal}/WriteModalContent.tsx (100%) rename src/components/organisms/navigation/{ => navigation}/Navigation.stories.tsx (100%) rename src/components/organisms/navigation/{ => navigation}/Navigation.tsx (89%) rename src/components/organisms/navigation/{ => navigationList}/NavigationList.stories.tsx (100%) rename src/components/organisms/navigation/{ => navigationList}/NavigationList.tsx (94%) rename src/components/templates/login/{ => auth}/Auth.stories.tsx (100%) rename src/components/templates/login/{ => auth}/Auth.tsx (96%) rename src/components/templates/login/{ => main}/Main.stories.tsx (100%) rename src/components/templates/login/{ => main}/Main.tsx (89%) rename src/components/templates/{ => social}/main/Main.stories.tsx (100%) rename src/components/templates/{ => social}/main/Main.tsx (78%) rename src/components/templates/{main => social/mainDetail}/MainDetail.stories.tsx (100%) rename src/components/templates/{main => social/mainDetail}/MainDetail.tsx (97%) diff --git a/src/app/(main)/test/page.tsx b/src/app/(social)/detail/page.tsx similarity index 62% rename from src/app/(main)/test/page.tsx rename to src/app/(social)/detail/page.tsx index 20493f1..eef1bde 100644 --- a/src/app/(main)/test/page.tsx +++ b/src/app/(social)/detail/page.tsx @@ -1,5 +1,5 @@ +import MainDetail from "@/components/templates/social/mainDetail/MainDetail"; import React from "react"; -import MainDetail from "../../../components/templates/main/MainDetail"; const page = () => { return ( diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 155015e..e9b5c04 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,10 +1,9 @@ -import MainDetail from "../components/templates/main/MainDetail"; import type { Metadata } from "next"; import { Inter } from "next/font/google"; import Image from "next/image"; import logo from "../../public/icons/logo.png"; import "../styles/globals.css"; -import Navigation from "@/components/organisms/navigation/Navigation"; +import Navigation from "@/components/organisms/navigation/navigation/Navigation"; export const metadata: Metadata = { title: "Create Next App", diff --git a/src/app/login/auth/page.tsx b/src/app/login/auth/page.tsx index 83341fe..a34b857 100644 --- a/src/app/login/auth/page.tsx +++ b/src/app/login/auth/page.tsx @@ -1,5 +1,5 @@ "use client"; -import Auth from "@/components/templates/login/Auth"; +import Auth from "@/components/templates/login/auth/Auth"; import React from "react"; const page = () => { diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 2d61b86..585eb6e 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -1,5 +1,5 @@ "use client"; -import Main from "@/components/templates/login/Main"; +import Main from "@/components/templates/login/main/Main"; import React from "react"; const page = () => { diff --git a/src/app/page.tsx b/src/app/page.tsx index 18c85f7..05a32a8 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,4 +1,4 @@ -import Main from "@/components/templates/main/Main"; +import Main from "@/components/templates/social/main/Main"; import Image from "next/image"; import React from "react"; diff --git a/src/components/organisms/modal/letter/WriteModal.stories.tsx b/src/components/organisms/modal/letter/writeModal/WriteModal.stories.tsx similarity index 83% rename from src/components/organisms/modal/letter/WriteModal.stories.tsx rename to src/components/organisms/modal/letter/writeModal/WriteModal.stories.tsx index 2b6ea34..4ec970a 100644 --- a/src/components/organisms/modal/letter/WriteModal.stories.tsx +++ b/src/components/organisms/modal/letter/writeModal/WriteModal.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from "@storybook/react"; import WriteModal from "./WriteModal"; const meta: Meta = { - title: "components/organisms/modal/WriteModal", + title: "components/organisms/modal/writeModal/WriteModal", component: WriteModal, tags: ["autodocs"], argTypes: {}, diff --git a/src/components/organisms/modal/letter/WriteModal.tsx b/src/components/organisms/modal/letter/writeModal/WriteModal.tsx similarity index 100% rename from src/components/organisms/modal/letter/WriteModal.tsx rename to src/components/organisms/modal/letter/writeModal/WriteModal.tsx diff --git a/src/components/organisms/modal/letter/WriteModalContent.tsx b/src/components/organisms/modal/letter/writeModal/WriteModalContent.tsx similarity index 100% rename from src/components/organisms/modal/letter/WriteModalContent.tsx rename to src/components/organisms/modal/letter/writeModal/WriteModalContent.tsx diff --git a/src/components/organisms/navigation/Navigation.stories.tsx b/src/components/organisms/navigation/navigation/Navigation.stories.tsx similarity index 100% rename from src/components/organisms/navigation/Navigation.stories.tsx rename to src/components/organisms/navigation/navigation/Navigation.stories.tsx diff --git a/src/components/organisms/navigation/Navigation.tsx b/src/components/organisms/navigation/navigation/Navigation.tsx similarity index 89% rename from src/components/organisms/navigation/Navigation.tsx rename to src/components/organisms/navigation/navigation/Navigation.tsx index 6ed8c48..529fdd6 100644 --- a/src/components/organisms/navigation/Navigation.tsx +++ b/src/components/organisms/navigation/navigation/Navigation.tsx @@ -1,12 +1,13 @@ "use client"; -import NoticeIcon from "../../atoms/notice/noticeIcon/NoticeIcon"; +import NoticeIcon from "../../../atoms/notice/noticeIcon/NoticeIcon"; import Image from "next/image"; import React, { useEffect, useState } from "react"; -import logo from "../../../../public/icons/logo.png"; -import menu from "../../../../public/icons/menu.png"; -import NavigationList from "./NavigationList"; +import logo from "../../../../../public/icons/logo.png"; +import menu from "../../../../../public/icons/menu.png"; + import Link from "next/link"; import { useRouter, useSearchParams } from "next/navigation"; +import NavigationList from "../navigationList/NavigationList"; const Navigation = () => { const [isOpened, setIsOpened] = useState(false); diff --git a/src/components/organisms/navigation/NavigationList.stories.tsx b/src/components/organisms/navigation/navigationList/NavigationList.stories.tsx similarity index 100% rename from src/components/organisms/navigation/NavigationList.stories.tsx rename to src/components/organisms/navigation/navigationList/NavigationList.stories.tsx diff --git a/src/components/organisms/navigation/NavigationList.tsx b/src/components/organisms/navigation/navigationList/NavigationList.tsx similarity index 94% rename from src/components/organisms/navigation/NavigationList.tsx rename to src/components/organisms/navigation/navigationList/NavigationList.tsx index 20655e3..26f90c7 100644 --- a/src/components/organisms/navigation/NavigationList.tsx +++ b/src/components/organisms/navigation/navigationList/NavigationList.tsx @@ -1,8 +1,8 @@ import Image from "next/image"; import Link from "next/link"; import React from "react"; -import close from "../../../../public/icons/close.png"; -import openLink from "../../../../public/icons/openLink.png"; +import close from "../../../../../public/icons/close.png"; +import openLink from "../../../../../public/icons/openLink.png"; interface navigationListProps { user?: { diff --git a/src/components/templates/login/Auth.stories.tsx b/src/components/templates/login/auth/Auth.stories.tsx similarity index 100% rename from src/components/templates/login/Auth.stories.tsx rename to src/components/templates/login/auth/Auth.stories.tsx diff --git a/src/components/templates/login/Auth.tsx b/src/components/templates/login/auth/Auth.tsx similarity index 96% rename from src/components/templates/login/Auth.tsx rename to src/components/templates/login/auth/Auth.tsx index 00c00be..10af67d 100644 --- a/src/components/templates/login/Auth.tsx +++ b/src/components/templates/login/auth/Auth.tsx @@ -1,8 +1,8 @@ "use client"; 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 logo from "../../../../../public/icons/logo.png"; +import check from "../../../../../public/icons/check.png"; import { AuthModalProps } from "@/types/Modal"; import AuthModal from "@/components/organisms/modal/auth/AuthModal"; diff --git a/src/components/templates/login/Main.stories.tsx b/src/components/templates/login/main/Main.stories.tsx similarity index 100% rename from src/components/templates/login/Main.stories.tsx rename to src/components/templates/login/main/Main.stories.tsx diff --git a/src/components/templates/login/Main.tsx b/src/components/templates/login/main/Main.tsx similarity index 89% rename from src/components/templates/login/Main.tsx rename to src/components/templates/login/main/Main.tsx index 795099d..25ebca6 100644 --- a/src/components/templates/login/Main.tsx +++ b/src/components/templates/login/main/Main.tsx @@ -1,8 +1,8 @@ "use client"; import Image from "next/image"; import React from "react"; -import logo from "../../../../public/icons/logo.png"; -import loginImg from "../../../../public/icons/loginImg.png"; +import logo from "../../../../../public/icons/logo.png"; +import loginImg from "../../../../../public/icons/loginImg.png"; import Link from "next/link"; const Main = () => { diff --git a/src/components/templates/main/Main.stories.tsx b/src/components/templates/social/main/Main.stories.tsx similarity index 100% rename from src/components/templates/main/Main.stories.tsx rename to src/components/templates/social/main/Main.stories.tsx diff --git a/src/components/templates/main/Main.tsx b/src/components/templates/social/main/Main.tsx similarity index 78% rename from src/components/templates/main/Main.tsx rename to src/components/templates/social/main/Main.tsx index 7f01ee1..0c53f7f 100644 --- a/src/components/templates/main/Main.tsx +++ b/src/components/templates/social/main/Main.tsx @@ -1,11 +1,12 @@ "use client"; -import MainProfile from "../../atoms/profile/mainProfile/MainProfile"; -import SearchBar from "../../organisms/searchBar/SearchBar"; + import React, { useState } from "react"; -import test from "../../../../public/icons/testProfile.png"; -import SearchResult from "../../organisms/searchBar/SearchResult"; -import Search from "../search/Search"; +import test from "../../../../../public/icons/testProfile.png"; import Link from "next/link"; +import MainProfile from "@/components/atoms/profile/mainProfile/MainProfile"; +import SearchBar from "@/components/organisms/searchBar/SearchBar"; +import SearchResult from "@/components/organisms/searchBar/SearchResult"; +import Search from "../../search/Search"; const Main = () => { const [searchValue, setSearchValue] = useState(""); @@ -34,7 +35,7 @@ const Main = () => { ) : (
- + { studentId={"21"} /> - + { studentId={"21"} />{" "} - + { const { isOpen, onOpen, onOpenChange } = useDisclosure();