From f9bbb8e469bfbd6a5bcb40287c470cba5dc59731 Mon Sep 17 00:00:00 2001 From: HaeJungg Date: Thu, 21 Nov 2024 09:17:25 +0900 Subject: [PATCH 01/14] =?UTF-8?q?=F0=9F=9A=91=20fix:=20npm=20i=20changed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 120 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/package-lock.json b/package-lock.json index a9c4068a..c61ceff2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2347,6 +2347,126 @@ "glob": "10.3.10" } }, + "node_modules/@next/swc-darwin-arm64": { + "version": "14.2.18", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.18.tgz", + "integrity": "sha512-tOBlDHCjGdyLf0ube/rDUs6VtwNOajaWV+5FV/ajPgrvHeisllEdymY/oDgv2cx561+gJksfMUtqf8crug7sbA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-darwin-x64": { + "version": "14.2.18", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.18.tgz", + "integrity": "sha512-uJCEjutt5VeJ30jjrHV1VIHCsbMYnEqytQgvREx+DjURd/fmKy15NaVK4aR/u98S1LGTnjq35lRTnRyygglxoA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-gnu": { + "version": "14.2.18", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.18.tgz", + "integrity": "sha512-IL6rU8vnBB+BAm6YSWZewc+qvdL1EaA+VhLQ6tlUc0xp+kkdxQrVqAnh8Zek1ccKHlTDFRyAft0e60gteYmQ4A==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-musl": { + "version": "14.2.18", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.18.tgz", + "integrity": "sha512-RCaENbIZqKKqTlL8KNd+AZV/yAdCsovblOpYFp0OJ7ZxgLNbV5w23CUU1G5On+0fgafrsGcW+GdMKdFjaRwyYA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-gnu": { + "version": "14.2.18", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.18.tgz", + "integrity": "sha512-3kmv8DlyhPRCEBM1Vavn8NjyXtMeQ49ID0Olr/Sut7pgzaQTo4h01S7Z8YNE0VtbowyuAL26ibcz0ka6xCTH5g==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-musl": { + "version": "14.2.18", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.18.tgz", + "integrity": "sha512-mliTfa8seVSpTbVEcKEXGjC18+TDII8ykW4a36au97spm9XMPqQTpdGPNBJ9RySSFw9/hLuaCMByluQIAnkzlw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-arm64-msvc": { + "version": "14.2.18", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.18.tgz", + "integrity": "sha512-J5g0UFPbAjKYmqS3Cy7l2fetFmWMY9Oao32eUsBPYohts26BdrMUyfCJnZFQkX9npYaHNDOWqZ6uV9hSDPw9NA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-ia32-msvc": { + "version": "14.2.18", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.18.tgz", + "integrity": "sha512-Ynxuk4ZgIpdcN7d16ivJdjsDG1+3hTvK24Pp8DiDmIa2+A4CfhJSEHHVndCHok6rnLUzAZD+/UOKESQgTsAZGg==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/@next/swc-win32-x64-msvc": { "version": "14.2.18", "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.18.tgz", From 37d9d12d7928bc4bdea94877be5011b6c435cfc3 Mon Sep 17 00:00:00 2001 From: HaeJungg Date: Thu, 21 Nov 2024 09:17:57 +0900 Subject: [PATCH 02/14] =?UTF-8?q?=F0=9F=9A=91=20fix:=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=9E=9C=EB=8D=94=EB=A7=81=20=EC=95=88=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=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/(crew)/my-page/layout.tsx | 3 ++- src/app/(crew)/my-page/page.tsx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/(crew)/my-page/layout.tsx b/src/app/(crew)/my-page/layout.tsx index 6cd148f5..913285f7 100644 --- a/src/app/(crew)/my-page/layout.tsx +++ b/src/app/(crew)/my-page/layout.tsx @@ -1,13 +1,14 @@ import ProfileCardContainer from '@/src/app/(crew)/my-page/_components/profile-card/container'; import ReviewTabs from './_components/review-tabs'; -export default function MyPage() { +export default function MyPage({ children }: { children: React.ReactNode }) { return (
+
{children}
); diff --git a/src/app/(crew)/my-page/page.tsx b/src/app/(crew)/my-page/page.tsx index 57e2baa1..5d127dee 100644 --- a/src/app/(crew)/my-page/page.tsx +++ b/src/app/(crew)/my-page/page.tsx @@ -4,4 +4,5 @@ import { redirect } from 'next/navigation'; export default function MyPage() { redirect('/my-page/reviewable'); + return null; } From 1b2142a01081a0cca390e67e15b5b48a0c4cd415 Mon Sep 17 00:00:00 2001 From: HaeJungg Date: Thu, 21 Nov 2024 13:22:10 +0900 Subject: [PATCH 03/14] =?UTF-8?q?=F0=9F=9A=91=20fix:=20=EB=A7=A5=20?= =?UTF-8?q?=EC=8A=A4=ED=86=A0=EB=A6=AC=EB=B6=81=EC=9C=84=ED=95=B4=20esbuil?= =?UTF-8?q?d=EC=84=A4=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 345 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 345 insertions(+) diff --git a/package-lock.json b/package-lock.json index c61ceff2..2923c63c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1859,6 +1859,351 @@ "yarn": ">=1.22.18" } }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz", + "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==", + "cpu": [ + "ppc64" + ], + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz", + "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz", + "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz", + "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz", + "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz", + "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz", + "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz", + "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz", + "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz", + "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz", + "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz", + "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==", + "cpu": [ + "loong64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz", + "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==", + "cpu": [ + "mips64el" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz", + "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==", + "cpu": [ + "ppc64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz", + "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==", + "cpu": [ + "riscv64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz", + "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==", + "cpu": [ + "s390x" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz", + "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz", + "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz", + "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz", + "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz", + "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz", + "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz", + "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@esbuild/win32-x64": { "version": "0.24.0", "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz", From 1a1e0e353bcd390e9d0cb3b2e6fad62e4c458754 Mon Sep 17 00:00:00 2001 From: HaeJungg Date: Thu, 21 Nov 2024 13:22:43 +0900 Subject: [PATCH 04/14] =?UTF-8?q?=F0=9F=92=84=20design:=20fontweignt?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tailwind.config.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/tailwind.config.ts b/tailwind.config.ts index 7cadf6d8..2ca36911 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -176,7 +176,6 @@ const config: Config = { transition: 'background-color 0.3s ease', '&:hover, &:active': { backgroundColor: '#2563EB', - fontWeight: '600', }, '&:disabled': { backgroundColor: '#6B7280', @@ -191,7 +190,6 @@ const config: Config = { '&:hover, &:active': { border: '1px solid #2563EB', color: '#2563EB', - fontWeight: '600', }, '&:disabled': { backgroundColor: '#6B7280', From 53c7303f8acb7d880d6dc0f9573671dee4891e5c Mon Sep 17 00:00:00 2001 From: HaeJungg Date: Thu, 21 Nov 2024 13:23:10 +0900 Subject: [PATCH 05/14] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=ED=8F=AC=EB=A9=A7?= =?UTF-8?q?=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=94=94=EC=9E=90=EC=9D=B8?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/format-date.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/utils/format-date.ts b/src/utils/format-date.ts index 940f50c7..6f55a955 100644 --- a/src/utils/format-date.ts +++ b/src/utils/format-date.ts @@ -39,3 +39,17 @@ export function formatDateToRequest(date: Date) { return `${year}-${month}-${day}`; } + +export function formatCompactDateTime24H(dateString: string): string { + const date = new Date(dateString); + + // 월, 일 계산 + const month = `${date.getMonth() + 1}`.padStart(2, '0'); + const day = `${date.getDate()}`.padStart(2, '0'); + + // 시간 계산 + const hours = `${date.getHours()}`.padStart(2, '0'); + const minutes = `${date.getMinutes()}`.padStart(2, '0'); + + return `${month}월 ${day}일・${hours}:${minutes}`; +} From a0eed320aa7a18fa5165a876be7f8daacff38cc5 Mon Sep 17 00:00:00 2001 From: HaeJungg Date: Thu, 21 Nov 2024 13:23:29 +0900 Subject: [PATCH 06/14] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/review.d.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/types/review.d.ts b/src/types/review.d.ts index fa71291c..f9e7cc7a 100644 --- a/src/types/review.d.ts +++ b/src/types/review.d.ts @@ -1,6 +1,11 @@ -export interface ReviewInformResponse { - data: CrewReview[] | MyReview[]; - hasNextPage: boolean; +export interface MyReviewResponse { + content: MyReview[]; + hasNext: boolean; +} + +// API 응답 타입 정의 (data 감싸는 구조) +export interface ApiResponse { + data: T; } export interface CrewReviewInformResponse { From f130c0c1d044bd8745d73908d510865a9cd4e7a2 Mon Sep 17 00:00:00 2001 From: HaeJungg Date: Thu, 21 Nov 2024 13:24:03 +0900 Subject: [PATCH 07/14] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=A6=AC=EB=B6=81=20=EB=AA=A9=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mock/review-data.ts | 190 +++++++++++++++------------------------- 1 file changed, 73 insertions(+), 117 deletions(-) diff --git a/src/mock/review-data.ts b/src/mock/review-data.ts index 7bf39305..f7e92e59 100644 --- a/src/mock/review-data.ts +++ b/src/mock/review-data.ts @@ -213,128 +213,84 @@ export const CrewReviewData: { data: CrewReview[] } = { ], }; -// NOTE: 나의 리뷰 -export const MyReviewData: { data: MyReview[] } = { - data: [ +// NOTE: 나의 리뷰 (스토리북 테스트용) +export const MyReviewData = { + pages: [ { - crewId: 1, - crewName: '크루크루크루크루크루크루', - gatheringName: '모임모임모임약속약속약속', - id: 3, - rate: 3, - comment: '리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰', - createdAt: '2024-11-09T10:09:12.306+09:00', - gatheringLocation: '어느동', + content: [ + { + crewId: 1, + crewName: '크루크루크루크루크루크루', + gatheringName: '모임모임모임약속약속약속', + id: 3, + rate: 3, + comment: '리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰', + createdAt: '2024-11-09T10:09:12.306+09:00', + gatheringLocation: '어느동', + }, + { + crewId: 2, + crewName: '최초의크루이자최후의크루', + gatheringName: '천지창조', + id: 4, + rate: 4, + comment: '다시는 안 간다', + createdAt: '2024-10-31T10:09:12.306+09:00', + gatheringLocation: '어느동', + }, + ], + hasNext: true, // 다음 페이지 여부 }, { - crewId: 2, - crewName: '최초의크루이자최후의크루', - gatheringName: '천지창조', - id: 4, - rate: 4, - comment: '다시는 안 간다', - createdAt: '2024-10-31T10:09:12.306+09:00', - gatheringLocation: '어느동', + content: [ + { + crewId: 3, + crewName: '마지막크루...최종의최종의최종', + gatheringName: '친구들아모여라', + id: 5, + rate: 2, + comment: '펭귄이랑 친구하고싶어요', + createdAt: '2024-10-31T10:09:12.306+09:00', + gatheringLocation: '어느동', + }, + { + crewId: 4, + crewName: '할일없는사람만들어오세요', + gatheringName: '숨쉬기모임', + id: 6, + rate: 5, + comment: '복식호흡을 할 수 있게 됐어요 감사합니다', + createdAt: '2024-10-31T10:09:12.306+09:00', + gatheringLocation: '어느동', + }, + ], + hasNext: true, }, { - crewId: 2, - crewName: '마지막크루...최종의최종의최종', - gatheringName: '친구들아모여라', - id: 5, - rate: 2, - comment: '펭귄이랑 친구하고싶어요', - createdAt: '2024-10-31T10:09:12.306+09:00', - gatheringLocation: '어느동', - }, - { - crewId: 3, - crewName: '할일없는사람만들어오세요', - gatheringName: '숨쉬기모임', - id: 6, - rate: 5, - comment: '복식호흡을 할 수 있게 됐어요 감사합니다', - createdAt: '2024-10-31T10:09:12.306+09:006', - gatheringLocation: '어느동', - }, - { - crewId: 3, - crewName: '크루크루크루크루크루크루', - gatheringName: '모임모임모임약속약속약속', - id: 7, - rate: 3, - comment: '리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰', - createdAt: '2024-10-31T00:56', - gatheringLocation: '어느동', - }, - { - crewId: 3, - crewName: '최초의크루이자최후의크루', - gatheringName: '천지창조', - id: 8, - rate: 4, - comment: '다시는 안 간다', - createdAt: '2024-10-31T10:09:12.306+09:00', - gatheringLocation: '어느동', - }, - { - crewId: 4, - crewName: '마지막크루...최종의최종의최종', - gatheringName: '친구들아모여라', - id: 9, - rate: 3, - comment: '펭귄이랑 친구하고싶어요', - createdAt: '2024-10-31T10:09:12.306+09:00', - gatheringLocation: '어느동', - }, - { - crewId: 5, - crewName: '할일없는사람만들어오세요', - gatheringName: '숨쉬기모임', - id: 10, - rate: 5, - comment: '복식호흡을 할 수 있게 됐어요 감사합니다', - createdAt: '2024-10-31T10:09:12.306+09:00', - gatheringLocation: '어느동', - }, - { - crewId: 5, - crewName: '크루크루크루크루크루크루', - gatheringName: '모임모임모임약속약속약속', - id: 11, - rate: 4, - comment: '리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰', - createdAt: '2024-10-31T10:09:12.306+09:00', - gatheringLocation: '어느동', - }, - { - crewId: 6, - crewName: '최초의크루이자최후의크루', - gatheringName: '천지창조', - id: 12, - rate: 3, - comment: '다시는 안 간다', - createdAt: '2024-10-31T10:09:12.306+09:00', - gatheringLocation: '어느동', - }, - { - crewId: 6, - crewName: '마지막크루...최종의최종의최종', - gatheringName: '친구들아모여라', - id: 13, - rate: 2, - comment: '펭귄이랑 친구하고싶어요', - createdAt: '2024-10-31T10:09:12.306+09:00', - gatheringLocation: '어느동', - }, - { - crewId: 6, - crewName: '할일없는사람만들어오세요', - gatheringName: '숨쉬기모임', - id: 14, - rate: 5, - comment: '복식호흡을 할 수 있게 됐어요 감사합니다', - createdAt: '2024-10-31T10:09:12.306+09:00', - gatheringLocation: '어느동', + content: [ + { + crewId: 5, + crewName: '크루크루크루크루크루크루', + gatheringName: '모임모임모임약속약속약속', + id: 7, + rate: 3, + comment: '리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰리뷰', + createdAt: '2024-10-31T00:56', + gatheringLocation: '어느동', + }, + { + crewId: 6, + crewName: '최초의크루이자최후의크루', + gatheringName: '천지창조', + id: 8, + rate: 4, + comment: '다시는 안 간다', + createdAt: '2024-10-31T10:09:12.306+09:00', + gatheringLocation: '어느동', + }, + ], + hasNext: false, }, ], + pageParams: [], // 페이지 파라미터 }; From 717d96723eacbe43fdbb2ad51a711ca5574b76a1 Mon Sep 17 00:00:00 2001 From: HaeJungg Date: Thu, 21 Nov 2024 13:24:41 +0900 Subject: [PATCH 08/14] =?UTF-8?q?=F0=9F=92=84=20design:=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EB=82=A0?= =?UTF-8?q?=EC=A7=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reviewable-gathering-card.tsx | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/components/my-page/reviewable-gatherings/reviewable-gathering-card.tsx b/src/components/my-page/reviewable-gatherings/reviewable-gathering-card.tsx index eb5fec4c..63b005a6 100644 --- a/src/components/my-page/reviewable-gatherings/reviewable-gathering-card.tsx +++ b/src/components/my-page/reviewable-gatherings/reviewable-gathering-card.tsx @@ -2,6 +2,7 @@ import { useState } from 'react'; import Image from 'next/image'; +import { formatCompactDateTime24H } from '@/src/utils/format-date'; import Profiles from '@/src/components/common/crew-list/profiles'; import Button from '@/src/components/common/input/button'; import { ParticipantType } from '@/src/types/reviewable-gathering-card'; @@ -18,17 +19,6 @@ interface ReviewableGatheringCardProps { participants: ParticipantType[]; } -// NOTE: 추후 합치기 -export function formatDateWithYear(dateString: string) { - const date = new Date(dateString); - - const year = date.getFullYear(); - const month = date.getMonth() + 1; - const day = date.getDate(); - - return { year, month, day }; -} - export default function ReviewableGatheringCard({ id, currentCount, @@ -39,7 +29,7 @@ export default function ReviewableGatheringCard({ totalCount, }: ReviewableGatheringCardProps) { const [isModalOpened, setIsModalOpened] = useState(false); - const { year, month, day } = formatDateWithYear(dateTime); + const formatDate = formatCompactDateTime24H(dateTime); const profiles = participants.map((participant) => ({ id: participant.id, @@ -68,7 +58,7 @@ export default function ReviewableGatheringCard({
-
{`${year}년 ${month}월 ${day}일`}
+
{formatDate}
)}
{isMine && ( - {crewName} + + {gatheringName} + )}
@@ -108,8 +117,7 @@ export default function ReviewCard({
{isMine && ( From 6c368ca75c6e99e83d08f6894b793a51a45287da Mon Sep 17 00:00:00 2001 From: HaeJungg Date: Thu, 21 Nov 2024 13:44:01 +0900 Subject: [PATCH 14/14] =?UTF-8?q?=F0=9F=92=84=20design:=20=EB=A7=88?= =?UTF-8?q?=EC=A7=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(crew)/my-page/my-review/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/(crew)/my-page/my-review/page.tsx b/src/app/(crew)/my-page/my-review/page.tsx index 30c71937..21c8fd3d 100644 --- a/src/app/(crew)/my-page/my-review/page.tsx +++ b/src/app/(crew)/my-page/my-review/page.tsx @@ -27,7 +27,7 @@ export default function MyReviewPage() { } return ( -
+
{isFetchingNextPage && (