From 30000d3d8e78251dbcbc93947c3389a484593b8f Mon Sep 17 00:00:00 2001 From: arkingco Date: Mon, 27 Nov 2023 14:42:47 +0900 Subject: [PATCH 01/28] =?UTF-8?q?fix:=20=EB=AA=A8=EB=8B=AC=20=EB=B0=B1?= =?UTF-8?q?=EA=B7=B8=EB=9D=BC=EC=9A=B4=EB=93=9C=20div=20=EC=A0=9C=EA=B1=B0?= =?UTF-8?q?=20#74?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Modal/index.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/component/Modal/index.tsx b/src/component/Modal/index.tsx index 8f5807b4..f0c41f1a 100644 --- a/src/component/Modal/index.tsx +++ b/src/component/Modal/index.tsx @@ -15,9 +15,7 @@ export default function Modal() { className="fixed top-0 z-20 flex h-full w-full max-w-md items-center justify-center bg-slate-400/50" onClick={(e) => handleBackground(e, closeModal)} > -
- {modal.modalComponent} -
+ {modal.modalComponent} ) ); From 4379770e3ea5f13029d8f16aedbd5163c3a224a3 Mon Sep 17 00:00:00 2001 From: arkingco Date: Mon, 27 Nov 2023 16:49:13 +0900 Subject: [PATCH 02/28] =?UTF-8?q?fix:=20confirm=20=EB=AA=A8=EB=8B=AC=20?= =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95=20#74?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Modal/Confirm.tsx | 46 +++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/src/component/Modal/Confirm.tsx b/src/component/Modal/Confirm.tsx index 2bdd45f5..f698a8b8 100644 --- a/src/component/Modal/Confirm.tsx +++ b/src/component/Modal/Confirm.tsx @@ -1,3 +1,5 @@ +import BottomButton from '@/component/BottomButton'; + interface Props { content: string; yes: () => void; @@ -6,23 +8,35 @@ interface Props { export default function Confirm({ content, yes, no }: Props) { return ( -
-
- {content} +
+
+
-
- - + {content} +
+ +
); From 5533aeea83c3f99a6e61a87bfb9cfd1759fc2ca2 Mon Sep 17 00:00:00 2001 From: lyssoi <114637463+lyssoi@users.noreply.github.com> Date: Mon, 27 Nov 2023 21:11:00 +0900 Subject: [PATCH 03/28] =?UTF-8?q?feat/confirm=EB=AA=A8=EB=8B=AC=20?= =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=A0=81=EC=9A=A9=20#74?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/Modal.png | Bin 0 -> 1159 bytes src/component/Modal/Confirm.tsx | 56 +++++++++++++++----------------- 2 files changed, 27 insertions(+), 29 deletions(-) create mode 100644 public/Modal.png diff --git a/public/Modal.png b/public/Modal.png new file mode 100644 index 0000000000000000000000000000000000000000..53888917315e0ddfad951dd9635f943ab1af499b GIT binary patch literal 1159 zcmeAS@N?(olHy`uVBq!ia0y~yV6*^X4mP03`TF-+K#H@#BeIx*fm;}a85w5HkpK!Z z76-XIF|0c$^AgBmNq6*hWMJ6X&;2Kn708wGba4!+V0?SyAZJ4W59>jfH~UlniXW7k zHZxc&Lhk0z%09-99c&6-4;pkDnKxa#&%0t1gvr8pLdZhFdz3TW!$4xiXgrUIw7#aA i!RgzNJZ_k0*N8LfbLDz-GJFP>8w{SVelF{r5}E)HKznKc literal 0 HcmV?d00001 diff --git a/src/component/Modal/Confirm.tsx b/src/component/Modal/Confirm.tsx index f698a8b8..41574afc 100644 --- a/src/component/Modal/Confirm.tsx +++ b/src/component/Modal/Confirm.tsx @@ -1,4 +1,5 @@ import BottomButton from '@/component/BottomButton'; +import Image from 'next/image'; interface Props { content: string; @@ -8,35 +9,32 @@ interface Props { export default function Confirm({ content, yes, no }: Props) { return ( -
-
-
-
- {content} -
- - +
+ modal +
+
+

{content}

+
+
+
+ + +
+
); From 89ebcce858564624cc5ec615377b9c637d4eb92d Mon Sep 17 00:00:00 2001 From: arkingco Date: Tue, 28 Nov 2023 01:00:58 +0900 Subject: [PATCH 04/28] =?UTF-8?q?feat:=20personal=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EA=B3=A0=EC=96=91=EC=9D=B4=20=EC=95=A0=EB=8B=88?= =?UTF-8?q?=EB=A7=A4=EC=9D=B4=EC=85=98=20=ED=95=98=EB=93=9C=EC=BD=94?= =?UTF-8?q?=EB=94=A9=20#18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/cats/app_bar_left.gif | Bin 0 -> 5277 bytes ...at_basic_default.gif => basic_default.gif} | Bin src/app/api/personal/data.json | 2 +- src/app/personal/[id]/page.tsx | 36 ++++++-- src/component/BottomButton.tsx | 1 + src/component/CatAnimation.tsx | 10 +-- src/component/StrcatAnimationHeader.tsx | 83 ++++++++++++++++++ src/types/cat.ts | 2 +- 8 files changed, 121 insertions(+), 13 deletions(-) create mode 100644 public/cats/app_bar_left.gif rename public/cats/{strcat_basic_default.gif => basic_default.gif} (100%) create mode 100644 src/component/StrcatAnimationHeader.tsx diff --git a/public/cats/app_bar_left.gif b/public/cats/app_bar_left.gif new file mode 100644 index 0000000000000000000000000000000000000000..749853b8781c3faefe5a0223c95d5e2c9f4107e9 GIT binary patch literal 5277 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 AKmY&$ literal 0 HcmV?d00001 diff --git a/public/cats/strcat_basic_default.gif b/public/cats/basic_default.gif similarity index 100% rename from public/cats/strcat_basic_default.gif rename to public/cats/basic_default.gif diff --git a/src/app/api/personal/data.json b/src/app/api/personal/data.json index 879135f9..256b41db 100644 --- a/src/app/api/personal/data.json +++ b/src/app/api/personal/data.json @@ -3,7 +3,7 @@ "board": { "id": 1, "title": "Sample Board", - "theme": "green", + "theme": "strcat", "contents": [ { "id": 1, diff --git a/src/app/personal/[id]/page.tsx b/src/app/personal/[id]/page.tsx index 4f81185e..94b7325a 100644 --- a/src/app/personal/[id]/page.tsx +++ b/src/app/personal/[id]/page.tsx @@ -8,11 +8,15 @@ import ContentPhoto from '@/component/ContentPhoto'; import { useRecoilState } from 'recoil'; import { themeState } from '@/recoil/theme'; import Drawer from '@/component/Drawer'; -import StrcatHeader from '@/component/StrcatHeader'; import { observeState } from '@/recoil/observe'; import { useRouter } from 'next/navigation'; import { board } from '@/types/boards'; import { scrollToAdd, setMap } from '@/utils/scrollTo'; +import StrcatAnimationHeader from '@/component/StrcatAnimationHeader'; +import axios from 'axios'; +import CatAnimation from '@/component/CatAnimation'; +import { catState } from '@/recoil/cat'; +import { catAction } from '@/types/cat'; export default function Personal({ params }: { params: { id: string } }) { const [board, setBoard] = useState([]); @@ -22,10 +26,11 @@ export default function Personal({ params }: { params: { id: string } }) { const [observe] = useRecoilState(observeState); const [theme, setTheme] = useRecoilState(themeState); const router = useRouter(); + const [cat, setCat] = useRecoilState(catState); useEffect(() => { - axiosInstance - .get(`/boards/${params.id}`) - //.get(`/api/personal`) + axios + // .get(`/boards/${params.id}`) + .get(`/api/personal`) .then((data) => { setBoard([data.data.board]); setTheme(data.data.board.theme); @@ -38,7 +43,25 @@ export default function Personal({ params }: { params: { id: string } }) { setIsAdd(true); scrollToAdd(board[0].id, itemsRef); }; + + useEffect(() => { + setTimeout(() => { + const div = document.getElementById('strcatCreate'); + if (div === null) return; + const divLeft = div.getBoundingClientRect().left; + const divTop = div.getBoundingClientRect().top; + setCat({ + catAction: catAction.sit, + width: 40, + height: 40, + top: divTop - 40, + left: divLeft + 200, + }); + }, 5000); + }, []); + if (!board.length) return null; + const handleShare = async () => { try { await navigator.share({ @@ -55,7 +78,8 @@ export default function Personal({ params }: { params: { id: string } }) { return ( <> - + +
@@ -68,7 +92,7 @@ export default function Personal({ params }: { params: { id: string } }) { {!isAdd && (isOwner ? (
-
+
{cat.catAction === catAction.exit && ( - exit + exit )} - {cat.catAction === catAction.scroll && ( - exit + {cat.catAction === catAction.sit && ( + exit )}
); diff --git a/src/component/StrcatAnimationHeader.tsx b/src/component/StrcatAnimationHeader.tsx new file mode 100644 index 00000000..9ef33050 --- /dev/null +++ b/src/component/StrcatAnimationHeader.tsx @@ -0,0 +1,83 @@ +'use client'; + +import { useLogin } from '@/hooks/useLogin'; +import { catState, drawerState, themeState } from '@/recoil/state'; +import { catAction } from '@/types/cat'; +import Image from 'next/image'; +import Link from 'next/link'; +import { usePathname } from 'next/navigation'; +import { useEffect } from 'react'; +import { useRecoilState } from 'recoil'; + +export default function StrcatAnimationHeader() { + const [isLogin, checkLogin] = useLogin(); + const pathName = usePathname(); + const [, setDrawer] = useRecoilState(drawerState); + const [theme] = useRecoilState(themeState); + const [cat, setCat] = useRecoilState(catState); + + useEffect(() => { + checkLogin(); + + const div = document.getElementById('catHeader'); + if (div === null) return; + const divLeft = div.getBoundingClientRect().left; + const divTop = div.getBoundingClientRect().top; + console.log('hi', divLeft, divTop); + setCat({ + catAction: catAction.exit, + width: 114, + height: 40, + top: 8, + left: divLeft - 24, + }); + }, []); + + return ( +
+
+ +
+ +
+ {isLogin ? ( + profileImg setDrawer(true)} + /> + ) : ( + + localStorage.setItem('strcat_login_success_url', pathName) + } + > +
+ login + + 로그인 + +
+ + )} +
+
+ ); +} diff --git a/src/types/cat.ts b/src/types/cat.ts index abaf2936..8df612aa 100644 --- a/src/types/cat.ts +++ b/src/types/cat.ts @@ -1,8 +1,8 @@ export const catAction = { exit: 'exit', newContent: 'newContent', - scroll: 'scroll', longText: 'longText', + sit: 'sit', none: 'none', }; From 9b379246268fcb283f166269b84ce6336f59e9fd Mon Sep 17 00:00:00 2001 From: lyssoi <114637463+lyssoi@users.noreply.github.com> Date: Tue, 28 Nov 2023 14:18:52 +0900 Subject: [PATCH 05/28] =?UTF-8?q?feat/=EB=AA=A8=EB=8B=AC=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=8B=AB=EA=B8=B0=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=B6=94=EA=B0=80#74?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Icon/Close.tsx | 14 +++++++++++ src/component/Modal/Confirm.tsx | 44 ++++++++++++++++++--------------- 2 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 src/component/Icon/Close.tsx diff --git a/src/component/Icon/Close.tsx b/src/component/Icon/Close.tsx new file mode 100644 index 00000000..03975605 --- /dev/null +++ b/src/component/Icon/Close.tsx @@ -0,0 +1,14 @@ +export default function Close() { + return ( + + + + + ); +} diff --git a/src/component/Modal/Confirm.tsx b/src/component/Modal/Confirm.tsx index 41574afc..580c9f73 100644 --- a/src/component/Modal/Confirm.tsx +++ b/src/component/Modal/Confirm.tsx @@ -1,5 +1,6 @@ import BottomButton from '@/component/BottomButton'; import Image from 'next/image'; +import Close from '../Icon/Close'; interface Props { content: string; @@ -12,28 +13,31 @@ export default function Confirm({ content, yes, no }: Props) {
modal
-
+
+
+ +
+
+

{content}

-
-
- - -
+
+ +
From 50c8063756b583e8353e9ec43e4dfca7a1cbea47 Mon Sep 17 00:00:00 2001 From: lyssoi <114637463+lyssoi@users.noreply.github.com> Date: Tue, 28 Nov 2023 14:50:45 +0900 Subject: [PATCH 06/28] =?UTF-8?q?feat:=20=EB=AA=A8=EB=8B=AC=20=EC=83=89?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20#74?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Modal/Confirm.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/component/Modal/Confirm.tsx b/src/component/Modal/Confirm.tsx index 580c9f73..e4dbe12c 100644 --- a/src/component/Modal/Confirm.tsx +++ b/src/component/Modal/Confirm.tsx @@ -24,18 +24,18 @@ export default function Confirm({ content, yes, no }: Props) {
From d825cb04ff6a7478e42be4f57b0f668fb668ac26 Mon Sep 17 00:00:00 2001 From: lyssoi <114637463+lyssoi@users.noreply.github.com> Date: Tue, 28 Nov 2023 16:30:57 +0900 Subject: [PATCH 07/28] =?UTF-8?q?feat:=20modal=20svg=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20#74?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Icon/ModalBackground.tsx | 12 ++++++++++++ src/component/Icon/{Close.tsx => ModalClose.tsx} | 2 +- src/component/Modal/Confirm.tsx | 11 ++++++----- 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 src/component/Icon/ModalBackground.tsx rename src/component/Icon/{Close.tsx => ModalClose.tsx} (93%) diff --git a/src/component/Icon/ModalBackground.tsx b/src/component/Icon/ModalBackground.tsx new file mode 100644 index 00000000..c320c619 --- /dev/null +++ b/src/component/Icon/ModalBackground.tsx @@ -0,0 +1,12 @@ +export default function ModalBackground() { + return ( + + + + ); +} diff --git a/src/component/Icon/Close.tsx b/src/component/Icon/ModalClose.tsx similarity index 93% rename from src/component/Icon/Close.tsx rename to src/component/Icon/ModalClose.tsx index 03975605..08742e77 100644 --- a/src/component/Icon/Close.tsx +++ b/src/component/Icon/ModalClose.tsx @@ -1,4 +1,4 @@ -export default function Close() { +export default function ModalClose() { return ( - +
+
- +
-
+

{content}

From 75b60215fa843b2009328225dc18425c9fad5fd0 Mon Sep 17 00:00:00 2001 From: lyssoi <114637463+lyssoi@users.noreply.github.com> Date: Tue, 28 Nov 2023 16:32:12 +0900 Subject: [PATCH 08/28] =?UTF-8?q?feat:=20=EB=AA=A8=EB=8B=AC=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/Modal.png | Bin 1159 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/Modal.png diff --git a/public/Modal.png b/public/Modal.png deleted file mode 100644 index 53888917315e0ddfad951dd9635f943ab1af499b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1159 zcmeAS@N?(olHy`uVBq!ia0y~yV6*^X4mP03`TF-+K#H@#BeIx*fm;}a85w5HkpK!Z z76-XIF|0c$^AgBmNq6*hWMJ6X&;2Kn708wGba4!+V0?SyAZJ4W59>jfH~UlniXW7k zHZxc&Lhk0z%09-99c&6-4;pkDnKxa#&%0t1gvr8pLdZhFdz3TW!$4xiXgrUIw7#aA i!RgzNJZ_k0*N8LfbLDz-GJFP>8w{SVelF{r5}E)HKznKc From ab12c9ea1a3d590128fa083696e5c4dffe2a8926 Mon Sep 17 00:00:00 2001 From: lyssoi <114637463+lyssoi@users.noreply.github.com> Date: Tue, 28 Nov 2023 16:37:08 +0900 Subject: [PATCH 09/28] =?UTF-8?q?feat:=20strcat=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=95=88=EB=93=A4=EC=96=B4=EC=99=94=EC=9D=84?= =?UTF-8?q?=EB=95=8C=20=EB=A1=9C=EC=A7=81=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/personal/[id]/page.tsx | 2 +- src/component/StrcatBoard.tsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/personal/[id]/page.tsx b/src/app/personal/[id]/page.tsx index 30a287f3..526a747b 100644 --- a/src/app/personal/[id]/page.tsx +++ b/src/app/personal/[id]/page.tsx @@ -39,7 +39,7 @@ export default function Personal({ params }: { params: { id: string } }) { setIsAdd(true); scrollToAdd(board[0].id, itemsRef); }; - if (!board.length) return null; + // if (!board.length) return null; return ( <> diff --git a/src/component/StrcatBoard.tsx b/src/component/StrcatBoard.tsx index 43794ba3..283973a1 100644 --- a/src/component/StrcatBoard.tsx +++ b/src/component/StrcatBoard.tsx @@ -26,9 +26,10 @@ const StrcatBoard = forwardRef(function StrcatBoard( { board, isAdd, setIsAdd }, ref, ) { + if (!board) return null; const [observe] = useRecoilState(observeState); const [theme, setTheme] = useRecoilState(themeState); - const [content, setContent] = useState(board.contents); + const [content, setContent] = useState([]); useEffect(() => { setContent(board.contents); }, [board]); From 4384624c4262827bc23bad4ed3452748622cb3c2 Mon Sep 17 00:00:00 2001 From: lyssoi <114637463+lyssoi@users.noreply.github.com> Date: Tue, 28 Nov 2023 17:08:39 +0900 Subject: [PATCH 10/28] =?UTF-8?q?fix:=20boardId=20strign=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/group/[id]/page.tsx | 4 ++-- src/app/personal/[id]/page.tsx | 27 ++++++++++++--------------- src/component/ObserveContent.tsx | 2 +- src/component/ShareButton.tsx | 16 ++++++++++++++++ src/component/StrcatBoard.tsx | 3 +-- src/component/StrcatGroupTitle.tsx | 2 +- src/recoil/observe.ts | 2 +- src/types/boards.ts | 2 +- src/utils/scrollTo.ts | 2 +- 9 files changed, 36 insertions(+), 24 deletions(-) create mode 100644 src/component/ShareButton.tsx diff --git a/src/app/group/[id]/page.tsx b/src/app/group/[id]/page.tsx index ee2633c8..c94120bd 100644 --- a/src/app/group/[id]/page.tsx +++ b/src/app/group/[id]/page.tsx @@ -25,7 +25,7 @@ export default function Group({ params }: { params: { id: string } }) { const [observe] = useRecoilState(observeState); const [isOwner, setIsOwner] = useState(false); const router = useRouter(); - const scrollToId = (itemId: number) => { + const scrollToId = (itemId: string) => { const map = itemsRef.current; const node = map.get(itemId); const offset = node.offsetTop; @@ -48,7 +48,7 @@ export default function Group({ params }: { params: { id: string } }) { setIsOwner(data.data.isOwner); }) .catch((error) => {}); - }, []); + }, [params.id]); return ( <> diff --git a/src/app/personal/[id]/page.tsx b/src/app/personal/[id]/page.tsx index 526a747b..7508a9a0 100644 --- a/src/app/personal/[id]/page.tsx +++ b/src/app/personal/[id]/page.tsx @@ -14,6 +14,7 @@ import { useRouter } from 'next/navigation'; import { board } from '@/types/boards'; import { scrollToAdd, setMap } from '@/utils/scrollTo'; import { handleShare } from '@/utils/handleShare'; +import ShareButton from '@/component/ShareButton'; export default function Personal({ params }: { params: { id: string } }) { const [board, setBoard] = useState([]); @@ -33,13 +34,12 @@ export default function Personal({ params }: { params: { id: string } }) { setIsOwner(data.data.isOwner); }) .catch((error) => {}); - }, []); + }, [params.id]); const handleClick = () => { setIsAdd(true); scrollToAdd(board[0].id, itemsRef); }; - // if (!board.length) return null; return ( <> @@ -47,12 +47,14 @@ export default function Personal({ params }: { params: { id: string } }) {
- setMap(node, board[0], itemsRef)} - isAdd={isAdd} - setIsAdd={setIsAdd} - /> + {board.length && ( + setMap(node, board[0], itemsRef)} + isAdd={isAdd} + setIsAdd={setIsAdd} + /> + )} {!isAdd && (isOwner ? (
@@ -107,13 +109,8 @@ export default function Personal({ params }: { params: { id: string } }) {
))} - {!board[0].contents.length && !isAdd && ( -
handleShare(`/personal/${params.id}`)} - > - 공유하기 -
+ {board.length && !board[0].contents.length && !isAdd && ( + )} {!isAdd && }
diff --git a/src/component/ObserveContent.tsx b/src/component/ObserveContent.tsx index 1a5acde3..7f92b0fc 100644 --- a/src/component/ObserveContent.tsx +++ b/src/component/ObserveContent.tsx @@ -6,7 +6,7 @@ import React from 'react'; import { themeObj, themeState } from '@/recoil/theme'; interface props { content: content; - boardId: number; + boardId: string; isAdd: boolean; boardTheme: 'strcat' | 'calm' | 'green' | 'cyan'; } diff --git a/src/component/ShareButton.tsx b/src/component/ShareButton.tsx new file mode 100644 index 00000000..89caf35f --- /dev/null +++ b/src/component/ShareButton.tsx @@ -0,0 +1,16 @@ +import { handleShare } from '@/utils/handleShare'; + +interface Props { + params: string; +} + +export default function ShareButton({ params }: Props) { + return ( +
handleShare(`/personal/${params}`)} + > + 공유하기 +
+ ); +} diff --git a/src/component/StrcatBoard.tsx b/src/component/StrcatBoard.tsx index 283973a1..fc9deb25 100644 --- a/src/component/StrcatBoard.tsx +++ b/src/component/StrcatBoard.tsx @@ -26,9 +26,8 @@ const StrcatBoard = forwardRef(function StrcatBoard( { board, isAdd, setIsAdd }, ref, ) { - if (!board) return null; const [observe] = useRecoilState(observeState); - const [theme, setTheme] = useRecoilState(themeState); + const [theme] = useRecoilState(themeState); const [content, setContent] = useState([]); useEffect(() => { setContent(board.contents); diff --git a/src/component/StrcatGroupTitle.tsx b/src/component/StrcatGroupTitle.tsx index 6ec8d3dc..5e9d4d36 100644 --- a/src/component/StrcatGroupTitle.tsx +++ b/src/component/StrcatGroupTitle.tsx @@ -4,7 +4,7 @@ import Strcat from './Icon/Strcat'; interface Props { board: board; - scrollToId: (arg0: number) => void; + scrollToId: (arg0: string) => void; } export default function StrcatGroupTitle({ board, scrollToId }: Props) { diff --git a/src/recoil/observe.ts b/src/recoil/observe.ts index b1fde28e..3dc7465a 100644 --- a/src/recoil/observe.ts +++ b/src/recoil/observe.ts @@ -3,7 +3,7 @@ import { atom } from 'recoil'; export const observeState = atom({ key: 'observeState', default: { - boardId: 0, + boardId: '', contentId: 0, photoUrl: '', writer: '', diff --git a/src/types/boards.ts b/src/types/boards.ts index b40661eb..bfccda2e 100644 --- a/src/types/boards.ts +++ b/src/types/boards.ts @@ -1,7 +1,7 @@ import { content } from './content'; export interface board { - id: number; + id: string; title: string; theme: 'strcat' | 'calm' | 'green' | 'cyan'; contents: content[]; diff --git a/src/utils/scrollTo.ts b/src/utils/scrollTo.ts index 5887c63d..68a5611c 100644 --- a/src/utils/scrollTo.ts +++ b/src/utils/scrollTo.ts @@ -2,7 +2,7 @@ import { MutableRefObject } from 'react'; import { board } from '@/types/boards'; export const scrollToAdd = ( - itemId: number, + itemId: string, itemsRef: MutableRefObject>, ) => { const map = itemsRef.current; From 947264d9a0cbbaedaaa1362a13ea3f1c33fd62e6 Mon Sep 17 00:00:00 2001 From: dokoh Date: Tue, 28 Nov 2023 17:37:04 +0900 Subject: [PATCH 11/28] =?UTF-8?q?fix/svg=EB=A1=9C=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20=EB=B2=84=ED=8A=BC=20css=20=EC=A1=B0=EC=A0=95#130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/ActivateButton.png | Bin 1004 -> 0 bytes public/BackPage.png | Bin 192 -> 0 bytes public/CalmButton.png | Bin 753 -> 0 bytes public/CyanButton.png | Bin 802 -> 0 bytes public/DisabledButton.png | Bin 876 -> 0 bytes public/Google.png | Bin 835 -> 0 bytes public/Google.svg | 13 +++++++++ public/GroupStrcatMake.png | Bin 253 -> 0 bytes public/StrcatButton.png | Bin 785 -> 0 bytes public/StrcatMake.png | Bin 250 -> 0 bytes public/greenButton.png | Bin 794 -> 0 bytes public/kakao.png | Bin 513 -> 0 bytes public/kakao.svg | 3 ++ public/strcatImage.png | Bin 15375 -> 0 bytes src/app/login/page.tsx | 52 +++++++++++++++------------------ src/component/ThemeChange.tsx | 53 ++++++++++++++++------------------ 16 files changed, 64 insertions(+), 57 deletions(-) delete mode 100644 public/ActivateButton.png delete mode 100644 public/BackPage.png delete mode 100644 public/CalmButton.png delete mode 100644 public/CyanButton.png delete mode 100644 public/DisabledButton.png delete mode 100644 public/Google.png create mode 100644 public/Google.svg delete mode 100644 public/GroupStrcatMake.png delete mode 100644 public/StrcatButton.png delete mode 100644 public/StrcatMake.png delete mode 100644 public/greenButton.png delete mode 100644 public/kakao.png create mode 100644 public/kakao.svg delete mode 100644 public/strcatImage.png diff --git a/public/ActivateButton.png b/public/ActivateButton.png deleted file mode 100644 index 733c655561a6dc5c12d317792df1ee68993ea51d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1004 zcmVPCU2CPJYDHG0p3hoyh$eV9_Yem_a`n)e=M`{kT_?t2xoX=pa_O8~$j2Lu2d zMZf`YRt2po09R4L0dN)p2f$eb8~|q#Z~&Y|zyWX;0SCZY1RMZo5pXDp_0<(wTb%cf zK)Dcb2uwpO@nOdMXo%&rI5{D&Z(Njb&z=fUE|mgUTK*D~Ptj3Hyr0>2zN+DN~;`#MHe(3F@%yVf}z2^4Zc zpAr0Sf>py5utmVZ%G`LwYfZbyo|}+q+Bn%DQg20!+uxfq zt?(<;@&ZAy1_vwJo*q0@`zPEoXjP@3?A8@1H!3(-scLL8?P$!a;xy>8>G|q_?PH+< zMLwyexBx*BaIn(c)8|b_b*(LYf5e2@MkS}gHuofITFAJ!HkVD;&0-SuzBhKAle+fM z*0p!$w{&d}C=~(@Ry3S6z;vBWw}0r`TROQS>t@iPA=h?!Ktk7Z15Vpkzjf6LFEikj zR)gUOBVwyMPm2r`LcqbA23SjPzX_~qiH&bmZKnqBcoWrpZL4a#G9ay&2E6YFYjW?Y ztf>jSy#%nukO6_{FrnFmoL@<46iM`VQ&Ml4Sz@xL`zQ}0S7At9E$3E6!EGwpUpzQO~9QWd*L1ZO}zRTR`%v! zo!aV<;=;>m0fHjnP?T0ne#N8@*r!*MInz+!U&N3B*0j=^x;rQzBclTB2UKt<37xd+ zCm*c>Go>~M7C)0KIoJHwIQzWPwLV}c1RVC1Uj^p#!wfPCUCTbN+f}+Z*YJQs2si|m zuhQCyuGjf%c$GD^-fNZq7E@H%s2G|}1brH__ z*0e3;xl!yVY!dH`00008QZAiRf(sADjMaUXevB6X?Us47p<>%3>T8({Wg2~xB?6c05DiHp&( zGQBi+t-Sq=dR;50v;=hy;EA=+YYZU?p66k%Tvj8m4Z5=HiC7SmKFX1q%tK&6>#b46G)(lhxhLpg|1N!ea26G|NmQUf9QP!VvBhekM;ozgvy(Ku^}uJ z(`Sm1Vk9W&Z6d(t&UPGn=}~BL2|3?aVMj3xJt@XjE-6?L{7{TeWgA4CL%E!ftcKQ$r#!leD<3+WPImpgE z$g7vF3Zsx?14)asK-hwjhi=}wt;%j>@u)4z zPYw%YTf?UFu*E0-29F&!y(a0DSHu4$m}7Sr7PLC-LEI}z+i`+y#|g3>C&+f3Alq^4 jAzL|q!q0GYA!j>Ve~bIRB7Wiq00000NkvXXu0mjfQ>s?M diff --git a/public/CyanButton.png b/public/CyanButton.png deleted file mode 100644 index 3b8831a3dc1e382a18eb265a36bd2aed142ff38b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 802 zcmV+-1Ks?IP)T!CYDO0)WG{axQ5aOc<&v_%jJEN%U$o@_4-n(G&9Au? zcz`|d7@ia4^NQ6RjOBF42+|!RNOz1N-7$i6M+-qq_5wa!>qI)4fGX00=;4LAOwIZ1 z$S~}&QHYSAp2YH>Mf?=JuO3o@oQKc8?yotYO})e1&>M)*5Df8sxme^KqJos5a&ZwQ zW)l+ieZ!CcoVbtN^c3syDTr{ey#q%sb@2|N?@$rd07bqq>&*`h@?(kxSx&}#(6}#z z*@1qf`=0XAB9WppE@D}2jf^1&U5Kmx|^#g(k9 z6hkAaznGZ#$B$n=FV$TC&yq)OW@iZ^-IqX_339|lSfZd!6eU50!V2G<t`jh)QI(jR?n(KhiAKbK7Bm8f6wc2UUaxHMO?k z@cD~y8;YI$jM#)+52>^rQ?$iy;<@F6R8pW~lB~C6|9}cq-pEXzTOlQgl0rCURVG-S zkha_jR!r)MiJ^MXXwe*EkA18xqdQ-`t!m?3qe|e+qa;5^MJ`qDc^9qgiXf_v1AM{_ zR?gAqsy215(Z0PkiT4*y!!497N5x}+^>{dT47#8+LZ^CqvCJxJr^lVLD16kaX-mas z%dZ85qZW1(*WcjLKS2~HBK00E2C0^7>wThJCz@B1x?=?CjuE6gMv(3pLAqnsL%Q

aNzFpOm4^?w+l0u zqoi~HU$WU|S*UyRzVpuRh54o1?fx(T5Rq>N03t=e0f^QGtto(5QNaO-76At!S_B+` zXc2G#qD8;~h!z0{AX)?*fM^kLIEn3cYgVh3Jp<=Lz#*7IYc`wNW4&Id-ZPy}O|#iF zqtVC!=knbEo)(LR>GgVMKA-<~{r2|O6pKak@bF+lwA*bHO8+CD&l|u80S7N?H(ekp zU|wHe&1SQ)p*I)|>}QoqB{<|lC|DJyfG+|LUWUV=ZB1*nnz^~TvDb9IySuZY)@rqE z&?)46h1{!vRm%&6U=0plRHiOeYi^p1YOSqYF7GNi1)f?{O;ghr|5erLb9sJ#wk@rr-^!Z80{;R52QN=g zPd305R*go(29>Hd1)PqLj}Mc}<^K4d0?xIrs_>ElC#nV&n7-0lWFQLx2X6|nmzS4a zRi^5zP$<~yF0E}91>gJoyZt-up6l!DlTKdoeLpzpagI$x>^vnoa)iGagV+5@KvYMRMpV$WJz z)1h`%EoavK`xKV?{Sa?&Zv-5?5O6q38*-BsoKMT?6L8uzEN&C8f^mQIuO_Wp^Q+hE z1_;GQUmWE&`07|Lm)_MGaBc(~ys6UabUOBdd*CaeMa4;IElx)oy=E!NZT5AqVM=nX z@&0vre0(&(Ap{&gm8$~NsP)bIZ2!8ZwAE_W0EZB82$oi99ddtvzngk$V{gb?M6xhN zg%1J_!46egX*4Z$fuu7}F5t5eaPaoG)fZ1P;9Lkec%%BlSHm_D0MR1g07Q#`0}w3& z4nVXBH~`UNiV7e)rBdlaXDT=V(IVggM2mm}5Uro&04tPKsXpZZ0000I` z6G0Tm-`nYuqBYb+3B4`xWIR|BFdRH=mFN|WF@Z}V@ve7bfJD7g{sM|IAw~{88$yTZ zfdpduAFwedD#lpDk2Y*~#+e4NEzru$Ru9Z4>2~t=&Fp;Ny!o*UU@#aA27|$1I9DLF ziO=pp(kAF2=W%4js{nWjy5>O}2vx)vchDsy7)Ib}4j4b-X$4>~*S)fyg%Alv#HQ=U zW7ggjNB;CLt9TfYiK}#tLI`M!kOD4{T`C&7d8UdSyBL##x$(7Toln1B$ z>iVYtDfY*B5aDJWl<8M1E)0}K?7y?e(SrH%haM=s@2T1X@Mpn%d6TZZVd-PjI@-ehGw4vHv==uDNpMq6O}NzlPU z z=0Rp{H0MD`wBx!uq4P%6oyqU@#aA27|$H#BbU>0wiDx + + + + + + + + + + + + diff --git a/public/GroupStrcatMake.png b/public/GroupStrcatMake.png deleted file mode 100644 index ea8c97542a170967b9eb6f6ddda7bba36f98eef5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^CxBR$gAGWsH!V8^q&N#aB8wRqxP?KOkzv*x37{Zj zage(c!@6@aFM%AEbVpxD28NCO+w)uIHjF-aGkqZ!)pHieBm$M*Jcgf*BRtESq^=PI%v$zFVdQ&MBb@0LL;tMgRZ+ diff --git a/public/StrcatButton.png b/public/StrcatButton.png deleted file mode 100644 index 9a938c571a51c4e6d6cb12eafb5a785a7f17655d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 785 zcmV+s1Md8ZP)H5`QH2r#mRFM`m{c3~CCCAsk_^Cnp z+!l#YEI3rHwkf}~O{z!<;)Cb5DKoq2Ylon@Y=cA?80fsldbP#xS3yb;23}=mf*GC9 z{ulN9**X=M9d?M#^!TlQN2cq+1M-F`d-pNhai!H-@M$0x3b2)#ibH=CgHfLL#^; zV=uF=B9$NW5fc8q2&-1YjEOMmI=uQm*VKm=LLr;z2Xu7qpbQD2|lYxqr$ z4$|dIKPf1bOb+!HYA*x`T~K(r67|d P00000NkvXXu0mjfJULjR diff --git a/public/StrcatMake.png b/public/StrcatMake.png deleted file mode 100644 index f7dd18295d25002baa1d49ab3cf7715cfeaa8cb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^(|}l&gAGV7h!?N~Qk(@Ik;M!Q+`=Ht$S`Y;1W=H% zILO_JVcj{Imp~3nx}&cn1H;CC?mvmFKz_fci(^Oy;JW|740 znb9yop>fyV@=WHb_lx&zE8fdi^Tb?1K}YB^_mYH-9vs~*8z?9Ku-9b7_x+6Nc6EwS dX>onTwqJwo8*}J#1EA9wJYD@<);T3K0RRv4QD^`F diff --git a/public/greenButton.png b/public/greenButton.png deleted file mode 100644 index 207294329b3715e13d808ef36990ebb41d09c138..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 794 zcmV+#1LgdQP)bNz(p@`@dUZGmoi{ALz1*~}-|Y&$!X-S7M!^P61{)OeqJTm={4 z1()GEK_0ibS{?0js-p#|juxakT9E2!L8_yKATzTMe;%#C?AIK~A}k1Ro?kB8+Eb$@ zq{mA@A)DNVa`6CGiQ`%!B*?n?Hq3v|+uBqA3a~g*015%a!_O6yjUO$73_^k`?7>T! z3ZK!Xk*!Ai^k5b?W_Q`K0~F%@A?SK}gHOoR;HH!)KS+{fuD393i7K&J5T*BR2Luf- zw|eqhj#~>wQW3JyT$8JzkY+I=v)s)D+ zphtvsmU9YB2;rDtD6<`hJO!bcj|Z>QU`D&sM|ZJi$WIpSX@h%D4R9K)=d#2FxfMcF z-7V=Bmx=4P4?;-+vk$tSxhB3|AXwgrES_f}BnXp2q%%k^Lazd0m+N80q>AVmY6V&= z&eo9CiBe-5{p|1E6MgE}uo8GO6yt3stJ!e7P_GT0z!5>gu$L{kes=aX+VKC$KK5&P zjt;fK@7@$Rg_O%-0U2g99_b2#Do9!A;fGs1?HC*QlDpX+~M}Lx39W6+8v>?^df>cKfQXRb?Qk9P#WBjX`b~)8K Y1hu6BnXKZUQ~&?~07*qoM6N<$g1;YH^Z)<= diff --git a/public/kakao.png b/public/kakao.png deleted file mode 100644 index 0cdd5df669f622e27445b8066caf58087a405826..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 513 zcmV+c0{;DpP)~asreSkQ+d5zzs-lU`~LkKva};3=#*}76}Nm@)n^9 z_Ut%K=98>!qWJOeuJ-{LV~jDzn6;9j2M5lT1EA!hTlks6@kCTZnOcZL=Ufhq=fDMj zEtdS%^G&NCV8Ve23X($%ohv?pD=v=F5#M~O5hf`_to@2>e-CoR=bxqo5r+r?_~d*1 z?e|hiL2?LjfNSUk2ttM2LP*pSu@&B+@BERdLPw&O$OJEOOP3IkcBhmVd6^Od(hv^) zC?Fv1P9FUbT~`!>hrv-t3veAGm$^NdP}W8RL=<18M#$Vh9~ z)`m)mZysv%ruIV@xxtF5gos^bf0eawj4{R-W7gO&v1fb(o)5tF00000NkvXXu0mjf Duf*Ei diff --git a/public/kakao.svg b/public/kakao.svg new file mode 100644 index 00000000..e083ecbf --- /dev/null +++ b/public/kakao.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/strcatImage.png b/public/strcatImage.png deleted file mode 100644 index f76690bc0bf462b7f03ceb762ee6622648f8180f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15375 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로그인하고 스트링캣을 생성해보세요.

-
+
- - +
diff --git a/src/component/ThemeChange.tsx b/src/component/ThemeChange.tsx index 6ca11fbf..60ce1e37 100644 --- a/src/component/ThemeChange.tsx +++ b/src/component/ThemeChange.tsx @@ -2,7 +2,12 @@ import { useRecoilState } from 'recoil'; import { calm, cyan, green, strcat, themeState } from '@/recoil/theme'; -import Image from 'next/image'; +import { + ThemeCalm, + ThemeCyan, + ThemeGreen, + ThemeStrcat, +} from '@/component/Icon/Theme'; export default function ThemeChange() { const [Theme, setTheme] = useRecoilState(themeState); @@ -13,41 +18,33 @@ export default function ThemeChange() { <>
- strcatButton handleThemeChange(strcat)} - /> + > + +
- CalmButton handleThemeChange(calm)} - /> + > + +
- GreenButton handleThemeChange(green)} - /> + > + +
- CyanButton handleThemeChange(cyan)} - /> + > + +
From 0039f1312cd9fefb1c40b2ef4d0da435dc559dfc Mon Sep 17 00:00:00 2001 From: dokoh Date: Tue, 28 Nov 2023 19:26:53 +0900 Subject: [PATCH 12/28] =?UTF-8?q?fix/=EB=A7=88=EC=A7=84=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=88#130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/create/page.tsx | 4 ++-- src/component/ThemeChange.tsx | 43 ++++++++++++++--------------------- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/src/app/create/page.tsx b/src/app/create/page.tsx index a52c3f62..9e58011a 100644 --- a/src/app/create/page.tsx +++ b/src/app/create/page.tsx @@ -132,11 +132,11 @@ export default function Create() {
-
+
handleConfirm()} disabled={buttonState} color={`${Theme.rightCTA}`} diff --git a/src/component/ThemeChange.tsx b/src/component/ThemeChange.tsx index 60ce1e37..232955cd 100644 --- a/src/component/ThemeChange.tsx +++ b/src/component/ThemeChange.tsx @@ -15,53 +15,44 @@ export default function ThemeChange() { setTheme(newTheme); }; return ( - <> +
-
handleThemeChange(strcat)} > +
strcat
-
+
handleThemeChange(calm)} > +
+ Calm +
-
+
handleThemeChange(green)} > +
+ green +
-
+
handleThemeChange(cyan)} > +
Cyan
-
-
-
-
- strcat -
-
-
Calm
-
-
- green -
-
-
Cyan
-
-
- +
); } From 1ab5078379342e87fcc9c11f09637d2d15168ec4 Mon Sep 17 00:00:00 2001 From: dokoh Date: Tue, 28 Nov 2023 19:41:34 +0900 Subject: [PATCH 13/28] =?UTF-8?q?fix/ios=20=EC=A3=BC=EC=84=9D=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C#133?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index 16ef7dd1..85cf81fa 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -41,7 +41,7 @@ export default function Home() { className={`mx-[24px] mt-[46px] text-[20px] ${Theme.defaultText}`} >

- {`// 스트링캣은 문자열을 끝없이 늘려 스크롤을 만들 수 있는 신개념 + {`\/\/ 스트링캣은 문자열을 끝없이 늘려 스크롤을 만들 수 있는 신개념 롤링페이퍼 서비스 입니다.`}

소중한 사람에게 스트링캣을 남겨보세요!

From 4c8d5330f4621b2fb3e28df86303ab9074df1537 Mon Sep 17 00:00:00 2001 From: dokoh Date: Tue, 28 Nov 2023 20:42:06 +0900 Subject: [PATCH 14/28] =?UTF-8?q?fix/pull=20=EC=B6=94=EA=B0=80#135?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/create/group/page.tsx | 4 +++- src/app/create/page.tsx | 33 ++++++++++++++++----------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/app/create/group/page.tsx b/src/app/create/group/page.tsx index 5c190e39..f5ea2efc 100644 --- a/src/app/create/group/page.tsx +++ b/src/app/create/group/page.tsx @@ -27,7 +27,9 @@ export default function Create() { ); if (isConfirmed) { try { - const res = await axiosInstance.post(`/board-groups`, { title: title }); + const res = await axiosInstance.post(`/board-groups`, { + title: `\/\/${title}`, + }); router.push(`/group/${res.data}`); } catch (err) { const error = err as AxiosError; diff --git a/src/app/create/page.tsx b/src/app/create/page.tsx index a52c3f62..b9d6668b 100644 --- a/src/app/create/page.tsx +++ b/src/app/create/page.tsx @@ -38,7 +38,7 @@ export default function Create() { const data = { groupId: groupId, backgroundColor: Theme, - title: title, + title: `\/\/${title}`, }; axiosInstance .post(`/boards`, data) @@ -83,7 +83,7 @@ export default function Create() { return (
-
+
-
-
-