Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

header to remix

Maksim Mrugb7a1c2c74627
diff --git a/app/components/Footer/index.tsx b/app/components/Footer/index.tsx
index 2b542aa71..cf92e7dc1 100644
--- a/app/components/Footer/index.tsx
+++ b/app/components/Footer/index.tsx
@@ -10,7 +10,7 @@ import {
LINKEDIN_URL, STATUSPAGE_URL, TWITTER_URL, BLOG_URL, UTM_GENERATOR_URL, SWETRIX_VS_GOOGLE,
SWETRIX_VS_CLOUDFLARE, DOCS_URL, SWETRIX_VS_SIMPLE_ANALYTICS, DISCORD_URL, CAPTCHA_URL,
} from '~/constants'
-import links from '~/links'
+import routesPath from '~/routesPath'
const navigation = {
support: [
@@ -18,7 +18,7 @@ const navigation = {
key: string
href: string
internal: boolean
- } => (authenticated ? { key: 'billing', href: links.billing, internal: true } : { key: 'pricing', href: `${links.main}#pricing`, internal: true }),
+ } => (authenticated ? { key: 'billing', href: routesPath.billing, internal: true } : { key: 'pricing', href: `${routesPath.main}#pricing`, internal: true }),
(): {
key: string
href: string
@@ -28,13 +28,13 @@ const navigation = {
key: string
href: string
internal: boolean
- } => ({ key: 'contact', href: links.contact, internal: true }),
+ } => ({ key: 'contact', href: routesPath.contact, internal: true }),
],
company: [
- { key: 'about', href: links.about, internal: true },
- { key: 'changelog', href: links.changelog, internal: true },
- { key: 'open', href: links.open, internal: true },
- { key: 'press', href: links.press, internal: true },
+ { key: 'about', href: routesPath.about, internal: true },
+ { key: 'changelog', href: routesPath.changelog, internal: true },
+ { key: 'open', href: routesPath.open, internal: true },
+ { key: 'press', href: routesPath.press, internal: true },
{ key: 'status', href: STATUSPAGE_URL },
{ key: 'donate', href: DONATE_URL },
{ key: 'blog', href: BLOG_URL },
@@ -42,9 +42,9 @@ const navigation = {
{ key: 'utm', href: UTM_GENERATOR_URL },
],
legal: [
- { key: 'privacy', href: links.privacy },
- { key: 'terms', href: links.terms },
- { key: 'cookie', href: links.cookiePolicy },
+ { key: 'privacy', href: routesPath.privacy },
+ { key: 'terms', href: routesPath.terms },
+ { key: 'cookie', href: routesPath.cookiePolicy },
],
comparisons: [
{ value: 'Google Analytics', href: SWETRIX_VS_GOOGLE },
@@ -119,7 +119,7 @@ const SelfHostedFooter = () => {
<div className='max-w-7xl mx-auto py-8 px-4 overflow-hidden sm:px-6 lg:px-8'>
<nav className='-mx-5 -my-2 flex flex-wrap justify-center' aria-label='Footer'>
<div className='px-5 py-2'>
- <Link to={links.contact} className='text-base text-gray-300 hover:text-white'>
+ <Link to={routesPath.contact} className='text-base text-gray-300 hover:text-white'>
{t('footer.contact')}
</Link>
</div>
@@ -134,7 +134,7 @@ const SelfHostedFooter = () => {
</a>
</div>
<div className='px-5 py-2'>
- <Link to={links.about} className='text-base text-gray-300 hover:text-white'>
+ <Link to={routesPath.about} className='text-base text-gray-300 hover:text-white'>
{t('footer.about')}
</Link>
</div>
@@ -161,22 +161,22 @@ const Footer = ({ minimal, authenticated }: {
<div className='max-w-7xl mx-auto py-8 px-4 overflow-hidden sm:px-6 lg:px-8'>
<nav className='-mx-5 -my-2 flex flex-wrap justify-center' aria-label='Footer'>
<div className='px-5 py-2'>
- <Link to={links.contact} className='text-base text-gray-300 hover:text-white'>
+ <Link to={routesPath.contact} className='text-base text-gray-300 hover:text-white'>
{t('footer.contact')}
</Link>
</div>
<div className='px-5 py-2'>
- <Link to={links.privacy} className='text-base text-gray-300 hover:text-white'>
+ <Link to={routesPath.privacy} className='text-base text-gray-300 hover:text-white'>
{t('footer.pp')}
</Link>
</div>
<div className='px-5 py-2'>
- <Link to={links.terms} className='text-base text-gray-300 hover:text-white'>
+ <Link to={routesPath.terms} className='text-base text-gray-300 hover:text-white'>
{t('footer.tos')}
</Link>
</div>
<div className='px-5 py-2'>
- <Link to={links.about} className='text-base text-gray-300 hover:text-white'>
+ <Link to={routesPath.about} className='text-base text-gray-300 hover:text-white'>
{t('footer.about')}
</Link>
</div>
diff --git a/app/components/Header/index.tsx b/app/components/Header/index.tsx
index c37c2a839..0a60e7a65 100644
--- a/app/components/Header/index.tsx
+++ b/app/components/Header/index.tsx
@@ -3,10 +3,9 @@ import React, {
memo, Fragment, useRef, useMemo, MutableRefObject,
} from 'react'
import PropTypes from 'prop-types'
-import { Link, NavLink } from 'react-router-dom'
-import { HashLink } from 'react-router-hash-link'
-import { useAppDispatch } from 'redux/store'
-import { useDispatch } from 'react-redux'
+import { Link, NavLink } from '@remix-run/react'
+// import { useAppDispatch } from 'redux/store'
+// import { useDispatch } from 'react-redux'
import { useTranslation } from 'react-i18next'
import Flag from 'react-flagkit'
import i18next from 'i18next'
@@ -25,16 +24,16 @@ import _map from 'lodash/map'
import _includes from 'lodash/includes'
import cx from 'clsx'
-import routes from 'routes'
-import { authActions } from 'redux/reducers/auth'
-import sagaActions from 'redux/sagas/actions'
-import UIActions from 'redux/reducers/ui'
+import routesPath from '~/routesPath'
+// import { authActions } from 'redux/reducers/auth'
+// import sagaActions from 'redux/sagas/actions'
+// import UIActions from 'redux/reducers/ui'
import {
whitelist, languages, languageFlag, isSelfhosted, BLOG_URL,
DOCS_URL, SUPPORTED_THEMES,
-} from 'redux/constants'
-import Dropdown from 'ui/Dropdown'
-import { IUser } from 'redux/models/IUser'
+} from '~/constants'
+import Dropdown from '~/ui/Dropdown'
+// import { IUser } from 'redux/models/IUser'
dayjs.extend(utc)
dayjs.extend(duration)
@@ -112,7 +111,8 @@ const ThemeMenu = ({
const ProfileMenu = ({
user, logoutHandler, t, onLanguageChange, language,
}: {
- user: IUser,
+ // user: IUser,
+ user: any,
logoutHandler: () => void,
t: (key: string, options?: {
[key: string]: string | number | null,
@@ -215,7 +215,7 @@ const ProfileMenu = ({
<Menu.Item>
{({ active }) => (
<Link
- to={routes.changelog}
+ to={routesPath.changelog}
className={cx('block px-4 py-2 text-sm text-gray-700 dark:text-gray-50', {
'bg-gray-100 dark:bg-slate-800': active,
})}
@@ -227,7 +227,7 @@ const ProfileMenu = ({
<Menu.Item>
{({ active }) => (
<Link
- to={routes.contact}
+ to={routesPath.contact}
className={cx('block px-4 py-2 text-sm text-gray-700 dark:text-gray-50', {
'bg-gray-100 dark:bg-slate-800': active,
})}
@@ -240,7 +240,7 @@ const ProfileMenu = ({
<Menu.Item>
{({ active }) => (
<Link
- to={routes.billing}
+ to={routesPath.billing}
className={cx('block px-4 py-2 text-sm text-gray-700 dark:text-gray-50', {
'bg-gray-100 dark:bg-slate-800': active,
})}
@@ -255,7 +255,7 @@ const ProfileMenu = ({
<Menu.Item>
{({ active }) => (
<Link
- to={routes.user_settings}
+ to={routesPath.user_settings}
className={cx('block px-4 py-2 text-sm text-gray-700 dark:text-gray-50', {
'bg-gray-100 dark:bg-slate-800': active,
})}
@@ -284,7 +284,8 @@ const ProfileMenu = ({
const AuthedHeader = ({
user, switchTheme, theme, onLanguageChange, rawStatus, status, t, language, logoutHandler,
}: {
- user: IUser
+ // user: IUser
+ user: any
switchTheme: (thm?: string) => void
theme: string
onLanguageChange: (lng: string) => void
@@ -301,7 +302,7 @@ const AuthedHeader = ({
<div className='w-full py-4 flex items-center justify-between border-b border-indigo-500 dark:border-gray-300 lg:border-none'>
<div className='flex items-center'>
{/* Logo */}
- <Link to={routes.main}>
+ <Link to={routesPath.main}>
<span className='sr-only'>Swetrix</span>
<img className='h-7' height='28' src='/assets/logo_white.png' alt='Swetrix' />
</Link>
@@ -309,7 +310,7 @@ const AuthedHeader = ({
<div className='hidden ml-10 space-x-1 lg:flex'>
{user?.planCode === 'trial' && (
<Link
- to={routes.billing}
+ to={routesPath.billing}
className={cx('flex justify-center items-center text-base select-none font-medium py-2 px-2 rounded-md', {
'text-amber-800 bg-amber-200 dark:bg-amber-300 hover:bg-amber-300 dark:hover:bg-amber-200': rawStatus === TRIAL_STATUS_MAPPING.ENDS_IN_X_DAYS,
'text-rose-800 bg-rose-200 dark:bg-rose-300 hover:bg-rose-300 dark:hover:bg-rose-200': rawStatus === TRIAL_STATUS_MAPPING.ENDS_TODAY || rawStatus === TRIAL_STATUS_MAPPING.ENDS_TOMORROW || rawStatus === TRIAL_STATUS_MAPPING.ENDED,
@@ -321,7 +322,7 @@ const AuthedHeader = ({
)}
{user?.planCode === 'none' && (
<Link
- to={routes.billing}
+ to={routesPath.billing}
className='flex justify-center items-center text-base select-none font-medium py-2 px-2 rounded-md text-rose-800 bg-rose-200 dark:bg-rose-300 hover:bg-rose-300 dark:hover:bg-rose-200'
key='NoSubscription'
>
@@ -336,7 +337,7 @@ const AuthedHeader = ({
<DocumentTextIcon className='w-5 h-5 mr-1' />
{t('common.docs')}
</a>
- <Link to={routes.dashboard} className='flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-2 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md'>
+ <Link to={routesPath.dashboard} className='flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-2 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md'>
<PresentationChartLineIcon className='w-5 h-5 mr-1' />
{t('common.dashboard')}
</Link>
@@ -384,7 +385,7 @@ const AuthedHeader = ({
<DocumentTextIcon className='w-5 h-5 mr-1' />
{t('common.docs')}
</a>
- <Link to={routes.dashboard} className='flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-2 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md'>
+ <Link to={routesPath.dashboard} className='flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-2 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md'>
<PresentationChartLineIcon className='w-5 h-5 mr-1' />
{t('common.dashboard')}
</Link>
@@ -407,7 +408,7 @@ const NotAuthedHeader = ({
<div className='w-full py-4 flex items-center justify-between border-b border-indigo-500 dark:border-gray-300 lg:border-none'>
<div className='flex items-center'>
{/* Logo */}
- <Link to={routes.main}>
+ <Link to={routesPath.main}>
<span className='sr-only'>Swetrix</span>
<img className='h-7' height='28' src='/assets/logo_white.png' alt='Swetrix' />
</Link>
@@ -419,14 +420,14 @@ const NotAuthedHeader = ({
</a>
{!isSelfhosted && (
<>
- <NavLink to={routes.features} className='flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-2 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md' activeClassName='bg-indigo-700 hover:bg-indigo-700 dark:bg-slate-800' key='Features'>
+ <NavLink to={routesPath.features} className={({ isActive }) => `flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-2 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md + ${isActive ? 'bg-indigo-700 hover:bg-indigo-700 dark:bg-slate-800' : ''}`} key='Features'>
<CircleStackIcon className='w-5 h-5 mr-1' />
{t('common.features')}
</NavLink>
- <HashLink to={`${routes.main}#pricing`} className='flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-2 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md' key='Pricing'>
+ <Link to={`${routesPath.main}#pricing`} className='flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-2 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md' key='Pricing'>
<CreditCardIcon className='w-5 h-5 mr-1' />
{t('common.pricing')}
- </HashLink>
+ </Link>
</>
)}
<a href={DOCS_URL} className='flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-2 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md' target='_blank' rel='noreferrer noopener'>
@@ -458,7 +459,7 @@ const NotAuthedHeader = ({
{languages[language]}
</>
)}
- labelExtractor={(lng) => (
+ labelExtractor={(lng: string) => (
<div className='flex'>
<div className='pt-1'>
<Flag className='rounded-sm mr-1.5' country={languageFlag[lng]} size={21} alt={languageFlag[lng]} />
@@ -468,11 +469,11 @@ const NotAuthedHeader = ({
)}
onSelect={onLanguageChange}
/>
- <Link to={routes.signin} className='inline-block select-none bg-indigo-500 dark:bg-slate-800 mt-1 sm:mt-0 py-2 px-3 md:px-4 border border-transparent rounded-md text-base font-medium text-white hover:bg-opacity-75 hover:dark:bg-slate-700'>
+ <Link to={routesPath.signin} className='inline-block select-none bg-indigo-500 dark:bg-slate-800 mt-1 sm:mt-0 py-2 px-3 md:px-4 border border-transparent rounded-md text-base font-medium text-white hover:bg-opacity-75 hover:dark:bg-slate-700'>
{t('auth.common.signin')}
</Link>
{!isSelfhosted && (
- <Link to={routes.signup} className='inline-block select-none bg-white dark:bg-slate-800 dark:text-gray-50 py-2 px-3 md:px-4 border border-transparent rounded-md text-base font-medium text-indigo-600 hover:bg-indigo-50 hover:dark:bg-slate-700' aria-label={t('titles.signup')}>
+ <Link to={routesPath.signup} className='inline-block select-none bg-white dark:bg-slate-800 dark:text-gray-50 py-2 px-3 md:px-4 border border-transparent rounded-md text-base font-medium text-indigo-600 hover:bg-indigo-50 hover:dark:bg-slate-700' aria-label={t('titles.signup')}>
{t('common.getStarted')}
</Link>
)}
@@ -501,11 +502,11 @@ const NotAuthedHeader = ({
<RssIcon className='w-5 h-5 mr-1' />
{t('footer.blog')}
</a>
- <HashLink to={`${routes.main}#pricing`} className='flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-1 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md' key='Pricing'>
+ <Link to={`${routesPath.main}#pricing`} className='flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-1 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md' key='Pricing'>
<CreditCardIcon className='w-5 h-5 mr-1' />
{t('common.pricing')}
- </HashLink>
- <NavLink to={routes.features} className='flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-1 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md' activeClassName='bg-indigo-700 hover:bg-indigo-700 dark:bg-slate-800' key='Features'>
+ </Link>
+ <NavLink to={routesPath.features} className={({ isActive }) => `flex justify-center items-center text-base select-none font-medium text-white hover:text-indigo-50 py-1 px-2 dark:hover:bg-gray-700 hover:bg-indigo-500 rounded-md ${isActive ? 'bg-indigo-700 hover:bg-indigo-700 dark:bg-slate-800' : ''}`} key='Features'>
<CircleStackIcon className='w-5 h-5 mr-1' />
{t('common.features')}
</NavLink>
@@ -526,7 +527,8 @@ const Header = ({
authenticated: boolean,
theme: string,
// themeType: string,
- user: IUser,
+ // user: IUser,
+ user: any,
}): JSX.Element => {
const { t, i18n: { language } }: {
t: (key: string, options?: {
@@ -534,8 +536,8 @@ const Header = ({
}) => string,
i18n: { language: string },
} = useTranslation('common')
- const dispatch = useAppDispatch()
- const _dispatch = useDispatch()
+ // const dispatch = useAppDispatch()
+ // const _dispatch = useDispatch()
// @ts-ignore
const buttonRef: MutableRefObject<HTMLButtonElement> = useRef<HTMLButtonElement>()
@@ -574,13 +576,13 @@ const Header = ({
}, [user, t])
const logoutHandler = () => {
- dispatch(authActions.logout())
- _dispatch(sagaActions.logout(false))
+ // dispatch(authActions.logout())
+ // _dispatch(sagaActions.logout(false))
}
const switchTheme = (_theme?: string) => {
const newTheme = (_includes(SUPPORTED_THEMES, _theme) && _theme) || (theme === 'dark' ? 'light' : 'dark')
- dispatch(UIActions.setTheme(newTheme as 'light' | 'dark'))
+ // dispatch(UIActions.setTheme(newTheme as 'light' | 'dark'))
}
const onLanguageChange = (id: string) => {
@@ -626,7 +628,7 @@ const Header = ({
<div className='rounded-lg shadow-lg ring-1 ring-black ring-opacity-5 bg-white dark:bg-gray-750 divide-y-2 divide-gray-50 dark:divide-gray-800'>
<div className='pt-5 pb-6 px-5'>
<div className='flex items-center justify-between'>
- <Link to={routes.main}>
+ <Link to={routesPath.main}>
<span className='sr-only'>Swetrix</span>
{theme === 'dark' ? (
<img className='h-7' height='28' src='/assets/logo_white.png' alt='Swetrix' />
@@ -655,7 +657,7 @@ const Header = ({
{languages[language]}
</>
)}
- labelExtractor={(lng) => (
+ labelExtractor={(lng: string) => (
<div className='flex'>
<div className='pt-1'>
<Flag className='rounded-sm mr-1.5' country={languageFlag[lng]} size={21} alt={languageFlag[lng]} />
@@ -669,7 +671,7 @@ const Header = ({
<>
{user?.planCode === 'trial' && (
<Link
- to={routes.billing}
+ to={routesPath.billing}
className={cx('flex justify-center items-center text-base select-none font-medium py-2 px-2 rounded-md', {
'text-amber-800 bg-amber-200 dark:bg-amber-300 hover:bg-amber-300 dark:hover:bg-amber-200': rawStatus === TRIAL_STATUS_MAPPING.ENDS_IN_X_DAYS,
'text-rose-800 bg-rose-200 dark:bg-rose-300 hover:bg-rose-300 dark:hover:bg-rose-200': rawStatus === TRIAL_STATUS_MAPPING.ENDS_TODAY || rawStatus === TRIAL_STATUS_MAPPING.ENDS_TOMORROW || rawStatus === TRIAL_STATUS_MAPPING.ENDED,
@@ -681,7 +683,7 @@ const Header = ({
)}
{user?.planCode === 'none' && (
<Link
- to={routes.billing}
+ to={routesPath.billing}
className='flex justify-center items-center text-base select-none font-medium py-2 px-2 rounded-md text-rose-800 bg-rose-200 dark:bg-rose-300 hover:bg-rose-300 dark:hover:bg-rose-200'
key='NoSubscription'
>
@@ -691,7 +693,7 @@ const Header = ({
{/* Temporarily put it here until the header is fully redesigned */}
{!isSelfhosted && user?.planCode !== 'none' && user?.planCode !== 'trial' && (
<Link
- to={routes.billing}
+ to={routesPath.billing}
className='w-full flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white bg-indigo-600 hover:bg-indigo-700 dark:text-gray-50 dark:bg-slate-800 dark:hover:bg-slate-700'
key='Billing'
>
@@ -699,7 +701,7 @@ const Header = ({
</Link>
)}
<div onClick={() => buttonRef.current?.click()}>
- <Link to={routes.user_settings} className='w-full flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white bg-indigo-600 hover:bg-indigo-700 dark:text-gray-50 dark:bg-slate-800 dark:hover:bg-slate-700'>
+ <Link to={routesPath.user_settings} className='w-full flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white bg-indigo-600 hover:bg-indigo-700 dark:text-gray-50 dark:bg-slate-800 dark:hover:bg-slate-700'>
{t('common.accountSettings')}
</Link>
</div>
@@ -712,12 +714,12 @@ const Header = ({
) : (
<>
<div onClick={() => buttonRef.current?.click()}>
- <Link to={routes.signin} className='w-full flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-indigo-600 bg-gray-50 hover:bg-indigo-50'>
+ <Link to={routesPath.signin} className='w-full flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-indigo-600 bg-gray-50 hover:bg-indigo-50'>
{t('auth.common.signin')}
</Link>
</div>
<div onClick={() => buttonRef.current?.click()}>
- <Link to={routes.signup} className='w-full flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white bg-indigo-600 hover:bg-indigo-700' aria-label={t('titles.signup')}>
+ <Link to={routesPath.signup} className='w-full flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white bg-indigo-600 hover:bg-indigo-700' aria-label={t('titles.signup')}>
{t('common.getStarted')}
</Link>
</div>
diff --git a/app/root.tsx b/app/root.tsx
index 9cfeeffb8..a6bcd8fc8 100644
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -9,6 +9,7 @@ import {
} from '@remix-run/react'
import tailwindCss from './css/tailwind.css'
import Footer from './components/Footer'
+import Header from './components/Header'
export const links: LinksFunction = () => [
{ rel: 'stylesheet', href: tailwindCss },
@@ -24,6 +25,7 @@ export default function App() {
<Links />
</head>
<body>
+ <Header />
<Outlet />
<ScrollRestoration />
<Scripts />
diff --git a/app/links/index.ts b/app/routesPath/index.ts
similarity index 100%
rename from app/links/index.ts
rename to app/routesPath/index.ts