📈 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
resolve conflicts
kruzhambus2f6de2d6ba0a
diff --cc src/components/Header/index.jsxindex 879286bcf,0af5710ad..7acc79633--- a/src/components/Header/index.jsx+++ b/src/components/Header/index.jsx@@@ -65,11 -67,12 +67,12 @@@ const Header = ({ authenticated, theme<Link to={routes.main}><span className='sr-only'>Swetrix</span>{themeType === THEME_TYPE.christmas ? (- <img className='h-10' src='/assets/logo_white_christmas.png' alt='' />+ <img className='h-10' src='/assets/logo_white_christmas.png' alt='Swetrix' />) : (- <img className='h-10' src='/assets/logo_white.svg' alt='' />+ <img className='h-10' src='/assets/logo_white.svg' alt='Swetrix' />)}</Link>+<div className='hidden ml-10 space-x-1 lg:flex'><a href={BLOG_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'><RssIcon className='w-5 h-5 mr-1' />diff --cc src/redux/actions/auth/index.jsindex 58bf19821,c8739200a..6c9f40b2e--- a/src/redux/actions/auth/index.js+++ b/src/redux/actions/auth/index.js@@@ -32,9 -31,8 +32,9 @@@ export const authActions =}},- logout() {+ logout(basedOn401Error) {removeAccessToken()+ removeRefreshToken()removeItem(LS_VIEW_PREFS_SETTING)return {diff --cc src/redux/constants/index.jsindex 69dbbd7a7,ed309c86a..6f20b310f--- a/src/redux/constants/index.js+++ b/src/redux/constants/index.js@@@ -138,10 -151,9 +151,10 @@@ export const GDPR_REQUEST = 'gdpr_requeexport const CONFIRMATION_TIMEOUT = 'confirmation_timeout'export const LOW_EVENTS_WARNING = 'low_events_warning'export const TOKEN = 'access_token'+export const REFRESH_TOKEN = 'refresh_token'// List of languages with translations available- export const whitelist = ['en', 'uk', 'de', 'sv', 'el', 'ru', 'hi', 'zh']+ export const whitelist = ['en', 'uk', 'pl', 'de', 'sv', 'el', 'ru', 'hi', 'zh']export const defaultLanguage = 'en'export const languages = {en: 'English',