From 9b6e690f684749cbbf02957422e94965056ff3f0 Mon Sep 17 00:00:00 2001 From: William Grant Date: Fri, 5 Jul 2024 12:25:26 +1000 Subject: [PATCH 01/10] fix: improved landinge page hero and header responsiveness --- apps/staking/app/page.tsx | 45 ++++++++++++++++++++---------- apps/staking/components/Header.tsx | 10 ++++--- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/apps/staking/app/page.tsx b/apps/staking/app/page.tsx index aa52bfee..141e36cd 100644 --- a/apps/staking/app/page.tsx +++ b/apps/staking/app/page.tsx @@ -1,5 +1,6 @@ import { URL } from '@/lib/constants'; import { ButtonDataTestId } from '@/testing/data-test-ids'; +import { cn } from '@session/ui/lib/utils'; import { Button } from '@session/ui/ui/button'; import { useTranslations } from 'next-intl'; import Image from 'next/image'; @@ -8,20 +9,38 @@ import Link from 'next/link'; export default function LandingPage() { const dictionary = useTranslations('home'); return ( -
-
-

+
+
+

{dictionary.rich('title')}

-
- - - +
-
- - - +
+
+ + + ); +} diff --git a/packages/ui/components/SocialLinkList.tsx b/packages/ui/components/SocialLinkList.tsx new file mode 100644 index 00000000..015d2faa --- /dev/null +++ b/packages/ui/components/SocialLinkList.tsx @@ -0,0 +1,100 @@ +import { DiscordIcon } from '../icons/socials/DiscordIcon'; +import { FacebookIcon } from '../icons/socials/FacebookIcon'; +import { GithubIcon } from '../icons/socials/GithubIcon'; +import { InstagramIcon } from '../icons/socials/InstagramIcon'; +import { LinkedInIcon } from '../icons/socials/LinkedInIcon'; +import { RSSIcon } from '../icons/socials/RSSIcon'; +import { RedditIcon } from '../icons/socials/RedditIcon'; +import { SessionIcon } from '../icons/socials/SessionIcon'; +import { TelegramIcon } from '../icons/socials/TelegramIcon'; +import { VimeoIcon } from '../icons/socials/VimeoIcon'; +import { WhatsappIcon } from '../icons/socials/WhatsappIcon'; +import { XIcon } from '../icons/socials/XIcon'; +import { YoutubeIcon } from '../icons/socials/YoutubeIcon'; +import { cn } from '../lib/utils'; + +export enum Social { + Discord = 'discord', + Facebook = 'facebook', + Github = 'github', + Instagram = 'instagram', + LinkedIn = 'linkedin', + Reddit = 'reddit', + RSS = 'rss', + Session = 'session', + Telegram = 'telegram', + Vimeo = 'vimeo', + Whatsapp = 'whatsapp', + X = 'x', + Youtube = 'youtube', +} + +function getSocialIcon(social: Social) { + switch (social) { + case Social.Discord: + return ; + case Social.Facebook: + return ; + case Social.Github: + return ; + case Social.Instagram: + return ; + case Social.LinkedIn: + return ; + case Social.Reddit: + return ; + case Social.RSS: + return ; + case Social.Session: + return ; + case Social.Telegram: + return ; + case Social.Vimeo: + return ; + case Social.Whatsapp: + return ; + case Social.X: + return ; + case Social.Youtube: + return ; + default: + } +} + +export type SocialLink = { + name: Social; + link: string; +}; + +export type SocialLinkListProps = { + socialLinks: Array; + className?: string; +}; + +export default function SocialLinkList(props: SocialLinkListProps) { + const { socialLinks, className } = props; + + return ( + + ); +} diff --git a/packages/ui/icons/socials/DiscordIcon.tsx b/packages/ui/icons/socials/DiscordIcon.tsx new file mode 100644 index 00000000..b3a1b702 --- /dev/null +++ b/packages/ui/icons/socials/DiscordIcon.tsx @@ -0,0 +1,11 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const DiscordIcon = forwardRef((props, ref) => ( + + + +)); diff --git a/packages/ui/icons/socials/FacebookIcon.tsx b/packages/ui/icons/socials/FacebookIcon.tsx new file mode 100644 index 00000000..9be7853a --- /dev/null +++ b/packages/ui/icons/socials/FacebookIcon.tsx @@ -0,0 +1,8 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const FacebookIcon = forwardRef((props, ref) => ( + + + +)); diff --git a/packages/ui/icons/socials/GithubIcon.tsx b/packages/ui/icons/socials/GithubIcon.tsx new file mode 100644 index 00000000..7e09d97f --- /dev/null +++ b/packages/ui/icons/socials/GithubIcon.tsx @@ -0,0 +1,8 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const GithubIcon = forwardRef((props, ref) => ( + + + +)); diff --git a/packages/ui/icons/socials/InstagramIcon.tsx b/packages/ui/icons/socials/InstagramIcon.tsx new file mode 100644 index 00000000..8677925d --- /dev/null +++ b/packages/ui/icons/socials/InstagramIcon.tsx @@ -0,0 +1,8 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const InstagramIcon = forwardRef((props, ref) => ( + + + +)); diff --git a/packages/ui/icons/socials/LinkedInIcon.tsx b/packages/ui/icons/socials/LinkedInIcon.tsx new file mode 100644 index 00000000..2dae7dfd --- /dev/null +++ b/packages/ui/icons/socials/LinkedInIcon.tsx @@ -0,0 +1,8 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const LinkedInIcon = forwardRef((props, ref) => ( + + + +)); diff --git a/packages/ui/icons/socials/RSSIcon.tsx b/packages/ui/icons/socials/RSSIcon.tsx new file mode 100644 index 00000000..6f89fbff --- /dev/null +++ b/packages/ui/icons/socials/RSSIcon.tsx @@ -0,0 +1,8 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const RSSIcon = forwardRef((props, ref) => ( + + + +)); diff --git a/packages/ui/icons/socials/RedditIcon.tsx b/packages/ui/icons/socials/RedditIcon.tsx new file mode 100644 index 00000000..bd720527 --- /dev/null +++ b/packages/ui/icons/socials/RedditIcon.tsx @@ -0,0 +1,8 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const RedditIcon = forwardRef((props, ref) => ( + + + +)); diff --git a/packages/ui/icons/socials/SessionIcon.tsx b/packages/ui/icons/socials/SessionIcon.tsx new file mode 100644 index 00000000..35edf094 --- /dev/null +++ b/packages/ui/icons/socials/SessionIcon.tsx @@ -0,0 +1,8 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const SessionIcon = forwardRef((props, ref) => ( + + + +)); diff --git a/packages/ui/icons/socials/TelegramIcon.tsx b/packages/ui/icons/socials/TelegramIcon.tsx new file mode 100644 index 00000000..13fc05dc --- /dev/null +++ b/packages/ui/icons/socials/TelegramIcon.tsx @@ -0,0 +1,8 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const TelegramIcon = forwardRef((props, ref) => ( + + + +)); diff --git a/packages/ui/icons/socials/VimeoIcon.tsx b/packages/ui/icons/socials/VimeoIcon.tsx new file mode 100644 index 00000000..b98bc86a --- /dev/null +++ b/packages/ui/icons/socials/VimeoIcon.tsx @@ -0,0 +1,8 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const VimeoIcon = forwardRef((props, ref) => ( + + + +)); diff --git a/packages/ui/icons/socials/WhatsappIcon.tsx b/packages/ui/icons/socials/WhatsappIcon.tsx new file mode 100644 index 00000000..dfb5934b --- /dev/null +++ b/packages/ui/icons/socials/WhatsappIcon.tsx @@ -0,0 +1,8 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const WhatsappIcon = forwardRef((props, ref) => ( + + + +)); diff --git a/packages/ui/icons/socials/XIcon.tsx b/packages/ui/icons/socials/XIcon.tsx new file mode 100644 index 00000000..dc0e51f7 --- /dev/null +++ b/packages/ui/icons/socials/XIcon.tsx @@ -0,0 +1,15 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const XIcon = forwardRef((props, ref) => ( + + + + + + + + + + +)); diff --git a/packages/ui/icons/socials/YoutubeIcon.tsx b/packages/ui/icons/socials/YoutubeIcon.tsx new file mode 100644 index 00000000..92bc194e --- /dev/null +++ b/packages/ui/icons/socials/YoutubeIcon.tsx @@ -0,0 +1,8 @@ +import { forwardRef } from 'react'; +import { SVGAttributes } from '../types'; + +export const YoutubeIcon = forwardRef((props, ref) => ( + + + +)); From 20e84470fa7367c3161c00b1947d85749b27ceb2 Mon Sep 17 00:00:00 2001 From: William Grant Date: Fri, 5 Jul 2024 17:44:47 +1000 Subject: [PATCH 05/10] feat: added footer to landing page --- apps/staking/app/page.tsx | 124 +++++++++++++++-------------- apps/staking/components/Footer.tsx | 25 ++++++ apps/staking/components/Header.tsx | 16 +--- apps/staking/lib/constants.ts | 22 ++++- apps/staking/locales/en.json | 3 +- 5 files changed, 117 insertions(+), 73 deletions(-) create mode 100644 apps/staking/components/Footer.tsx diff --git a/apps/staking/app/page.tsx b/apps/staking/app/page.tsx index 141e36cd..d88bb466 100644 --- a/apps/staking/app/page.tsx +++ b/apps/staking/app/page.tsx @@ -1,3 +1,4 @@ +import { Footer } from '@/components/Footer'; import { URL } from '@/lib/constants'; import { ButtonDataTestId } from '@/testing/data-test-ids'; import { cn } from '@session/ui/lib/utils'; @@ -9,71 +10,78 @@ import Link from 'next/link'; export default function LandingPage() { const dictionary = useTranslations('home'); return ( -
+
-

- {dictionary.rich('title')} -

-
- - - - - - - - - - - - +

+ {dictionary.rich('title')} +

+
+ + + + + + + + + + + + +
+
+
+ {dictionary('heroImageAlt')}
-
- {dictionary('heroImageAlt')} -
+
); } diff --git a/apps/staking/components/Footer.tsx b/apps/staking/components/Footer.tsx new file mode 100644 index 00000000..fc51a35a --- /dev/null +++ b/apps/staking/components/Footer.tsx @@ -0,0 +1,25 @@ +import { ROUTES, SOCIALS } from '@/lib/constants'; +import { Footer as FooterComp } from '@session/ui/components/Footer'; +import { cn } from '@session/ui/lib/utils'; + +import { useTranslations } from 'next-intl'; +export function Footer() { + const dictionary = useTranslations('navigation'); + + const menuItems = ROUTES.map(({ dictionaryKey, href }) => ({ + title: dictionary(dictionaryKey), + href: href, + })); + + const socialLinks = Object.values(SOCIALS); + + return ( + + ); +} diff --git a/apps/staking/components/Header.tsx b/apps/staking/components/Header.tsx index 42394f8e..224fa011 100644 --- a/apps/staking/components/Header.tsx +++ b/apps/staking/components/Header.tsx @@ -1,6 +1,6 @@ 'use client'; -import type { LocaleKey } from '@/lib/locale-util'; +import { ROUTES } from '@/lib/constants'; import { ButtonDataTestId } from '@/testing/data-test-ids'; import { HamburgerIcon } from '@session/ui/icons/HamburgerIcon'; import { cn } from '@session/ui/lib/utils'; @@ -19,16 +19,6 @@ import { usePathname } from 'next/navigation'; import { WalletModalButtonWithLocales } from './WalletModalButtonWithLocales'; import { WalletNetworkDropdownWithLocales } from './WalletNetworkDropdownWithLocales'; -type LinkItem = { - href: string; - dictionaryKey: keyof Omit; -}; - -const links: LinkItem[] = [ - { dictionaryKey: 'stake', href: '/stake' }, - { dictionaryKey: 'myStakes', href: '/mystakes' }, -] as const; - type NavLinkProps = { href: string; pathname: string; @@ -61,7 +51,7 @@ export default function Header() { Session Token Logo
- {links.map(({ dictionaryKey, href }) => ( + {ROUTES.map(({ dictionaryKey, href }) => ( ))}
@@ -108,7 +98,7 @@ function DropdownHamburgerMenu() { > {dictionary('language')} - {links.map(({ dictionaryKey, href }) => ( + {ROUTES.map(({ dictionaryKey, href }) => ( ; +}; + +export const ROUTES: LinkItem[] = [ + { dictionaryKey: 'stake', href: '/stake' }, + { dictionaryKey: 'myStakes', href: '/mystakes' }, +] as const; + +export const SOCIALS: Partial> = { + [Social.Discord]: { name: Social.Discord, link: 'https://discord.com/invite/J5BTQdCfXN' }, + [Social.Github]: { name: Social.Github, link: 'https://github.com/oxen-io/websites' }, + [Social.RSS]: { name: Social.RSS, link: 'https://token.getsession.org/blog/feed' }, + [Social.Session]: { name: Social.Session, link: 'https://getsession.org/' }, + [Social.X]: { name: Social.X, link: 'https://x.com/session_token' }, + [Social.Youtube]: { name: Social.Youtube, link: 'https://www.youtube.com/@sessiontv' }, +}; diff --git a/apps/staking/locales/en.json b/apps/staking/locales/en.json index 1649dec5..b3c263af 100644 --- a/apps/staking/locales/en.json +++ b/apps/staking/locales/en.json @@ -25,7 +25,8 @@ "ariaSupport": "Go to support page", "faucet": "Faucet", "ariaFaucet": "Go to faucet page" - } + }, + "managedBy": "/ Managed by the Session Network" }, "wallet": { "modalButton": { From 4d5d8f3a9dda6cb9d9f2e80c14c16d97b95d9e51 Mon Sep 17 00:00:00 2001 From: William Grant Date: Mon, 8 Jul 2024 14:18:58 +1000 Subject: [PATCH 06/10] feat: updated footer links added support for external links --- apps/staking/components/Footer.tsx | 5 +++-- apps/staking/lib/constants.ts | 25 +++++++++++++++++-------- apps/staking/locales/en.json | 1 + apps/staking/next.config.mjs | 9 +++++++++ packages/ui/components/Footer.tsx | 8 +++++++- 5 files changed, 37 insertions(+), 11 deletions(-) diff --git a/apps/staking/components/Footer.tsx b/apps/staking/components/Footer.tsx index fc51a35a..67c0d936 100644 --- a/apps/staking/components/Footer.tsx +++ b/apps/staking/components/Footer.tsx @@ -1,4 +1,4 @@ -import { ROUTES, SOCIALS } from '@/lib/constants'; +import { FOOTER_LINKS, SOCIALS } from '@/lib/constants'; import { Footer as FooterComp } from '@session/ui/components/Footer'; import { cn } from '@session/ui/lib/utils'; @@ -6,9 +6,10 @@ import { useTranslations } from 'next-intl'; export function Footer() { const dictionary = useTranslations('navigation'); - const menuItems = ROUTES.map(({ dictionaryKey, href }) => ({ + const menuItems = FOOTER_LINKS.map(({ dictionaryKey, href, linkType = 'internal' }) => ({ title: dictionary(dictionaryKey), href: href, + linkType, })); const socialLinks = Object.values(SOCIALS); diff --git a/apps/staking/lib/constants.ts b/apps/staking/lib/constants.ts index efbc9aa0..4c0975be 100644 --- a/apps/staking/lib/constants.ts +++ b/apps/staking/lib/constants.ts @@ -23,6 +23,15 @@ export enum COMMUNITY_DATE { OXEN_SERVICE_NODE_BONUS_PROGRAM = '2024-06-12', } +export const SOCIALS: Partial> = { + [Social.Discord]: { name: Social.Discord, link: 'https://discord.com/invite/J5BTQdCfXN' }, + [Social.X]: { name: Social.X, link: 'https://x.com/session_token' }, + [Social.Youtube]: { name: Social.Youtube, link: 'https://www.youtube.com/@sessiontv' }, + [Social.Session]: { name: Social.Session, link: 'https://getsession.org/' }, + [Social.Github]: { name: Social.Github, link: 'https://github.com/oxen-io/websites' }, + [Social.RSS]: { name: Social.RSS, link: 'https://token.getsession.org/blog/feed' }, +}; + export enum FAUCET { MIN_ETH_BALANCE = 0.01, DRIP = 240, @@ -51,6 +60,7 @@ export enum NETWORK { type LinkItem = { href: string; dictionaryKey: keyof Omit; + linkType?: 'internal' | 'external'; }; export const ROUTES: LinkItem[] = [ @@ -58,11 +68,10 @@ export const ROUTES: LinkItem[] = [ { dictionaryKey: 'myStakes', href: '/mystakes' }, ] as const; -export const SOCIALS: Partial> = { - [Social.Discord]: { name: Social.Discord, link: 'https://discord.com/invite/J5BTQdCfXN' }, - [Social.Github]: { name: Social.Github, link: 'https://github.com/oxen-io/websites' }, - [Social.RSS]: { name: Social.RSS, link: 'https://token.getsession.org/blog/feed' }, - [Social.Session]: { name: Social.Session, link: 'https://getsession.org/' }, - [Social.X]: { name: Social.X, link: 'https://x.com/session_token' }, - [Social.Youtube]: { name: Social.Youtube, link: 'https://www.youtube.com/@sessiontv' }, -}; +export const FOOTER_LINKS: LinkItem[] = [ + ...ROUTES, + { dictionaryKey: 'faucet', href: '/faucet' }, + { dictionaryKey: 'tokenSite', href: 'https://token.getsession.org', linkType: 'external' }, + { dictionaryKey: 'support', href: '/support', linkType: 'external' }, + { dictionaryKey: 'docs', href: 'https://docs.getsession.org', linkType: 'external' }, +] as const; diff --git a/apps/staking/locales/en.json b/apps/staking/locales/en.json index b3c263af..26dbf1d1 100644 --- a/apps/staking/locales/en.json +++ b/apps/staking/locales/en.json @@ -15,6 +15,7 @@ "stake": "Stake Now", "myStakes": "My Stakes", "docs": "Docs", + "tokenSite": "Session Token", "support": "Support", "faucet": "Faucet", "hamburgerDropdown": { diff --git a/apps/staking/next.config.mjs b/apps/staking/next.config.mjs index 58629ded..9545f3eb 100644 --- a/apps/staking/next.config.mjs +++ b/apps/staking/next.config.mjs @@ -27,6 +27,15 @@ const nextConfig = { config.externals.push('pino-pretty', 'lokijs', 'encoding'); return config; }, + redirects: async () => { + return [ + { + source: '/support', + destination: 'https://discord.com/invite/J5BTQdCfXN', + permanent: false, + }, + ]; + }, rewrites: async () => { return [ { diff --git a/packages/ui/components/Footer.tsx b/packages/ui/components/Footer.tsx index 30e84866..8366e1d7 100644 --- a/packages/ui/components/Footer.tsx +++ b/packages/ui/components/Footer.tsx @@ -30,6 +30,7 @@ export type FooterItem = { title: string; slug?: string; href?: string; + linkType?: 'internal' | 'external'; }; export type FooterProps = { @@ -93,12 +94,17 @@ export function Footer(props: FooterProps) { return (
{item.slug || item.href ? ( {item.title} From 768477fc038ba08ef26c02bda60b2a0cbaa3aa12 Mon Sep 17 00:00:00 2001 From: William Grant Date: Tue, 9 Jul 2024 13:59:25 +1000 Subject: [PATCH 07/10] fix: revert header button style override it was breaking the width of the wallet button --- apps/staking/components/Header.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/staking/components/Header.tsx b/apps/staking/components/Header.tsx index 224fa011..5092c4a8 100644 --- a/apps/staking/components/Header.tsx +++ b/apps/staking/components/Header.tsx @@ -57,9 +57,7 @@ export default function Header() {
- + {isConnected ? : null}
From 00ef76dee0529a5179e36ae7d85b99f95018c9fa Mon Sep 17 00:00:00 2001 From: William Grant Date: Tue, 9 Jul 2024 13:59:55 +1000 Subject: [PATCH 08/10] fix: build errors svg should use react props, missing imports --- packages/ui/icons/SessionTokenIcon.tsx | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/ui/icons/SessionTokenIcon.tsx b/packages/ui/icons/SessionTokenIcon.tsx index dc59e8e9..35c69096 100644 --- a/packages/ui/icons/SessionTokenIcon.tsx +++ b/packages/ui/icons/SessionTokenIcon.tsx @@ -18,10 +18,10 @@ export const SessionTokenIcon = forwardRef((props, y2="199.3" gradientUnits="userSpaceOnUse" > - - - - + + + + ((props, gradientTransform="matrix(2.5 0 0 2.7 -486.7 -293.9)" gradientUnits="userSpaceOnUse" > - - + + ((props, gradientTransform="matrix(1.3 0 0 2.5 -37.4 -268.6)" gradientUnits="userSpaceOnUse" > - - + + ((props, y2="414.2" gradientUnits="userSpaceOnUse" > - - - + + + ((props, gradientTransform="matrix(2.8 0 0 3.3 -967.7 -199.1)" gradientUnits="userSpaceOnUse" > - - + + ((props, gradientTransform="matrix(2.6 0 0 2.6 -348.3 -479.8)" gradientUnits="userSpaceOnUse" > - - + + ((props, /> - + ((props, /> - + Date: Tue, 9 Jul 2024 15:34:33 +1000 Subject: [PATCH 09/10] fix: can now click on all nav links separate external routes const --- apps/staking/app/page.tsx | 2 +- apps/staking/components/Footer.tsx | 14 ++++---- apps/staking/components/Header.tsx | 40 ++++++++------------- apps/staking/lib/constants.ts | 5 ++- packages/ui/tailwind.config.ts | 3 +- packages/wallet/components/WalletButton.tsx | 12 +++---- 6 files changed, 32 insertions(+), 44 deletions(-) diff --git a/apps/staking/app/page.tsx b/apps/staking/app/page.tsx index d88bb466..7e2fb455 100644 --- a/apps/staking/app/page.tsx +++ b/apps/staking/app/page.tsx @@ -10,7 +10,7 @@ import Link from 'next/link'; export default function LandingPage() { const dictionary = useTranslations('home'); return ( -
+
({ - title: dictionary(dictionaryKey), - href: href, - linkType, - })); + const menuItems = [...ROUTES, ...EXTERNAL_ROUTES].map( + ({ dictionaryKey, href, linkType = 'internal' }) => ({ + title: dictionary(dictionaryKey), + href: href, + linkType, + }) + ); const socialLinks = Object.values(SOCIALS); diff --git a/apps/staking/components/Header.tsx b/apps/staking/components/Header.tsx index 5092c4a8..c22cf9d7 100644 --- a/apps/staking/components/Header.tsx +++ b/apps/staking/components/Header.tsx @@ -1,6 +1,6 @@ 'use client'; -import { ROUTES } from '@/lib/constants'; +import { EXTERNAL_ROUTES, ROUTES } from '@/lib/constants'; import { ButtonDataTestId } from '@/testing/data-test-ids'; import { HamburgerIcon } from '@session/ui/icons/HamburgerIcon'; import { cn } from '@session/ui/lib/utils'; @@ -46,19 +46,19 @@ export default function Header() { const pathname = usePathname(); return ( @@ -90,35 +90,23 @@ function DropdownHamburgerMenu() { - console.log('lang')} - aria-label={dictionary('ariaLanguage')} - > - {dictionary('language')} - {ROUTES.map(({ dictionaryKey, href }) => ( + ))} + {EXTERNAL_ROUTES.map(({ dictionaryKey, href }) => ( + ))} - - {dictionary('support')} - - - {dictionary('faucet')} - ); diff --git a/apps/staking/lib/constants.ts b/apps/staking/lib/constants.ts index 4c0975be..6a17edd3 100644 --- a/apps/staking/lib/constants.ts +++ b/apps/staking/lib/constants.ts @@ -66,11 +66,10 @@ type LinkItem = { export const ROUTES: LinkItem[] = [ { dictionaryKey: 'stake', href: '/stake' }, { dictionaryKey: 'myStakes', href: '/mystakes' }, + { dictionaryKey: 'faucet', href: '/faucet' }, ] as const; -export const FOOTER_LINKS: LinkItem[] = [ - ...ROUTES, - { dictionaryKey: 'faucet', href: '/faucet' }, +export const EXTERNAL_ROUTES: LinkItem[] = [ { dictionaryKey: 'tokenSite', href: 'https://token.getsession.org', linkType: 'external' }, { dictionaryKey: 'support', href: '/support', linkType: 'external' }, { dictionaryKey: 'docs', href: 'https://docs.getsession.org', linkType: 'external' }, diff --git a/packages/ui/tailwind.config.ts b/packages/ui/tailwind.config.ts index b19b52c2..9eac24e8 100644 --- a/packages/ui/tailwind.config.ts +++ b/packages/ui/tailwind.config.ts @@ -1,9 +1,8 @@ import type { Config } from 'tailwindcss'; export default { - mode: 'jit', darkMode: ['class'], - content: ['./**/*.{ts,tsx}'], + content: { relative: true, files: ['./**/*.{ts,tsx}'] }, prefix: '', theme: { container: { diff --git a/packages/wallet/components/WalletButton.tsx b/packages/wallet/components/WalletButton.tsx index fa2ce3d5..8456268e 100644 --- a/packages/wallet/components/WalletButton.tsx +++ b/packages/wallet/components/WalletButton.tsx @@ -37,9 +37,9 @@ export function WalletButton({ disabled={isLoading} className={cn( 'group', - 'select-none justify-end overflow-x-hidden', + 'select-none justify-end overflow-x-hidden text-xs', isConnected - ? 'bg-session-green hover:bg-session-green hover:text-session-black h-full w-full max-w-36 border-2 px-0 py-0 transition-all duration-1000 ease-in-out hover:brightness-110 motion-reduce:transition-none lg:hover:max-w-full lg:focus:max-w-full lg:active:max-w-full' + ? 'bg-session-green hover:bg-session-green hover:text-session-black h-full w-full max-w-28 border-2 px-0 py-0 transition-all duration-1000 ease-in-out hover:brightness-110 motion-reduce:transition-none sm:max-w-36 lg:hover:max-w-full lg:focus:max-w-full lg:active:max-w-full' : 'px-3 py-2', forceBalanceOpen && 'lg:max-w-full' )} @@ -52,7 +52,7 @@ export function WalletButton({ {!hideBalance ? (
- + {name}
From d375b071d8a15a1cea14ca37a952ee8bc32e44f0 Mon Sep 17 00:00:00 2001 From: William Grant Date: Tue, 9 Jul 2024 15:37:39 +1000 Subject: [PATCH 10/10] fix: hamburger circle --- apps/staking/components/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/staking/components/Header.tsx b/apps/staking/components/Header.tsx index c22cf9d7..82a1e971 100644 --- a/apps/staking/components/Header.tsx +++ b/apps/staking/components/Header.tsx @@ -82,7 +82,7 @@ function DropdownHamburgerMenu() {