Skip to content

Commit 5571c18

Browse files
authored
Merge pull request #185 from CodeitFESI4-Team1/Hotfix/183/FixTime
🚑 fix: 이름수정, 시간계산 수정
2 parents 7c42a0d + a6dfef8 commit 5571c18

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

src/app/(auth)/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default function AuthLayout({
2626
<div className="flex h-full w-full flex-col items-center bg-white p-6 md:w-1/2 md:justify-center md:p-8 lg:p-20">
2727
<div className="text-xl font-semibold md:text-2xl lg:text-3xl">Welcome,</div>
2828
<div className="text-center text-xl font-semibold md:text-2xl lg:text-3xl">
29-
크루에 오신 것을 환영합니다 🙌
29+
크루크루에 오신 것을 환영합니다 🙌
3030
</div>
3131
<div className="mt-4 text-center text-sm font-semibold lg:text-base">
3232
함께할 사람이없나요? 지금 크루에 참여해보세요

src/app/(auth)/login/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default function LoginPage() {
4444
<div>
4545
<LoginForm formMethods={formMethods} onSubmit={handleSubmit} />
4646
<div className="mt-6 flex justify-center space-x-1 text-sm font-medium">
47-
<div>크루가 처음이신가요?</div>
47+
<div>크루크루가 처음이신가요?</div>
4848
<Link
4949
href={redirect !== '/' ? `/signup?redirect=${redirect}` : '/signup'}
5050
className="text-blue-500 underline"

src/components/common/gathering-card/container.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ export default function GatheringCard({
3737
const today = new Date();
3838
const isPast = gatheringDate < today;
3939

40-
// 24시간 이내인지 확인
41-
const timeDifference = gatheringDate.getTime() - today.getTime();
42-
const isWithin24Hours = timeDifference > 0 && timeDifference <= 24 * 60 * 60 * 1000;
40+
// 오늘 이낸지 확인
41+
const isToday = gatheringDate.toDateString() === today.toDateString();
4342

4443
// 마감 시간 문자열 생성
4544
const deadlineMessage = `오늘 ${gatheringDate.getHours()}시 마감`;
@@ -87,7 +86,7 @@ export default function GatheringCard({
8786
id={id}
8887
isPast={isPast}
8988
deadlineMessage={deadlineMessage}
90-
isWithin24Hours={isWithin24Hours}
89+
isToday={isToday}
9190
title={title}
9291
dateTime={dateTime}
9392
location={location}

src/components/common/gathering-card/presenter.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export interface GatheringCardPresenterProps {
1919
onLikeToggle: () => void;
2020
onClick: () => void;
2121
isPast: boolean;
22-
isWithin24Hours?: boolean;
22+
isToday?: boolean;
2323
deadlineMessage?: string;
2424
className?: string;
2525
}
@@ -36,7 +36,7 @@ export default function GatheringCardPresenter({
3636
onLikeToggle,
3737
onClick,
3838
isPast,
39-
isWithin24Hours,
39+
isToday,
4040
deadlineMessage,
4141
className,
4242
}: GatheringCardPresenterProps) {
@@ -64,7 +64,7 @@ export default function GatheringCardPresenter({
6464
/>
6565
</div>
6666

67-
{isWithin24Hours && (
67+
{isToday && (
6868
<div className="absolute right-0 top-0 flex items-center space-x-1 bg-blue-600 px-4 py-2 text-white">
6969
<Image src={IcoTimer} alt="timer icon" width={16} height={16} />
7070
<p className="text-base font-medium">{deadlineMessage}</p>

0 commit comments

Comments
 (0)