From c744eae4191168c497377bd365b75ef318e1e001 Mon Sep 17 00:00:00 2001 From: ahk0413 Date: Tue, 23 Sep 2025 19:36:37 +0900 Subject: [PATCH 1/7] =?UTF-8?q?[fix]=20=EB=B0=96=EC=97=90=20=EC=9E=88?= =?UTF-8?q?=EB=8A=94=20components=20=ED=8F=B4=EB=8D=94=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=20=EB=B0=8F=20public=EC=97=90=20=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=EB=A1=9C=EA=B3=A0=20=EA=B2=BD=EB=A1=9C=20=EB=AC=B8=EC=A0=9C?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/layout.tsx | 4 ++-- src/components/header/HeaderLogo.tsx | 14 ------------- src/{ => shared}/components/footer/Footer.tsx | 0 src/{ => shared}/components/footer/Github.tsx | 0 .../components/header/DropdownMenu.tsx | 16 ++++++++++----- .../components/header/HamburgerMenu.tsx | 0 src/{ => shared}/components/header/Header.tsx | 2 +- .../components/header/HeaderBtn.tsx | 0 src/shared/components/header/HeaderLogo.tsx | 20 +++++++++++++++++++ .../components/header/NavItem.tsx | 0 10 files changed, 34 insertions(+), 22 deletions(-) delete mode 100644 src/components/header/HeaderLogo.tsx rename src/{ => shared}/components/footer/Footer.tsx (100%) rename src/{ => shared}/components/footer/Github.tsx (100%) rename src/{ => shared}/components/header/DropdownMenu.tsx (89%) rename src/{ => shared}/components/header/HamburgerMenu.tsx (100%) rename src/{ => shared}/components/header/Header.tsx (92%) rename src/{ => shared}/components/header/HeaderBtn.tsx (100%) create mode 100644 src/shared/components/header/HeaderLogo.tsx rename src/{ => shared}/components/header/NavItem.tsx (100%) diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 354aadf..e2c3a2c 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -2,8 +2,8 @@ import type { Metadata } from 'next'; import '@/shared/styles/global.css'; import { Toaster } from 'react-hot-toast'; import ScrollTopBtn from '@/shared/components/scrollTop/ScrollTopBtn'; -import Header from '@/components/header/Header'; -import Footer from '@/components/footer/Footer'; +import Header from '@/shared/components/header/Header'; +import Footer from '@/shared/components/footer/Footer'; export const metadata: Metadata = { title: 'SSOUL', description: '칵테일을 좋아하는 사람들을 위한 서비스', diff --git a/src/components/header/HeaderLogo.tsx b/src/components/header/HeaderLogo.tsx deleted file mode 100644 index 56ea5a3..0000000 --- a/src/components/header/HeaderLogo.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import Link from 'next/link'; -import Logo from '../../../public/logo.svg'; - -function HeaderLogo() { - return ( -
- - - -
- ); -} - -export default HeaderLogo; diff --git a/src/components/footer/Footer.tsx b/src/shared/components/footer/Footer.tsx similarity index 100% rename from src/components/footer/Footer.tsx rename to src/shared/components/footer/Footer.tsx diff --git a/src/components/footer/Github.tsx b/src/shared/components/footer/Github.tsx similarity index 100% rename from src/components/footer/Github.tsx rename to src/shared/components/footer/Github.tsx diff --git a/src/components/header/DropdownMenu.tsx b/src/shared/components/header/DropdownMenu.tsx similarity index 89% rename from src/components/header/DropdownMenu.tsx rename to src/shared/components/header/DropdownMenu.tsx index 82bbc04..528cbce 100644 --- a/src/components/header/DropdownMenu.tsx +++ b/src/shared/components/header/DropdownMenu.tsx @@ -1,5 +1,5 @@ import { navItem } from '@/shared/utills/navigation'; -import LogoDark from '../../../public/logoDark.svg'; +import Image from 'next/image'; import Close from '@/shared/assets/icons/close_32.svg'; import User from '@/shared/assets/icons/user_24.svg'; import Link from 'next/link'; @@ -66,8 +66,14 @@ function DropdownMenu({ isClicked, setIsClicked }: Props) { id="mobile-dropdown-menu" ref={menuRef} > -
- +
+ Ssoul 로고
    @@ -101,14 +107,14 @@ function DropdownMenu({ isClicked, setIsClicked }: Props) { 로그인/회원가입
-
+
diff --git a/src/components/header/HamburgerMenu.tsx b/src/shared/components/header/HamburgerMenu.tsx similarity index 100% rename from src/components/header/HamburgerMenu.tsx rename to src/shared/components/header/HamburgerMenu.tsx diff --git a/src/components/header/Header.tsx b/src/shared/components/header/Header.tsx similarity index 92% rename from src/components/header/Header.tsx rename to src/shared/components/header/Header.tsx index 2a8da2e..bdc4af5 100644 --- a/src/components/header/Header.tsx +++ b/src/shared/components/header/Header.tsx @@ -49,7 +49,7 @@ function Header() { return (
+ + Ssoul 로고 + +
+ ); +} + +export default HeaderLogo; diff --git a/src/components/header/NavItem.tsx b/src/shared/components/header/NavItem.tsx similarity index 100% rename from src/components/header/NavItem.tsx rename to src/shared/components/header/NavItem.tsx From 8bd10120371f21f4eb715cdbffa79ada7bbe631c Mon Sep 17 00:00:00 2001 From: ahk0413 Date: Tue, 23 Sep 2025 20:51:00 +0900 Subject: [PATCH 2/7] =?UTF-8?q?[fix]=20svg=20current=20->=20currentColor?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/assets/icons/arrow_up_24.svg | 2 +- src/shared/assets/icons/bell_24.svg | 8 ++++---- src/shared/assets/icons/close_20.svg | 4 ++-- src/shared/assets/icons/close_32.svg | 4 ++-- src/shared/assets/icons/sign_in_24.svg | 4 ++++ src/shared/assets/icons/sign_out_24.svg | 4 ++++ src/shared/assets/icons/signout_24.svg | 4 ---- src/shared/assets/icons/user_24.svg | 6 +++--- 8 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 src/shared/assets/icons/sign_in_24.svg create mode 100644 src/shared/assets/icons/sign_out_24.svg delete mode 100644 src/shared/assets/icons/signout_24.svg diff --git a/src/shared/assets/icons/arrow_up_24.svg b/src/shared/assets/icons/arrow_up_24.svg index 885c40e..24da3d0 100644 --- a/src/shared/assets/icons/arrow_up_24.svg +++ b/src/shared/assets/icons/arrow_up_24.svg @@ -1,3 +1,3 @@ - + diff --git a/src/shared/assets/icons/bell_24.svg b/src/shared/assets/icons/bell_24.svg index be239cd..ab560cb 100644 --- a/src/shared/assets/icons/bell_24.svg +++ b/src/shared/assets/icons/bell_24.svg @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/src/shared/assets/icons/close_20.svg b/src/shared/assets/icons/close_20.svg index fced93f..844b38d 100644 --- a/src/shared/assets/icons/close_20.svg +++ b/src/shared/assets/icons/close_20.svg @@ -1,4 +1,4 @@ - - + + diff --git a/src/shared/assets/icons/close_32.svg b/src/shared/assets/icons/close_32.svg index abf0db5..21f3782 100644 --- a/src/shared/assets/icons/close_32.svg +++ b/src/shared/assets/icons/close_32.svg @@ -1,4 +1,4 @@ - - + + diff --git a/src/shared/assets/icons/sign_in_24.svg b/src/shared/assets/icons/sign_in_24.svg new file mode 100644 index 0000000..3c0d540 --- /dev/null +++ b/src/shared/assets/icons/sign_in_24.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/shared/assets/icons/sign_out_24.svg b/src/shared/assets/icons/sign_out_24.svg new file mode 100644 index 0000000..3cc2b7d --- /dev/null +++ b/src/shared/assets/icons/sign_out_24.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/shared/assets/icons/signout_24.svg b/src/shared/assets/icons/signout_24.svg deleted file mode 100644 index 2931ea8..0000000 --- a/src/shared/assets/icons/signout_24.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/shared/assets/icons/user_24.svg b/src/shared/assets/icons/user_24.svg index 96e15ca..70396a1 100644 --- a/src/shared/assets/icons/user_24.svg +++ b/src/shared/assets/icons/user_24.svg @@ -1,4 +1,4 @@ - - - + + + From ce541eba375d46bf894d2ebef3d14728b8d73f3c Mon Sep 17 00:00:00 2001 From: mtm1018 Date: Tue, 23 Sep 2025 20:55:02 +0900 Subject: [PATCH 3/7] =?UTF-8?q?[stype]=20=EA=B3=B5=EC=9C=A0=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/design-system/page.tsx | 6 ++++++ src/shared/components/share/Share.tsx | 28 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/shared/components/share/Share.tsx diff --git a/src/app/design-system/page.tsx b/src/app/design-system/page.tsx index 3efc235..088bc33 100644 --- a/src/app/design-system/page.tsx +++ b/src/app/design-system/page.tsx @@ -10,6 +10,7 @@ import ConfirmPop from '@/shared/components/modalPop/ConfirmPop'; import ChatInput from '@/shared/components/InputBox/ChatInput'; import SelectBox from '@/shared/components/InputBox/SelectBox'; import LikeBtn from '@/shared/components/like/LikeBtn'; +import Share from '@/shared/components/share/Share'; function Page() { const [isModalOpen, setModalOpen] = useState(false); @@ -142,6 +143,11 @@ function Page() {

like

+
+

Share

+ + +
); diff --git a/src/shared/components/share/Share.tsx b/src/shared/components/share/Share.tsx new file mode 100644 index 0000000..14ddedf --- /dev/null +++ b/src/shared/components/share/Share.tsx @@ -0,0 +1,28 @@ +import ShareBtn from '@/shared/assets/icons/share_24.svg'; + +interface Props { + onClick?: () => void; + variants?: 'default' | 'community'; + title?: string; + content?: string; +} + +function Share({ onClick, variants = 'default', title, content }: Props) { + // title과 content는 추후 API가 들어오면 사용예정 API가 들어오면 타입 옵셔널 체크 해제헤 주세요 + + return ( + + ); +} +export default Share; From f3222aafa64e839d9663b644477784833317672a Mon Sep 17 00:00:00 2001 From: ahk0413 Date: Tue, 23 Sep 2025 21:13:23 +0900 Subject: [PATCH 4/7] =?UTF-8?q?[design]=20layout=20=EA=B4=80=EB=A0=A8=20cs?= =?UTF-8?q?s=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/layout.tsx | 5 ++-- src/app/login/page.tsx | 2 +- src/app/page.tsx | 6 ++--- src/shared/styles/_utilities.css | 41 ++++++++++++++++++++++++++++++-- 4 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/app/layout.tsx b/src/app/layout.tsx index e2c3a2c..1915389 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -18,10 +18,12 @@ export default function RootLayout({
-
+
{children}
+