Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/(auth)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function AuthLayout({
<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">
<div className="text-xl font-semibold md:text-2xl lg:text-3xl">Welcome,</div>
<div className="text-center text-xl font-semibold md:text-2xl lg:text-3xl">
크루에 μ˜€μ‹  것을 ν™˜μ˜ν•©λ‹ˆλ‹€ πŸ™Œ
크루크루에 μ˜€μ‹  것을 ν™˜μ˜ν•©λ‹ˆλ‹€ πŸ™Œ
</div>
<div className="mt-4 text-center text-sm font-semibold lg:text-base">
ν•¨κ»˜ν•  μ‚¬λžŒμ΄μ—†λ‚˜μš”? μ§€κΈˆ 크루에 μ°Έμ—¬ν•΄λ³΄μ„Έμš”
Expand Down
2 changes: 1 addition & 1 deletion src/app/(auth)/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function LoginPage() {
<div>
<LoginForm formMethods={formMethods} onSubmit={handleSubmit} />
<div className="mt-6 flex justify-center space-x-1 text-sm font-medium">
<div>크루가 μ²˜μŒμ΄μ‹ κ°€μš”?</div>
<div>크루크루가 μ²˜μŒμ΄μ‹ κ°€μš”?</div>
<Link
href={redirect !== '/' ? `/signup?redirect=${redirect}` : '/signup'}
className="text-blue-500 underline"
Expand Down
7 changes: 3 additions & 4 deletions src/components/common/gathering-card/container.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ export default function GatheringCard({
const today = new Date();
const isPast = gatheringDate < today;

// 24μ‹œκ°„ 이내인지 확인
const timeDifference = gatheringDate.getTime() - today.getTime();
const isWithin24Hours = timeDifference > 0 && timeDifference <= 24 * 60 * 60 * 1000;
// 였늘 이낸지 확인
const isToday = gatheringDate.toDateString() === today.toDateString();

// 마감 μ‹œκ°„ λ¬Έμžμ—΄ 생성
const deadlineMessage = `였늘 ${gatheringDate.getHours()}μ‹œ 마감`;
Expand Down Expand Up @@ -87,7 +86,7 @@ export default function GatheringCard({
id={id}
isPast={isPast}
deadlineMessage={deadlineMessage}
isWithin24Hours={isWithin24Hours}
isToday={isToday}
title={title}
dateTime={dateTime}
location={location}
Expand Down
6 changes: 3 additions & 3 deletions src/components/common/gathering-card/presenter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface GatheringCardPresenterProps {
onLikeToggle: () => void;
onClick: () => void;
isPast: boolean;
isWithin24Hours?: boolean;
isToday?: boolean;
deadlineMessage?: string;
className?: string;
}
Expand All @@ -36,7 +36,7 @@ export default function GatheringCardPresenter({
onLikeToggle,
onClick,
isPast,
isWithin24Hours,
isToday,
deadlineMessage,
className,
}: GatheringCardPresenterProps) {
Expand Down Expand Up @@ -64,7 +64,7 @@ export default function GatheringCardPresenter({
/>
</div>

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