🚑 fix: 이름수정, 시간계산 수정

CodeitFESI4-Team1 · Nov 24, 2024 · a6dfef8 · a6dfef8
1 parent 7c42a0d
commit a6dfef8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/app/(auth)/layout.tsx b/src/app/(auth)/layout.tsx
@@ -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">
             함께할 사람이없나요? 지금 크루에 참여해보세요

diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx
@@ -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"

diff --git a/src/components/common/gathering-card/container.tsx b/src/components/common/gathering-card/container.tsx
@@ -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()}시 마감`;
@@ -87,7 +86,7 @@ export default function GatheringCard({
         id={id}
         isPast={isPast}
         deadlineMessage={deadlineMessage}
-        isWithin24Hours={isWithin24Hours}
+        isToday={isToday}
         title={title}
         dateTime={dateTime}
         location={location}

diff --git a/src/components/common/gathering-card/presenter.tsx b/src/components/common/gathering-card/presenter.tsx
@@ -19,7 +19,7 @@ export interface GatheringCardPresenterProps {
   onLikeToggle: () => void;
   onClick: () => void;
   isPast: boolean;
-  isWithin24Hours?: boolean;
+  isToday?: boolean;
   deadlineMessage?: string;
   className?: string;
 }
@@ -36,7 +36,7 @@ export default function GatheringCardPresenter({
   onLikeToggle,
   onClick,
   isPast,
-  isWithin24Hours,
+  isToday,
   deadlineMessage,
   className,
 }: GatheringCardPresenterProps) {
@@ -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>