📈 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
christmas is over😈
Blue Mouse0fd9c9a1d720
diff --git a/src/App.js b/src/App.jsindex 7e85c974b..c19090341 100644--- a/src/App.js+++ b/src/App.js@@ -4,7 +4,7 @@ import React, {import { Switch, Route, useLocation } from 'react-router-dom'import { useDispatch, useSelector } from 'react-redux'import { useAlert } from '@blaumaus/react-alert'-import Snowfall from 'react-snowfall'+// import Snowfall from 'react-snowfall'import cx from 'clsx'import _some from 'lodash/some'import _includes from 'lodash/includes'@@ -17,7 +17,9 @@ import Loader from 'ui/Loader'import ScrollToTop from 'hoc/ScrollToTop'import Selfhosted from 'hoc/Selfhosted'-import { isSelfhosted, THEME_TYPE } from 'redux/constants'+import {+ isSelfhosted, // THEME_TYPE,+} from 'redux/constants'import { getAccessToken } from 'utils/accessToken'import { authActions } from 'redux/actions/auth'import { errorsActions } from 'redux/actions/errors'@@ -162,12 +164,12 @@ const App = () => {// eslint-disable-next-line react/jsx-no-useless-fragment<Suspense fallback={<></>}><Header authenticated={authenticated} theme={theme} themeType={themeType} />- {location.pathname === routes.main && (+ {/* {location.pathname === routes.main && (<Snowfall />- )}- {location.pathname !== routes.main && themeType === THEME_TYPE.christmas && (+ )} */}+ {/* {location.pathname !== routes.main && themeType === THEME_TYPE.christmas && (<Snowfall snowflakeCount={10} />- )}+ )} */}<ScrollToTop><Selfhosted><Suspense fallback={<Fallback theme={theme} isMinimalFooter={isMinimalFooter} />}>diff --git a/src/pages/UserSettings/UserSettings.container.jsx b/src/pages/UserSettings/UserSettings.container.jsxindex 7d6a2eca3..c69e6b5a7 100644--- a/src/pages/UserSettings/UserSettings.container.jsx+++ b/src/pages/UserSettings/UserSettings.container.jsx@@ -13,7 +13,7 @@ const mapStateToProps = (state) => {user: state.auth.user,dontRemember: state.auth.dontRemember,isPaidTierUsed: state.auth.isPaidTierUsed,- themeType: state.ui.theme.type,+ // themeType: state.ui.theme.type,}}@@ -89,9 +89,9 @@ const mapDispatchToProps = (dispatch) => ({setAPIKey: (apiKey) => {dispatch(authActions.setApiKey(apiKey))},- setThemeType: (theme) => {- dispatch(UIActions.setThemeType(theme))- },+ // setThemeType: (theme) => {+ // dispatch(UIActions.setThemeType(theme))+ // },})export default connect(mapStateToProps, mapDispatchToProps)(UserSettings)diff --git a/src/pages/UserSettings/UserSettings.jsx b/src/pages/UserSettings/UserSettings.jsxindex 1a1d9bf83..bbcb00dbf 100644--- a/src/pages/UserSettings/UserSettings.jsx+++ b/src/pages/UserSettings/UserSettings.jsx@@ -19,7 +19,7 @@ import utc from 'dayjs/plugin/utc'import {reportFrequencies, DEFAULT_TIMEZONE, WEEKLY_REPORT_FREQUENCY, CONFIRMATION_TIMEOUT,- GDPR_REQUEST, GDPR_EXPORT_TIMEFRAME, THEME_TYPE, TimeFormat,+ GDPR_REQUEST, GDPR_EXPORT_TIMEFRAME, TimeFormat,} from 'redux/constants'import Title from 'components/Title'import { withAuthentication, auth } from 'hoc/protected'@@ -28,7 +28,6 @@ import Button from 'ui/Button'import Modal from 'ui/Modal'import Beta from 'ui/Beta'import Select from 'ui/Select'-import { ActivePin } from 'ui/Pin'import PaidFeature from 'modals/PaidFeature'import TimezonePicker from 'ui/TimezonePicker'import { isValidEmail, isValidPassword, MIN_PASSWORD_CHARS } from 'utils/validator'@@ -36,7 +35,7 @@ import routes from 'routes'import { trackCustom } from 'utils/analytics'import { getCookie, setCookie } from 'utils/cookie'import {- confirmEmail, exportUserData, generateApiKey, deleteApiKey, setTheme,+ confirmEmail, exportUserData, generateApiKey, deleteApiKey, // setTheme,} from 'api'import ProjectList from './components/ProjectList'import TwoFA from './components/TwoFA'@@ -51,7 +50,7 @@ const UserSettings = ({onDelete, onDeleteProjectCache, removeProject, removeShareProject, setUserShareData,setProjectsShareData, userSharedUpdate, sharedProjectError, updateUserData, login,genericError, onGDPRExportFailed, updateProfileFailed, updateUserProfileAsync,- accountUpdated, setAPIKey, user, dontRemember, isPaidTierUsed, setThemeType, themeType,+ accountUpdated, setAPIKey, user, dontRemember, isPaidTierUsed, // setThemeType, themeType,}) => {const history = useHistory()const { t, i18n: { language } } = useTranslation('common')@@ -274,14 +273,14 @@ const UserSettings = ({}}- const setAsyncThemeType = async (theme) => {- try {- await setTheme(theme)- setThemeType(theme)- } catch (e) {- updateProfileFailed(e)- }- }+ // const setAsyncThemeType = async (theme) => {+ // try {+ // await setTheme(theme)+ // setThemeType(theme)+ // } catch (e) {+ // updateProfileFailed(e)+ // }+ // }const setAsyncTimeFormat = async () => {setBeenSubmitted(true)@@ -342,12 +341,10 @@ const UserSettings = ({<Button className='mt-4' type='submit' primary large>{t('profileSettings.update')}</Button>- <hr className='mt-5 border-gray-200 dark:border-gray-600' />+ {/* Theme type switch */}+ {/* <hr className='mt-5 border-gray-200 dark:border-gray-600' /><h3 className='flex items-center mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>{t('profileSettings.theme')}- <div className='ml-3'>- <ActivePin label={t('common.new')} />- </div></h3><div className='grid grid-cols-1 gap-y-6 gap-x-4 lg:grid-cols-2 mt-2 mb-4'><div>@@ -359,7 +356,8 @@ const UserSettings = ({onSelect={(f) => setAsyncThemeType(f)}/></div>- </div>+ </div> */}+ {/* Timezone selector */}<hr className='mt-5 border-gray-200 dark:border-gray-600' /><h3 className='mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>{t('profileSettings.timezone')}@@ -372,6 +370,7 @@ const UserSettings = ({<Button className='mt-4' onClick={handleTimezoneSave} primary large>{t('common.save')}</Button>+ {/* Timeformat selector (12 / 24 hour format) */}<hr className='mt-5 border-gray-200 dark:border-gray-600' /><h3 className='mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>{t('profileSettings.timeFormat')}@@ -390,6 +389,7 @@ const UserSettings = ({<Button className='mt-4' onClick={setAsyncTimeFormat} primary large>{t('common.save')}</Button>+ {/* Email reports frequency selector (e.g. monthly, weekly, etc.) */}<hr className='mt-5 border-gray-200 dark:border-gray-600' /><h3 className='mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>{t('profileSettings.email')}@@ -413,6 +413,7 @@ const UserSettings = ({</Button><hr className='mt-5 border-gray-200 dark:border-gray-600' />+ {/* Integrations setup */}<h3 id='integrations' className='flex items-center mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>{t('profileSettings.integrations')}<div className='ml-5'>@@ -425,9 +426,9 @@ const UserSettings = ({handleIntegrationSave={handleIntegrationSave}genericError={genericError}/>-<hr className='mt-5 border-gray-200 dark:border-gray-600' />+ {/* API access setup */}<h3 className='flex items-center mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>{t('profileSettings.apiKey')}<div className='ml-5'>@@ -487,6 +488,8 @@ const UserSettings = ({{t('profileSettings.addApiKeyBtn')}</Button>)}++ {/* 2FA setting */}<hr className='mt-5 border-gray-200 dark:border-gray-600' /><h3 className='flex items-center mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>{t('profileSettings.2fa')}@@ -499,6 +502,7 @@ const UserSettings = ({genericError={genericError}/>+ {/* Shared projects setting */}<hr className='mt-5 border-gray-200 dark:border-gray-600' /><h3 className='flex items-center mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>{t('profileSettings.shared')}diff --git a/src/redux/reducers/ui/theme.js b/src/redux/reducers/ui/theme.jsindex 92f43990d..738b2b119 100644--- a/src/redux/reducers/ui/theme.js+++ b/src/redux/reducers/ui/theme.js@@ -38,7 +38,7 @@ const getInitialTheme = () => {const getInitialState = () => {return {theme: getInitialTheme(),- type: THEME_TYPE.christmas,+ type: THEME_TYPE.classic,}}diff --git a/src/redux/sagas/auth/workers/logout.js b/src/redux/sagas/auth/workers/logout.jsindex ec671a523..60cd16f5d 100644--- a/src/redux/sagas/auth/workers/logout.js+++ b/src/redux/sagas/auth/workers/logout.js@@ -14,7 +14,7 @@ export default function* logoutWorker({ payload: { basedOn401Error } = {} }) {yield put(UIActions.setGeneralStats(stats))}- yield put(UIActions.setThemeType(THEME_TYPE.christmas))+ yield put(UIActions.setThemeType(THEME_TYPE.classic))} catch (e) {debug('Error while getting general stats data: %s', e)}