From 78e1ac7a107da40a3c2a8c87fc8c25e9cee3487a Mon Sep 17 00:00:00 2001 From: YOOJS1205 Date: Fri, 2 Feb 2024 01:12:27 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20QA=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EB=AF=B8=EB=93=A4=EC=9B=A8=EC=96=B4=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/icon20/food_bunsik_default_20.svg | 12 +++++ .../assets/icon20/food_bunski_active_20.svg | 12 +++++ src/app/globals.css | 26 ++++----- src/app/search/page.tsx | 2 +- src/app/terms/page.tsx | 1 + src/components/common/ListItem/index.tsx | 28 +++++----- src/components/common/Pin/index.tsx | 1 - .../main/CurrentLocationButton/index.tsx | 2 +- src/components/main/ProfileButton/index.tsx | 2 +- .../main/StoreInformation/index.tsx | 8 +-- .../search/RecentSearchKeyword/index.tsx | 4 +- src/components/terms/Description/index.tsx | 4 +- src/components/terms/TermsItem/index.tsx | 2 +- src/constants/tags.ts | 10 +--- src/middleware.ts | 53 ++++++++++++------- 15 files changed, 100 insertions(+), 67 deletions(-) create mode 100644 public/assets/icon20/food_bunsik_default_20.svg create mode 100644 public/assets/icon20/food_bunski_active_20.svg diff --git a/public/assets/icon20/food_bunsik_default_20.svg b/public/assets/icon20/food_bunsik_default_20.svg new file mode 100644 index 00000000..8fd870c9 --- /dev/null +++ b/public/assets/icon20/food_bunsik_default_20.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/public/assets/icon20/food_bunski_active_20.svg b/public/assets/icon20/food_bunski_active_20.svg new file mode 100644 index 00000000..21a6758a --- /dev/null +++ b/public/assets/icon20/food_bunski_active_20.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/app/globals.css b/src/app/globals.css index 30ea5b06..6504cc3c 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -4,43 +4,43 @@ @layer utilities { .header-22 { - @apply text-[22px]/[130%] tracking-[-0.44px] font-extrabold; + @apply text-[22px]/[130%] tracking-[-0.44px] font-semibold; } .header-20 { - @apply text-[20px]/[130%] tracking-[-0.4px] font-extrabold; + @apply text-[20px]/[130%] tracking-[-0.4px] font-semibold; } .header-18 { - @apply text-[18px]/[130%] tracking-[-0.36px] font-extrabold; + @apply text-[18px]/[130%] tracking-[-0.36px] font-semibold; } .body-16-bold { - @apply text-[16px]/[140%] tracking-[-0.48px] font-bold; + @apply text-[16px]/[140%] tracking-[-0.48px] font-medium; } .body-16-regular { - @apply text-[16px]/[140%] tracking-[-0.48px] font-normal; + @apply text-[16px]/[140%] tracking-[-0.48px] font-extralight; } .body-14-extraBold { - @apply text-[14px]/[140%] tracking-[-0.42px] font-extrabold; + @apply text-[14px]/[140%] tracking-[-0.42px] font-semibold; } .body-14-bold { - @apply text-[14px]/[140%] tracking-[-0.42px] font-bold; + @apply text-[14px]/[140%] tracking-[-0.42px] font-medium; } .body-14-regular { - @apply text-[14px]/[140%] tracking-[-0.42px] font-normal; + @apply text-[14px]/[140%] tracking-[-0.42px] font-extralight; } .caption-12-extraBold { - @apply text-[12px]/[140%] tracking-[-0.36px] font-extrabold; + @apply text-[12px]/[140%] tracking-[-0.36px] font-semibold; } .caption-12-bold { - @apply text-[12px]/[140%] tracking-[-0.36px] font-bold; + @apply text-[12px]/[140%] tracking-[-0.36px] font-medium; } .caption-12-regular { - @apply text-[12px]/[140%] tracking-[-0.36px] font-normal; + @apply text-[12px]/[140%] tracking-[-0.36px] font-extralight; } .caption-10-bold { - @apply text-[10px]/[140%] tracking-[-0.3px] font-bold; + @apply text-[10px]/[140%] tracking-[-0.3px] font-medium; } .caption-10-regular { - @apply text-[10px]/[140%] tracking-[-0.3px] font-normal; + @apply text-[10px]/[140%] tracking-[-0.3px] font-extralight; } .scrollbar-hide { -ms-overflow-style: none; diff --git a/src/app/search/page.tsx b/src/app/search/page.tsx index 8ff72704..d08cf1a3 100644 --- a/src/app/search/page.tsx +++ b/src/app/search/page.tsx @@ -87,7 +87,7 @@ export default function Page() { resetText={resetText} /> -
+
{!storeList && isMounted && ( diff --git a/src/components/common/ListItem/index.tsx b/src/components/common/ListItem/index.tsx index 8cfb36de..aa5baebd 100644 --- a/src/components/common/ListItem/index.tsx +++ b/src/components/common/ListItem/index.tsx @@ -17,20 +17,18 @@ export default function ListItem({ children, }: PropsWithChildren) { return ( - <> -
  • -
    -
    {children}
    - {hasDeleteOption && } -
    -
    • - +
  • +
    +
    {children}
    + {hasDeleteOption && } +
    +
    • ); } diff --git a/src/components/common/Pin/index.tsx b/src/components/common/Pin/index.tsx index a05dc9b7..a0bfc414 100644 --- a/src/components/common/Pin/index.tsx +++ b/src/components/common/Pin/index.tsx @@ -47,7 +47,6 @@ export default function Pin({ {totalRevisitedCount} - 명 )} diff --git a/src/components/main/CurrentLocationButton/index.tsx b/src/components/main/CurrentLocationButton/index.tsx index f2c6cb78..973539a6 100644 --- a/src/components/main/CurrentLocationButton/index.tsx +++ b/src/components/main/CurrentLocationButton/index.tsx @@ -34,7 +34,7 @@ export default function CurrentLocationButton({ diff --git a/src/components/main/StoreInformation/index.tsx b/src/components/main/StoreInformation/index.tsx index 621e7874..003a41dc 100644 --- a/src/components/main/StoreInformation/index.tsx +++ b/src/components/main/StoreInformation/index.tsx @@ -21,7 +21,7 @@ function StoreInformation({ return (
    - {storeName} + {storeName}
    내방문 {myRevisitedCount}번 @@ -32,11 +32,13 @@ function StoreInformation({
    - {address} + {address}
    - 방문기록 {totalReviewCount} + + 방문기록 {totalReviewCount} +
    diff --git a/src/components/search/RecentSearchKeyword/index.tsx b/src/components/search/RecentSearchKeyword/index.tsx index bebe043a..b073be63 100644 --- a/src/components/search/RecentSearchKeyword/index.tsx +++ b/src/components/search/RecentSearchKeyword/index.tsx @@ -18,13 +18,13 @@ export default function RecentSearchKeyword({ }: RecentSearchKeywordProps) { return (
    -

    최근 검색어

    +

    최근 검색어

    {recentSearchKeywords.map((recentSearchKeyword, index) => (

    {recentSearchKeyword}

    diff --git a/src/components/terms/Description/index.tsx b/src/components/terms/Description/index.tsx index 66c6b197..e09806bb 100644 --- a/src/components/terms/Description/index.tsx +++ b/src/components/terms/Description/index.tsx @@ -12,10 +12,10 @@ interface DescriptionProps { export default function Description({ type }: DescriptionProps) { const terms = TERMS_MAP[type]; return ( -
    +
    {terms.map((term, index) => (
    -

    {term.title}

    +

    {term.title}

    {term.subscription &&

    {term.subscription}

    } {term.list && (
      diff --git a/src/components/terms/TermsItem/index.tsx b/src/components/terms/TermsItem/index.tsx index 3500c700..31847d35 100644 --- a/src/components/terms/TermsItem/index.tsx +++ b/src/components/terms/TermsItem/index.tsx @@ -37,7 +37,7 @@ export default function TermsItem({ {...restProps} /> {checked ? : } -

      {title}

      +

      {title}