From 06b2f908f3a4fb11b28b1cd24da6a2e796ea13a5 Mon Sep 17 00:00:00 2001 From: Danah Date: Sun, 1 Dec 2024 18:47:22 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20faq=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.test.tsx | 2 +- src/assets/icons/outline/export_outline.svg | 5 +++ src/assets/icons/outline/index.ts | 1 + .../faq/_components/FagList/FagList.styles.ts | 8 ++++ src/pages/faq/_components/FagList/FagList.tsx | 42 ++++++++++--------- src/pages/faq/how-to-connect/page.tsx | 20 --------- 6 files changed, 38 insertions(+), 40 deletions(-) create mode 100644 src/assets/icons/outline/export_outline.svg delete mode 100644 src/pages/faq/how-to-connect/page.tsx diff --git a/src/App.test.tsx b/src/App.test.tsx index faa3cf6..4e72020 100644 --- a/src/App.test.tsx +++ b/src/App.test.tsx @@ -15,7 +15,7 @@ describe("상단 네비게이션", () => { await userEvent.click(screen.getByRole("button", { name: /FAQ/ })); expect( - await screen.findByText(/How to connect an external calendar(iCloud、Google、Outlook)/i) + await screen.findByText(/If your iCloud Contacts, Calendars, or Reminders won’t sync/i) ).toBeInTheDocument(); }); diff --git a/src/assets/icons/outline/export_outline.svg b/src/assets/icons/outline/export_outline.svg new file mode 100644 index 0000000..a186717 --- /dev/null +++ b/src/assets/icons/outline/export_outline.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/assets/icons/outline/index.ts b/src/assets/icons/outline/index.ts index 1930ca9..be5ce04 100644 --- a/src/assets/icons/outline/index.ts +++ b/src/assets/icons/outline/index.ts @@ -1 +1,2 @@ export { default as ShieldOutline } from "./shield-outline.svg"; +export { default as ExportOutline } from "./export_outline.svg"; diff --git a/src/pages/faq/_components/FagList/FagList.styles.ts b/src/pages/faq/_components/FagList/FagList.styles.ts index 6a02769..5f0bba2 100644 --- a/src/pages/faq/_components/FagList/FagList.styles.ts +++ b/src/pages/faq/_components/FagList/FagList.styles.ts @@ -7,8 +7,16 @@ export const StyledFagList = styled.ul` export const FagListItem = styled.li` & button { text-align: left; + color: ${({ theme }) => theme.palette.grey["700"]}; } & button > svg { min-width: fit-content; } `; + +export const Bullet = styled.span` + min-width: 4px; + height: 4px; + border-radius: 50%; + background-color: ${({ theme: { palette } }) => palette.grey["700"]}; +`; diff --git a/src/pages/faq/_components/FagList/FagList.tsx b/src/pages/faq/_components/FagList/FagList.tsx index 913f26c..f0de035 100644 --- a/src/pages/faq/_components/FagList/FagList.tsx +++ b/src/pages/faq/_components/FagList/FagList.tsx @@ -1,33 +1,37 @@ -import { Link } from "react-router-dom"; +import { useTranslation } from "react-i18next"; import Button from "@components/atoms/Button"; import Icon from "@components/atoms/Icon"; -import { FagListItem, StyledFagList } from "./FagList.styles"; +import { matchSupportLanguage } from "@utils/i18n"; + +import { Bullet, FagListItem, StyledFagList } from "./FagList.styles"; function FagList() { + const { t, i18n } = useTranslation(); + const fullLangCode = matchSupportLanguage(i18n.resolvedLanguage).fullLangCode; + return ( - - - - - - - - + - - - + ); diff --git a/src/pages/faq/how-to-connect/page.tsx b/src/pages/faq/how-to-connect/page.tsx deleted file mode 100644 index 01259e5..0000000 --- a/src/pages/faq/how-to-connect/page.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import Typography from "@components/atoms/Typography"; -import GeneralLayout from "@components/layouts/GeneralLayout"; -import Footer from "@components/molecules/Footer"; -import Header from "@components/molecules/Header"; - -function HowToConnectPage() { - return ( - } footer={