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!

Merge branch 'main' into feature/secure-website

Maksim Mrug4068326ff38f
diff --cc src/App.tsx
index 78137c366,8ce2a246f..67e79c937
--- a/src/App.tsx
+++ b/src/App.tsx
@@@ -62,7 -62,7 +62,8 @@@ const MediaAndPress = lazy(() => import
const TransferProjectConfirm = lazy(() => import('pages/Project/Settings/TransferProject/TransferProjectConfirm'))
const TransferProjectReject = lazy(() => import('pages/Project/Settings/TransferProject/TransferProjectReject'))
const Socialised = lazy(() => import('pages/Auth/Socialised'))
+const ProjectProtectedPassword = lazy(() => import('pages/Project/ProjectProtectedPassword'))
+ const OpenStartup = lazy(() => import('pages/OpenStartup'))
const minimalFooterPages = [
'/projects', '/dashboard', '/settings', '/contact',
@@@ -243,7 -243,7 +244,8 @@@ const App = () =>
<Route path={routes.transfer_confirm} component={TransferProjectConfirm} exact />
<Route path={routes.transfer_reject} component={TransferProjectReject} exact />
<Route path={routes.socialised} component={Socialised} exact />
+ <Route path={routes.project_protected_password} component={ProjectProtectedPassword} exact />
+ <Route path={routes.open} component={OpenStartup} exact />
<Route path='*' component={NotFound} />
</Switch>
</Suspense>
diff --cc src/pages/Project/View/ViewProject.tsx
index 4ee93b1c8,7a96f50f3..b551b125e
--- a/src/pages/Project/View/ViewProject.tsx
+++ b/src/pages/Project/View/ViewProject.tsx
@@@ -35,8 -35,7 +35,10 @@@ import _truncate from 'lodash/truncate
import PropTypes from 'prop-types'
import * as SwetrixSDK from '@swetrix/sdk'
+import { withProjectProtected } from 'hoc/projectProtected'
+
+ import { periodToCompareDate } from 'utils/compareConvertDate'
++
import { getTimeFromSeconds, getStringFromTime } from 'utils/generic'
import { getItem, setItem } from 'utils/localstorage'
import Title from 'components/Title'
@@@ -44,8 -43,8 +46,8 @@@ import EventsRunningOutBanner from 'com
import {
tbPeriodPairs, getProjectCacheKey, LIVE_VISITORS_UPDATE_INTERVAL, DEFAULT_TIMEZONE, CDN_URL, isDevelopment,
timeBucketToDays, getProjectCacheCustomKey, roleViewer, MAX_MONTHS_IN_PAST, PROJECT_TABS,
- TimeFormat, getProjectForcastCacheKey, chartTypes, roleAdmin, TRAFFIC_PANELS_ORDER, PERFORMANCE_PANELS_ORDER, isSelfhosted,
- PROJECTS_PROTECTED_PASSWORD,
+ TimeFormat, getProjectForcastCacheKey, chartTypes, roleAdmin, TRAFFIC_PANELS_ORDER, PERFORMANCE_PANELS_ORDER, isSelfhosted, tbPeriodPairsCompare,
- PERIOD_PAIRS_COMPARE, filtersPeriodPairs, IS_ACTIVE_COMPARE,
++ PERIOD_PAIRS_COMPARE, filtersPeriodPairs, IS_ACTIVE_COMPARE, PROJECTS_PROTECTED_PASSWORD,
} from 'redux/constants'
import { IUser } from 'redux/models/IUser'
import { IProject, ILiveStats } from 'redux/models/IProject'
diff --cc src/redux/constants/index.ts
index 8c1795bd3,eca4307e0..f48bc797f
--- a/src/redux/constants/index.ts
+++ b/src/redux/constants/index.ts
@@@ -205,8 -244,8 +244,12 @@@ export const REFRESH_TOKEN: string = 'r
// LocalStorage
export const PAGE_FORCE_REFRESHED = 'page-force-refreshed'
++
+export const PROJECTS_PROTECTED_PASSWORD: string = 'projects_protected_password'
+
+ export const IS_ACTIVE_COMPARE = 'is-active-compare'
+
++
// List of languages with translations available
export const whitelist: string[] = ['en', 'uk', 'pl', 'de', 'sv', 'el', 'ru', 'hi', 'zh']
export const defaultLanguage: string = 'en'
diff --cc src/routes.ts
index f63f5ae51,b4cd24023..6666ce850
--- a/src/routes.ts
+++ b/src/routes.ts
@@@ -30,7 -30,7 +30,8 @@@ const routes = Object.freeze(
transfer_confirm: '/project/transfer/confirm',
transfer_reject: '/project/transfer/cancel',
socialised: '/socialised',
+ project_protected_password: '/projects/:id/password',
+ open: '/open',
})
export default routes