From 58723513e7df9d262746f0a12f396038a6fdc3e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?= <43837214+Minsiki@users.noreply.github.com> Date: Tue, 7 Jan 2025 13:11:33 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=9A=A8chore:=20Sync=20Sass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/_layout.scss | 1 + src/styles/_main.scss | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/styles/_layout.scss b/src/styles/_layout.scss index a549ad0e..858ab351 100644 --- a/src/styles/_layout.scss +++ b/src/styles/_layout.scss @@ -207,6 +207,7 @@ header{ .select-box{ min-width: 165px; margin-right: 8px; + height: 30px; >div{ width: 100%; } diff --git a/src/styles/_main.scss b/src/styles/_main.scss index 0733f285..5da1350d 100644 --- a/src/styles/_main.scss +++ b/src/styles/_main.scss @@ -155,6 +155,7 @@ .product-item-content{ margin-top: 30px; overflow: hidden; + height: 100%; .recently-list{ .recently-item{ border: 1px solid #F2F2F2; @@ -208,6 +209,25 @@ } } } + .recently-no-data{ + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 100%; + h3{ + font-size: 16px; + color: #101010; + font-weight: 600; + margin-bottom: 5px; + } + p{ + font-size: 12px; + color: #666; + font-weight: 400; + margin-bottom: 10px; + } + } .notice-box{ height: 100%; overflow-y: auto; From 3f966da81f53e8bc2c42461a19c736c80272dd64 Mon Sep 17 00:00:00 2001 From: basssy Date: Tue, 7 Jan 2025 13:28:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EA=B3=B5=EC=A7=80?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20faq=20=EC=97=86=EC=9D=84=20=EB=95=8C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/main/MainContents.jsx | 86 ++++++++++++---------------- 1 file changed, 38 insertions(+), 48 deletions(-) diff --git a/src/components/main/MainContents.jsx b/src/components/main/MainContents.jsx index d58ba4c3..72034a8a 100644 --- a/src/components/main/MainContents.jsx +++ b/src/components/main/MainContents.jsx @@ -11,11 +11,13 @@ import { useRouter } from 'next/navigation' import { globalLocaleStore } from '@/store/localeAtom' import { queryStringFormatter } from '@/util/common-utils' import MainSkeleton from '../ui/MainSkeleton' -import { SessionContext } from '@/app/SessionProvider' import { useMainContentsController } from '@/hooks/main/useMainContentsController' import { QcastContext } from '@/app/QcastProvider' +import { useSwal } from '@/hooks/useSwal' export default function MainContents() { + const { swalFire } = useSwal() + const { getMessage } = useMessage() const router = useRouter() const globalLocaleState = useRecoilValue(globalLocaleStore) @@ -125,62 +127,50 @@ export default function MainContents() { )} -
- {recentNoticeList.length > 0 ? ( - <> -
{dayjs(recentNoticeList[0]?.regDt).format('YYYY.MM.DD')}
-
{recentNoticeList[0]?.title}
-
') : '' }} - >
- - ) : ( - - )} -
+ {recentNoticeList.length > 0 ? ( +
+
{dayjs(recentNoticeList[0]?.regDt).format('YYYY.MM.DD')}
+
{recentNoticeList[0]?.title}
+
') : '' }} + >
+
+ ) : ( +
+

{getMessage('main.content.noBusiness')}

+
+ )}
-
    - {recentFaqList.length > 0 ? ( - <> - {recentFaqList.map((row) => { - return ( -
  • -
    -
    FAQ {row.totCnt - row.rowNumber}
    -
    {row.title}
    -
    {dayjs(row.regDt).format('YYYY.MM.DD')}
    -
    -
  • - ) - })} - - ) : ( - - )} -
+ {recentFaqList.length > 0 ? ( +
    + {recentFaqList.map((row) => { + return ( +
  • +
    +
    FAQ {row.totCnt - row.rowNumber}
    +
    {row.title}
    +
    {dayjs(row.regDt).format('YYYY.MM.DD')}
    +
    +
  • + ) + })} +
+ ) : ( +
+

{getMessage('main.content.noBusiness')}

+
+ )}
- -