diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index c6cb29b..3e197eb 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/charts/BaseOptions/index.ts b/charts/BaseOptions/index.ts index 84e0693..05eb0fe 100644 --- a/charts/BaseOptions/index.ts +++ b/charts/BaseOptions/index.ts @@ -125,7 +125,7 @@ export default function BaseOptions() { // Tooltip tooltip: { style: { - fontFamily: 'Strawford, Helvetica, sans-serif', + fontFamily: 'var(--font-family)', }, theme: isDarkMode ? 'dark' : 'light', x: { diff --git a/charts/DoughnutChart/index.tsx b/charts/DoughnutChart/index.tsx index 9401c49..44bb97d 100644 --- a/charts/DoughnutChart/index.tsx +++ b/charts/DoughnutChart/index.tsx @@ -40,7 +40,7 @@ const DoughnutChart = ({ data, title, label, value, colorSet }: any) => { backgroundColor: theme.background.tooltip, textStyle: { color: theme.text.primary, - fontFamily: 'Strawford, Helvetica, sans-serif', + fontFamily: 'var(--font-family)', }, borderWidth: 0, borderRadius: 10, @@ -54,7 +54,7 @@ const DoughnutChart = ({ data, title, label, value, colorSet }: any) => { textStyle: { color: theme.graph.legendText, fontSize: 12, - fontFamily: 'Strawford, Helvetica, sans-serif', + fontFamily: 'var(--font-family)', fontWeight: 500, }, itemWidth: 15, @@ -90,13 +90,13 @@ const DoughnutChart = ({ data, title, label, value, colorSet }: any) => { a: { lineHeight: 15, color: theme.graph.primaryLabel, - fontFamily: 'Strawford, Helvetica, sans-serif', + fontFamily: 'var(--font-family)', fontSize: '12px', }, b: { fontWeight: 500, color: theme.graph.secondaryLabel, - fontFamily: 'Strawford, Helvetica, sans-serif', + fontFamily: 'var(--font-family)', fontSize: '14px', lineHeight: 20, }, diff --git a/charts/HorizontalBarChart/index.tsx b/charts/HorizontalBarChart/index.tsx index 1f2b27c..7e677cf 100644 --- a/charts/HorizontalBarChart/index.tsx +++ b/charts/HorizontalBarChart/index.tsx @@ -49,7 +49,7 @@ export default function HorizontalBarChart({ window.open(DAPP_LINKS.CHANNELS, '_blank'); }, }, - fontFamily: 'Strawford, Helvetica, sans-serif', + fontFamily: 'var(--font-family)', }, plotOptions: { bar: { @@ -90,7 +90,7 @@ export default function HorizontalBarChart({ }, style: { fontSize: '12px', - fontFamily: 'Strawford, Helvetica, sans-serif', + fontFamily: 'var(--font-family)', colors: theme.graph.primaryLabel, cursor: 'pointer', }, @@ -111,7 +111,7 @@ export default function HorizontalBarChart({ }, style: { fontSize: '12px', - fontFamily: 'Strawford, Helvetica, sans-serif', + fontFamily: 'var(--font-family)', colors: theme.graph.primaryLabel, }, }, @@ -147,7 +147,7 @@ export default function HorizontalBarChart({ alignItems="flex-start" justifyContent="flex-start" height="auto" - width="100%" + width="-webkit-fill-available" background={isMobile ? 'transparent' : theme.background.card} border={`1px solid ${theme.background.border}`} borderRadius="28px" diff --git a/charts/LineChart/index.tsx b/charts/LineChart/index.tsx index 5ed9caf..1dfd1da 100644 --- a/charts/LineChart/index.tsx +++ b/charts/LineChart/index.tsx @@ -55,7 +55,7 @@ export default function Chart({ // autoScaleYaxis: true, }, offsetX: -10, - fontFamily: 'Strawford, Helvetica, sans-serif', + fontFamily: 'var(--font-family)', }, yaxis: { axisTicks: { @@ -67,7 +67,7 @@ export default function Chart({ labels: { style: { fontSize: '12px', - fontFamily: 'Strawford, Helvetica, sans-serif', + fontFamily: 'var(--font-family)', colors: theme.graph.primaryLabel, }, }, @@ -82,7 +82,7 @@ export default function Chart({ hideOverlappingLabels: true, style: { fontSize: '12px', - fontFamily: 'Strawford, Helvetica, sans-serif', + fontFamily: 'var(--font-family)', colors: theme.graph.primaryLabel, }, datetimeFormatter: { @@ -130,7 +130,7 @@ export default function Chart({ alignItems="flex-start" justifyContent="flex-start" height="auto" - width="100%" + width="-webkit-fill-available" background={isMobile ? 'transparent' : theme.background.card} border={`1px solid ${theme.background.border}`} borderRadius="28px" diff --git a/components/Dashboard/LineChartSet/linchartset.styled.ts b/components/Dashboard/LineChartSet/linchartset.styled.ts index 51464e6..25d1814 100644 --- a/components/Dashboard/LineChartSet/linchartset.styled.ts +++ b/components/Dashboard/LineChartSet/linchartset.styled.ts @@ -60,7 +60,7 @@ export const Option = styled.div` width: 100%; background-color: transparent; color: ${({ theme }) => theme.text.secondary}; - font-family: 'Strawford', Helvetica, sans-serif; + font-family: 'var(--font-family)'; display: flex; justify-content: flex-start; align-items: center; @@ -95,7 +95,7 @@ export const TimeFilter = styled.button` background-color: ${(props) => props.background || '#cf1c84'}; color: ${(props) => props.color || '#657795'}; font-weight: ${(props) => props.fontWeight || '500'}; - font-family: 'Strawford', Helvetica, sans-serif; + font-family: 'FK Grotesk Neu'; font-size: 15px; border-radius: 12px; min-width: 41px; diff --git a/components/Navbar/NavBarButtons.tsx b/components/Navbar/NavBarButtons.tsx index e5d5094..c7b4bc2 100644 --- a/components/Navbar/NavBarButtons.tsx +++ b/components/Navbar/NavBarButtons.tsx @@ -34,7 +34,7 @@ const Button = styled(ButtonV2)` max-width: 140px; font-size: 18px; font-weight: 500; - font-family: 'Strawford', Helvetica, sans-serif; + font-family: 'var(--font-family)'; border-radius: 10px; padding: 10px 10px; type: submit; diff --git a/components/Navbar/index.tsx b/components/Navbar/index.tsx index 9e48fd9..b23c5d1 100644 --- a/components/Navbar/index.tsx +++ b/components/Navbar/index.tsx @@ -5,33 +5,18 @@ import Link from 'next/link'; // External Library imports import { DarkModeSwitch } from 'react-toggle-dark-mode'; -import { useMediaQuery } from '@mui/material'; -import { css, useTheme } from 'styled-components'; +import { css } from 'styled-components'; // Internal Components imports import { useTheme as Theme } from '../../contexts/ThemeContext'; -import { useData } from '../../contexts/DataContext'; -import { ROUTES, CREDENTIALKEYS } from '../../utils/constants'; -import { ThemeType } from '../../types/theme'; import { Box, Text, Lozenge, PushLogo } from '../../blocks'; import SearchBar from '../Home/SearchBar'; export default function Navbar() { const { isDarkMode, darkModeToggle } = Theme(); - const { isLoggedIn, setIsLoggedIn, token } = useData(); + const router = useRouter(); - const theme = useTheme() as ThemeType; - const isMobile = useMediaQuery('(max-width:480px)'); - const isSmall = useMediaQuery('(max-width:1024px)'); const { asPath } = useRouter(); - const [showSidebar, setShowSidebar] = React.useState(false); - - const logout = () => { - setIsLoggedIn?.(false); - sessionStorage.setItem(CREDENTIALKEYS.LOGINCHECK, '' + false); - sessionStorage.setItem(CREDENTIALKEYS.TOKEN, ''); - router.push(ROUTES.LOGIN); - }; return ( diff --git a/components/Reusables/SharedStyling/index.ts b/components/Reusables/SharedStyling/index.ts index f52bb3a..00f3506 100644 --- a/components/Reusables/SharedStyling/index.ts +++ b/components/Reusables/SharedStyling/index.ts @@ -10,7 +10,7 @@ import { ISectionV2Props, ISpanV2Props, ISkeletonProps, - ISkeletonLineProps + ISkeletonLineProps, } from '../../../types/sharedStyling'; import { TextType } from '../../../types/otherStyled'; import { themeLight } from '../../../theme/palette'; @@ -108,8 +108,7 @@ export const ItemVV2 = styled(ItemHV2)` export const H2V2 = styled.h2` color: ${(props) => props.color || themeLight.text.primary}; - font-family: ${(props) => - props.family || "'Strawford', Helvetica, sans-serif"}; + font-family: ${(props) => props.family || 'var(--font-family)'}; font-size: ${(props) => props.fontSize || 'initial'}; font-weight: ${(props) => props.fontWeight || 'initial'}; letter-spacing: ${(props) => props.letterSpacing || 'initial'}; @@ -250,7 +249,7 @@ export const DashBoardContainer = styled(ItemVV2)` export const Text = styled.p` font-size: ${(props) => props.size || '15px'}; font-weight: ${(props) => props.weight || 400}; - font-family: 'Strawford', Helvetica, sans-serif; + font-family: var(--font-family); color: ${(props) => props.color || props.theme.text.primary}; margin-top: ${(props) => props.marginTop || '0px'}; margin-bottom: ${(props) => props.marginBottom || '0px'}; diff --git a/public/static/fonts_old/Strawford-Black.eot b/public/static/fonts_old/Strawford-Black.eot deleted file mode 100644 index 53f28ca..0000000 Binary files a/public/static/fonts_old/Strawford-Black.eot and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Black.svg b/public/static/fonts_old/Strawford-Black.svg deleted file mode 100644 index 08fb89b..0000000 --- a/public/static/fonts_old/Strawford-Black.svg +++ /dev/null @@ -1,1837 +0,0 @@ - - - - -Created by FontForge 20190801 at Thu Jun 3 17:06:48 2021 - By www-data -Copyright (c) 2021 by atipo. All rights reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/static/fonts_old/Strawford-Black.ttf b/public/static/fonts_old/Strawford-Black.ttf deleted file mode 100644 index 0f3baa8..0000000 Binary files a/public/static/fonts_old/Strawford-Black.ttf and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Black.woff b/public/static/fonts_old/Strawford-Black.woff deleted file mode 100644 index 0f96b29..0000000 Binary files a/public/static/fonts_old/Strawford-Black.woff and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Black.woff2 b/public/static/fonts_old/Strawford-Black.woff2 deleted file mode 100644 index 9e23dd2..0000000 Binary files a/public/static/fonts_old/Strawford-Black.woff2 and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Bold.eot b/public/static/fonts_old/Strawford-Bold.eot deleted file mode 100644 index 94b3c39..0000000 Binary files a/public/static/fonts_old/Strawford-Bold.eot and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Bold.svg b/public/static/fonts_old/Strawford-Bold.svg deleted file mode 100644 index 1d75eae..0000000 --- a/public/static/fonts_old/Strawford-Bold.svg +++ /dev/null @@ -1,1836 +0,0 @@ - - - - -Created by FontForge 20190801 at Thu Jun 3 17:06:49 2021 - By www-data -Copyright (c) 2021 by atipo. All rights reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/static/fonts_old/Strawford-Bold.ttf b/public/static/fonts_old/Strawford-Bold.ttf deleted file mode 100644 index 07a07ba..0000000 Binary files a/public/static/fonts_old/Strawford-Bold.ttf and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Bold.woff b/public/static/fonts_old/Strawford-Bold.woff deleted file mode 100644 index 0fc13bb..0000000 Binary files a/public/static/fonts_old/Strawford-Bold.woff and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Bold.woff2 b/public/static/fonts_old/Strawford-Bold.woff2 deleted file mode 100644 index f10a406..0000000 Binary files a/public/static/fonts_old/Strawford-Bold.woff2 and /dev/null differ diff --git a/public/static/fonts_old/Strawford-ExtraLight.otf b/public/static/fonts_old/Strawford-ExtraLight.otf deleted file mode 100644 index ae041f1..0000000 Binary files a/public/static/fonts_old/Strawford-ExtraLight.otf and /dev/null differ diff --git a/public/static/fonts_old/Strawford-ExtraLight.ttf b/public/static/fonts_old/Strawford-ExtraLight.ttf deleted file mode 100644 index cfa816d..0000000 Binary files a/public/static/fonts_old/Strawford-ExtraLight.ttf and /dev/null differ diff --git a/public/static/fonts_old/Strawford-ExtraLight.woff2 b/public/static/fonts_old/Strawford-ExtraLight.woff2 deleted file mode 100644 index 27d2d7b..0000000 Binary files a/public/static/fonts_old/Strawford-ExtraLight.woff2 and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Light.otf b/public/static/fonts_old/Strawford-Light.otf deleted file mode 100644 index 7bed36a..0000000 Binary files a/public/static/fonts_old/Strawford-Light.otf and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Light.ttf b/public/static/fonts_old/Strawford-Light.ttf deleted file mode 100644 index 6faee6b..0000000 Binary files a/public/static/fonts_old/Strawford-Light.ttf and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Light.woff2 b/public/static/fonts_old/Strawford-Light.woff2 deleted file mode 100644 index ee32ec8..0000000 Binary files a/public/static/fonts_old/Strawford-Light.woff2 and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Medium.otf b/public/static/fonts_old/Strawford-Medium.otf deleted file mode 100644 index 25b1cf4..0000000 Binary files a/public/static/fonts_old/Strawford-Medium.otf and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Medium.ttf b/public/static/fonts_old/Strawford-Medium.ttf deleted file mode 100644 index b04e784..0000000 Binary files a/public/static/fonts_old/Strawford-Medium.ttf and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Medium.woff2 b/public/static/fonts_old/Strawford-Medium.woff2 deleted file mode 100644 index e397dfe..0000000 Binary files a/public/static/fonts_old/Strawford-Medium.woff2 and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Regular.eot b/public/static/fonts_old/Strawford-Regular.eot deleted file mode 100644 index 69014ca..0000000 Binary files a/public/static/fonts_old/Strawford-Regular.eot and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Regular.otf b/public/static/fonts_old/Strawford-Regular.otf deleted file mode 100644 index 7a060a5..0000000 Binary files a/public/static/fonts_old/Strawford-Regular.otf and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Regular.ttf b/public/static/fonts_old/Strawford-Regular.ttf deleted file mode 100644 index 0c4c51c..0000000 Binary files a/public/static/fonts_old/Strawford-Regular.ttf and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Regular.woff b/public/static/fonts_old/Strawford-Regular.woff deleted file mode 100644 index ac5a79b..0000000 Binary files a/public/static/fonts_old/Strawford-Regular.woff and /dev/null differ diff --git a/public/static/fonts_old/Strawford-Regular.woff2 b/public/static/fonts_old/Strawford-Regular.woff2 deleted file mode 100644 index c4c3fb3..0000000 Binary files a/public/static/fonts_old/Strawford-Regular.woff2 and /dev/null differ diff --git a/sections/Login/login.styled.ts b/sections/Login/login.styled.ts index da4149c..96fc474 100644 --- a/sections/Login/login.styled.ts +++ b/sections/Login/login.styled.ts @@ -9,7 +9,7 @@ export const Input = styled.input` border: none; width: 85%; font-size: 18px; - font-family: 'Strawford', Helvetica, sans-serif; + font-family: var(--font-family); padding: 15px 10px; margin: 5px 0px; background-color: ${(props) => props.theme.background.secondary}; diff --git a/theme/globalStyles.ts b/theme/globalStyles.ts index 9043163..f6b17ae 100644 --- a/theme/globalStyles.ts +++ b/theme/globalStyles.ts @@ -1,6 +1,6 @@ // External Library imports import { createGlobalStyle } from 'styled-components'; -import { blocksColors, getBlocksCSSVariables } from '../blocks'; +import { getBlocksCSSVariables } from '../blocks'; export const GlobalStyles = createGlobalStyle` @font-face { @@ -32,7 +32,7 @@ export const GlobalStyles = createGlobalStyle` body { background: ${({ theme }) => theme.background.default}; color: ${({ theme }) => theme.text.color}; - font-family: 'Strawford', Helvetica, sans-serif; + font-family: var(--font-family); transition: all 0.2s linear; } :root {