📈 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
redesigned auth flow & removed features page
Blue Mouse8de5ce747090
diff --git a/app/components/GithubAuth.tsx b/app/components/GithubAuth.tsxindex d7c78dc90..e523597b4 100644--- a/app/components/GithubAuth.tsx+++ b/app/components/GithubAuth.tsx@@ -55,7 +55,7 @@ const GithubAuth: React.FC<IGoogleAuth> = ({return (<Button- className={cx(className, 'border-indigo-100 dark:text-gray-50 dark:border-slate-700/50 dark:bg-slate-800 dark:hover:bg-slate-700')}+ className={cx(className, 'flex items-center justify-center border-indigo-100 dark:text-gray-50 dark:border-slate-700/50 dark:bg-slate-800 dark:hover:bg-slate-700')}onClick={googleLogin}secondaryregular@@ -66,7 +66,7 @@ const GithubAuth: React.FC<IGoogleAuth> = ({) : (<GithubDarkSVG className='w-5 h-5 mr-2' />)}- {t('auth.common.continueWithGithub')}+ {t('auth.common.github')}</></Button>)diff --git a/app/components/GoogleAuth.tsx b/app/components/GoogleAuth.tsxindex 42f0fc63f..4409cd663 100644--- a/app/components/GoogleAuth.tsx+++ b/app/components/GoogleAuth.tsx@@ -45,14 +45,14 @@ const GoogleAuth: React.FC<IGoogleAuth> = ({return (<Button- className={cx(className, 'border-indigo-100 dark:text-gray-50 dark:border-slate-700/50 dark:bg-slate-800 dark:hover:bg-slate-700')}+ className={cx(className, 'flex items-center justify-center border-indigo-100 dark:text-gray-50 dark:border-slate-700/50 dark:bg-slate-800 dark:hover:bg-slate-700')}onClick={googleLogin}secondaryregular><><GoogleGSVG className='w-5 h-5 mr-2' />- {t('auth.common.continueWithGoogle')}+ {t('auth.common.google')}</></Button>)diff --git a/app/components/Header/index.tsx b/app/components/Header/index.tsxindex bdc00bc7b..ecf17242f 100644--- a/app/components/Header/index.tsx+++ b/app/components/Header/index.tsx@@ -474,13 +474,6 @@ const NotAuthedHeader = ({{t('footer.blog')}</a>{!isSelfhosted && (- <>- <Link- to={routesPath.features}- className='font-semibold leading-6 text-base text-slate-800 hover:text-slate-700 dark:text-slate-200 dark:hover:text-white'- >- {t('common.features')}- </Link><Linkto={`${routesPath.main}#pricing`}className='font-semibold leading-6 text-base text-slate-800 hover:text-slate-700 dark:text-slate-200 dark:hover:text-white'@@ -488,7 +481,6 @@ const NotAuthedHeader = ({>{t('common.pricing')}</Link>- </>)}<a href={DOCS_URL} className='font-semibold leading-6 text-base text-slate-800 hover:text-slate-700 dark:text-slate-200 dark:hover:text-white' target='_blank' rel='noreferrer noopener'>{/* <DocumentTextIcon className='w-5 h-5 mr-1' /> */}@@ -572,12 +564,6 @@ const NotAuthedHeader = ({>{t('common.pricing')}</Link>- <Link- to={routesPath.features}- className='flex items-center font-semibold leading-6 text-base text-slate-800 hover:text-slate-700 dark:text-slate-200 dark:hover:text-white'- >- {t('common.features')}- </Link><ahref={DOCS_URL}className='flex items-center font-semibold leading-6 text-base text-slate-800 hover:text-slate-700 dark:text-slate-200 dark:hover:text-white'diff --git a/app/pages/Auth/CreateNewPassword/CreateNewPassword.tsx b/app/pages/Auth/CreateNewPassword/CreateNewPassword.tsxindex b73822267..9f2dcfd4f 100644--- a/app/pages/Auth/CreateNewPassword/CreateNewPassword.tsx+++ b/app/pages/Auth/CreateNewPassword/CreateNewPassword.tsx@@ -1,6 +1,6 @@import React, { useState, useEffect, memo } from 'react'import { Link, useNavigate, useParams } from '@remix-run/react'-import { useTranslation } from 'react-i18next'+import { useTranslation, Trans } from 'react-i18next'import _size from 'lodash/size'import _keys from 'lodash/keys'import _isEmpty from 'lodash/isEmpty'@@ -108,43 +108,51 @@ const CreateNewPassword = ({return (<div>- <div className='min-h-page bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>- <form className='max-w-7xl w-full mx-auto' onSubmit={handleSubmit}>- <h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>+ <div className='min-h-[40rem] bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>+ <div className='sm:mx-auto sm:w-full sm:max-w-md'>+ <h2 className='text-center text-2xl font-bold leading-9 tracking-tight text-gray-900 dark:text-gray-50'>{t('auth.recovery.title')}</h2>- <Input- name='password'- id='password'- type='password'- label={t('auth.recovery.newPassword')}- hint={t('auth.common.hint', { amount: MIN_PASSWORD_CHARS })}- value={form.password}- placeholder={t('auth.common.password')}- className='mt-4'- onChange={handleInput}- error={beenSubmitted && errors.password}- />- <Input- name='repeat'- id='repeat'- type='password'- label={t('auth.common.repeat')}- value={form.repeat}- placeholder={t('auth.common.password')}- className='mt-4'- onChange={handleInput}- error={beenSubmitted && errors.repeat}- />- <div className='flex justify-between mt-3'>- <Link to={routes.signin} className='underline text-blue-600 hover:text-indigo-800 dark:text-blue-400 dark:hover:text-blue-500'>- {t('auth.common.signinInstead')}- </Link>- <Button type='submit' loading={isLoading} primary large>- {t('auth.recovery.save')}- </Button>+ </div>+ <div className='mt-10 sm:mx-auto sm:w-full sm:max-w-[480px]'>+ <div className='bg-white dark:bg-slate-800/20 dark:ring-1 dark:ring-slate-800 px-6 py-12 shadow sm:rounded-lg sm:px-12'>+ <form className='space-y-6' onSubmit={handleSubmit}>+ <Input+ name='password'+ id='password'+ type='password'+ label={t('auth.recovery.newPassword')}+ hint={t('auth.common.hint', { amount: MIN_PASSWORD_CHARS })}+ value={form.password}+ onChange={handleInput}+ error={beenSubmitted && errors.password}+ />+ <Input+ name='repeat'+ id='repeat'+ type='password'+ label={t('auth.common.repeat')}+ value={form.repeat}+ onChange={handleInput}+ error={beenSubmitted && errors.repeat}+ />+ <Button className='w-full justify-center' type='submit' loading={isLoading} primary giant>+ {t('auth.recovery.save')}+ </Button>+ </form></div>- </form>+ <p className='mt-10 mb-4 text-center text-sm text-gray-500 dark:text-gray-200'>+ <Trans+ // @ts-ignore+ t={t}+ i18nKey='auth.signup.alreadyAMember'+ components={{+ // eslint-disable-next-line jsx-a11y/anchor-has-content+ url: <Link to={routes.signin} className='font-semibold leading-6 text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500' aria-label={t('footer.tos')} />,+ }}+ />+ </p>+ </div></div></div>)diff --git a/app/pages/Auth/ForgotPassword/ForgotPassword.tsx b/app/pages/Auth/ForgotPassword/ForgotPassword.tsxindex 4a0265c15..2ee973d96 100644--- a/app/pages/Auth/ForgotPassword/ForgotPassword.tsx+++ b/app/pages/Auth/ForgotPassword/ForgotPassword.tsx@@ -1,6 +1,6 @@import React, { useState, useEffect, memo } from 'react'import { Link, useNavigate } from '@remix-run/react'-import { useTranslation } from 'react-i18next'+import { useTranslation, Trans } from 'react-i18next'import _keys from 'lodash/keys'import _isEmpty from 'lodash/isEmpty'@@ -9,6 +9,7 @@ import { withAuthentication, auth } from 'hoc/protected'import routes from 'routesPath'import Input from 'ui/Input'import Button from 'ui/Button'+import { TRIAL_DAYS } from 'redux/constants'import { isValidEmail } from 'utils/validator'const ForgotPassword = ({@@ -94,31 +95,44 @@ const ForgotPassword = ({return (<div>- <div className='min-h-page bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>- <form className='max-w-7xl w-full mx-auto' onSubmit={handleSubmit}>- <h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>+ <div className='min-h-[40rem] bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>+ <div className='sm:mx-auto sm:w-full sm:max-w-md'>+ <h2 className='text-center text-2xl font-bold leading-9 tracking-tight text-gray-900 dark:text-gray-50'>{t('titles.recovery')}</h2>- <Input- name='email'- id='email'- type='email'- label={t('auth.common.email')}- value={form.email}- placeholder='[email protected]'- className='mt-4'- onChange={handleInput}- error={beenSubmitted && errors.email}- />- <div className='flex justify-between mt-3'>- <Link to={routes.signin} className='mt-1 underline text-blue-600 hover:text-indigo-800 dark:text-blue-400 dark:hover:text-blue-500'>- {t('auth.common.signin')}- </Link>- <Button type='submit' loading={isLoading} primary large>- {t('auth.forgot.reset')}- </Button>+ </div>+ <div className='mt-10 sm:mx-auto sm:w-full sm:max-w-[480px]'>+ <div className='bg-white dark:bg-slate-800/20 dark:ring-1 dark:ring-slate-800 px-6 py-12 shadow sm:rounded-lg sm:px-12'>+ <form className='space-y-6' onSubmit={handleSubmit}>+ <Input+ name='email'+ id='email'+ type='email'+ label={t('auth.common.email')}+ value={form.email}+ onChange={handleInput}+ error={beenSubmitted && errors.email}+ />+ <Button className='w-full justify-center' type='submit' loading={isLoading} primary giant>+ {t('auth.forgot.reset')}+ </Button>+ </form></div>- </form>+ <p className='mt-10 mb-4 text-center text-sm text-gray-500 dark:text-gray-200'>+ <Trans+ // @ts-ignore+ t={t}+ i18nKey='auth.signin.notAMember'+ components={{+ // eslint-disable-next-line jsx-a11y/anchor-has-content+ url: <Link to={routes.signup} className='font-semibold leading-6 text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500' aria-label={t('footer.tos')} />,+ }}+ values={{+ amount: TRIAL_DAYS,+ }}+ />+ </p>+ </div></div></div>)diff --git a/app/pages/Auth/Signin/Signin.tsx b/app/pages/Auth/Signin/Signin.tsxindex 455aab3ca..5f2819b78 100644--- a/app/pages/Auth/Signin/Signin.tsx+++ b/app/pages/Auth/Signin/Signin.tsx@@ -16,7 +16,7 @@ import Checkbox from 'ui/Checkbox'import {isValidEmail, isValidPassword, MIN_PASSWORD_CHARS,} from 'utils/validator'-import { isSelfhosted } from 'redux/constants'+import { isSelfhosted, TRIAL_DAYS } from 'redux/constants'import { IUser } from 'redux/models/IUser'import { submit2FA } from 'api'import { setAccessToken, removeAccessToken } from 'utils/accessToken'@@ -180,15 +180,15 @@ const Signin = ({<div className='flex justify-between mt-3'><div className='whitespace-pre-line text-sm text-gray-600 dark:text-gray-400'>{!isSelfhosted && (- <Trans- // @ts-ignore- t={t}- i18nKey='auth.signin.2faUnavailable'- components={{- // eslint-disable-next-line jsx-a11y/anchor-has-content- ctl: <Link to={routes.contact} className='underline hover:text-gray-900 dark:hover:text-gray-200' />,- }}- />+ <Trans+ // @ts-ignore+ t={t}+ i18nKey='auth.signin.2faUnavailable'+ components={{+ // eslint-disable-next-line jsx-a11y/anchor-has-content+ ctl: <Link to={routes.contact} className='underline hover:text-gray-900 dark:hover:text-gray-200' />,+ }}+ />)}</div><Button type='submit' loading={isLoading} primary large>@@ -201,80 +201,102 @@ const Signin = ({}return (- <div className='min-h-page bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>- <form className='max-w-7xl w-full mx-auto' onSubmit={handleSubmit}>- <h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>+ <div className='bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>+ <div className='sm:mx-auto sm:w-full sm:max-w-md'>+ <h2 className='text-center text-2xl font-bold leading-9 tracking-tight text-gray-900 dark:text-gray-50'>{t('auth.signin.title')}</h2>- <Input- name='email'- id='email'- type='email'- label={t('auth.common.email')}- value={form.email}- placeholder='[email protected]'- className='mt-4'- onChange={handleInput}- error={beenSubmitted && errors.email}- />- <Input- name='password'- id='password'- type='password'- label={t('auth.common.password')}- hint={t('auth.common.hint', { amount: MIN_PASSWORD_CHARS })}- value={form.password}- placeholder={t('auth.common.password')}- className='mt-4'- onChange={handleInput}- error={beenSubmitted && errors.password}- />- <Checkbox- checked={form.dontRemember}- onChange={handleInput}- name='dontRemember'- id='dontRemember'- className='mt-4'- label={t('auth.common.noRemember')}- />- <div className='flex justify-between mt-3'>- <div className='pt-1'>- {!isSelfhosted && (- <>- <Link to={routes.reset_password} className='underline text-blue-600 hover:text-indigo-800 dark:text-blue-400 dark:hover:text-blue-500'>- {t('auth.signin.forgot')}- </Link>- <span className='text-gray-900 dark:text-gray-50'> | </span>- <Link to={routes.signup} className='underline text-blue-600 hover:text-indigo-800 dark:text-blue-400 dark:hover:text-blue-500' aria-label={t('titles.signup')}>- {t('auth.common.signupInstead')}- </Link>- </>- )}- </div>- <Button type='submit' loading={isLoading} primary large>- {t('auth.signin.button')}- </Button>+ </div>+ <div className='mt-10 sm:mx-auto sm:w-full sm:max-w-[480px]'>+ <div className='bg-white dark:bg-slate-800/20 dark:ring-1 dark:ring-slate-800 px-6 py-12 shadow sm:rounded-lg sm:px-12'>+ <form className='space-y-6' onSubmit={handleSubmit}>+ <Input+ name='email'+ id='email'+ type='email'+ label={t('auth.common.email')}+ value={form.email}+ className='mt-4'+ onChange={handleInput}+ error={beenSubmitted ? errors.email : ''}+ />+ <Input+ name='password'+ id='password'+ type='password'+ label={t('auth.common.password')}+ hint={t('auth.common.hint', { amount: MIN_PASSWORD_CHARS })}+ value={form.password}+ className='mt-4'+ onChange={handleInput}+ error={beenSubmitted ? errors.password : ''}+ />+ <div className='flex items-center justify-between'>+ <Checkbox+ checked={form.dontRemember}+ onChange={handleInput}+ name='dontRemember'+ id='dontRemember'+ label={t('auth.common.noRemember')}+ />+ <div className='text-sm leading-6'>+ <Link to={routes.reset_password} className='font-semibold text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500'>+ {t('auth.signin.forgot')}+ </Link>+ </div>+ </div>++ <Button className='w-full justify-center' type='submit' loading={isLoading} primary giant>+ {t('auth.signin.button')}+ </Button>+ </form>++ {!isSelfhosted && (+ <div>+ <div className='relative mt-10'>+ <div className='absolute inset-0 flex items-center' aria-hidden='true'>+ <div className='w-full border-t border-gray-200 dark:border-gray-600' />+ </div>+ <div className='relative flex justify-center text-sm font-medium leading-6'>+ <span className='bg-white dark:bg-slate-800/20 px-6 text-gray-900 dark:text-gray-50'>+ {t('auth.common.orContinueWith')}+ </span>+ </div>+ </div>+ <div className='mt-6 grid grid-cols-2 gap-4'>+ <GoogleAuth+ setIsLoading={setIsLoading}+ authSSO={authSSO}+ callback={loginCallback}+ dontRemember={false}+ />+ <GithubAuth+ setIsLoading={setIsLoading}+ authSSO={authSSO}+ callback={loginCallback}+ dontRemember={false}+ ssrTheme={ssrTheme}+ />+ </div>+ </div>+ )}</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}- ssrTheme={ssrTheme}++ <p className='mt-10 mb-4 text-center text-sm text-gray-500 dark:text-gray-200'>+ <Trans+ // @ts-ignore+ t={t}+ i18nKey='auth.signin.notAMember'+ components={{+ // eslint-disable-next-line jsx-a11y/anchor-has-content+ url: <Link to={routes.signup} className='font-semibold leading-6 text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500' aria-label={t('footer.tos')} />,+ }}+ values={{+ amount: TRIAL_DAYS,+ }}/>- </div>- )}- </form>+ </p>+ </div></div>)}diff --git a/app/pages/Auth/Signup/Signup.tsx b/app/pages/Auth/Signup/Signup.tsxindex e6bde24a1..71c460c2d 100644--- a/app/pages/Auth/Signup/Signup.tsx+++ b/app/pages/Auth/Signup/Signup.tsx@@ -144,134 +144,145 @@ const Signup = ({ signup, authSSO, ssrTheme }: ISignup): JSX.Element => {return (<div>- <div className='min-h-page bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>- <form className='max-w-7xl w-full mx-auto' onSubmit={handleSubmit}>- <h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>- {t('auth.signup.trial', {- amount: TRIAL_DAYS,- })}- </h2>- <p className='text-lg text-gray-900 dark:text-gray-50'>- {t('auth.signup.noCC')}- </p>- <Input- name='email'- id='email'- type='email'- label={t('auth.common.email')}- value={form.email}- placeholder='[email protected]'- className='mt-4'- onChange={handleInput}- error={beenSubmitted ? errors.email : ''}- />- <Input- name='password'- id='password'- type='password'- label={t('auth.common.password')}- hint={t('auth.common.hint', { amount: MIN_PASSWORD_CHARS })}- value={form.password}- placeholder={t('auth.common.password')}- className='mt-4'- onChange={handleInput}- error={beenSubmitted ? errors.password : ''}- />- <Input- name='repeat'- id='repeat'- type='password'- label={t('auth.common.repeat')}- value={form.repeat}- placeholder={t('auth.common.repeat')}- className='mt-4'- onChange={handleInput}- error={beenSubmitted ? errors.repeat : ''}- />- <Checkbox- checked={form.tos}- onChange={handleInput}- name='tos'- id='tos'- className='mt-4'- label={(- <span>- <Trans- // @ts-ignore- t={t}- i18nKey='auth.signup.tos'- components={{- // eslint-disable-next-line jsx-a11y/anchor-has-content- tos: <Link to={routes.terms} className='font-medium text-gray-900 dark:text-gray-300 hover:underline' aria-label={t('footer.tos')} />,- // eslint-disable-next-line jsx-a11y/anchor-has-content- pp: <Link to={routes.privacy} className='font-medium text-gray-900 dark:text-gray-300 hover:underline' aria-label={t('footer.pp')} />,- }}+ <div className='bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>+ <div className='flex min-h-full flex-1 flex-col justify-center py-6 sm:px-6 lg:px-8'>+ <div className='sm:mx-auto sm:w-full sm:max-w-md'>+ <h2 className='text-center text-2xl font-bold leading-9 tracking-tight text-gray-900 dark:text-gray-50'>+ {t('auth.signup.trial', {+ amount: TRIAL_DAYS,+ })}+ </h2>+ <p className='text-center text-base text-gray-900 dark:text-gray-50'>+ {t('auth.signup.noCC')}+ </p>+ </div>+ <div className='mt-10 sm:mx-auto sm:w-full sm:max-w-[480px]'>+ <div className='bg-white dark:bg-slate-800/20 dark:ring-1 dark:ring-slate-800 px-6 py-12 shadow sm:rounded-lg sm:px-12'>+ <form className='space-y-6' onSubmit={handleSubmit}>+ <Input+ name='email'+ id='email'+ type='email'+ label={t('auth.common.email')}+ value={form.email}+ onChange={handleInput}+ error={beenSubmitted ? errors.email : ''}/>- </span>- )}- hintClassName='!text-red-600 dark:!text-red-500'- hint={beenSubmitted ? errors.tos : ''}- />- <div className='flex mt-4'>- <Checkbox- checked={form.checkIfLeaked}- onChange={handleInput}- name='checkIfLeaked'- id='checkIfLeaked'- label={t('auth.common.checkLeakedPassword')}- />- <Tooltip- className='ml-2'- text={(- <Trans- // @ts-ignore- t={t}- i18nKey='auth.common.checkLeakedPasswordDesc'- components={{- // eslint-disable-next-line jsx-a11y/anchor-has-content- db: <a href={HAVE_I_BEEN_PWNED_URL} className='font-medium text-indigo-400 hover:underline hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500' target='_blank' rel='noreferrer noopener' />,- }}- values={{- database: 'haveibeenpwned.com',- }}+ <Input+ name='password'+ id='password'+ type='password'+ label={t('auth.common.password')}+ hint={t('auth.common.hint', { amount: MIN_PASSWORD_CHARS })}+ value={form.password}+ onChange={handleInput}+ error={beenSubmitted ? errors.password : ''}/>- )}- />- </div>- <Checkbox- checked={form.dontRemember}- onChange={handleInput}- name='dontRemember'- id='dontRemember'- className='mt-4'- label={t('auth.common.noRemember')}- />- <div className='pt-1 flex justify-between mt-3'>- <Link to={routes.signin} className='underline text-blue-600 hover:text-indigo-800 dark:text-blue-400 dark:hover:text-blue-500'>- {t('auth.common.signinInstead')}- </Link>- <Button type='submit' loading={isLoading} primary large>- {t('auth.signup.button')}- </Button>- </div>- <div className='flex flex-wrap'>- <GoogleAuth- className='mt-4 mr-5'- setIsLoading={setIsLoading}- authSSO={authSSO}- callback={signUpCallback}- dontRemember={form.dontRemember}- />- <GithubAuth- className='mt-4'- setIsLoading={setIsLoading}- authSSO={authSSO}- callback={signUpCallback}- dontRemember={form.dontRemember}- ssrTheme={ssrTheme}- />+ <Input+ name='repeat'+ id='repeat'+ type='password'+ label={t('auth.common.repeat')}+ value={form.repeat}+ onChange={handleInput}+ error={beenSubmitted ? errors.repeat : ''}+ />+ <Checkbox+ checked={form.tos}+ onChange={handleInput}+ name='tos'+ id='tos'+ label={(+ <span>+ <Trans+ // @ts-ignore+ t={t}+ i18nKey='auth.signup.tos'+ components={{+ // eslint-disable-next-line jsx-a11y/anchor-has-content+ tos: <Link to={routes.terms} className='font-medium text-gray-900 dark:text-gray-300 underline decoration-dashed hover:decoration-solid' aria-label={t('footer.tos')} />,+ // eslint-disable-next-line jsx-a11y/anchor-has-content+ pp: <Link to={routes.privacy} className='font-medium text-gray-900 dark:text-gray-300 underline decoration-dashed hover:decoration-solid' aria-label={t('footer.pp')} />,+ }}+ />+ </span>+ )}+ hintClassName='!text-red-600 dark:!text-red-500'+ hint={beenSubmitted ? errors.tos : ''}+ />+ <div className='flex'>+ <Checkbox+ checked={form.checkIfLeaked}+ onChange={handleInput}+ name='checkIfLeaked'+ id='checkIfLeaked'+ label={t('auth.common.checkLeakedPassword')}+ />+ <Tooltip+ className='ml-2'+ text={(+ <Trans+ // @ts-ignore+ t={t}+ i18nKey='auth.common.checkLeakedPasswordDesc'+ components={{+ // eslint-disable-next-line jsx-a11y/anchor-has-content+ db: <a href={HAVE_I_BEEN_PWNED_URL} className='font-medium text-indigo-400 hover:underline hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500' target='_blank' rel='noreferrer noopener' />,+ }}+ values={{+ database: 'haveibeenpwned.com',+ }}+ />+ )}+ />+ </div>+ <Button className='w-full justify-center' type='submit' loading={isLoading} primary giant>+ {t('auth.signup.button')}+ </Button>+ </form>++ <div>+ <div className='relative mt-10'>+ <div className='absolute inset-0 flex items-center' aria-hidden='true'>+ <div className='w-full border-t border-gray-200 dark:border-gray-600' />+ </div>+ <div className='relative flex justify-center text-sm font-medium leading-6'>+ <span className='bg-white dark:bg-slate-800/20 px-6 text-gray-900 dark:text-gray-50'>+ {t('auth.common.orContinueWith')}+ </span>+ </div>+ </div>+ <div className='mt-6 grid grid-cols-2 gap-4'>+ <GoogleAuth+ setIsLoading={setIsLoading}+ authSSO={authSSO}+ callback={signUpCallback}+ dontRemember={false}+ />+ <GithubAuth+ setIsLoading={setIsLoading}+ authSSO={authSSO}+ callback={signUpCallback}+ dontRemember={false}+ ssrTheme={ssrTheme}+ />+ </div>+ </div>+ </div>++ <p className='mt-10 text-center text-sm text-gray-500 dark:text-gray-200'>+ <Trans+ // @ts-ignore+ t={t}+ i18nKey='auth.signup.alreadyAMember'+ components={{+ // eslint-disable-next-line jsx-a11y/anchor-has-content+ url: <Link to={routes.signin} className='font-semibold leading-6 text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500' aria-label={t('footer.tos')} />,+ }}+ />+ </p></div>- </form>+ </div></div></div>)diff --git a/app/pages/Features/index.tsx b/app/pages/Features/index.tsxdeleted file mode 100644index 0b92efddf..000000000--- a/app/pages/Features/index.tsx+++ /dev/null@@ -1,97 +0,0 @@-/* eslint-disable jsx-a11y/anchor-has-content */-import React, { Fragment } from 'react'-import { Link } from '@remix-run/react'-import { useTranslation, Trans } from 'react-i18next'-import _map from 'lodash/map'--import {- CHROME_EXTENSION_URL, FIREFOX_ADDON_URL, DOCS_URL,-} from 'redux/constants'-import routes from 'routesPath'--const Features = (): JSX.Element => {- const { t }: {- t: (key: string, options?: {- [key: string]: string | number | boolean | undefined- }) => string- } = useTranslation('common')-- return (- <>- <div className='bg-gray-50 dark:bg-slate-900'>- <div className='w-11/12 md:w-4/5 mx-auto pb-16 pt-12 px-4 sm:px-6 lg:px-8 whitespace-pre-line'>- <h1 className='text-4xl font-bold text-gray-900 dark:text-gray-50 tracking-tight'>- {t('titles.features')}- </h1>-- <h3 className='text-2xl font-normal text-gray-900 dark:text-gray-50 tracking-tight mt-4'>- {t('features.feature1Name')}- </h3>- <p className='text-lg text-gray-900 dark:text-gray-50 tracking-tight'>- <Trans- // @ts-ignore- t={t}- i18nKey='features.feature1Content'- components={{- docs: <a className='text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500' href={`${DOCS_URL}/swetrix-js-reference#trackviews`} target='_blank' rel='noreferrer noopener' />,- gh: <a className='text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500' href='https://github.com/Swetrix' target='_blank' rel='noopener noreferrer' />,- }}- />- </p>-- <h3 className='text-2xl font-normal text-gray-900 dark:text-gray-50 tracking-tight mt-4'>- {t('features.feature2Name')}- </h3>- <p className='text-lg text-gray-900 dark:text-gray-50 tracking-tight'>- <Trans- // @ts-ignore- t={t}- i18nKey='features.feature2Content'- components={{- firefox: <a className='text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500' href={FIREFOX_ADDON_URL} target='_blank' rel='noopener noreferrer' aria-label='Firefox Addon (opens in a new tab)' />,- chrome: <a className='text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-500' href={CHROME_EXTENSION_URL} target='_blank' rel='noopener noreferrer' aria-label='Chrome Extension (opens in a new tab)' />,- }}- />- </p>- {_map(t('features.list', { returnObjects: true }), (feature: {- name: string- content: string- }) => (- <Fragment key={feature.name}>- <h3 className='text-2xl font-normal text-gray-900 dark:text-gray-50 tracking-tight mt-4'>- {feature.name}- </h3>- <p className='text-lg text-gray-900 dark:text-gray-50 tracking-tight'>- {feature.content}- </p>- </Fragment>- ))}- </div>- </div>- <div className='bg-indigo-600 dark:bg-slate-800'>- <div className='w-4/5 mx-auto pb-16 pt-12 px-4 sm:px-6 lg:px-8 lg:flex lg:items-center lg:justify-between'>- <h2 className='text-3xl sm:text-4xl font-bold tracking-tight text-gray-900 dark:text-gray-50'>- <span className='block text-white'>- {t('features.ready')}- </span>- <span className='block text-gray-300'>- {t('features.start')}- </span>- </h2>- <div className='mt-6 space-y-4 sm:space-y-0 sm:flex sm:space-x-5'>- <Link- to={routes.signup}- className='flex items-center justify-center px-3 py-2 border border-transparent text-lg font-medium rounded-md shadow-sm text-indigo-800 bg-indigo-50 hover:bg-indigo-100 dark:text-slate-800'- aria-label={t('titles.signup')}- >- {t('common.getStarted')}- </Link>- </div>- </div>- </div>-- </>- )-}--export default Featuresdiff --git a/app/routes/features.tsx b/app/routes/features.tsxdeleted file mode 100644index a75f230d1..000000000--- a/app/routes/features.tsx+++ /dev/null@@ -1,10 +0,0 @@-import Features from 'pages/Features'-import type { SitemapFunction } from 'remix-sitemap'--export const sitemap: SitemapFunction = () => ({- priority: 0.9,-})--export default function Index() {- return <Features />-}diff --git a/app/routesPath/index.ts b/app/routesPath/index.tsindex 9857fb5a9..7498b2d88 100644--- a/app/routesPath/index.ts+++ b/app/routesPath/index.ts@@ -16,7 +16,6 @@ const routes = Object.freeze({captcha_settings: '/captchas/settings/:id',project: '/projects/:id',captcha: '/captchas/:id',- features: '/features',billing: '/billing',privacy: '/privacy',cookiePolicy: '/cookie-policy',diff --git a/app/ui/Input.tsx b/app/ui/Input.tsxindex 4580e4f7f..dd5d8abd9 100644--- a/app/ui/Input.tsx+++ b/app/ui/Input.tsx@@ -45,7 +45,7 @@ const Input = ({</div><divclassName={cx('relative', {- 'mt-1': label && hint,+ 'mt-1': label,})}><inputdiff --git a/app/utils/server.ts b/app/utils/server.tsindex 54d041f17..22f77b8c3 100644--- a/app/utils/server.ts+++ b/app/utils/server.ts@@ -124,12 +124,6 @@ export const getPageMeta = (}break- case routes.features:- result = {- title: t('titles.features'),- }- break-case routes.billing:result = {title: t('titles.billing'),diff --git a/public/locales/en.json b/public/locales/en.jsonindex cfe6d7a03..5b55e2ef6 100644--- a/public/locales/en.json+++ b/public/locales/en.json@@ -285,7 +285,8 @@"2fa": "Two-factor authentication","2faDesc": "Open the two-factor authentication app on your device to view your authentication code and verify your identity.\nYou can also use your backup code.","2faUnavailable": "Don't have access to 2FA?\n<ctl>Contact support</ctl>.",- "6digitCode": "6-digit authentication code"+ "6digitCode": "6-digit authentication code",+ "notAMember": "Not a member? <url>Start a {{amount}} day free trial</url>"},"signup": {"button": "Sign up",@@ -293,7 +294,8 @@"email": "Email address","create": "Create your account","trial": "Start your free {{amount}} day trial",- "noCC": "No credit card required."+ "noCC": "No credit card required.",+ "alreadyAMember": "Already a member? <url>Sign in</url>"},"verification": {"success": "Your email has been successfully verified!"@@ -321,67 +323,12 @@"checkLeakedPasswordDesc": "When enabled we check your password with the <db>{{database}}</db> database. We don't send your password to the service. First we hash your password (using SHA1) and send only the first 5 characters of that hash to the service. The service returns all leaked passwords that start with those 5 characters. At our end we check if one of these matches with your password. We show you a warning if it has been leaked before. We never store your password in plain text.","addedOn": "Added on","continueWithGoogle": "Continue with Google",- "continueWithGithub": "Continue with Github"+ "continueWithGithub": "Continue with Github",+ "google": "Google",+ "github": "Github",+ "orContinueWith": "Or continue with"}},- "features": {- "feature1Name": "Transparency",- "feature1Content": "At Swetrix, we believe that everyone has a right to privacy and transparency, especially when it comes to analytics.\nWe do not collect more information than we <docs>claim</docs>, all data is stored on servers physically located in the European Union and our analytics script is publicly available and accessible to all on our <gh>Github</gh>.",- "feature2Name": "Browser Addons",- "feature2Content": "Need to quickly view statistics for your website?\nWe have developed <chrome>Chrome</chrome> and <firefox>Firefox</firefox> extensions for this purpose.\nUsing these, you can instantly view the most important insights, receive traffic spikes notifications and much more!",- "ready": "Ready to get to know your users?",- "start": "Start using Swetrix today.",- "list": [- {- "name": "Performance monitoring",- "content": "With Swetrix you can stop guessing how fast does your website load across the globe.\nWe offer a wide range of metrics, such as page load time, DNS lookup time, TTFB and more.\nYou can see data breakdowns by time spent on frontend, backend or network, view this data for the specific countries, browsers, devices.\nAll of this is available in real-time, so you can see how your website performs at any given moment."- },- {- "name": "Custom alerts",- "content": "Do you want to track traffic spikes? Or maybe the pageviews for a specific time period? All this is available with custom alerts.\nYou can set up alerts for a wide range of metrics and receive notifications via messengers like Telegram when they get triggered."- },- {- "name": "Extensions & Extension Marketplace",- "content": "Is there some feature missing or you want to modify the Dashboard specifically for your needs? All of this is possible with Swetrix Extensions: we offer a customisable SDK which will allow you to modify the dashboard in any way you want, you can also publish your extension for other people to use or install addons people created from our Extension Marketplace."- },- {- "name": "AI forecasting",- "content": "You can forecast your website traffic with our AI-powered forecasting tool."- },- {- "name": "Public & Shared Dashboards",- "content": "With Swetrix you can make your dashboard available for other people to view.\nYou can also invite other Swetrix users to your projects, assign different roles to them."- },- {- "name": "Simplicity",- "content": "When we created our service we tried to make it as simple and flexible as possible.\nNo more confusing metrics and complicated dashboards - with us you can have control over all your projects and data in a simple and straightforward way."- },- {- "name": "Page Views Tracking",- "content": "Swetrix offers the ability to track page views, including unique views as well as user flow.\nAll views include a wide range of data, such as user country, locale, device type, page load time, and more.\nWe do not use cookies or any other type of user profiling to collect data. All incoming data is anonymised, ensuring that users cannot be tracked down in any way based on this."- },- {- "name": "Custom Events Tracking",- "content": "In addition to tracking page views, we also offer the ability to track сustom events.\nYou can track any event, such as button clicks, registrations or authorisations.\nAll of this is also completely private to the user, as we don't store any other information about them along with the events.\nYou can read more about custom events in our documentation."- },- {- "name": "Developer API",- "content": "We offer a developer API, which allows you to integrate Swetrix into your own applications.\nYou can use our API to create custom dashboards, or to integrate Swetrix into your own applications."- },- {- "name": "Convenience",- "content": "Besides the big features we try to focus on small things that make any project better.\nYou can customise Swetrix for your needs, for example use your native language or your favourite theme, set up 2FA, use a timezone or a time notation you prefer."- },- {- "name": "Speed",- "content": "We are fast. Our analytics script is as optimised as possible and uses CDNs for its delivery, which ensures that the script won't slow down your sites."- },- {- "name": "Trust",- "content": "We are a small business, not a big corporation.\nWe are interested in creating a good and quality product that will be used by satisfied customers, not in squeezing as much money as possible from our users or selling your personal data."- }- ]- },"profileSettings": {"logoutAll": "Log out from all devices","account": "Account",@@ -770,6 +717,7 @@"contact": "Need to track more than {{amount}} million events per month?\nContact us at <mail>{{email}}</mail> to discuss your needs.","update": "Update payment details","nextBillDate": "Next bill date:",+ "nextBillDateIs": "Your next bill date is {{date}}","trialEnds": "Trial ends {{date}}","cancelSub": "Cancel subscription","noSubWarning": "You don't have an active subscription.\nNo new analytics data will be stored into our database. You can still view the data that was collected before the subscription was cancelled.",@@ -787,7 +735,14 @@"dueNow": "Due now","dueNowDescription": "You will be charged pro-rated amount for the remaining days of the current billing period.","negativePayment": "Negative 'Amount' means that you will have a credit balance of {{currency}}{{dueNowAmount}}. You will be billed {{currency}}0.00 on {{dueNowDate}}. Once the credit balance is used up, your recurring billing amount will be {{currency}}{{nextPaymentAmount}} every billing cycle of your subscription plan.",- "nextPayment": "Next payment"+ "nextPayment": "Next payment",+ "subscription": "Subscription",+ "planUsageDesc": "The plan usage shows the number of events (page views, custom events, CAPTCHA completions) that you have used for the current month.",+ "xofy": "{{x}} of {{y}}",+ "resetDate": "The plan usage resets on the first day of each month.",+ "selectPlan": "Select a subscription plan to unveil full Swetrix potential.",+ "changePlan": "You can change or cancel your subscription plan at any time here.",+ "membersNotification": "Pageviews, custom events and CAPTCHA completions are counted towards the limit of the subscription of the account owner. People you invite into your projects don't need a subscription."},"modals": {"paidFeature": {@@ -893,7 +848,6 @@"verification": "Email verification","invitation": "Shared project invitation","profileSettings": "Profile settings",- "features": "Features","dashboard": "Dashboard","docs": "Documentation","billing": "Billing",