Merge pull request #4 from push-protocol/f_push_scan

font fixes and ui fixes
push-protocol · Nov 11, 2024 · a4cdb55 · a4cdb55
2 parents 1b2c71a + 78cf16d
commit a4cdb55
Show file tree

Hide file tree

Showing 35 changed files with 24 additions and 3,714 deletions.
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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<TimeFilterType>`
   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
@@ -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
@@ -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<boolean>(false);
-
-  const logout = () => {
-    setIsLoggedIn?.(false);
-    sessionStorage.setItem(CREDENTIALKEYS.LOGINCHECK, '' + false);
-    sessionStorage.setItem(CREDENTIALKEYS.TOKEN, '');
-    router.push(ROUTES.LOGIN);
-  };
 
   return (
     <Box
@@ -75,7 +60,6 @@ export default function Navbar() {
               size="small"
               variant="primary"
               css={css`
-                padding: 10px;
                 margin-left: 10px;
               `}
             >

diff --git 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<IH2V2Props>`
   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<TextType>`
   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