📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
remove language & theme selector from header, add it to footer & viewproject component
Blue Mouse4c2f8b078dc9
diff --git a/web/app/components/Footer/index.tsx b/web/app/components/Footer/index.tsxindex a7af61054..3ea712d2b 100644--- a/web/app/components/Footer/index.tsx+++ b/web/app/components/Footer/index.tsx@@ -1,3 +1,4 @@+import { MoonIcon, SunIcon } from '@heroicons/react/24/solid'import { SiDiscord, SiGithub, SiX } from '@icons-pack/react-simple-icons'import _map from 'lodash/map'import { SquareArrowOutUpRightIcon } from 'lucide-react'@@ -5,6 +6,7 @@ import React, { memo } from 'react'import { Trans, useTranslation } from 'react-i18next'import { Link } from 'react-router'+import { changeLanguage } from '~/i18n'import {isSelfhosted,DONATE_URL,@@ -19,11 +21,17 @@ import {SWETRIX_VS_SIMPLE_ANALYTICS,DISCORD_URL,CAPTCHA_URL,+ whitelist,+ languages,+ languageFlag,} from '~/lib/constants'import { useAuth } from '~/providers/AuthProvider'+import { useTheme } from '~/providers/ThemeProvider'+import Dropdown from '~/ui/Dropdown'import Flag from '~/ui/Flag'import LinkedIn from '~/ui/icons/LinkedIn'import SwetrixLogo from '~/ui/icons/SwetrixLogo'+import { cn } from '~/utils/generic'import routesPath from '~/utils/routes'const CONTACT_US_URL = `https://swetrix.com${routesPath.contact}`@@ -115,6 +123,85 @@ const navigation = {],}+const LanguageSelector = () => {+ const {+ i18n: { language },+ } = useTranslation('common')++ return (+ <Dropdown+ position='up'+ items={whitelist}+ buttonClassName='!py-2 !px-3 inline-flex items-center rounded-md bg-gray-700 hover:bg-gray-600 [&>svg]:w-4 [&>svg]:h-4 [&>svg]:mr-0 [&>svg]:ml-1 font-medium !text-sm text-gray-300 hover:text-white border border-gray-600'+ title={+ <span className='inline-flex items-center'>+ <Flag className='mr-2 rounded-xs' country={languageFlag[language]} size={16} alt={languages[language]} />+ {languages[language]}+ </span>+ }+ labelExtractor={(lng: string) => (+ <div className='flex items-center'>+ <Flag className='mr-2 rounded-xs' country={languageFlag[lng]} size={16} alt={languageFlag[lng]} />+ {languages[lng]}+ </div>+ )}+ onSelect={(lng: string) => {+ changeLanguage(lng)+ }}+ headless+ menuItemsClassName='left-1/2 -translate-x-1/2 origin-bottom'+ className='w-full sm:w-auto'+ />+ )+}++const ThemeSelector = () => {+ const { theme, setTheme } = useTheme()+ const { t } = useTranslation('common')++ return (+ <Dropdown+ position='up'+ title={+ <span className='flex items-center'>+ {theme === 'dark' ? (+ <MoonIcon className='mr-2 h-4 w-4 text-gray-300' aria-hidden='true' />+ ) : (+ <SunIcon className='mr-2 h-4 w-4 text-gray-300' aria-hidden='true' />+ )}+ {theme === 'dark' ? t('header.dark') : t('header.light')}+ </span>+ }+ items={[+ { key: 'light', label: t('header.light'), icon: SunIcon },+ { key: 'dark', label: t('header.dark'), icon: MoonIcon },+ ]}+ keyExtractor={(item) => item.key}+ labelExtractor={(item) => (+ <div+ className={cn('flex w-full items-center', {+ 'light:text-indigo-600': item.key === 'light',+ 'dark:text-indigo-400': item.key === 'dark',+ })}+ >+ <item.icon+ className={cn('mr-2 h-5 w-5', {+ 'dark:text-gray-300': item.key === 'light',+ 'light:text-gray-400': item.key === 'dark',+ })}+ aria-hidden='true'+ />+ {item.label}+ </div>+ )}+ onSelect={(item) => setTheme(item.key as 'light' | 'dark')}+ className='w-full sm:w-auto'+ headless+ buttonClassName='!py-2 !px-3 inline-flex items-center rounded-md bg-gray-700 hover:bg-gray-600 [&>svg]:w-4 [&>svg]:h-4 [&>svg]:mr-0 [&>svg]:ml-1 font-medium !text-sm text-gray-300 hover:text-white border border-gray-600'+ />+ )+}+const SelfHostedFooter = () => {const { t } = useTranslation('common')@@ -165,6 +252,12 @@ const SelfHostedFooter = () => {</a></div></nav>+ <div className='mt-8 border-t border-gray-200 pt-6 dark:border-slate-800/50'>+ <div className='flex flex-col justify-center space-y-3 sm:flex-row sm:space-y-0 sm:space-x-4'>+ <LanguageSelector />+ <ThemeSelector />+ </div>+ </div></div></footer>)@@ -216,18 +309,24 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {</a>))}</div>- <p className='pt-10 text-base text-gray-300'>- © {year} {t('footer.copy')}- </p>- <a- href='https://u24.gov.ua/'- target='_blank'- rel='noreferrer noopener'- className='block max-w-max items-center border-b-2 border-transparent text-base text-gray-300 hover:border-gray-300'- >- {t('main.ukrSupport')}- <SquareArrowOutUpRightIcon className='mb-1 ml-1 inline size-4' strokeWidth={1.5} />- </a>+ <div className='flex flex-col space-y-4 pt-10'>+ <div className='flex flex-col space-y-3 sm:flex-row sm:space-y-0 sm:space-x-4'>+ <LanguageSelector />+ <ThemeSelector />+ </div>+ <p className='text-base text-gray-300'>+ © {year} {t('footer.copy')}+ </p>+ <a+ href='https://u24.gov.ua/'+ target='_blank'+ rel='noreferrer noopener'+ className='block max-w-max items-center border-b-2 border-transparent text-base text-gray-300 hover:border-gray-300'+ >+ {t('main.ukrSupport')}+ <SquareArrowOutUpRightIcon className='mb-1 ml-1 inline size-4' strokeWidth={1.5} />+ </a>+ </div></div><div className='mt-12 xl:mt-0'><div className='grid grid-cols-2 gap-8 md:grid-cols-3'>diff --git a/web/app/components/Header/index.tsx b/web/app/components/Header/index.tsxindex ec6978805..ac997638b 100644--- a/web/app/components/Header/index.tsx+++ b/web/app/components/Header/index.tsx@@ -22,7 +22,6 @@ import dayjs from 'dayjs'import duration from 'dayjs/plugin/duration'import utc from 'dayjs/plugin/utc'import { type t as i18nextT } from 'i18next'-import { changeLanguage as changeLanguageI18n } from 'i18next'import _map from 'lodash/map'import _startsWith from 'lodash/startsWith'import { GaugeIcon, ChartPieIcon, BugIcon, PuzzleIcon, PhoneIcon } from 'lucide-react'@@ -30,6 +29,7 @@ import { memo, Fragment, useMemo, useState } from 'react'import { useTranslation } from 'react-i18next'import { Link } from 'react-router'+import { changeLanguage } from '~/i18n'import {whitelist,languages,@@ -41,10 +41,8 @@ import {} from '~/lib/constants'import { useAuth } from '~/providers/AuthProvider'import { useTheme } from '~/providers/ThemeProvider'-import Dropdown from '~/ui/Dropdown'import Flag from '~/ui/Flag'import SwetrixLogo from '~/ui/icons/SwetrixLogo'-import { trackCustom } from '~/utils/analytics'import routes from '~/utils/routes'dayjs.extend(utc)@@ -86,11 +84,6 @@ const getSolutions = (t: typeof i18nextT) => [},]-const changeLanguage = (language: string) => {- changeLanguageI18n(language)- trackCustom('CHANGE_LANGUAGE', { language })-}-const getCallsToAction = (t: typeof i18nextT) => [{ name: t('header.watchDemo'), link: 'https://www.youtube.com/watch?v=XBp38fZREIE', icon: SiYoutube },{ name: t('header.contactSales'), link: routes.contact, icon: PhoneIcon },@@ -206,54 +199,6 @@ const SolutionsMenu = () => {)}-const ThemeMenu = ({ className }: { className?: string }) => {- const { theme, setTheme } = useTheme()- const { t } = useTranslation('common')-- return (- <Dropdown- title={- <span className='flex items-center justify-center'>- <span className='sr-only'>{t('header.switchTheme')}</span>- {theme === 'dark' ? (- <SunIcon className='h-6 w-6 cursor-pointer text-gray-200 hover:text-gray-300' aria-hidden='true' />- ) : (- <MoonIcon className='h-6 w-6 cursor-pointer text-slate-700 hover:text-slate-600' aria-hidden='true' />- )}- </span>- }- items={[- { key: 'light', label: t('header.light'), icon: SunIcon },- { key: 'dark', label: t('header.dark'), icon: MoonIcon },- ]}- keyExtractor={(item) => item.key}- labelExtractor={(item) => (- <div- className={cx('flex w-full items-center', {- 'light:text-indigo-600': item.key === 'light',- 'dark:text-indigo-400': item.key === 'dark',- })}- >- <item.icon- className={cx('mr-2 h-5 w-5', {- 'dark:text-gray-300': item.key === 'light',- 'light:text-gray-400': item.key === 'dark',- })}- aria-hidden='true'- />- {item.label}- </div>- )}- onSelect={(item) => setTheme(item.key as 'light' | 'dark')}- className={cx('flex', className)}- chevron={null}- headless- buttonClassName='p-0 md:p-0'- selectItemClassName='font-semibold'- />- )-}-const ProfileMenu = ({ logoutHandler }: { logoutHandler: () => void }) => {const { user } = useAuth()const {@@ -449,7 +394,6 @@ const AuthedHeader = ({openMenu: () => void}) => {const { user } = useAuth()- const { theme, setTheme } = useTheme()const { t } = useTranslation('common')return (@@ -527,26 +471,9 @@ const AuthedHeader = ({</div></div><div className='ml-1 hidden flex-wrap items-center justify-center space-y-1 space-x-2 sm:space-y-0 lg:ml-10 lg:flex lg:space-x-4'>- <ThemeMenu className='ml-3' /><ProfileMenu logoutHandler={logoutHandler} /></div><div className='flex items-center justify-center space-x-3 lg:hidden'>- {/* Theme switch */}- {theme === 'dark' ? (- <div className='rotate-180 transition-all duration-1000 ease-in-out'>- <SunIcon- onClick={() => setTheme('light')}- className='h-8 w-8 cursor-pointer text-gray-200 hover:text-gray-300'- />- </div>- ) : (- <div className='transition-all duration-1000 ease-in-out'>- <MoonIcon- onClick={() => setTheme('dark')}- className='h-8 w-8 cursor-pointer text-slate-700 hover:text-slate-600'- />- </div>- )}<buttontype='button'onClick={openMenu}@@ -571,11 +498,7 @@ const NotAuthedHeader = ({refPage?: booleanopenMenu: () => void}) => {- const { theme, setTheme } = useTheme()- const {- t,- i18n: { language },- } = useTranslation('common')+ const { t } = useTranslation('common')return (<header@@ -637,37 +560,8 @@ const NotAuthedHeader = ({) : null}</div><div className='ml-1 hidden flex-wrap items-center justify-center space-y-1 space-x-2 sm:space-y-0 lg:ml-10 lg:flex lg:space-x-4'>- {/* Language selector */}- <Dropdown- items={whitelist}- buttonClassName='!py-0 !px-2 inline-flex items-center [&>svg]:w-4 [&>svg]:h-4 [&>svg]:mr-0 [&>svg]:ml-1 font-semibold leading-6 !text-base text-slate-800 hover:text-slate-700 dark:text-slate-200 dark:hover:text-white'- title={- <span className='inline-flex items-center'>- <Flag- className='mr-1.5 rounded-xs'- country={languageFlag[language]}- size={18}- alt={languages[language]}- />- </span>- }- labelExtractor={(lng: string) => (- <div className='flex'>- <div className='pt-1'>- <Flag className='mr-1.5 rounded-xs' country={languageFlag[lng]} size={21} alt={languageFlag[lng]} />- </div>- {languages[lng]}- </div>- )}- onSelect={(lng: string) => {- changeLanguage(lng)- }}- headless- />- <ThemeMenu />{!refPage ? (<>- <Separator /><Linkto={routes.signin}className='flex items-center text-base leading-6 font-semibold text-slate-800 hover:text-slate-700 dark:text-slate-200 dark:hover:text-white'@@ -686,22 +580,6 @@ const NotAuthedHeader = ({) : null}</div><div className='flex items-center justify-center space-x-3 lg:hidden'>- {/* Theme switch */}- {theme === 'dark' ? (- <div className='rotate-180 transition-all duration-1000 ease-in-out'>- <SunIcon- onClick={() => setTheme('light')}- className='h-8 w-8 cursor-pointer text-gray-200 hover:text-gray-300'- />- </div>- ) : (- <div className='transition-all duration-1000 ease-in-out'>- <MoonIcon- onClick={() => setTheme('dark')}- className='h-8 w-8 cursor-pointer text-slate-700 hover:text-slate-600'- />- </div>- )}<buttontype='button'onClick={openMenu}@@ -723,10 +601,7 @@ interface HeaderProps {}const Header = ({ refPage, transparent }: HeaderProps) => {- const {- t,- i18n: { language },- } = useTranslation('common')+ const { t } = useTranslation('common')const { isAuthenticated, user, logout } = useAuth()const [mobileMenuOpen, setMobileMenuOpen] = useState(false)const { theme, setTheme } = useTheme()@@ -827,68 +702,6 @@ const Header = ({ refPage, transparent }: HeaderProps) => {<div className='mt-6 flow-root'><div className='-my-6 divide-y divide-gray-500/10'><div className='space-y-2 py-6'>- {/* Language selector */}- <Menu as='div' className='-mx-3'>- {({ open }) => (- <>- <MenuButton className='flex w-full items-center justify-between rounded-lg py-2 pr-3.5 pl-3 text-base leading-7 font-semibold text-gray-900 hover:bg-gray-300/50 dark:text-gray-50 dark:hover:bg-slate-700/80'>- <div className='flex'>- <Flag- className='mr-1.5 rounded-xs'- country={languageFlag[language]}- size={20}- alt=''- aria-hidden='true'- />- {languages[language]}- </div>- <ChevronDownIcon- className={cx(open ? 'rotate-180' : '', 'h-5 w-5 flex-none')}- aria-hidden='true'- />- </MenuButton>-- <Transition- show={open}- as={Fragment}- enter='transition ease-out duration-100'- enterFrom='transform opacity-0 scale-95'- enterTo='transform opacity-100 scale-100'- leave='transition ease-in duration-75'- leaveFrom='transform opacity-100 scale-100'- leaveTo='transform opacity-0 scale-95'- >- <MenuItems- className='absolute right-0 z-50 w-full min-w-max origin-top-right rounded-md bg-white p-1 ring-1 ring-slate-200 focus:outline-hidden dark:bg-slate-800 dark:ring-slate-800'- static- >- {_map(whitelist, (lng) => (- <MenuItem key={lng}>- <span- className='block cursor-pointer rounded-md p-2 text-sm text-gray-700 hover:bg-gray-200 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-gray-600'- role='menuitem'- tabIndex={0}- onClick={() => changeLanguage(lng)}- >- <div className='flex'>- <div className='pt-1'>- <Flag- className='mr-1.5 rounded-xs'- country={languageFlag[lng]}- size={20}- alt={languageFlag[lng]}- />- </div>- {languages[lng]}- </div>- </span>- </MenuItem>- ))}- </MenuItems>- </Transition>- </>- )}- </Menu>{!isSelfhosted ? (<Disclosure as='div' className='-mx-3'>{({ open }) => (diff --git a/web/app/i18n.ts b/web/app/i18n.tsindex c2c885347..ae3c7849f 100644--- a/web/app/i18n.ts+++ b/web/app/i18n.ts@@ -1,7 +1,8 @@-import { InitOptions } from 'i18next'+import { InitOptions, changeLanguage as changeLanguageI18n } from 'i18next'import _includes from 'lodash/includes'import { defaultLanguage, I18N_CACHE_BREAKER, whitelist } from '~/lib/constants'+import { trackCustom } from '~/utils/analytics'const genericConfig: InitOptions = {supportedLngs: whitelist,@@ -41,4 +42,9 @@ export function detectLanguage(request: Request): string {return defaultLanguage}+export const changeLanguage = (language: string) => {+ changeLanguageI18n(language)+ trackCustom('CHANGE_LANGUAGE', { language })+}+export default genericConfigdiff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 6902d592d..31aaa7d5c 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -1,4 +1,5 @@import { MagnifyingGlassIcon, ChevronLeftIcon, GlobeAltIcon } from '@heroicons/react/24/outline'+import { MoonIcon, SunIcon } from '@heroicons/react/24/solid'import SwetrixSDK from '@swetrix/sdk'import billboard, { Chart } from 'billboard.js'import cx from 'clsx'@@ -68,6 +69,7 @@ import EventsRunningOutBanner from '~/components/EventsRunningOutBanner'import Footer from '~/components/Footer'import Header from '~/components/Header'import useSize from '~/hooks/useSize'+import { changeLanguage } from '~/i18n'import {tbPeriodPairs,DEFAULT_TIMEZONE,@@ -98,6 +100,9 @@ import {type TimeBucket,VALID_PERIODS,VALID_TIME_BUCKETS,+ whitelist,+ languages,+ languageFlag,} from '~/lib/constants'import { CountryEntry, Entry } from '~/lib/models/Entry'import {@@ -116,6 +121,7 @@ import { useAuth } from '~/providers/AuthProvider'import { useTheme } from '~/providers/ThemeProvider'import Checkbox from '~/ui/Checkbox'import Dropdown from '~/ui/Dropdown'+import Flag from '~/ui/Flag'import FlatPicker from '~/ui/Flatpicker'import Loader from '~/ui/Loader'import LoadingBar from '~/ui/LoadingBar'@@ -237,7 +243,7 @@ const ViewProject = () => {useCurrentProject()const projectPassword = useProjectPassword(id)- const { theme } = useTheme()+ const { theme, setTheme } = useTheme()const { isAuthenticated, user, isLoading: authLoading } = useAuth()@@ -4353,6 +4359,93 @@ const ViewProject = () => {) : null}</div>) : null}++ {isEmbedded ? null : (+ <div+ className={cx('mt-4 flex w-full items-center justify-between', {+ hidden: analyticsLoading || dataLoading,+ })}+ >+ <Dropdown+ items={whitelist}+ buttonClassName='!py-2 !px-3 inline-flex items-center [&>svg]:w-4 [&>svg]:h-4 [&>svg]:mr-0 [&>svg]:ml-1 font-medium !text-sm text-slate-900 dark:text-gray-50'+ title={+ <span className='inline-flex items-center'>+ <Flag+ className='mr-2 rounded-xs'+ country={languageFlag[language]}+ size={16}+ alt={languages[language]}+ />+ {languages[language]}+ </span>+ }+ labelExtractor={(lng: string) => (+ <div className='flex items-center'>+ <Flag+ className='mr-2 rounded-xs'+ country={languageFlag[lng]}+ size={16}+ alt={languageFlag[lng]}+ />+ {languages[lng]}+ </div>+ )}+ onSelect={(lng: string) => {+ changeLanguage(lng)+ }}+ headless+ menuItemsClassName='left-1/2 -translate-x-1/2 origin-bottom'+ />+ <Dropdown+ title={+ <span className='flex items-center justify-center'>+ <span className='sr-only'>{t('header.switchTheme')}</span>+ {theme === 'dark' ? (+ <SunIcon+ className='h-6 w-6 cursor-pointer text-gray-200 hover:text-gray-300'+ aria-hidden='true'+ />+ ) : (+ <MoonIcon+ className='h-6 w-6 cursor-pointer text-slate-700 hover:text-slate-600'+ aria-hidden='true'+ />+ )}+ </span>+ }+ items={[+ { key: 'light', label: t('header.light'), icon: SunIcon },+ { key: 'dark', label: t('header.dark'), icon: MoonIcon },+ ]}+ keyExtractor={(item) => item.key}+ labelExtractor={(item) => (+ <div+ className={cx('flex w-full items-center', {+ 'light:text-indigo-600': item.key === 'light',+ 'dark:text-indigo-400': item.key === 'dark',+ })}+ >+ <item.icon+ className={cx('mr-2 h-5 w-5', {+ 'dark:text-gray-300': item.key === 'light',+ 'light:text-gray-400': item.key === 'dark',+ })}+ aria-hidden='true'+ />+ {item.label}+ </div>+ )}+ onSelect={(item) => setTheme(item.key as 'light' | 'dark')}+ className='flex'+ chevron={null}+ headless+ buttonClassName='p-0 md:p-0'+ menuItemsClassName='top-5'+ selectItemClassName='font-semibold'+ />+ </div>+ )}</div></div><ViewProjectHotkeys isOpened={isHotkeysHelpOpened} onClose={() => setIsHotkeysHelpOpened(false)} />