From 2253f5b97c42661b0bee6c7c0b0ad70549783827 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Sat, 30 Nov 2024 05:54:47 -0500 Subject: [PATCH 1/7] remove chat link from external navigation --- src/components/ui/page/Navigation/NavigationLinks.tsx | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/components/ui/page/Navigation/NavigationLinks.tsx b/src/components/ui/page/Navigation/NavigationLinks.tsx index b05109275..cb37e4301 100644 --- a/src/components/ui/page/Navigation/NavigationLinks.tsx +++ b/src/components/ui/page/Navigation/NavigationLinks.tsx @@ -1,8 +1,7 @@ import { Box, Flex, Hide } from '@chakra-ui/react'; import { BookOpen, Coins, GitFork, House, Question, UsersThree } from '@phosphor-icons/react'; -import { WarpcastIcon } from '../../../../assets/theme/custom/icons/WarpcastIcon'; import { DAO_ROUTES } from '../../../../constants/routes'; -import { URL_CHAT, URL_DOCS, URL_FAQ } from '../../../../constants/url'; +import { URL_DOCS, URL_FAQ } from '../../../../constants/url'; import { useNetworkConfig } from '../../../../providers/NetworkConfig/NetworkConfigProvider'; import { useDaoInfoStore } from '../../../../store/daoInfo/useDaoInfoStore'; import Divider from '../../utils/Divider'; @@ -31,14 +30,6 @@ function ExternalLinks({ closeDrawer }: { closeDrawer?: () => void }) { scope="external" closeDrawer={closeDrawer} /> - Date: Sat, 30 Nov 2024 05:55:35 -0500 Subject: [PATCH 2/7] add social media URLs for Twitter, Telegram, and Discord --- src/constants/url.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/constants/url.ts b/src/constants/url.ts index c2c60b5ad..70e74485b 100644 --- a/src/constants/url.ts +++ b/src/constants/url.ts @@ -3,3 +3,6 @@ export const URL_CHAT = 'https://warpcast.com/~/channel/decentdao'; export const URL_DOCS = 'https://docs.decentdao.org/app'; export const URL_DOCS_GOV_TYPES = 'https://docs.decentdao.org/app/user-guide/types'; export const URL_DECENT = 'https://www.decentdao.org/'; +export const URL_TWITTER = 'https://twitter.com/'; // @todo - Add Twitter handle; +export const URL_TELEGRAM = 'https://t.me/'; // @todo - Add Telegram handle; +export const URL_DISCORD = 'https://discord.gg/'; // @todo - Add Discord handle; From 129912fb0c88f56516da798396ac8a4a09757d79 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Sat, 30 Nov 2024 05:57:24 -0500 Subject: [PATCH 3/7] add navigation icons for social media links in footer --- src/components/ui/page/Footer.tsx | 71 +++++++++++++++++++++++++++-- src/constants/url.ts | 2 +- src/i18n/locales/en/navigation.json | 8 +++- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/src/components/ui/page/Footer.tsx b/src/components/ui/page/Footer.tsx index 062472bf1..f9769c08e 100644 --- a/src/components/ui/page/Footer.tsx +++ b/src/components/ui/page/Footer.tsx @@ -1,10 +1,49 @@ -import { Flex } from '@chakra-ui/react'; +import { Box, ComponentWithAs, Flex, Icon as ChakraIcon, IconProps } from '@chakra-ui/react'; +import { DiscordLogo, Icon, TelegramLogo, XLogo } from '@phosphor-icons/react'; import { useTranslation } from 'react-i18next'; -import { URL_DECENT } from '../../../constants/url'; +import { Link } from 'react-router-dom'; +import { WarpcastIcon } from '../../../assets/theme/custom/icons/WarpcastIcon'; +import { + URL_DECENT, + URL_DISCORD, + URL_TELEGRAM, + URL_TWITTER, + URL_WARPCAST, +} from '../../../constants/url'; import ExternalLink from '../links/ExternalLink'; +function NavigationIconLink(props: { + DisplayIcon: Icon | ComponentWithAs<'svg', IconProps>; + to: string; + ariaLabel: string; +}) { + const { t } = useTranslation('navigation'); + const { DisplayIcon, to, ariaLabel } = props; + return ( + + + + + + + + ); +} + export function Footer() { - const { t } = useTranslation('home'); + const { t } = useTranslation('navigation'); return ( {t('madeWithLove')} + + + + + + + ); } diff --git a/src/constants/url.ts b/src/constants/url.ts index 70e74485b..ae679ad21 100644 --- a/src/constants/url.ts +++ b/src/constants/url.ts @@ -1,5 +1,5 @@ export const URL_FAQ = 'https://docs.decentdao.org/app/learn-more/faq'; -export const URL_CHAT = 'https://warpcast.com/~/channel/decentdao'; +export const URL_WARPCAST = 'https://warpcast.com/~/channel/decentdao'; export const URL_DOCS = 'https://docs.decentdao.org/app'; export const URL_DOCS_GOV_TYPES = 'https://docs.decentdao.org/app/user-guide/types'; export const URL_DECENT = 'https://www.decentdao.org/'; diff --git a/src/i18n/locales/en/navigation.json b/src/i18n/locales/en/navigation.json index 69c9ac323..f35a96098 100644 --- a/src/i18n/locales/en/navigation.json +++ b/src/i18n/locales/en/navigation.json @@ -8,5 +8,9 @@ "faq": "FAQ", "chat": "Warpcast", "documentation": "Documentation", - "ariaLabelFractalBrand": "Navigate Decent Home" -} + "ariaLabelFractalBrand": "Navigate Decent Home", + "navigationExternalTelegram": "Go to telegram", + "navigationExternalX": "Go to X", + "navigationExternalWarpcast": "Go to Warpcast", + "navigationExternalDiscord": "Go to Discord" +} \ No newline at end of file From 5fbcb5541bf09d6ed03f385c9ee924de667a7f90 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Sat, 30 Nov 2024 06:34:49 -0500 Subject: [PATCH 4/7] refactor footer and external link components for improved accessibility and translation support --- src/components/ui/links/ExternalLink.tsx | 52 +++++++++++------------- src/components/ui/page/Footer.tsx | 10 ++--- src/i18n/locales/en/navigation.json | 2 +- 3 files changed, 30 insertions(+), 34 deletions(-) diff --git a/src/components/ui/links/ExternalLink.tsx b/src/components/ui/links/ExternalLink.tsx index f3e8d72db..80cbc5455 100644 --- a/src/components/ui/links/ExternalLink.tsx +++ b/src/components/ui/links/ExternalLink.tsx @@ -105,35 +105,31 @@ export default function ExternalLink({ }; return ( - - + - - {children} - {isTextLink && } - - - + {children} + {isTextLink && } + + ); } diff --git a/src/components/ui/page/Footer.tsx b/src/components/ui/page/Footer.tsx index f9769c08e..d0c659445 100644 --- a/src/components/ui/page/Footer.tsx +++ b/src/components/ui/page/Footer.tsx @@ -43,17 +43,17 @@ function NavigationIconLink(props: { } export function Footer() { - const { t } = useTranslation('navigation'); + const { t } = useTranslation(['navigation', 'home']); return ( - - {t('audit')} + + {t('audit', { ns: 'home' })} @@ -66,7 +66,7 @@ export function Footer() { styleVariant="grey" fontSize="1.2rem" > - {t('madeWithLove')} + {t('madeWithLove', { ns: 'home' })} Date: Sat, 30 Nov 2024 06:35:04 -0500 Subject: [PATCH 5/7] fix: add missing newline at end of navigation.json file --- src/i18n/locales/en/navigation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/locales/en/navigation.json b/src/i18n/locales/en/navigation.json index 418041d38..dd92be1d2 100644 --- a/src/i18n/locales/en/navigation.json +++ b/src/i18n/locales/en/navigation.json @@ -13,4 +13,4 @@ "navigationExternalX": "Go to X", "navigationExternalWarpcast": "Go to Warpcast", "navigationExternalDiscordmade": "Go to Discord" -} \ No newline at end of file +} From 49e48f0e7da73a3e97e43e193c175eac31dfb4f3 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Mon, 2 Dec 2024 14:33:18 -0500 Subject: [PATCH 6/7] fix: update social media URLs for Twitter and Discord --- src/constants/url.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/constants/url.ts b/src/constants/url.ts index ae679ad21..23d1d1e08 100644 --- a/src/constants/url.ts +++ b/src/constants/url.ts @@ -3,6 +3,6 @@ export const URL_WARPCAST = 'https://warpcast.com/~/channel/decentdao'; export const URL_DOCS = 'https://docs.decentdao.org/app'; export const URL_DOCS_GOV_TYPES = 'https://docs.decentdao.org/app/user-guide/types'; export const URL_DECENT = 'https://www.decentdao.org/'; -export const URL_TWITTER = 'https://twitter.com/'; // @todo - Add Twitter handle; +export const URL_TWITTER = 'https://x.com/decentdao'; export const URL_TELEGRAM = 'https://t.me/'; // @todo - Add Telegram handle; -export const URL_DISCORD = 'https://discord.gg/'; // @todo - Add Discord handle; +export const URL_DISCORD = 'https://discord.gg/Zh2emKspVF'; From 819a2b2ffe2ec9e30dec22dfa406e29d07aa9070 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:46:41 -0500 Subject: [PATCH 7/7] fix: update Telegram URL with the correct handle --- src/constants/url.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constants/url.ts b/src/constants/url.ts index 23d1d1e08..2a0acde68 100644 --- a/src/constants/url.ts +++ b/src/constants/url.ts @@ -4,5 +4,5 @@ export const URL_DOCS = 'https://docs.decentdao.org/app'; export const URL_DOCS_GOV_TYPES = 'https://docs.decentdao.org/app/user-guide/types'; export const URL_DECENT = 'https://www.decentdao.org/'; export const URL_TWITTER = 'https://x.com/decentdao'; -export const URL_TELEGRAM = 'https://t.me/'; // @todo - Add Telegram handle; +export const URL_TELEGRAM = 'https://t.me/+ZmKrTaL3pQcyOGRh'; export const URL_DISCORD = 'https://discord.gg/Zh2emKspVF';