From 9607552a5412e9444f07a448162254621f20ca0a Mon Sep 17 00:00:00 2001 From: seondal Date: Tue, 30 Jan 2024 22:57:01 +0900 Subject: [PATCH 01/76] =?UTF-8?q?=F0=9F=92=84=20style=20:=20=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=ED=8E=98=EC=9D=B4=EC=A7=80=20>=20=ED=8F=AC=EC=A6=88?= =?UTF-8?q?=ED=94=BC=EC=BB=A4=20=EA=B3=B5=EC=8B=9D=20SNS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/icons/github.svg | 3 -- public/icons/instagram.svg | 5 ---- .../(Sub)/menu/components/MakerSection.tsx | 29 ------------------- .../(Sub)/menu/components/MenuListSection.tsx | 14 +++++++-- src/app/(Sub)/menu/page.tsx | 2 -- src/constants/url.ts | 1 + 6 files changed, 13 insertions(+), 41 deletions(-) delete mode 100644 public/icons/github.svg delete mode 100644 public/icons/instagram.svg delete mode 100644 src/app/(Sub)/menu/components/MakerSection.tsx diff --git a/public/icons/github.svg b/public/icons/github.svg deleted file mode 100644 index 40dddf54..00000000 --- a/public/icons/github.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/public/icons/instagram.svg b/public/icons/instagram.svg deleted file mode 100644 index 5d5ba7aa..00000000 --- a/public/icons/instagram.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/app/(Sub)/menu/components/MakerSection.tsx b/src/app/(Sub)/menu/components/MakerSection.tsx deleted file mode 100644 index 23d470fe..00000000 --- a/src/app/(Sub)/menu/components/MakerSection.tsx +++ /dev/null @@ -1,29 +0,0 @@ -'use client'; - -import { Icon } from '@/components/Button'; -import { BottomFixedDiv } from '@/components/Button/BottomFixedDiv'; -import { Spacing } from '@/components/Spacing'; - -export default function MakerSection() { - return ( - -
-
- - -
- -
-

© POSEPICKER

-
- -
- - ); -} diff --git a/src/app/(Sub)/menu/components/MenuListSection.tsx b/src/app/(Sub)/menu/components/MenuListSection.tsx index da1d6cf9..cceccf87 100644 --- a/src/app/(Sub)/menu/components/MenuListSection.tsx +++ b/src/app/(Sub)/menu/components/MenuListSection.tsx @@ -2,9 +2,15 @@ import { URL } from '@/constants/url'; -const MenuList = [ +interface MenuI { + text: string; + link: string; + highlight?: boolean; +} +const MenuList: readonly MenuI[] = [ { text: '공지사항', link: URL.menu.notice }, { text: '자주 묻는 질문', link: URL.menu.faq }, + { text: '포즈피커 공식 SNS', link: URL.instagram, highlight: true }, { text: '문의하기', link: URL.inquiry }, { text: '', link: '' }, { text: '이용약관', link: URL.menu.term }, @@ -16,7 +22,11 @@ export default function MenuListSection() {
{MenuList.map((item, idx) => item.text ? ( -
window.open(item.link)}> +
window.open(item.link)} + > {item.text}
) : ( diff --git a/src/app/(Sub)/menu/page.tsx b/src/app/(Sub)/menu/page.tsx index 49b875b7..726bbec2 100644 --- a/src/app/(Sub)/menu/page.tsx +++ b/src/app/(Sub)/menu/page.tsx @@ -1,5 +1,4 @@ import LoginSection from './components/LoginSection'; -import MakerSection from './components/MakerSection'; import MenuListSection from './components/MenuListSection'; import { MenuHeader } from '@/components/Header'; @@ -9,7 +8,6 @@ export default function MenuPage() { -
); } diff --git a/src/constants/url.ts b/src/constants/url.ts index 7e6d0d0e..09dc2b90 100644 --- a/src/constants/url.ts +++ b/src/constants/url.ts @@ -1,6 +1,7 @@ export const URL = { site: 'https://www.posepicker.site', inquiry: 'https://litt.ly/posepicker', + instagram: 'https://www.instagram.com/posepicker', menu: { notice: 'https://shineshine.notion.site/fde248040bed45f68fbfa3004e2c4856', faq: 'https://shineshine.notion.site/cc71decc2e534ae6abb195bb10a501c0', From 46b5cc944f6d0bc50334ad93c7d982300b9eaa2b Mon Sep 17 00:00:00 2001 From: seondal Date: Tue, 30 Jan 2024 23:27:25 +0900 Subject: [PATCH 02/76] =?UTF-8?q?=E2=9C=82=EF=B8=8F=20edit=20:=20=20?= =?UTF-8?q?=ED=8F=AC=EC=A6=88=ED=86=A1=20=ED=88=B4=ED=8C=81=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(Main)/talk/components/TitleSection.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/(Main)/talk/components/TitleSection.tsx b/src/app/(Main)/talk/components/TitleSection.tsx index 6f105d11..38db970c 100644 --- a/src/app/(Main)/talk/components/TitleSection.tsx +++ b/src/app/(Main)/talk/components/TitleSection.tsx @@ -49,8 +49,8 @@ export default function TitleSection() { }} >
-

제시어에 맞춰 포즈를 취해 보세요!

-

독특한 나만의 포즈가 완성된답니다.

+

{`일명 <포즈로 말해요> 챌린지!`}

+

제시어에 맞춰 포즈를 취해보세요.

From f548273ff050f668139d5507b5c401084f85bf13 Mon Sep 17 00:00:00 2001 From: seondal Date: Tue, 30 Jan 2024 23:27:48 +0900 Subject: [PATCH 03/76] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor=20:=20=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../(Sub)/menu/components/MenuListSection.tsx | 17 +---------------- src/constants/menuList.ts | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 src/constants/menuList.ts diff --git a/src/app/(Sub)/menu/components/MenuListSection.tsx b/src/app/(Sub)/menu/components/MenuListSection.tsx index cceccf87..e39fcc82 100644 --- a/src/app/(Sub)/menu/components/MenuListSection.tsx +++ b/src/app/(Sub)/menu/components/MenuListSection.tsx @@ -1,21 +1,6 @@ 'use client'; -import { URL } from '@/constants/url'; - -interface MenuI { - text: string; - link: string; - highlight?: boolean; -} -const MenuList: readonly MenuI[] = [ - { text: '공지사항', link: URL.menu.notice }, - { text: '자주 묻는 질문', link: URL.menu.faq }, - { text: '포즈피커 공식 SNS', link: URL.instagram, highlight: true }, - { text: '문의하기', link: URL.inquiry }, - { text: '', link: '' }, - { text: '이용약관', link: URL.menu.term }, - { text: '개인정보 처리방침', link: URL.menu.privacy }, -] as const; +import MenuList from '@/constants/menuList'; export default function MenuListSection() { return ( diff --git a/src/constants/menuList.ts b/src/constants/menuList.ts new file mode 100644 index 00000000..ad68e4dc --- /dev/null +++ b/src/constants/menuList.ts @@ -0,0 +1,18 @@ +import { URL } from './url'; + +interface MenuI { + text: string; + link: string; + highlight?: boolean; +} +const MenuList: readonly MenuI[] = [ + { text: '공지사항', link: URL.menu.notice }, + { text: '자주 묻는 질문', link: URL.menu.faq }, + { text: '포즈피커 공식 SNS', link: URL.instagram, highlight: true }, + { text: '문의하기', link: URL.inquiry }, + { text: '', link: '' }, + { text: '이용약관', link: URL.menu.term }, + { text: '개인정보 처리방침', link: URL.menu.privacy }, +] as const; + +export default MenuList; From 8ee3fc564f6bdbcc99299dbd6f14fdaa7add9209 Mon Sep 17 00:00:00 2001 From: seondal Date: Mon, 19 Feb 2024 13:38:56 +0900 Subject: [PATCH 04/76] =?UTF-8?q?=E2=9C=A8=20feat=20:=20=20=EB=A7=88?= =?UTF-8?q?=EC=9D=B4=ED=8F=AC=EC=A6=88=20=ED=94=8C=EB=A1=9C=EC=9A=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(Main)/layout.tsx | 2 ++ .../mypose}/components/LoginButton.tsx | 0 .../mypose}/components/LoginModal.tsx | 0 .../mypose}/components/LoginSection.tsx | 0 src/app/(Main)/mypose/layout.tsx | 21 +++++++++++++++++++ src/app/(Main)/mypose/page.tsx | 3 +++ src/app/(Main)/pick/page.tsx | 8 +------ src/app/(Main)/talk/page.tsx | 2 -- src/app/(Sub)/menu/page.tsx | 2 -- src/components/Header/Tab.tsx | 1 + 10 files changed, 28 insertions(+), 11 deletions(-) rename src/app/{(Sub)/menu => (Main)/mypose}/components/LoginButton.tsx (100%) rename src/app/{(Sub)/menu => (Main)/mypose}/components/LoginModal.tsx (100%) rename src/app/{(Sub)/menu => (Main)/mypose}/components/LoginSection.tsx (100%) create mode 100644 src/app/(Main)/mypose/layout.tsx create mode 100644 src/app/(Main)/mypose/page.tsx diff --git a/src/app/(Main)/layout.tsx b/src/app/(Main)/layout.tsx index fe76aa83..89861634 100644 --- a/src/app/(Main)/layout.tsx +++ b/src/app/(Main)/layout.tsx @@ -1,9 +1,11 @@ +import { MainHeader } from '@/components/Header'; import { Spacing } from '@/components/Spacing'; import { StrictPropsWithChildren } from '@/types'; export default function MainLayout({ children }: StrictPropsWithChildren) { return (
+ {children}
diff --git a/src/app/(Sub)/menu/components/LoginButton.tsx b/src/app/(Main)/mypose/components/LoginButton.tsx similarity index 100% rename from src/app/(Sub)/menu/components/LoginButton.tsx rename to src/app/(Main)/mypose/components/LoginButton.tsx diff --git a/src/app/(Sub)/menu/components/LoginModal.tsx b/src/app/(Main)/mypose/components/LoginModal.tsx similarity index 100% rename from src/app/(Sub)/menu/components/LoginModal.tsx rename to src/app/(Main)/mypose/components/LoginModal.tsx diff --git a/src/app/(Sub)/menu/components/LoginSection.tsx b/src/app/(Main)/mypose/components/LoginSection.tsx similarity index 100% rename from src/app/(Sub)/menu/components/LoginSection.tsx rename to src/app/(Main)/mypose/components/LoginSection.tsx diff --git a/src/app/(Main)/mypose/layout.tsx b/src/app/(Main)/mypose/layout.tsx new file mode 100644 index 00000000..360c42ae --- /dev/null +++ b/src/app/(Main)/mypose/layout.tsx @@ -0,0 +1,21 @@ +import Link from 'next/link'; + +import LoginSection from './components/LoginSection'; +import { StrictPropsWithChildren } from '@/types'; + +export default function Layout({ children }: StrictPropsWithChildren) { + return ( + <> + +
    +
  • + 등록 +
    • +
  • + 저장 +
    • +
+ {children} + + ); +} diff --git a/src/app/(Main)/mypose/page.tsx b/src/app/(Main)/mypose/page.tsx new file mode 100644 index 00000000..c11bf961 --- /dev/null +++ b/src/app/(Main)/mypose/page.tsx @@ -0,0 +1,3 @@ +export default function Page() { + return <>mypose; +} diff --git a/src/app/(Main)/pick/page.tsx b/src/app/(Main)/pick/page.tsx index d09ee22d..4df7f063 100644 --- a/src/app/(Main)/pick/page.tsx +++ b/src/app/(Main)/pick/page.tsx @@ -1,11 +1,5 @@ import PickSection from './components/PickSection'; -import { MainHeader } from '@/components/Header'; export default function Pick() { - return ( - <> - - - - ); + return ; } diff --git a/src/app/(Main)/talk/page.tsx b/src/app/(Main)/talk/page.tsx index 6327afc5..a816a729 100644 --- a/src/app/(Main)/talk/page.tsx +++ b/src/app/(Main)/talk/page.tsx @@ -1,13 +1,11 @@ import TalkSection from './components/TalkSection'; import TitleSection from './components/TitleSection'; -import { MainHeader } from '@/components/Header'; import { PageAnimation } from '@/components/PageAnimation'; import { Spacing } from '@/components/Spacing'; export default function Talk() { return ( <> - diff --git a/src/app/(Sub)/menu/page.tsx b/src/app/(Sub)/menu/page.tsx index 726bbec2..7343d6df 100644 --- a/src/app/(Sub)/menu/page.tsx +++ b/src/app/(Sub)/menu/page.tsx @@ -1,4 +1,3 @@ -import LoginSection from './components/LoginSection'; import MenuListSection from './components/MenuListSection'; import { MenuHeader } from '@/components/Header'; @@ -6,7 +5,6 @@ export default function MenuPage() { return (
-
); diff --git a/src/components/Header/Tab.tsx b/src/components/Header/Tab.tsx index 2a9419c8..cb1498c7 100644 --- a/src/components/Header/Tab.tsx +++ b/src/components/Header/Tab.tsx @@ -8,6 +8,7 @@ const tabData = [ { path: '/pick', title: '포즈픽' }, { path: '/talk', title: '포즈톡' }, { path: '/feed', title: '포즈피드' }, + { path: '/mypose', title: '마이포즈' }, ]; export default function Tab() { From 53d9ec5762c0f961153a6e28aa22f071d5967713 Mon Sep 17 00:00:00 2001 From: seondal Date: Mon, 19 Feb 2024 14:39:21 +0900 Subject: [PATCH 05/76] =?UTF-8?q?=E2=9C=A8=20feat=20:=20=20=EB=A7=88?= =?UTF-8?q?=EC=9D=B4=ED=8F=AC=EC=A6=88=20=EB=93=B1=EB=A1=9D/=EC=A0=80?= =?UTF-8?q?=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/{(Sub) => (Main)/mypose}/bookmark/page.tsx | 2 -- src/app/(Main)/mypose/page.tsx | 11 ++++++++++- src/components/Feed/EmptyCase.tsx | 2 +- src/components/Header/Tab.tsx | 2 +- src/components/Header/index.tsx | 2 -- 5 files changed, 12 insertions(+), 7 deletions(-) rename src/app/{(Sub) => (Main)/mypose}/bookmark/page.tsx (85%) diff --git a/src/app/(Sub)/bookmark/page.tsx b/src/app/(Main)/mypose/bookmark/page.tsx similarity index 85% rename from src/app/(Sub)/bookmark/page.tsx rename to src/app/(Main)/mypose/bookmark/page.tsx index 96321991..bd577c0b 100644 --- a/src/app/(Sub)/bookmark/page.tsx +++ b/src/app/(Main)/mypose/bookmark/page.tsx @@ -1,11 +1,9 @@ import EmptyCase from '@/components/Feed/EmptyCase'; import PhotoList from '@/components/Feed/PhotoList'; -import { BookmarkHeader } from '@/components/Header'; export default function BookmarkPage() { return ( <> - mypose; + return ( + + ); } diff --git a/src/components/Feed/EmptyCase.tsx b/src/components/Feed/EmptyCase.tsx index 71ccd258..5533788a 100644 --- a/src/components/Feed/EmptyCase.tsx +++ b/src/components/Feed/EmptyCase.tsx @@ -21,7 +21,7 @@ export default function EmptyCase(props: EmptyCase) {
- +
diff --git a/src/components/Header/Tab.tsx b/src/components/Header/Tab.tsx index cb1498c7..a7d33bca 100644 --- a/src/components/Header/Tab.tsx +++ b/src/components/Header/Tab.tsx @@ -18,7 +18,7 @@ export default function Tab() {