📈 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
fixed the selfhosted swetrix edition
Blue Mouse9ced1d8d9e17
diff --git a/public/index.html b/public/index.htmlindex 4187af5d3..87b5a5ef9 100644--- a/public/index.html+++ b/public/index.html@@ -45,10 +45,12 @@<div id="root"></div><div id="intergramPlaceholder" class="flex sticky bottom-0 self-end items-end justify-end h-0 z-50" /><script>- window.intergramId = '380259923'- window.intergramServer = 'https://chat.swetrix.com'+ if ('%REACT_APP_SELFHOSTED%' !== 'true') {+ window.intergramId = '380259923'+ window.intergramServer = 'https://chat.swetrix.com'+ }</script><script id="intergram" type="text/javascript" src="https://chat.swetrix.com/js/widget.js"></script></body>-</html>\ No newline at end of file+</html>diff --git a/src/api/index.ts b/src/api/index.tsindex c67bad3f8..f38a5144c 100644--- a/src/api/index.ts+++ b/src/api/index.ts@@ -21,7 +21,8 @@ import { ISubscribers } from 'redux/models/ISubscribers'const debug = Debug('swetrix:api')// @ts-ignore-const baseURL = isSelfhosted ? window.env.API_URL : (process.env.REACT_APP_API_URL as string)+// const baseURL = isSelfhosted ? window.env.API_URL : (process.env.REACT_APP_API_URL as string)+const baseURL = process.env.REACT_APP_API_URL as stringconst api = axios.create({baseURL,diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsxindex b02cbcfa5..a3fb95ae8 100644--- a/src/components/Footer/index.tsx+++ b/src/components/Footer/index.tsx@@ -111,6 +111,44 @@ const navigation = {],}+const SelfHostedFooter = () => {+ const { t } = useTranslation('common')++ return (+ <footer className='bg-gray-800 dark:bg-slate-900 dark:border-t dark:border-slate-800/50'>+ <div className='max-w-7xl mx-auto py-8 px-4 overflow-hidden sm:px-6 lg:px-8'>+ <nav className='-mx-5 -my-2 flex flex-wrap justify-center' aria-label='Footer'>+ <div className='px-5 py-2'>+ <Link to={routes.contact} className='text-base text-gray-300 hover:text-white'>+ {t('footer.contact')}+ </Link>+ </div>+ <div className='px-5 py-2'>+ <Link to={routes.privacy} className='text-base text-gray-300 hover:text-white'>+ {t('footer.pp')}+ </Link>+ </div>+ <div className='px-5 py-2'>+ <Link to={routes.terms} className='text-base text-gray-300 hover:text-white'>+ {t('footer.tos')}+ </Link>+ </div>+ <div className='px-5 py-2'>+ <Link to={routes.about} className='text-base text-gray-300 hover:text-white'>+ {t('footer.about')}+ </Link>+ </div>+ <div className='px-5 py-2'>+ <a href={DONATE_URL} className='text-base text-gray-300 hover:text-white' target='_blank' rel='noopener noreferrer' aria-label={`${t('footer.status')} (opens in a new tab)`}>+ {t('footer.donate')}+ </a>+ </div>+ </nav>+ </div>+ </footer>+ )+}+const Footer = ({ minimal, authenticated }: {minimal?: booleanauthenticated?: boolean@@ -118,6 +156,10 @@ const Footer = ({ minimal, authenticated }: {const { t, i18n: { language } } = useTranslation('common')const year = new Date().getFullYear()+ if (isSelfhosted) {+ return <SelfHostedFooter />+ }+if (minimal) {return (<footer className='bg-gray-800 dark:bg-slate-900 dark:border-t dark:border-slate-800/50'>@@ -143,13 +185,11 @@ const Footer = ({ minimal, authenticated }: {{t('footer.about')}</Link></div>- {!isSelfhosted && (- <div className='px-5 py-2'>- <a href={STATUSPAGE_URL} className='text-base text-gray-300 hover:text-white' target='_blank' rel='noopener noreferrer' aria-label={`${t('footer.status')} (opens in a new tab)`}>- {t('footer.status')}- </a>- </div>- )}+ <div className='px-5 py-2'>+ <a href={STATUSPAGE_URL} className='text-base text-gray-300 hover:text-white' target='_blank' rel='noopener noreferrer' aria-label={`${t('footer.status')} (opens in a new tab)`}>+ {t('footer.status')}+ </a>+ </div></nav></div></footer>diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsxindex dcbd0692d..8cf926ca4 100644--- a/src/components/Header/index.tsx+++ b/src/components/Header/index.tsx@@ -239,18 +239,20 @@ const ProfileMenu = ({</Link>)}</Menu.Item>- <Menu.Item>- {({ active }) => (- <Link- to={routes.billing}- className={cx('block px-4 py-2 text-sm text-gray-700 dark:text-gray-50', {- 'bg-gray-100 dark:bg-slate-800': active,- })}- >- {t('common.billing')}- </Link>- )}- </Menu.Item>+ {!isSelfhosted && (+ <Menu.Item>+ {({ active }) => (+ <Link+ to={routes.billing}+ className={cx('block px-4 py-2 text-sm text-gray-700 dark:text-gray-50', {+ 'bg-gray-100 dark:bg-slate-800': active,+ })}+ >+ {t('common.billing')}+ </Link>+ )}+ </Menu.Item>+ )}</div>{!isSelfhosted && (@@ -310,7 +312,7 @@ const AuthedHeader = ({</Link><div className='hidden ml-10 space-x-1 lg:flex'>- {!isSelfhosted && user?.planCode === 'trial' && (+ {user?.planCode === 'trial' && (<Linkto={routes.billing}className={cx('flex justify-center items-center text-base select-none font-medium py-2 px-2 rounded-md', {@@ -675,7 +677,7 @@ const Header = ({/>{authenticated ? (<>- {!isSelfhosted && user?.planCode === 'trial' && (+ {user?.planCode === 'trial' && (<Linkto={routes.billing}className={cx('flex justify-center items-center text-base select-none font-medium py-2 px-2 rounded-md', {@@ -687,7 +689,7 @@ const Header = ({{status}</Link>)}- {!isSelfhosted && user?.planCode === 'none' && (+ {user?.planCode === 'none' && (<Linkto={routes.billing}className='flex justify-center items-center text-base select-none font-medium py-2 px-2 rounded-md text-rose-800 bg-rose-200 dark:bg-rose-300 hover:bg-rose-300 dark:hover:bg-rose-200'diff --git a/src/hoc/Selfhosted.tsx b/src/hoc/Selfhosted.tsxindex be10567df..3b73a15fd 100644--- a/src/hoc/Selfhosted.tsx+++ b/src/hoc/Selfhosted.tsx@@ -6,7 +6,8 @@ import { isSelfhosted } from 'redux/constants'import routes from 'routes'const selfHostedBlacklist = [- routes.signup, routes.reset_password, routes.new_password_form, routes.main, routes.user_settings, routes.verify, routes.change_email,+ routes.signup, routes.reset_password, routes.new_password_form, routes.main,+ routes.user_settings, routes.verify, routes.change_email, routes.billing,]const DEFAULT_PAGE = routes.signindiff --git a/src/pages/Auth/Signin/Signin.tsx b/src/pages/Auth/Signin/Signin.tsxindex 6cbeef48c..e9e9e73d4 100644--- a/src/pages/Auth/Signin/Signin.tsx+++ b/src/pages/Auth/Signin/Signin.tsx@@ -257,22 +257,24 @@ const Signin = ({{t('auth.signin.button')}</Button></div>- <div className='flex flex-wrap'>- <GoogleAuth- className='mt-4 mr-5'- setIsLoading={setIsLoading}- authSSO={authSSO}- callback={loginCallback}- dontRemember={form.dontRemember}- />- <GithubAuth- className='mt-4'- setIsLoading={setIsLoading}- authSSO={authSSO}- callback={loginCallback}- dontRemember={form.dontRemember}- />- </div>+ {!isSelfhosted && (+ <div className='flex flex-wrap'>+ <GoogleAuth+ className='mt-4 mr-5'+ setIsLoading={setIsLoading}+ authSSO={authSSO}+ callback={loginCallback}+ dontRemember={form.dontRemember}+ />+ <GithubAuth+ className='mt-4'+ setIsLoading={setIsLoading}+ authSSO={authSSO}+ callback={loginCallback}+ dontRemember={form.dontRemember}+ />+ </div>+ )}</form></div></Title>diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsxindex f1c075ed2..724e1e933 100644--- a/src/pages/Dashboard/Dashboard.tsx+++ b/src/pages/Dashboard/Dashboard.tsx@@ -21,8 +21,6 @@ import { ChevronUpIcon, ChevronDownIcon } from '@heroicons/react/20/solid'import Modal from 'ui/Modal'import Select from 'ui/Select'-import _includes from 'lodash/includes'-import _values from 'lodash/values'import { withAuthentication, auth } from 'hoc/protected'import Title from 'components/Title'import Loader from 'ui/Loader'@@ -32,7 +30,8 @@ import {import routes from 'routes'import { nFormatter } from 'utils/generic'import {- isSelfhosted, ENTRIES_PER_PAGE_DASHBOARD, tabForOwnedProject, tabForSharedProject, tabForCaptchaProject, DASHBOARD_TABS, tabsForDashboard, roleViewer,+ isSelfhosted, ENTRIES_PER_PAGE_DASHBOARD, tabForOwnedProject, tabForSharedProject,+ tabForCaptchaProject, DASHBOARD_TABS, tabsForDashboard, roleViewer,} from 'redux/constants'import EventsRunningOutBanner from 'components/EventsRunningOutBanner'@@ -45,8 +44,6 @@ import {} from 'redux/models/IProject'import { IUser } from 'redux/models/IUser'-const DASHBOARD_TABS_VALUES = _values(DASHBOARD_TABS)-interface IProjectCard {name?: stringactive?: boolean@@ -391,9 +388,9 @@ const Dashboard = ({// @ts-ignoreconst url = new URL(window.location)const { searchParams } = url- const tab = searchParams.get('tab')+ const tab = searchParams.get('tab') as string- if (_includes(DASHBOARD_TABS_VALUES, tab)) {+ if (DASHBOARD_TABS[tab]) {return tab}@@ -447,7 +444,7 @@ const Dashboard = ({<EventsRunningOutBanner /><div className='flex flex-col py-6 px-4 sm:px-6 lg:px-8'><div className='max-w-7xl w-full mx-auto'>- <div className='flex justify-between'>+ <div className='flex justify-between mb-6'><h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>{t('titles.dashboard')}</h2>@@ -456,50 +453,52 @@ const Dashboard = ({{tabProjects === tabForCaptchaProject ? t('dashboard.newCaptchaProject') : t('dashboard.newProject')}</span></div>- <div className='mt-6 mb-2'>- {/* Dashboard tabs selector */}- <div>- <div className='sm:hidden mb-2'>- <Select- items={_filter(dashboardLocTabs, (tab) => {- return !(tab.name === tabForSharedProject && sharedTotal <= 0)- })}- keyExtractor={(item) => item.id}- labelExtractor={(item) => t(item.label)}- onSelect={(label) => {- const selected = _find(dashboardLocTabs, (tab) => t(tab.label) === label)- setTabProjects(selected?.name ? selected.name : tabForOwnedProject)- setActiveDashTab(selected?.id ? selected.id : DASHBOARD_TABS.owned)- }}- title={activeDashTabLabel}- />- </div>- <div className='hidden sm:block'>- <nav className='-mb-px flex space-x-8'>- {_map(tabsForDashboard, (tab) => {- if (tab.name === tabForSharedProject && sharedTotal <= 0) {- return null- }-- return (- <button- key={tab.name}- type='button'- onClick={() => setTabProjects(tab.name)}- className={cx('whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-md', {- 'border-indigo-500 text-indigo-600 dark:text-gray-50 dark:border-gray-50': tabProjects === tab.name,- 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 dark:text-gray-400 dark:hover:text-gray-300 dark:hover:border-gray-300': tabProjects !== tab.name,- })}- aria-current={tab.name === tabProjects ? 'page' : undefined}- >- {t(tab.label)}- </button>- )- })}- </nav>+ {!isSelfhosted && (+ <div className='mb-2'>+ {/* Dashboard tabs selector */}+ <div>+ <div className='sm:hidden mb-2'>+ <Select+ items={_filter(dashboardLocTabs, (tab) => {+ return !(tab.name === tabForSharedProject && sharedTotal <= 0)+ })}+ keyExtractor={(item) => item.id}+ labelExtractor={(item) => t(item.label)}+ onSelect={(label) => {+ const selected = _find(dashboardLocTabs, (tab) => t(tab.label) === label)+ setTabProjects(selected?.name ? selected.name : tabForOwnedProject)+ setActiveDashTab(selected?.id ? selected.id : DASHBOARD_TABS.owned)+ }}+ title={activeDashTabLabel}+ />+ </div>+ <div className='hidden sm:block'>+ <nav className='-mb-px flex space-x-8'>+ {_map(tabsForDashboard, (tab) => {+ if (tab.name === tabForSharedProject && sharedTotal <= 0) {+ return null+ }++ return (+ <button+ key={tab.name}+ type='button'+ onClick={() => setTabProjects(tab.name)}+ className={cx('whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-md', {+ 'border-indigo-500 text-indigo-600 dark:text-gray-50 dark:border-gray-50': tabProjects === tab.name,+ 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 dark:text-gray-400 dark:hover:text-gray-300 dark:hover:border-gray-300': tabProjects !== tab.name,+ })}+ aria-current={tab.name === tabProjects ? 'page' : undefined}+ >+ {t(tab.label)}+ </button>+ )+ })}+ </nav>+ </div></div></div>- </div>+ )}{isLoading ? (<Title title={t('titles.dashboard')}><div className='min-h-min-footer bg-gray-50 dark:bg-slate-900'>diff --git a/src/pages/Project/Settings/ProjectSettings.tsx b/src/pages/Project/Settings/ProjectSettings.tsxindex 8beec1480..54bc3db50 100644--- a/src/pages/Project/Settings/ProjectSettings.tsx+++ b/src/pages/Project/Settings/ProjectSettings.tsx@@ -451,12 +451,14 @@ const ProjectSettings = ({</div>{!project?.shared && (<div className='flex flex-wrap items-center justify-end'>- <Button className='mr-2' onClick={() => setShowTransfer(true)} semiDanger semiSmall>- <>- <RocketLaunchIcon className='w-5 h-5 mr-1' />- {t('project.settings.transfer')}- </>- </Button>+ {!isSelfhosted && (+ <Button className='mr-2' onClick={() => setShowTransfer(true)} semiDanger semiSmall>+ <>+ <RocketLaunchIcon className='w-5 h-5 mr-1' />+ {t('project.settings.transfer')}+ </>+ </Button>+ )}<Button onClick={() => !projectResetting && setShowReset(true)} loading={projectDeleting} semiDanger semiSmall><><TrashIcon className='w-5 h-5 mr-1' />@@ -472,14 +474,18 @@ const ProjectSettings = ({</div>)}</div>- <hr className='mt-8 xs:mt-2 sm:mt-5 border-gray-200 dark:border-gray-600' />- <Emails projectId={id} projectName={project.name} />- <hr className='mt-2 sm:mt-5 border-gray-200 dark:border-gray-600' />- {- !project?.shared && (+ {!isSelfhosted && (+ <>+ <hr className='mt-8 xs:mt-2 sm:mt-5 border-gray-200 dark:border-gray-600' />+ <Emails projectId={id} projectName={project.name} />+ </>+ )}+ {!isSelfhosted && !project?.shared && (+ <>+ <hr className='mt-2 sm:mt-5 border-gray-200 dark:border-gray-600' /><People project={project} />- )- }+ </>+ )}</>) : (<p className='text-gray-500 dark:text-gray-300 italic mt-1 mb-4 text-sm'>diff --git a/src/redux/constants/index.ts b/src/redux/constants/index.tsindex a5ef354fc..8cd8c5d63 100644--- a/src/redux/constants/index.ts+++ b/src/redux/constants/index.ts@@ -261,10 +261,12 @@ export const tabForOwnedProject: string = 'owned'export const tabForSharedProject: string = 'shared'export const tabForCaptchaProject: string = 'captcha'-export const tabsForDashboard: {+interface IDashboardTabs {name: stringlabel: string-}[] = [+}++export const tabsForDashboard: IDashboardTabs[] = [{name: tabForOwnedProject,label: 'profileSettings.owned',