From f037b2ae68ec30e7fc3bab4c8d5b6c6e69a9c7cb Mon Sep 17 00:00:00 2001 From: Gala Date: Wed, 15 Nov 2023 15:58:31 +0100 Subject: [PATCH 1/5] adding nymvpn link to explorer --- explorer/src/components/Nav.tsx | 4 +++ explorer/src/icons/NymVpn.tsx | 63 +++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 explorer/src/icons/NymVpn.tsx diff --git a/explorer/src/components/Nav.tsx b/explorer/src/components/Nav.tsx index fbfe4b7ee5..c4d065aea6 100644 --- a/explorer/src/components/Nav.tsx +++ b/explorer/src/components/Nav.tsx @@ -22,6 +22,7 @@ import { useMainContext } from '../context/main'; import { MobileDrawerClose } from '../icons/MobileDrawerClose'; import { Socials } from './Socials'; import { Footer } from './Footer'; +import { NymVpnIcon } from '../icons/NymVpn'; import { DarkLightSwitchDesktop } from './Switch'; import { NavOptionType } from '../context/nav'; @@ -341,6 +342,9 @@ export const Nav: FCWithChildren = ({ children }) => { alignItems: 'center', }} > + + + diff --git a/explorer/src/icons/NymVpn.tsx b/explorer/src/icons/NymVpn.tsx new file mode 100644 index 0000000000..6cd67deb29 --- /dev/null +++ b/explorer/src/icons/NymVpn.tsx @@ -0,0 +1,63 @@ +import * as React from 'react'; +import { useTheme } from '@mui/material/styles'; + +interface DiscordIconProps { + size?: { width: number; height: number }; + color?: string; +} + +export const NymVpnIcon: FCWithChildren = ({ size, color: colorProp }) => { + const theme = useTheme(); + const color = colorProp || theme.palette.text.primary; + return ( + + + + + + + + + + + + ); +}; + +NymVpnIcon.defaultProps = { + size: { width: 80, height: 12 }, + color: undefined, +}; From 8339d6ab4924b9a1b3feecbd211d2bb863e444db Mon Sep 17 00:00:00 2001 From: Gala Date: Wed, 15 Nov 2023 16:20:14 +0100 Subject: [PATCH 2/5] nymvpn link on footer --- explorer/src/components/Footer.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/explorer/src/components/Footer.tsx b/explorer/src/components/Footer.tsx index c85ba47be4..89e8652d1b 100644 --- a/explorer/src/components/Footer.tsx +++ b/explorer/src/components/Footer.tsx @@ -1,8 +1,10 @@ -import * as React from 'react'; import Box from '@mui/material/Box'; -import { Typography } from '@mui/material'; +import MuiLink from '@mui/material/Link'; +import { Link } from 'react-router-dom'; +import Typography from '@mui/material/Typography'; import { Socials } from './Socials'; import { useIsMobile } from '../hooks/useIsMobile'; +import { NymVpnIcon } from '../icons/NymVpn'; export const Footer: FCWithChildren = () => { const isMobile = useIsMobile(); @@ -31,6 +33,9 @@ export const Footer: FCWithChildren = () => { mb: 2, }} > + + + )} From e624f42ad585c2ada4ab6d67579651d385b1b992 Mon Sep 17 00:00:00 2001 From: Gala Date: Thu, 16 Nov 2023 12:03:23 +0100 Subject: [PATCH 3/5] fixing build --- explorer/src/components/Footer.tsx | 1 + explorer/src/icons/NymVpn.tsx | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/explorer/src/components/Footer.tsx b/explorer/src/components/Footer.tsx index 89e8652d1b..2902cbd799 100644 --- a/explorer/src/components/Footer.tsx +++ b/explorer/src/components/Footer.tsx @@ -1,3 +1,4 @@ +import React from 'react'; import Box from '@mui/material/Box'; import MuiLink from '@mui/material/Link'; import { Link } from 'react-router-dom'; diff --git a/explorer/src/icons/NymVpn.tsx b/explorer/src/icons/NymVpn.tsx index 6cd67deb29..d943c4efaf 100644 --- a/explorer/src/icons/NymVpn.tsx +++ b/explorer/src/icons/NymVpn.tsx @@ -16,8 +16,8 @@ export const NymVpnIcon: FCWithChildren = ({ size, color: colo fill="white" /> @@ -26,8 +26,8 @@ export const NymVpnIcon: FCWithChildren = ({ size, color: colo fill="white" /> @@ -36,8 +36,8 @@ export const NymVpnIcon: FCWithChildren = ({ size, color: colo fill="white" /> From bb3e9b3d4efde3e8b6557dfd22221621ff426272 Mon Sep 17 00:00:00 2001 From: Gala Date: Thu, 16 Nov 2023 12:33:43 +0100 Subject: [PATCH 4/5] remove non used variable --- explorer/src/icons/NymVpn.tsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/explorer/src/icons/NymVpn.tsx b/explorer/src/icons/NymVpn.tsx index d943c4efaf..04e54c851f 100644 --- a/explorer/src/icons/NymVpn.tsx +++ b/explorer/src/icons/NymVpn.tsx @@ -1,14 +1,10 @@ import * as React from 'react'; -import { useTheme } from '@mui/material/styles'; interface DiscordIconProps { size?: { width: number; height: number }; - color?: string; } -export const NymVpnIcon: FCWithChildren = ({ size, color: colorProp }) => { - const theme = useTheme(); - const color = colorProp || theme.palette.text.primary; +export const NymVpnIcon: FCWithChildren = ({ size }) => { return ( = ({ size, color: colo NymVpnIcon.defaultProps = { size: { width: 80, height: 12 }, - color: undefined, }; From a9a1ba284773b0af143fbc59187bb779a4532fe2 Mon Sep 17 00:00:00 2001 From: Gala Date: Thu, 16 Nov 2023 12:50:10 +0100 Subject: [PATCH 5/5] please lint.. --- explorer/src/icons/NymVpn.tsx | 94 +++++++++++++++++------------------ 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/explorer/src/icons/NymVpn.tsx b/explorer/src/icons/NymVpn.tsx index 04e54c851f..788b78a4f9 100644 --- a/explorer/src/icons/NymVpn.tsx +++ b/explorer/src/icons/NymVpn.tsx @@ -4,54 +4,52 @@ interface DiscordIconProps { size?: { width: number; height: number }; } -export const NymVpnIcon: FCWithChildren = ({ size }) => { - return ( - - - - - - - - - - - - ); -}; +export const NymVpnIcon: FCWithChildren = ({ size }) => ( + + + + + + + + + + + +); NymVpnIcon.defaultProps = { size: { width: 80, height: 12 },