📈 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
Improve 'Add a recipient' texts and design
Blue Mousefcd43ad9c19b
diff --git a/web/app/pages/Project/Settings/Emails/Emails.tsx b/web/app/pages/Project/Settings/Emails/Emails.tsxindex 692f6943a..36ea2d31c 100644--- a/web/app/pages/Project/Settings/Emails/Emails.tsx+++ b/web/app/pages/Project/Settings/Emails/Emails.tsx@@ -25,14 +25,11 @@ import { Badge } from 'ui/Badge'import { ISubscribers } from 'redux/models/ISubscribers'const ModalMessage = ({- project,handleInput,beenSubmitted,errors,form,- t,}: {- project: stringhandleInput: (e: React.ChangeEvent<HTMLInputElement>) => voidbeenSubmitted: booleanerrors: {@@ -43,82 +40,100 @@ const ModalMessage = ({email: stringreportFrequency: string}+}) => {+ const { t } = useTranslation('common')++ return (+ <div>+ <h2 className='text-xl font-bold text-gray-700 dark:text-gray-200'>{t('project.settings.addARecipient')}</h2>+ <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>{t('project.settings.addARecipientDesc')}</p>+ <Input+ name='email'+ type='email'+ label={t('auth.common.email')}+ value={form.email}+ placeholder='[email protected]'+ className='mt-4'+ onChange={handleInput}+ error={beenSubmitted && errors.email}+ />+ <fieldset className='mt-4'>+ <legend className='block text-sm font-medium text-gray-700 dark:text-gray-300'>+ {t('project.emails.reportFrequency')}+ </legend>+ <div+ className={cx('mt-1 -space-y-px rounded-md bg-white dark:bg-slate-900', {+ 'border border-red-300': errors.reportFrequency,+ })}+ >+ {reportFrequencyForEmailsOptions.map((item, index) => (+ <ReportFrequencyOption+ key={item.value}+ item={item}+ index={index}+ form={form}+ handleInput={handleInput}+ t={t}+ totalOptions={reportFrequencyForEmailsOptions.length}+ />+ ))}+ </div>+ {errors.reportFrequency && (+ <p className='mt-2 text-sm text-red-600 dark:text-red-500' id='reportFrequency-error'>+ {errors.reportFrequency}+ </p>+ )}+ </fieldset>+ </div>+ )+}++const ReportFrequencyOption = ({+ item,+ index,+ form,+ handleInput,+ t,+ totalOptions,+}: {+ item: { value: string; label: string }+ index: number+ form: { reportFrequency: string }+ handleInput: (e: React.ChangeEvent<HTMLInputElement>) => voidt: typeof i18next.t-}): JSX.Element => (- <div>- <h2 className='text-xl font-bold text-gray-700 dark:text-gray-200'>- {t('project.settings.inviteTo', { project })}- </h2>- <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>{t('project.settings.inviteDesc')}</p>- <Input- name='email'- type='email'- label={t('auth.common.email')}- value={form.email}- placeholder='[email protected]'- className='mt-4'+ totalOptions: number+}) => (+ <label+ className={cx('relative flex cursor-pointer border border-gray-200 p-4 dark:border-slate-600', {+ 'z-10 border-indigo-200 bg-indigo-50 dark:border-indigo-800/40 dark:bg-indigo-600/40':+ item.value === form.reportFrequency,+ 'border-gray-200': form.reportFrequency !== item.value,+ 'rounded-tl-md rounded-tr-md': index === 0,+ 'rounded-bl-md rounded-br-md': index === totalOptions - 1,+ })}+ >+ <input+ name='reportFrequency'+ className='h-4 w-4 border-gray-300 text-indigo-600 focus:ring-indigo-500'+ type='radio'+ value={item.value}onChange={handleInput}- error={beenSubmitted && errors.email}+ checked={form.reportFrequency === item.value}/>- <fieldset className='mt-4'>- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}- <label className='block text-sm font-medium text-gray-700 dark:text-gray-300' htmlFor='role'>- {t('project.emails.reportFrequency')}- </label>- <div- className={cx('mt-1 -space-y-px rounded-md bg-white dark:bg-slate-900', {- 'border border-red-300': errors.reportFrequency,- })}- >- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}- {_map(reportFrequencyForEmailsOptions, (item, index) => (- <div key={item.value}>- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}- <label- className={cx('relative flex cursor-pointer border border-gray-200 p-4 dark:border-gray-500', {- 'z-10 border-indigo-200 bg-indigo-50 dark:border-indigo-800 dark:bg-indigo-500':- item.value === form.reportFrequency,- 'border-gray-200': form.reportFrequency !== item.value,- 'rounded-tl-md rounded-tr-md': index === 0,- 'rounded-bl-md rounded-br-md': index === reportFrequencyForEmailsOptions.length - 1,- })}- >- <input- name='reportFrequency'- className='h-4 w-4 border-gray-300 text-indigo-600 focus:ring-indigo-500'- id='reportFrequency'- type='radio'- value={item.value}- onChange={handleInput}- />- <div className='ml-3 flex flex-col'>- <span- className={cx('block text-sm font-medium', {- 'text-indigo-900 dark:text-white': form.reportFrequency === item.value,- 'text-gray-700 dark:text-gray-200': form.reportFrequency !== item.value,- })}- >- {t(`profileSettings.${item.value}`)}- </span>- </div>- </label>- </div>- ))}- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}- </div>- {errors.reportFrequency && (- <p className='mt-2 text-sm text-red-600 dark:text-red-500' id='email-error'>- {errors.reportFrequency}- </p>- )}- </fieldset>- </div>+ <span+ className={cx('ml-3 block text-sm font-medium', {+ 'text-indigo-900 dark:text-white': form.reportFrequency === item.value,+ 'text-gray-700 dark:text-gray-200': form.reportFrequency !== item.value,+ })}+ >+ {t(`profileSettings.${item.value}`)}+ </span>+ </label>)const EmailList = ({data,onRemove,- t,setEmails,language,}: {@@ -131,10 +146,10 @@ const EmailList = ({reportFrequency: string}onRemove: (id: string) => void- t: typeof i18next.tsetEmails: (value: ISubscribers[] | ((prevVar: ISubscribers[]) => ISubscribers[])) => voidlanguage: string}) => {+ const { t } = useTranslation('common')const [open, setOpen] = useState<boolean>(false)const [showDeleteModal, setShowDeleteModal] = useState<boolean>(false)const openRef = useRef<HTMLDivElement>(null)@@ -260,7 +275,7 @@ const NoSubscribers = ({ t }: { t: typeof i18next.t }): JSX.Element => (</div>)-const Emails = ({ projectId, projectName }: { projectId: string; projectName: string }): JSX.Element => {+const Emails = ({ projectId }: { projectId: string }): JSX.Element => {const [showModal, setShowModal] = useState<boolean>(false)const {t,@@ -431,7 +446,6 @@ const Emails = ({ projectId, projectName }: { projectId: string; projectName: stdata={email}key={email.id}onRemove={onRemove}- t={t}language={language}setEmails={setEmails}/>@@ -458,16 +472,7 @@ const Emails = ({ projectId, projectName }: { projectId: string; projectName: st</button>}closeText={t('common.cancel')}- message={- <ModalMessage- t={t}- project={projectName}- form={form}- handleInput={handleInput}- errors={errors}- beenSubmitted={beenSubmitted}- />- }+ message={<ModalMessage form={form} handleInput={handleInput} errors={errors} beenSubmitted={beenSubmitted} />}isOpened={showModal}/></div>diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsxindex f53fda698..0daa5936d 100644--- a/web/app/pages/Project/Settings/ProjectSettings.tsx+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx@@ -709,7 +709,7 @@ const ProjectSettings = ({{!isSelfhosted && (<><hr className='mt-8 border-gray-200 dark:border-gray-600 xs:mt-2 sm:mt-5' />- <Emails projectId={id} projectName={project.name} />+ <Emails projectId={id} /></>)}{!isSelfhosted && (diff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex 9bd13d3ce..37945827a 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -961,6 +961,8 @@"removeUser": "Remove {{user}}?","people": "People","inviteCoworkers": "Invite your coworkers",+ "addARecipient": "Add a recipient",+ "addARecipientDesc": "Enter an email address of the person you want to send reports to. They don't necessarily need to have an account on Swetrix.\nWe will send them your site's reports on a regular basis.","invite": "Invite a user","inviteTo": "Invite a user to {{project}}","inviteDesc": "Enter an email address and a role of the person you want to share your project with.\nWe shall contact them over email to offer the access to the project.",