From c172c4aade2e418ea58aaae382d37e363ee49622 Mon Sep 17 00:00:00 2001 From: Liz Date: Thu, 12 Sep 2024 11:41:17 +0800 Subject: [PATCH 1/5] change folder structure --- package.json | 2 +- .../{landing_footer => landing_page}/landing_footer.tsx | 0 .../{landing_i18n => landing_page}/landing_i18n.tsx | 0 .../{landing_nav_bar => landing_page}/landing_nav_bar.tsx | 0 .../{landing_page_body => landing_page}/landing_page_body.tsx | 2 +- src/pages/index.tsx | 4 ++-- src/pages/reports.tsx | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename src/components/{landing_footer => landing_page}/landing_footer.tsx (100%) rename src/components/{landing_i18n => landing_page}/landing_i18n.tsx (100%) rename src/components/{landing_nav_bar => landing_page}/landing_nav_bar.tsx (100%) rename src/components/{landing_page_body => landing_page}/landing_page_body.tsx (98%) diff --git a/package.json b/package.json index 67911bd8..d19dff29 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iSunFA", - "version": "0.8.1+8", + "version": "0.8.1+9", "private": false, "scripts": { "dev": "next dev", diff --git a/src/components/landing_footer/landing_footer.tsx b/src/components/landing_page/landing_footer.tsx similarity index 100% rename from src/components/landing_footer/landing_footer.tsx rename to src/components/landing_page/landing_footer.tsx diff --git a/src/components/landing_i18n/landing_i18n.tsx b/src/components/landing_page/landing_i18n.tsx similarity index 100% rename from src/components/landing_i18n/landing_i18n.tsx rename to src/components/landing_page/landing_i18n.tsx diff --git a/src/components/landing_nav_bar/landing_nav_bar.tsx b/src/components/landing_page/landing_nav_bar.tsx similarity index 100% rename from src/components/landing_nav_bar/landing_nav_bar.tsx rename to src/components/landing_page/landing_nav_bar.tsx diff --git a/src/components/landing_page_body/landing_page_body.tsx b/src/components/landing_page/landing_page_body.tsx similarity index 98% rename from src/components/landing_page_body/landing_page_body.tsx rename to src/components/landing_page/landing_page_body.tsx index b1374e3d..ba067c85 100644 --- a/src/components/landing_page_body/landing_page_body.tsx +++ b/src/components/landing_page/landing_page_body.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react'; -import LandingFooter from '@/components/landing_footer/landing_footer'; +import LandingFooter from '@/components/landing_page/landing_footer'; import HowWeWork from '@/components/how_we_work/how_we_work'; import CTASection from '@/components/cta_section/cta_section'; import NumberAnimationSection from '@/components/number_animation_section/number_animation_section'; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index bd42564c..b866fb9e 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,9 +1,9 @@ import Head from 'next/head'; import { serverSideTranslations } from 'next-i18next/serverSideTranslations'; import React from 'react'; -import LandingNavBar from '@/components/landing_nav_bar/landing_nav_bar'; +import LandingNavBar from '@/components/landing_page/landing_nav_bar'; import { ILocale } from '@/interfaces/locale'; -import LandingPageBody from '@/components/landing_page_body/landing_page_body'; +import LandingPageBody from '@/components/landing_page/landing_page_body'; import { useTranslation } from 'next-i18next'; interface ILandingPageProps { diff --git a/src/pages/reports.tsx b/src/pages/reports.tsx index 9fb27841..3af6e4fe 100644 --- a/src/pages/reports.tsx +++ b/src/pages/reports.tsx @@ -4,7 +4,7 @@ import React, { useState } from 'react'; import { serverSideTranslations } from 'next-i18next/serverSideTranslations'; import { useTranslation } from 'next-i18next'; import { ILocale } from '@/interfaces/locale'; -import LandingNavBar from '@/components/landing_nav_bar/landing_nav_bar'; +import LandingNavBar from '@/components/landing_page/landing_nav_bar'; import ToggleButton from '@/components/toggle_button/toggle_button'; import DatePicker, { DatePickerType } from '@/components/date_picker/date_picker'; import { default30DayPeriodInSec } from '@/constants/display'; From 0bd20396c99f686a94a8fc6030e9dfc04dd2b698 Mon Sep 17 00:00:00 2001 From: Liz Date: Thu, 12 Sep 2024 17:09:45 +0800 Subject: [PATCH 2/5] Landing Page Footer --- package.json | 2 +- .../landing_page/landing_footer.tsx | 120 ++++++++++-------- .../landing_page/landing_page_body.tsx | 6 - src/locales/cn/common.json | 10 ++ src/locales/en/common.json | 10 ++ src/locales/tw/common.json | 12 +- src/locales/tw/terms.json | 20 +-- src/pages/_document.tsx | 2 +- src/pages/index.tsx | 10 +- tailwind.config.ts | 5 + 10 files changed, 121 insertions(+), 76 deletions(-) diff --git a/package.json b/package.json index d19dff29..902ff6c8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iSunFA", - "version": "0.8.1+9", + "version": "0.8.1+10", "private": false, "scripts": { "dev": "next dev", diff --git a/src/components/landing_page/landing_footer.tsx b/src/components/landing_page/landing_footer.tsx index 22c1fdd0..195a82f3 100644 --- a/src/components/landing_page/landing_footer.tsx +++ b/src/components/landing_page/landing_footer.tsx @@ -1,71 +1,81 @@ import Link from 'next/link'; import Image from 'next/image'; -import { BiLogoGithub } from 'react-icons/bi'; -import { BsTelephone } from 'react-icons/bs'; -import { FiMapPin } from 'react-icons/fi'; import { ISUNFA_ROUTE } from '@/constants/url'; -import { - copyright, - iSunFAAddress, - iSunFAAddressOnMap, - iSunFAPhone, - githubLink, -} from '@/constants/config'; +import { copyright } from '@/constants/config'; +import { GrLocation } from 'react-icons/gr'; +import { BiPhoneCall, BiLogoFacebookSquare } from 'react-icons/bi'; +import { LuAlarmClock } from 'react-icons/lu'; +import { IoLogoGithub } from 'react-icons/io'; +import { TiSocialYoutubeCircular } from 'react-icons/ti'; +import { useTranslation } from 'next-i18next'; + +const CONTACT_PHONE_NUMBER = '+886-2-2700-1979'; +const GITHUB_LINK = 'https://github.com/CAFECA-IO'; +const FACEBOOK_LINK = 'https://www.facebook.com/profile.php?id=61555435381112'; +const YOUTUBE_LINK = 'https://www.youtube.com/@isunfa'; function LandingFooter() { + const { t } = useTranslation(['common']); + return ( -
-
- - {/* Info:(20230711 - Shirley) Desktop Logo */} - iSunFA_logo - {/* Info:(20230711 - Shirley) Mobile Logo */} - iSunFA_logo - +
+
+ iSunFA Logo +

/ Intelligent Accounting

+
+ +
+
+
+
{t('common:LANDING_FOOTER.QUICK_LINKS')}
+
+ ‣ {t('common:LANDING_FOOTER.HOME')} + + ‣ {t('common:LANDING_FOOTER.INFO_COLLECTION_STATEMENT')} + + + ‣ {t('common:LANDING_FOOTER.TERMS_OF_SERVICE_PRIVACY_POLICY')} + +
+
-
-
- - -

{iSunFAAddress}

- - - -

{iSunFAPhone}

- +
+
{t('common:LANDING_FOOTER.CONTACT_US')}
+
    +
  • + +

    {t('common:LANDING_FOOTER.CONTACT_ADDRESS')}

    +
    • +
  • + +

    {CONTACT_PHONE_NUMBER}

    +
    • +
  • + +

    + {t('common:LANDING_FOOTER.SERVICE_HOURS')} :
    + {t('common:LANDING_FOOTER.MON_TO_FRI_9AM_6PM')} +

    +
    • +
-
- - +
+ + + + + + + +
-
+
- {/* Info:(20230711 - Shirley) Copyright */} -
{copyright}
-
+
{copyright}
+ ); } diff --git a/src/components/landing_page/landing_page_body.tsx b/src/components/landing_page/landing_page_body.tsx index ba067c85..261fe0f7 100644 --- a/src/components/landing_page/landing_page_body.tsx +++ b/src/components/landing_page/landing_page_body.tsx @@ -1,5 +1,4 @@ import { useEffect, useState } from 'react'; -import LandingFooter from '@/components/landing_page/landing_footer'; import HowWeWork from '@/components/how_we_work/how_we_work'; import CTASection from '@/components/cta_section/cta_section'; import NumberAnimationSection from '@/components/number_animation_section/number_animation_section'; @@ -123,11 +122,6 @@ function LandingPageBody() { {/* Info: (20240318 - Shirley) ----- Contact form section ----- */} - - {/* Info: (20230711 - Shirley) Footer */} -
- -
); } diff --git a/src/locales/cn/common.json b/src/locales/cn/common.json index cd853db5..cfc2c842 100644 --- a/src/locales/cn/common.json +++ b/src/locales/cn/common.json @@ -115,6 +115,16 @@ "DOWNLOAD_TITLE": "下载应用程式", "DOWNLOAD_SUBTITLE": "让最实用的工具与您随行" }, + "LANDING_FOOTER": { + "QUICK_LINKS": "快速连结", + "CONTACT_US": "联络我们", + "SERVICE_HOURS": "服务时间", + "MON_TO_FRI_9AM_6PM": "周一至周五，上午 09:00 - 下午 06:00", + "HOME": "首页", + "INFO_COLLECTION_STATEMENT": "资讯收集声明", + "TERMS_OF_SERVICE_PRIVACY_POLICY": "服务条款与隐私政策", + "CONTACT_ADDRESS": "(110416)台湾台北市信义区信义路五段150巷2号13楼之6" + }, "COMING_SOON_PAGE": { "TITLE": "Coming Soon", "SUBTITLE": "我们的秘密计划即将揭晓！敬请期待！" diff --git a/src/locales/en/common.json b/src/locales/en/common.json index 59a4fa32..af271262 100644 --- a/src/locales/en/common.json +++ b/src/locales/en/common.json @@ -115,6 +115,16 @@ "DOWNLOAD_TITLE": "Download The App", "DOWNLOAD_SUBTITLE": "Carry the most useful tool with you" }, + "LANDING_FOOTER": { + "QUICK_LINKS": "Quick Links", + "CONTACT_US": "Contact Us", + "SERVICE_HOURS": "Service Hours", + "MON_TO_FRI_9AM_6PM": "Mon to Fri, 09:00 AM - 06:00 PM.", + "HOME": "Home", + "INFO_COLLECTION_STATEMENT": "Info. Collection Statement", + "TERMS_OF_SERVICE_PRIVACY_POLICY": "Terms of Service & Privacy Policy", + "CONTACT_ADDRESS": "13F.-6, No. 2, Ln. 150, Sec. 5, Xinyi Rd., Xinyi Dist., Taipei City 110416 , Taiwan" + }, "COMING_SOON_PAGE": { "TITLE": "Coming Soon", "SUBTITLE": "Our Secret Project is Almost Unveiled. Stay Tuned for the Big Reveal!" diff --git a/src/locales/tw/common.json b/src/locales/tw/common.json index 6d5e5080..d78a170a 100644 --- a/src/locales/tw/common.json +++ b/src/locales/tw/common.json @@ -115,6 +115,16 @@ "DOWNLOAD_TITLE": "下載應用程式", "DOWNLOAD_SUBTITLE": "讓最實用的工具與您隨行" }, + "LANDING_FOOTER": { + "QUICK_LINKS": "快速連結", + "CONTACT_US": "聯絡我們", + "SERVICE_HOURS": "服務時間", + "MON_TO_FRI_9AM_6PM": "週一至週五，上午 09:00 - 下午 06:00", + "HOME": "首頁", + "INFO_COLLECTION_STATEMENT": "資訊收集聲明", + "TERMS_OF_SERVICE_PRIVACY_POLICY": "服務條款與隱私政策", + "CONTACT_ADDRESS": "(110416)台灣台北市信義區信義路五段150巷2號13樓之6" + }, "COMING_SOON_PAGE": { "TITLE": "Coming Soon", "SUBTITLE": "我們的秘密計畫即將揭曉！敬請期待！" @@ -232,7 +242,7 @@ "ERROR_CODE": "錯誤代碼: {{code}}", "CANCEL": "取消", "PLEASE_READ_AND_AGREE_THE_FIRST_TIME_YOU_LOGIN": "首次登錄時，請閱讀並同意", - "AGREE_WITH_INFORMATION_COLLECTION_STATEMENT": "同意《信息收集聲明》", + "AGREE_WITH_INFORMATION_COLLECTION_STATEMENT": "同意《資訊收集聲明》", "AGREE_WITH_TOS_N_PP": "同意《服務條款》和《隱私政策》", "ALPHA_TEST_REMINDER": "Alpha 版本的資料只用於測試", "TYPE": "類型", diff --git a/src/locales/tw/terms.json b/src/locales/tw/terms.json index 0006ff35..bda6dbd3 100644 --- a/src/locales/tw/terms.json +++ b/src/locales/tw/terms.json @@ -25,12 +25,12 @@ "PROVIDERS": "服務提供商：與與我們合作的第三方服務提供商共享，但前提是他們僅按照我們的指示使用您的資訊並遵守適當的保密和安全措施。", "BUSINESS_TRANSFERS": "業務轉讓：在公司合併、收購或資產出售時，我們可能會轉讓您的資訊。", "YOUR_RIGHTS": "5. 您的權利", - "RIGHTS_DESC": "您有權隨時訪問、修改或刪除您的個人資訊。如您希望行使這些權利或有任何問題，請通過以下方式聯繫我們：", + "RIGHTS_DESC": "您有權隨時訪問、修改或刪除您的個人資訊。如您希望行使這些權利或有任何問題，請通過以下方式聯絡我們：", "EMAIL": "電子郵件：support@isunfa.com", "PHONE": "電話：+123-456-7890", "RESPONSE_TIME": "我們將努力在合理的時間範圍內回應您的請求。", "CHANGES": "6. 聲明的變更", - "CHANGES_DESC": "我們可能會不時更新本聲明以反映我們資訊處理實踐的變更。當我們對本聲明進行重大變更時，將通過軟體內通知或電子郵件通知您。", + "CHANGES_DESC": "我們可能會不時更新本聲明以反應我們資訊處理實踐的變更。當我們對本聲明進行重大變更時，將通過軟體內通知或電子郵件通知您。", "THANK_YOU_END": "感謝您對我們會計軟體的信任和支持！", "SIGN_OFF": "iSunFA 2024年8月6日" }, @@ -42,25 +42,25 @@ "SERVICE_CONTENT": "我們的會計軟體包括記帳、報表生成、發票管理和財務分析等功能。我們保留隨時更新或修改服務內容的權利，並將通過適當的方式通知您這些變更。", "ELIGIBILITY_TITLE": "資格", "ELIGIBILITY": "您必須年滿18歲或符合您所在國家的法定年齡要求，並且具有完全的法律行為能力使用我們的服務。您同意依照相關法律法規使用我們的服務，不從事任何非法或不正當的活動。", - "ACCOUNT_MANAGEMENT_TITLE": "賬戶管理", - "ACCOUNT_MANAGEMENT": "您需要提供準確且完整的註冊信息，並對您的賬戶安全負責。如果您發現任何未經授權的賬戶使用或安全漏洞，請立即通知我們。", + "ACCOUNT_MANAGEMENT_TITLE": "帳戶管理", + "ACCOUNT_MANAGEMENT": "您需要提供準確且完整的註冊資訊，並對您的帳戶安全負責。如果您發現任何未經授權的帳戶使用或安全漏洞，請立即通知我們。", "SERVICE_FEES_TITLE": "服務費用", "SERVICE_FEES": "某些功能或服務可能需要付費。具體費用及支付方式將在相關頁面或文件中詳細說明。除非法律另有規定，支付一經確認，概不退款。", "LIABILITY_TITLE": "責任限制", - "LIABILITY": "我們對因使用我們的服務而產生的任何間接、附帶、特殊或後果性損害概不負責。我們不對任何第三方服務或提供的鏈接負責。", + "LIABILITY": "我們對因使用我們的服務而產生的任何間接、附帶、特殊或後果性損害概不負責。我們不對任何第三方服務或提供的連結負責。", "TERMINATION_TITLE": "服務終止", "TERMINATION": "我們保留隨時出於任何原因終止或暫停服務的權利，且不承擔任何責任。您可以隨時取消使用我們的服務，但已支付的費用不予退還。", "PRIVACY_POLICY": "II. 隱私政策", "INFO_COLLECTION_TITLE": "資訊收集", - "INFO_COLLECTION": "我們收集與您使用會計軟體相關的各種信息，包括但不限於個人身份信息、使用數據和技術信息。詳細信息請參考《信息收集聲明》。", + "INFO_COLLECTION": "我們收集與您使用會計軟體相關的各種資訊，包括但不限於個人身份資訊、使用數據和技術資訊。詳細資訊請參考《資訊收集聲明》。", "USE_OF_INFO_TITLE": "資訊的使用", - "USE_OF_INFO": "收集的信息將用於提供、維護和改進我們的服務，確保安全和進行數據分析。未經您的同意，我們不會將您的信息用於其他用途。", + "USE_OF_INFO": "收集的資訊將用於提供、維護和改進我們的服務，確保安全和進行數據分析。未經您的同意，我們不會將您的資訊用於其他用途。", "PROTECTION_TITLE": "資訊的保護", - "PROTECTION": "我們採取合理的技術和組織措施保護您的信息，包括數據加密、訪問控制和定期安全審核。詳細內容請參考《信息收集聲明》。", + "PROTECTION": "我們採取合理的技術和組織措施保護您的資訊，包括數據加密、訪問控制和定期安全審核。詳細內容請參考《資訊收集聲明》。", "SHARING_TITLE": "資訊的共享", - "SHARING": "我們不會在未經您同意的情況下將您的個人信息出售、出租或交易給第三方，除非在法律要求、服務提供商合作或業務轉讓等特定情況下。詳細內容請參考《信息收集聲明》。", + "SHARING": "我們不會在未經您同意的情況下將您的個人資訊出售、出租或交易給第三方，除非在法律要求、服務提供商合作或業務轉讓等特定情況下。詳細內容請參考《資訊收集聲明》。", "YOUR_RIGHTS_TITLE": "您的權利", - "YOUR_RIGHTS": "您有權隨時訪問、修改或刪除您的個人信息。如有需要，請通過 support@isunfa.com 或 +123-456-7890 聯繫我們。", + "YOUR_RIGHTS": "您有權隨時訪問、修改或刪除您的個人資訊。如有需要，請通過 support@isunfa.com 或 +123-456-7890 聯絡我們。", "EMAIL": "電子郵件：support@isunfa.com", "PHONE": "電話：+123-456-7890", "RESPONSE_TIME": "我們將努力在合理的時間範圍內回應您的請求。", diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx index 3e2200b8..30e6c441 100644 --- a/src/pages/_document.tsx +++ b/src/pages/_document.tsx @@ -8,7 +8,7 @@ export default function Document() { diff --git a/src/pages/index.tsx b/src/pages/index.tsx index b866fb9e..efb211c8 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -5,6 +5,7 @@ import LandingNavBar from '@/components/landing_page/landing_nav_bar'; import { ILocale } from '@/interfaces/locale'; import LandingPageBody from '@/components/landing_page/landing_page_body'; import { useTranslation } from 'next-i18next'; +import LandingFooter from '@/components/landing_page/landing_footer'; interface ILandingPageProps { locale: string; @@ -31,14 +32,19 @@ function LandingPage({ locale }: ILandingPageProps) { - {/* Info: (20230712 - Shirley) Navbar */} -