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!

some updatte

Maksim Mrug37cf3c2bbba4
diff --git a/app/components/Footer/index.tsx b/app/components/Footer/index.tsx
index 6540dcc3a..fa5d7d812 100644
--- a/app/components/Footer/index.tsx
+++ b/app/components/Footer/index.tsx
@@ -9,7 +9,7 @@ import {
isSelfhosted, DONATE_URL, FIREFOX_ADDON_URL, CHROME_EXTENSION_URL, GITHUB_URL,
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'
+} from 'redux/constants'
import routesPath from 'routesPath'
const navigation = {
diff --git a/app/components/Header/index.tsx b/app/components/Header/index.tsx
index c097a14cb..ac5614eba 100644
--- a/app/components/Header/index.tsx
+++ b/app/components/Header/index.tsx
@@ -4,8 +4,8 @@ import React, {
} from 'react'
import PropTypes from 'prop-types'
import { Link, NavLink } from '@remix-run/react'
-// import { useAppDispatch } from 'redux/store'
-// import { useDispatch } from 'react-redux'
+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,15 +25,15 @@ import _includes from 'lodash/includes'
import cx from 'clsx'
import routesPath from 'routesPath'
-// import { authActions } from 'redux/reducers/auth'
-// import sagaActions from 'redux/sagas/actions'
-// import UIActions from 'redux/reducers/ui'
+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 'constants'
+} from 'redux/constants'
import Dropdown from 'ui/Dropdown'
-// import { IUser } from 'redux/models/IUser'
+import { IUser } from 'redux/models/IUser'
dayjs.extend(utc)
dayjs.extend(duration)
@@ -111,8 +111,7 @@ const ThemeMenu = ({
const ProfileMenu = ({
user, logoutHandler, t, onLanguageChange, language,
}: {
- // user: IUser,
- user: any,
+ user: IUser,
logoutHandler: () => void,
t: (key: string, options?: {
[key: string]: string | number | null,
@@ -284,8 +283,7 @@ const ProfileMenu = ({
const AuthedHeader = ({
user, switchTheme, theme, onLanguageChange, rawStatus, status, t, language, logoutHandler,
}: {
- // user: IUser
- user: any
+ user: IUser
switchTheme: (thm?: string) => void
theme: string
onLanguageChange: (lng: string) => void
@@ -527,8 +525,7 @@ const Header = ({
authenticated: boolean,
theme: string,
// themeType: string,
- // user: IUser,
- user: any,
+ user: IUser,
}): JSX.Element => {
const { t, i18n: { language } }: {
t: (key: string, options?: {
@@ -536,8 +533,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>()
@@ -576,13 +573,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) => {
diff --git a/app/constants/index.ts b/app/constants/index.ts
deleted file mode 100644
index 56c6ce16e..000000000
--- a/app/constants/index.ts
+++ /dev/null
@@ -1,543 +0,0 @@
-const getCustomLabel = (dates: Date[], t: Function): string => {
- if (dates) {
- const from = dates[0].toLocaleDateString()
- const to = dates[1].toLocaleDateString()
-
- if (from === to) {
- return from
- }
-
- return `${from} - ${to}`
- }
-
- return t('project.custom')
-}
-
-export const FORECAST_MAX_MAPPING: {
- [key: string]: number
-} = {
- hour: 72,
- day: 21,
- month: 12,
-}
-
-export const tbPeriodPairs = (t: Function, tbs?: string[] | null, dates?: Date[]): {
- label: string
- period: string
- tbs: string[]
- countDays?: number
- dropdownLabel?: string
- isCustomDate?: boolean
-}[] => [{
- label: t('project.today'),
- period: 'today',
- tbs: ['hour'],
-}, {
- label: t('project.yesterday'),
- period: 'yesterday',
- tbs: ['hour'],
-}, {
- label: t('project.last24h'),
- period: '1d',
- countDays: 1,
- tbs: ['hour'],
-}, {
- label: t('project.lastXDays', { amount: 7 }),
- period: '7d',
- tbs: ['hour', 'day'],
- countDays: 7,
-}, {
- label: t('project.lastXWeeks', { amount: 4 }),
- period: '4w',
- tbs: ['day'],
- countDays: 28,
-}, {
- label: t('project.lastXMonths', { amount: 3 }),
- period: '3M',
- tbs: ['month'],
- countDays: 90,
-}, {
- label: t('project.lastXMonths', { amount: 12 }),
- period: '12M',
- tbs: ['month'],
- countDays: 365,
-}, {
- label: t('project.lastXMonths', { amount: 24 }),
- period: '24M',
- tbs: ['month'],
-}, {
- label: dates ? getCustomLabel(dates, t) : t('project.custom'),
- dropdownLabel: t('project.custom'),
- isCustomDate: true,
- period: 'custom',
- tbs: tbs || ['custom'],
-}, {
- label: t('project.compare'),
- period: 'compare',
- tbs: tbs || ['custom'],
-}]
-
-export const filtersPeriodPairs = ['1d', '7d', '4w', '3M', '12M', 'custom', 'compare']
-
-export const tbPeriodPairsCompare = (t: Function, dates?: Date[]): {
- label: string
- period: string
-}[] => [{
- label: t('project.previousPeriod'),
- period: 'previous',
-}, {
- label: dates ? getCustomLabel(dates, t) : t('project.custom'),
- period: 'custom',
-}, {
- label: t('project.disableCompare'),
- period: 'disable',
-}]
-
-export const PERIOD_PAIRS_COMPARE: {
- COMPARE: string
- PREVIOS: string
- CUSTOM: string
- DISABLE: string
-} = {
- COMPARE: 'compare',
- PREVIOS: 'previous',
- CUSTOM: 'custom',
- DISABLE: 'disable',
-}
-
-interface IStringObject {
- [key: string]: string
-}
-
-// the order of panels in the project view
-export const TRAFFIC_PANELS_ORDER: string[] = ['cc', 'pg', 'lc', 'br', 'os', 'dv', 'ref', 'so', 'me', 'ca']
-export const PERFORMANCE_PANELS_ORDER: string[] = ['cc', 'pg', 'br', 'dv']
-
-// the maximum amount of months user can go back when picking a date in flat picker (project view)
-export const MAX_MONTHS_IN_PAST: number = 24
-
-export const timeBucketToDays: {
- lt: number
- tb: string[]
-}[] = [
- { lt: 1, tb: ['hour'] }, // 1 days
- { lt: 7, tb: ['hour', 'day'] }, // 7 days
- { lt: 28, tb: ['day'] }, // 4 weeks
- { lt: 366, tb: ['month'] }, // 12 months
- { lt: 732, tb: ['month'] }, // 24 months
-]
-
-export const tbsFormatMapper: IStringObject = {
- hour: '%I %p',
- day: '%d %b',
- month: '%b %Y',
-}
-
-export const tbsFormatMapperTooltip: IStringObject = {
- hour: '%d %b %I %p',
- day: '%d %b',
- month: '%b %Y',
-}
-
-export const tbsFormatMapperTooltip24h: IStringObject = {
- hour: '%d %b %H:%M',
- day: '%d %b',
- month: '%b %Y',
-}
-
-export const tbsFormatMapper24h: IStringObject = {
- hour: '%H:%M',
- day: '%d %b',
- month: '%b %Y',
-}
-
-export const TimeFormat: IStringObject = {
- '12-hour': '12-hour',
- '24-hour': '24-hour',
-}
-
-export const FREE_TIER_KEY: string = 'free'
-
-export const PADDLE_JS_URL = 'https://cdn.paddle.com/paddle/paddle.js'
-export const PADDLE_VENDOR_ID = 139393
-
-// a dedicated variable is needed for paid tier checking
-export const WEEKLY_REPORT_FREQUENCY: string = 'weekly'
-export const reportFrequencies: string[] = [WEEKLY_REPORT_FREQUENCY, 'monthly', 'quarterly', 'never']
-
-export const reportFrequencyForEmailsOptions: {
- value: string
- label: string
-}[] = [
- { value: 'quarterly', label: 'Quarterly' },
- { value: 'monthly', label: 'Monthly' },
- { value: 'weekly', label: 'Weekly' },
- { value: 'never', label: 'Never' },
-]
-
-export const GDPR_EXPORT_TIMEFRAME: number = 14 // days
-
-export const SHOW_BANNER_AT_PERC: number = 85 // show banner when 85% of events in tier are used
-
-export const TITLE_SUFFIX: string = '| Swetrix'
-
-export const LS_THEME_SETTING: string = 'colour-theme'
-export const LS_VIEW_PREFS_SETTING: string = 'proj-view-preferences'
-export const LS_CAPTCHA_VIEW_PREFS_SETTING: string = 'captcha-view-preferences'
-
-export const DEFAULT_TIMEZONE: string = 'Etc/GMT'
-
-export const DONATE_URL: string = 'https://ko-fi.com/andriir'
-export const FIREFOX_ADDON_URL: string = 'https://addons.mozilla.org/en-US/firefox/addon/swetrix/'
-export const CHROME_EXTENSION_URL: string = 'https://chrome.google.com/webstore/detail/swetrix/glbeclfdldjldjonfnpnembfkhphmeld'
-export const HAVE_I_BEEN_PWNED_URL: string = 'https://haveibeenpwned.com/passwords'
-export const LINKEDIN_URL: string = 'https://www.linkedin.com/company/swetrix/'
-export const GITHUB_URL: string = 'https://github.com/Swetrix'
-export const TWITTER_URL: string = 'https://twitter.com/intent/user?screen_name=swetrix'
-export const TWITTER_USERNAME: string = '@swetrix'
-export const DISCORD_URL: string = 'https://discord.gg/tVxGxU3s4B'
-export const STATUSPAGE_URL: string = 'https://stats.uptimerobot.com/33rvmiXXEz'
-export const BLOG_URL: string = 'https://blog.swetrix.com'
-export const UTM_GENERATOR_URL: string = 'https://url.swetrix.com'
-export const LIVE_DEMO_URL: string = '/projects/STEzHcB1rALV'
-export const MARKETPLACE_URL: string = 'https://marketplace.swetrix.com'
-export const DOCS_URL: string = 'https://docs.swetrix.com'
-export const CAPTCHA_URL: string = 'https://captcha.swetrix.com'
-export const DOCS_CAPTCHA_URL: string = `${DOCS_URL}/captcha/introduction`
-export const CDN_URL: string | undefined = process.env.REACT_APP_CDN_URL
-
-// Swetrix vs ...
-export const SWETRIX_VS_GOOGLE: string = 'https://blog.swetrix.com/post/vs-google-analytics/'
-export const SWETRIX_VS_CLOUDFLARE: string = 'https://blog.swetrix.com/post/vs-cloudflare-analytics/'
-export const SWETRIX_VS_SIMPLE_ANALYTICS: string = 'https://blog.swetrix.com/post/vs-simple-analytics/'
-
-export const isDevelopment: boolean = !process.env.NODE_ENV || process.env.NODE_ENV === 'development'
-
-export const SUPPORTED_THEMES: string[] = ['light', 'dark']
-
-export const CONTACT_EMAIL: string = '[email protected]'
-export const SECURITY_EMAIL: string = '[email protected]'
-
-export const isSelfhosted: boolean = Boolean(process.env.REACT_APP_SELFHOSTED)
-
-export const LIVE_VISITORS_UPDATE_INTERVAL: number = 40000
-
-// Functions
-export const getProjectCacheKey = (period: string, timeBucket: string): string => `${period}${timeBucket}`
-export const getProjectCaptchaCacheKey = (period: string, timeBucket: string): string => `${period}${timeBucket}captcha`
-export const getProjectForcastCacheKey = (period: string, timeBucket: string, periodToForecast: string): string => `${period}${timeBucket}${periodToForecast}forecast`
-export const getProjectCacheCustomKey = (from: string, to: string, timeBucket: string): string => `${from}-${to}-${timeBucket}`
-export const getProjectCacheCustomKeyPerf = (from: string, to: string, timeBucket: string): string => `${from}-${to}-${timeBucket}perf`
-export const getUserFlowCacheKey = (pid: string, period: string): string => `${pid}${period}userflow`
-
-// Cookies
-export const GDPR_REQUEST: string = 'gdpr_request'
-export const CONFIRMATION_TIMEOUT: string = 'confirmation_timeout'
-export const LOW_EVENTS_WARNING: string = 'low_events_warning'
-export const TOKEN: string = 'access_token'
-export const REFRESH_TOKEN: string = 'refresh_token'
-
-// LocalStorage
-export const PAGE_FORCE_REFRESHED = 'page-force-refreshed'
-export const PROJECTS_PROTECTED = 'projects_protected'
-
-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'
-export const languages: IStringObject = {
- en: 'English',
- uk: 'Українська',
- pl: 'Polski',
- de: 'Deutsch',
- sv: 'Svenska',
- el: 'Ελληνικά',
- ru: 'Русский',
- hi: 'हिन्दी',
- zh: '中文简体',
-}
-
-export const languageFlag: IStringObject = {
- en: 'GB',
- uk: 'UA',
- pl: 'PL',
- de: 'DE',
- sv: 'SE',
- el: 'GR',
- ru: 'RU',
- hi: 'IN',
- zh: 'CN',
-}
-
-export const paddleLanguageMapping: IStringObject = {
- zh: 'zh-Hans',
- uk: 'ru',
- el: 'en',
-}
-
-// dashboard && projects
-
-export const roles: string[] = ['admin', 'viewer']
-
-export const roleViewer: {
- name: string
- role: string
- description: string
-} = {
- name: 'Viewer',
- role: 'viewer',
- description: 'Can view the project',
-}
-
-export const roleAdmin: {
- name: string
- role: string
- description: string
-} = {
- name: 'Admin',
- role: 'admin',
- description: 'Can manage the project',
-}
-
-export const tabForOwnedProject: string = 'owned'
-export const tabForSharedProject: string = 'shared'
-export const tabForCaptchaProject: string = 'captcha'
-
-interface IDashboardTabs {
- name: string
- label: string
-}
-
-export const tabsForDashboard: IDashboardTabs[] = [
- {
- name: tabForOwnedProject,
- label: 'profileSettings.owned',
- },
- {
- name: tabForSharedProject,
- label: 'profileSettings.shared',
- },
- {
- name: tabForCaptchaProject,
- label: 'profileSettings.captcha',
- },
-]
-
-const SELFHOSTED_PROJECT_TABS: IStringObject = {
- traffic: 'traffic',
- performance: 'performance',
-}
-
-const PRODUCTION_PROJECT_TABS: IStringObject = {
- traffic: 'traffic',
- performance: 'performance',
- alerts: 'alerts',
-}
-
-export const PROJECT_TABS = isSelfhosted ? SELFHOSTED_PROJECT_TABS : PRODUCTION_PROJECT_TABS
-
-export const DASHBOARD_TABS: IStringObject = {
- owned: 'owned',
- shared: 'shared',
- captcha: 'captcha',
-}
-
-export const QUERY_METRIC: IStringObject = {
- PAGE_VIEWS: 'page_views',
- UNIQUE_PAGE_VIEWS: 'unique_page_views',
- ONLINE_USERS: 'online_users',
-}
-
-export const QUERY_CONDITION: IStringObject = {
- GREATER_THAN: 'greater_than',
- GREATER_EQUAL_THAN: 'greater_equal_than',
- LESS_THAN: 'less_than',
- LESS_EQUAL_THAN: 'less_equal_than',
-}
-
-export const QUERY_TIME: IStringObject = {
- LAST_15_MINUTES: 'last_15_minutes',
- LAST_30_MINUTES: 'last_30_minutes',
- LAST_1_HOUR: 'last_1_hour',
- LAST_4_HOURS: 'last_4_hours',
- LAST_24_HOURS: 'last_24_hours',
- LAST_48_HOURS: 'last_48_hours',
-}
-
-export const INVITATION_EXPIRES_IN: number = 48 // hours
-export const ENTRIES_PER_PAGE_DASHBOARD: number = 11
-
-export const THEME_TYPE: IStringObject = {
- classic: 'classic',
- christmas: 'christmas',
-}
-
-export const DEFAULT_ALERTS_TAKE: number = 100
-
-const EUR = {
- symbol: '€',
- code: 'EUR',
-}
-
-const USD = {
- symbol: '$',
- code: 'USD',
-}
-
-const GBP = {
- symbol: '£',
- code: 'GBP',
-}
-
-type ICurrencies = {
- [key in 'EUR' | 'USD' | 'GBP']: {
- symbol: string
- code: string
- }
-}
-
-export const CURRENCIES: ICurrencies = {
- EUR, USD, GBP,
-}
-
-// TODO: Eventually this should be fetched from the API, e.g. GET /config route
-export const PLAN_LIMITS = {
- free: {
- monthlyUsageLimit: 5000,
- maxProjects: 10,
- maxAlerts: 1,
- legacy: true,
- price: {
- USD: {
- monthly: 0,
- yearly: 0,
- },
- EUR: {
- monthly: 0,
- yearly: 0,
- },
- GBP: {
- monthly: 0,
- yearly: 0,
- },
- },
- },
- trial: {
- monthlyUsageLimit: 100000,
- maxProjects: 20,
- maxAlerts: 20,
- legacy: false,
- price: {
- USD: {
- monthly: 0,
- yearly: 0,
- },
- EUR: {
- monthly: 0,
- yearly: 0,
- },
- GBP: {
- monthly: 0,
- yearly: 0,
- },
- },
- },
- hobby: {
- monthlyUsageLimit: 10000,
- maxProjects: 20,
- maxAlerts: 10,
- legacy: false,
- price: {
- USD: {
- monthly: 5,
- yearly: 50,
- },
- EUR: {
- monthly: 5,
- yearly: 50,
- },
- GBP: {
- monthly: 4,
- yearly: 40,
- },
- },
- },
- freelancer: {
- monthlyUsageLimit: 100000,
- maxProjects: 20,
- maxAlerts: 20,
- legacy: false,
- price: {
- USD: {
- monthly: 15,
- yearly: 150,
- },
- EUR: {
- monthly: 15,
- yearly: 150,
- },
- GBP: {
- monthly: 14,
- yearly: 140,
- },
- },
- },
- startup: {
- monthlyUsageLimit: 1000000,
- maxProjects: 30,
- maxAlerts: 50,
- legacy: false,
- price: {
- USD: {
- monthly: 59,
- yearly: 590,
- },
- EUR: {
- monthly: 57,
- yearly: 570,
- },
- GBP: {
- monthly: 49,
- yearly: 490,
- },
- },
- },
- enterprise: {
- monthlyUsageLimit: 5000000,
- maxProjects: 50,
- maxAlerts: 100,
- legacy: false,
- price: {
- USD: {
- monthly: 110,
- yearly: 1100,
- },
- EUR: {
- monthly: 110,
- yearly: 1100,
- },
- GBP: {
- monthly: 95,
- yearly: 950,
- },
- },
- },
-}
-
-export const TRIAL_DAYS: number = 14
-
-export const chartTypes = Object.freeze({
- line: 'line',
- bar: 'bar',
-})
-
-export const SSO_ACTIONS = Object.freeze({
- LINK: 'link',
- AUTH: 'auth',
-})
-
-export const SSO_PROVIDERS = Object.freeze({
- GOOGLE: 'google',
- GITHUB: 'github',
-})