Skip to content

Commit

Permalink
Fix eslint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
haach committed Feb 21, 2024
1 parent 89a7f7d commit 0d26fc0
Show file tree
Hide file tree
Showing 15 changed files with 114 additions and 100 deletions.
10 changes: 6 additions & 4 deletions src/components/molecules/CookieBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interface CookieBanner {
onReject(): void;
}

export const CookieBanner: FC = () => {
const CookieBanner: FC = () => {
const location = useLocation();
const navigate = useNavigate();
const {consent, setConsent} = useCookieConsent();
Expand All @@ -21,7 +21,7 @@ export const CookieBanner: FC = () => {
className={classNames(
'min-h-full min-w-full fixed top-0 bottom-0 left-0 right-0 z-50',
{
' bg-neutral-900/50 dark:bg-netral-300/25':
' bg-neutral-900/50 dark:bg-neutral-300/25':
location.pathname !== '/cookie-consent',
},
)}
Expand All @@ -36,9 +36,9 @@ export const CookieBanner: FC = () => {
<>
{' '}
-{' '}
<Typo.LinkExternal to="/cookie-consent">
<Typo.LinkInternal to="/cookie-consent">
Read more
</Typo.LinkExternal>
</Typo.LinkInternal>
</>
)}
</Typo.P>
Expand Down Expand Up @@ -68,3 +68,5 @@ export const CookieBanner: FC = () => {
</div>
);
};

export default CookieBanner;
4 changes: 2 additions & 2 deletions src/components/molecules/DarkModeSwitch.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {useGTMDispatch} from '@elgorditosalsero/react-gtm-hook';
import classNames from 'classnames';
import {FC} from 'react';
import {ReactProps} from '~/components';
import type {FC} from 'react';
import type {ReactProps} from '~/components';
import {Typo} from '~/components/primitives/typography';
import {useTheme} from '~/contexts/ThemeContext';

Expand Down
6 changes: 3 additions & 3 deletions src/components/molecules/FormComponents.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {FC} from 'react';
import type {FC} from 'react';
import {input} from '~/components/primitives';
import {Typo} from '~/components/primitives/typography';

Expand Down Expand Up @@ -68,7 +68,7 @@ export const RadioGroup: FC<
> = ({label, options, ...props}) => {
return (
<>
<Typo.span>{label[0]}</Typo.span>
<Typo.Span>{label[0]}</Typo.Span>
{options.map(({value, label}) => (
<div key={value} className="flex flex-row items-center gap-1">
<input
Expand All @@ -83,7 +83,7 @@ export const RadioGroup: FC<
</label>
</div>
))}
<Typo.span>{label[1]}</Typo.span>
<Typo.Span>{label[1]}</Typo.Span>
</>
);
};
4 changes: 2 additions & 2 deletions src/components/molecules/HeadlineWithDivider.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import classNames from 'classnames';
import {FC, ReactNode} from 'react';
import {ReactProps} from '~/components';
import type {FC, ReactNode} from 'react';
import type {ReactProps} from '~/components';
import {HR} from '~/components/primitives';
import {Typo} from '~/components/primitives/typography';
/**
Expand Down
2 changes: 1 addition & 1 deletion src/components/molecules/Layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classNames from 'classnames';
import {ComponentWithChildren} from '~/components';
import type {ComponentWithChildren} from '~/components';

export const ContainerOuter: ComponentWithChildren = ({
children,
Expand Down
35 changes: 35 additions & 0 deletions src/components/molecules/ScrollPosition.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import {useLocation} from '@remix-run/react';
import type {FC} from 'react';
import {useCallback, useEffect, useState} from 'react';
import {useWindow} from '~/contexts/WindowContext';

/**
*
* @returns a custom component to restore scroll position and make it feel like a single page app
*/
export const ScrollPosition: FC = () => {
const {pathname} = useLocation();
const windowContext = useWindow();
const [currentPathname, setCurrentPathname] = useState<string>(pathname);

const resetScrollPosition = useCallback(
(
_pathname: string,
_currentPathname: string,
_windowContext: ReturnType<typeof useWindow>,
) => {
if (_windowContext && _currentPathname !== _pathname) {
debugger;
window.scroll(0, _windowContext.pageYOffset);
setCurrentPathname(_pathname);
}
},
[],
);

useEffect(() => {
resetScrollPosition(pathname, currentPathname, windowContext);
}, [pathname, currentPathname, windowContext, resetScrollPosition]);

return null;
};
22 changes: 0 additions & 22 deletions src/components/molecules/SrollPosition.tsx

This file was deleted.

5 changes: 3 additions & 2 deletions src/components/molecules/SuspenseImage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import classNames from 'classnames';
import {FC, Suspense} from 'react';
import type {FC} from 'react';
import { Suspense} from 'react';
import {Img, resource} from 'react-suspense-img';
import {ReactProps} from '~/components';
import type {ReactProps} from '~/components';

export const SuspenseImage: FC<
ReactProps & {
Expand Down
4 changes: 2 additions & 2 deletions src/components/primitives/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import classNames from 'classnames';
import {FC} from 'react';
import {ReactProps} from '~/components';
import type {FC} from 'react';
import type {ReactProps} from '~/components';

export const blackBorder = 'border-solid border-bl dark:border-white';
export const link =
Expand Down
8 changes: 4 additions & 4 deletions src/components/primitives/typography.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const P: FC<TypoProps & TypoColorProps> = ({children, ...typoProps}) => {
</p>
);
};
const SPAN: FC<TypoProps & TypoColorProps> = ({children, ...typoProps}) => {
const Span: FC<TypoProps & TypoColorProps> = ({children, ...typoProps}) => {
const className = classNames(
'font-thin',
commonClassNames(typoProps),
Expand Down Expand Up @@ -181,7 +181,7 @@ const LINK_EXTERNAL: FC<
</a>
);
};
const CAPTION: FC<TypoProps & TypoColorProps> = ({children, ...typoProps}) => {
const Caption: FC<TypoProps & TypoColorProps> = ({children, ...typoProps}) => {
const className = classNames(
'text-sm font-thin',
commonClassNames(typoProps),
Expand All @@ -202,8 +202,8 @@ export const Typo = {
H4,
H5,
P,
SPAN,
Span,
LinkInternal: LINK_INTERNAL,
LinkExternal: LINK_EXTERNAL,
Caption: CAPTION,
Caption,
} as const;
2 changes: 1 addition & 1 deletion src/contexts/CookieContext.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {createContext, useContext, useEffect, useState} from 'react';
import {ComponentWithChildren} from '~/components';
import type {ComponentWithChildren} from '~/components';

interface CookieContext {
consent: boolean | null;
Expand Down
4 changes: 2 additions & 2 deletions src/contexts/ThemeContext.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {createContext, useContext, useEffect, useState} from 'react';
import {ComponentWithChildren} from '~/components';
import type {ComponentWithChildren} from '~/components';
import {useWindow} from '~/contexts/WindowContext';
import {STORAGE_ITEMS} from '~/utils/constants';

Expand Down Expand Up @@ -37,7 +37,7 @@ export const ThemeContextProvider: ComponentWithChildren = ({children}) => {
setSystemDarkMode(system);
let isDarkMode = false;
const stored = window.localStorage.getItem(STORAGE_ITEMS.DARK_MODE);
if (!!stored) {
if (stored) {
// setting previously saved in localStorage
isDarkMode = JSON.parse(stored ?? 'false');
} else {
Expand Down
15 changes: 4 additions & 11 deletions src/contexts/WindowContext.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import debounce from 'just-debounce';
import {
createContext,
FC,
useContext,
useEffect,
useMemo,
useState,
} from 'react';
import {ComponentWithChildren} from '~/components';
import {createContext, useContext, useEffect, useMemo, useState} from 'react';
import type {ComponentWithChildren} from '~/components';

type WindowContext = {
width: number;
Expand Down Expand Up @@ -37,7 +30,7 @@ export const WindowContextProvider: ComponentWithChildren = ({children}) => {
setWindowObject({
width: window.innerWidth,
height: window.innerHeight,
pageYOffset: window.pageYOffset,
pageYOffset: window.scrollY,
});
};

Expand All @@ -58,7 +51,7 @@ export const WindowContextProvider: ComponentWithChildren = ({children}) => {
window.removeEventListener('resize', debouncedHandleResize);
window.removeEventListener('scroll', debouncedHandleResize);
};
}, []); // Empty array ensures that effect is only run on mount
}, [debouncedHandleResize]); // Empty array ensures that effect is only run on mount

return (
<WindowContext.Provider value={windowObject}>
Expand Down
31 changes: 18 additions & 13 deletions src/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ import {
import classNames from 'classnames';
import dotenv from 'dotenv';
import type {FC} from 'react';
import {useEffect, useState} from 'react';
import {useCallback, useEffect, useState} from 'react';
import {Helmet} from 'react-helmet';
import type {ComponentWithChildren} from '~/components';
import {CookieBanner} from '~/components/molecules/CookieBanner';
import {SrollPosition} from '~/components/molecules/SrollPosition';
import {Typo} from '~/components/primitives/typography';
import tailwindStyles from '~/styles/tailwind.css';
import {
Expand All @@ -27,6 +25,7 @@ import {
} from '~/contexts/CookieContext';
import {ThemeContextProvider, useTheme} from '~/contexts/ThemeContext';
import {WindowContextProvider} from '~/contexts/WindowContext';
import CookieBanner from './components/molecules/CookieBanner';

const description =
'I am a Berlin based frontend engineer and artist coming from a design driven background. On this portfolio you can find my cv and career path, a collection of things I currently love, some of my work and a way to contact me for job offers.';
Expand Down Expand Up @@ -65,14 +64,20 @@ const PageViewTracker: FC = () => {
const [oldPathname, setOldPathname] = useState<string>('/');
const {pathname} = useLocation();
const sendDataToGTM = useGTMDispatch();
useEffect(() => {

const trackNavigation = useCallback(() => {
sendDataToGTM({
'event': 'navigate',
'gtm.oldUrl': oldPathname,
'gtm.newUrl': pathname,
});
setOldPathname(pathname);
}, [pathname]);
}, [oldPathname, pathname, sendDataToGTM]);

useEffect(() => {
trackNavigation();
}, [trackNavigation]);

return null;
};

Expand Down Expand Up @@ -131,8 +136,6 @@ const Document: ComponentWithChildren = ({children}) => {
{process.env.NODE_ENV === 'development' && <LiveReload />}
{children}
<Scripts />
<SrollPosition />
{/* <ScrollRestoration /> */}
</body>
</html>
);
Expand Down Expand Up @@ -160,12 +163,14 @@ const GTMErrorTracker: FC<{err: string}> = ({err}) => {
const sendDataToGTM = useGTMDispatch();
const {pathname} = useLocation();
useEffect(() => {
sendDataToGTM({
'event': 'gtm.pageError',
'gtm.errorMessage': err,
'gtm.errorUrl': pathname,
});
}, []);
if (err && pathname) {
sendDataToGTM({
'event': 'gtm.pageError',
'gtm.errorMessage': err,
'gtm.errorUrl': pathname,
});
}
}, [sendDataToGTM, err, pathname]);
return null;
};

Expand Down
Loading

0 comments on commit 0d26fc0

Please sign in to comment.