diff --git a/apps/service/src/features/calendar/ui/Calendar.tsx b/apps/service/src/features/calendar/ui/Calendar.tsx index 087e81be..d794b6a7 100644 --- a/apps/service/src/features/calendar/ui/Calendar.tsx +++ b/apps/service/src/features/calendar/ui/Calendar.tsx @@ -1,7 +1,7 @@ 'use client' import { useTheme } from '@/entities/theme' -import { Container, ErrorGuideTxt } from '@/shared/ui' +import { ErrorGuideTxt } from '@/shared/ui' import React from 'react' import ActivityCalendar from 'react-activity-calendar' import { ErrorBoundary } from 'react-error-boundary' @@ -21,29 +21,27 @@ function CustomErrorGuideTxt() { export default function Calendar({ calendarData }: CalendarProps) { const { realTheme } = useTheme() return ( - - - { - const message = activity.count - ? `${activity.date}에 ${activity.count}개의 아티클을 읽었어요 🎉` - : `${activity.date}에는 아티클을 읽지 못했어요 🥲` + + { + const message = activity.count + ? `${activity.date}에 ${activity.count}개의 아티클을 읽었어요 🎉` + : `${activity.date}에는 아티클을 읽지 못했어요 🥲` - return React.cloneElement(block, { - 'data-tooltip-id': 'react-tooltip', - 'data-tooltip-html': message, - }) - }} - /> - - - + return React.cloneElement(block, { + 'data-tooltip-id': 'react-tooltip', + 'data-tooltip-html': message, + }) + }} + /> + + ) } diff --git a/apps/service/src/features/recent-newsletter/ui/RecentNewsletterContainer.tsx b/apps/service/src/features/recent-newsletter/ui/RecentNewsletterContainer.tsx index cd866c76..754c6648 100644 --- a/apps/service/src/features/recent-newsletter/ui/RecentNewsletterContainer.tsx +++ b/apps/service/src/features/recent-newsletter/ui/RecentNewsletterContainer.tsx @@ -42,11 +42,8 @@ export default function RecentNewsletterContainer() { {UserRecentNewsLetterResponse?.data.mypageArticles.length !== 0 ? (
-
-
+
+
{UserRecentNewsLetterResponse?.data.mypageArticles.map( (article) => (
diff --git a/apps/service/src/features/subscribe-list/ui/SubscribeList.tsx b/apps/service/src/features/subscribe-list/ui/SubscribeList.tsx index 78026d0d..09b450db 100644 --- a/apps/service/src/features/subscribe-list/ui/SubscribeList.tsx +++ b/apps/service/src/features/subscribe-list/ui/SubscribeList.tsx @@ -36,7 +36,7 @@ export default function SubscribeList() { />
{subscribeList?.length !== 0 ? ( -
    +
      {subscribeList?.map((newsletter) => (
    • | undefined} type="button" - className="block h-12 w-full rounded-lg bg-gray-700 p-2 text-center font-medium text-gray-50 transition-colors hover:bg-gray-800 disabled:!bg-gray-50 disabled:!text-gray-400 xs:text-lg md:h-10 md:text-base dark:bg-gray-50 dark:text-gray-700 dark:hover:bg-gray-100 dark:disabled:!bg-gray-700 dark:disabled:!text-gray-500" + className="block h-12 w-full rounded-lg bg-gray-700 p-2 text-center font-medium text-gray-50 transition-colors hover:bg-gray-800 disabled:!bg-gray-50 disabled:!text-gray-400 xs:text-lg md:h-10 md:rounded md:text-base dark:bg-gray-50 dark:text-gray-700 dark:hover:bg-gray-100 dark:disabled:!bg-gray-700 dark:disabled:!text-gray-500" {...props}> {children || '구독하기'} diff --git a/apps/service/src/widgets/main/ui/RecentArticleItem.tsx b/apps/service/src/widgets/main/ui/RecentArticleItem.tsx index f01373f6..763b75ee 100644 --- a/apps/service/src/widgets/main/ui/RecentArticleItem.tsx +++ b/apps/service/src/widgets/main/ui/RecentArticleItem.tsx @@ -39,13 +39,15 @@ export default function RecentArticleItem({ ...props }: RecentArticle) { />
-

{props.title}

-
-

{props.newsletter.name}

-

+

+ {props.title} +

+

+ {props.newsletter.name} + {getTimeFromNow(props.receivedAt)} -

-
+ +

diff --git a/apps/service/src/widgets/newsletter-introduce/ui/NewsletterProfile.tsx b/apps/service/src/widgets/newsletter-introduce/ui/NewsletterProfile.tsx index 1c815d8a..67f73361 100644 --- a/apps/service/src/widgets/newsletter-introduce/ui/NewsletterProfile.tsx +++ b/apps/service/src/widgets/newsletter-introduce/ui/NewsletterProfile.tsx @@ -19,10 +19,10 @@ export default async function NewsletterProfile({
-
+
diff --git a/apps/service/src/widgets/user-record/ui/UserRecord.tsx b/apps/service/src/widgets/user-record/ui/UserRecord.tsx index c0ef1824..77543070 100644 --- a/apps/service/src/widgets/user-record/ui/UserRecord.tsx +++ b/apps/service/src/widgets/user-record/ui/UserRecord.tsx @@ -1,9 +1,10 @@ 'use client' +import { skipToken, useQuery } from '@tanstack/react-query' import { useAuth } from '@/entities/auth' import { Calendar, calculateLevel, fetchUserRecord } from '@/features/calendar' import { Graph } from '@/features/graph' -import { skipToken, useQuery } from '@tanstack/react-query' +import { Container } from '@/shared/ui' export default function UserRecord() { const { userEmail } = useAuth() @@ -16,11 +17,13 @@ export default function UserRecord() { return (
- {calendarDataWithLevel ? ( - - ) : ( - '' - )} + + {calendarDataWithLevel ? ( + + ) : ( + '' + )} +