From 2c73c7c1ef7f7d38e02f6aa9f1d981e0a9525ae5 Mon Sep 17 00:00:00 2001 From: JiYoon Date: Wed, 29 Nov 2023 16:27:35 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E2=9C=A8=20Feat(#287):=20=EB=A7=88?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4=ED=85=8C=EB=94=94=20=EC=97=B0=EB=9D=BD?= =?UTF-8?q?=EC=88=98=EB=8B=A8=20=ED=81=B4=EB=A6=BD=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(user-menu)/mysteady/page.tsx | 26 ++++++++++++++++++++++++-- src/services/types/index.ts | 1 + 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/app/(user-menu)/mysteady/page.tsx b/src/app/(user-menu)/mysteady/page.tsx index f647f97c..d465f683 100644 --- a/src/app/(user-menu)/mysteady/page.tsx +++ b/src/app/(user-menu)/mysteady/page.tsx @@ -4,6 +4,7 @@ import { Fragment } from "react"; import InfiniteScroll from "react-infinite-scroller"; import Link from "next/link"; import { useSearchParams } from "next/navigation"; +import { useToast } from "@/components/ui/use-toast"; import { cn } from "@/lib/utils"; import { Separator } from "@radix-ui/themes"; import { format } from "date-fns"; @@ -38,8 +39,8 @@ const MySteadyPage = () => { direction: "desc", }); const ref = useScrollTo({ top: 0 }, [search]); + const { toast } = useToast(); - console.log(mySteadyData); const renderIcon = (steady: MySteadyContentType) => { if (search === "finished") { return
; @@ -107,6 +108,22 @@ const MySteadyPage = () => { } }; + const handleCopyClipBoard = async (text: string) => { + try { + await navigator.clipboard.writeText(text); + toast({ + description: "연락 수단 복사 성공!", + variant: "green", + }); + } catch (error) { + toast({ + description: "연락 수단 복사 실패!", + variant: "red", + }); + console.error("복사에 실패했습니다."); + } + }; + return (
@@ -149,13 +166,18 @@ const MySteadyPage = () => { href={`/steady/detail/${steady.steadyId}`} className="flex h-full w-fit flex-grow" > -
+
{steady.isLeader ? `👑 ${steady.name}` : `${steady.name}`}
+
{steady.isLeader ? "생성일: " : "참여일: "} {format(new Date(steady.joinedAt), "yyyy.MM.dd")} diff --git a/src/services/types/index.ts b/src/services/types/index.ts index b7b21326..ae43ac7b 100644 --- a/src/services/types/index.ts +++ b/src/services/types/index.ts @@ -196,6 +196,7 @@ export interface PositionResponse { export interface MySteadyContentType { steadyId: number; name: string; + contact: string; isLeader: boolean; joinedAt: string; } From 0a5150853c398439f5b4c20f9712306d986e681f Mon Sep 17 00:00:00 2001 From: JiYoon Date: Wed, 29 Nov 2023 16:43:58 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=92=84=20Style(#287):=20=EB=B1=83?= =?UTF-8?q?=EC=A7=80=20ui=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(user-menu)/mysteady/page.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/(user-menu)/mysteady/page.tsx b/src/app/(user-menu)/mysteady/page.tsx index 9f263d25..4e8459c3 100644 --- a/src/app/(user-menu)/mysteady/page.tsx +++ b/src/app/(user-menu)/mysteady/page.tsx @@ -6,7 +6,7 @@ import Link from "next/link"; import { useSearchParams } from "next/navigation"; import { useToast } from "@/components/ui/use-toast"; import { cn } from "@/lib/utils"; -import { Separator } from "@radix-ui/themes"; +import { Badge, Separator } from "@radix-ui/themes"; import { format } from "date-fns"; import type { MySteadyContentType } from "@/services/types"; import Button, { buttonSize } from "@/components/_common/Button"; @@ -173,11 +173,13 @@ const MySteadyPage = () => {
- + + +
{steady.isLeader ? "생성일: " : "참여일: "} {format(new Date(steady.joinedAt), "yyyy.MM.dd")} From 4e69a22c19f438a46af5e10b4876e860d2a72668 Mon Sep 17 00:00:00 2001 From: JiYoon Date: Wed, 29 Nov 2023 17:08:27 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=92=84=20Style(#287):=20=EC=8A=A4?= =?UTF-8?q?=ED=85=8C=EB=94=94=20=EC=83=81=EC=84=B8=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=B1=83=EC=A7=80=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(steady)/steady/detail/[id]/page.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/(steady)/steady/detail/[id]/page.tsx b/src/app/(steady)/steady/detail/[id]/page.tsx index a73d7b26..a8aefcc5 100644 --- a/src/app/(steady)/steady/detail/[id]/page.tsx +++ b/src/app/(steady)/steady/detail/[id]/page.tsx @@ -399,8 +399,9 @@ const SteadyDetailPage = ({ params }: { params: { id: string } }) => { className="whitespace-nowrap" > {position.name} From d51edb0f96e71b8c421bf8170ccf31d7d812cd58 Mon Sep 17 00:00:00 2001 From: JiYoon Date: Wed, 29 Nov 2023 17:09:04 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=F0=9F=92=84=20Style(#287):=20=EB=82=B4=20?= =?UTF-8?q?=EC=8A=A4=ED=85=8C=EB=94=94=20=ED=81=B4=EB=A6=BD=EB=B3=B4?= =?UTF-8?q?=EB=93=9C=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(user-menu)/mysteady/page.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/(user-menu)/mysteady/page.tsx b/src/app/(user-menu)/mysteady/page.tsx index 4e8459c3..5edc2a4f 100644 --- a/src/app/(user-menu)/mysteady/page.tsx +++ b/src/app/(user-menu)/mysteady/page.tsx @@ -6,6 +6,7 @@ import Link from "next/link"; import { useSearchParams } from "next/navigation"; import { useToast } from "@/components/ui/use-toast"; import { cn } from "@/lib/utils"; +import { CopyIcon } from "@radix-ui/react-icons"; import { Badge, Separator } from "@radix-ui/themes"; import { format } from "date-fns"; import type { MySteadyContentType } from "@/services/types"; @@ -173,11 +174,16 @@ const MySteadyPage = () => {
- +
From 4f4432239dfe94d70123d9b640ee238c3fe4e9ef Mon Sep 17 00:00:00 2001 From: JiYoon Date: Wed, 29 Nov 2023 17:26:47 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=9A=A8=20Fix(#287):=20=EB=92=A4?= =?UTF-8?q?=EB=A1=9C=EA=B0=80=EA=B8=B0=20div=20=EB=84=88=EB=B9=84=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(steady)/steady/detail/[id]/page.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/(steady)/steady/detail/[id]/page.tsx b/src/app/(steady)/steady/detail/[id]/page.tsx index a8aefcc5..7ebc2c4c 100644 --- a/src/app/(steady)/steady/detail/[id]/page.tsx +++ b/src/app/(steady)/steady/detail/[id]/page.tsx @@ -122,7 +122,10 @@ const SteadyDetailPage = ({ params }: { params: { id: string } }) => { return (
-
받은카드
-
+
{userProfileData.userCards.map((card) => (
{ 카드 이미지 -
{`(${card.count})`}
+
{`(${card.count})`}
))}
diff --git a/src/components/_common/Modal/UserModal/index.tsx b/src/components/_common/Modal/UserModal/index.tsx index 4cdeee70..122ba979 100644 --- a/src/components/_common/Modal/UserModal/index.tsx +++ b/src/components/_common/Modal/UserModal/index.tsx @@ -9,8 +9,8 @@ const UserModal = ({ return ( {trigger} - -
+ +
} > -
+
정말 스테디를 종료하겠습니까?
종료 시 되돌릴 수 없습니다.
@@ -182,7 +182,7 @@ const SteadyManagePage = ({ params }: { params: { id: string } }) => { } > -
+
정말 스테디를 삭제하겠습니까?
삭제 시 되돌릴 수 없습니다.
@@ -351,7 +351,9 @@ const SteadyManagePage = ({ params }: { params: { id: string } }) => { } > - 정말 해당 멤버를 추방하시겠습니까? + + 정말 해당 멤버를 추방하시겠습니까? +
@@ -393,7 +395,9 @@ const SteadyManagePage = ({ params }: { params: { id: string } }) => { } > - 정말 해당 멤버를 추방하시겠습니까? + + 정말 해당 멤버를 추방하시겠습니까? +
diff --git a/src/app/(user-menu)/mypage/page.tsx b/src/app/(user-menu)/mypage/page.tsx index ff7fd1f2..42dbae47 100644 --- a/src/app/(user-menu)/mypage/page.tsx +++ b/src/app/(user-menu)/mypage/page.tsx @@ -521,7 +521,9 @@ const MyProfilePage = () => { } > - 정말 스테디를 탈퇴하시겠습니까? + + 정말 스테디를 탈퇴하시겠습니까? +
diff --git a/src/app/(user-menu)/mysteady/page.tsx b/src/app/(user-menu)/mysteady/page.tsx index 7848ea57..5977ca81 100644 --- a/src/app/(user-menu)/mysteady/page.tsx +++ b/src/app/(user-menu)/mysteady/page.tsx @@ -89,7 +89,7 @@ const MySteadyPage = () => { } >
-
정말 탈퇴하시겠습니까?
+
정말 탈퇴하시겠습니까?
);