📈 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
refactoring, added new label and modal
kruzhambus54291feb2f63
diff --git a/src/pages/Project/Settings/People.jsx b/src/pages/Project/Settings/People.jsxdeleted file mode 100644index f744bb96c..000000000--- a/src/pages/Project/Settings/People.jsx+++ /dev/null@@ -1,71 +0,0 @@-import React, { useState } from 'react'-import Button from 'ui/Button'-import { ChevronDownIcon, CheckIcon } from '@heroicons/react/solid'-import { ActivePin } from 'ui/Pin'--const People = () => {- const [open, setOpen] = useState(false)-- return (- <div className='mt-6 mb-6'>- <div className='flex justify-between items-center mb-3'>- <div>- <h3 className='mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>People</h3>- <p className='text-sm text-gray-500 dark:text-gray-400'>Invite your coworkers</p>- </div>- <Button onClick={() => {}} className='h-8' primary regular type='button'>add Users</Button>- </div>- <div>- <ul className='divide-y divide-gray-200 dark:divide-gray-700'>- <li className='py-4'>- <div className='flex justify-between'>- <p className='text-gray-700 dark:text-gray-200'>[email protected]</p>- <div className='relative'>- <ActivePin label='Pannding' className='inline-flex items-center shadow-sm px-2.5 py-0.5 mr-3' />- <button onClick={() => setOpen(!open)} type='button' className='inline-flex items-center shadow-sm px-2.5 py-0.5 border border-gray-200 dark:border-gray-500 text-sm leading-5 font-medium rounded-full bg-white dark:bg-gray-700 text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-800'>- Viewer- <ChevronDownIcon style={{ transform: open ? 'rotate(180deg)' : '' }} className='w-4 h-4 pt-px ml-1' />- </button>- {open && (- <ul className='origin-top-right absolute z-10 right-0 mt-2 w-72 rounded-md shadow-lg overflow-hidden bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700 focus:outline-none'>- <li className='p-4 hover:bg-indigo-600 group cursor-pointer flex justify-between items-center'>- <div>- <p className='font-bold text-gray-700 dark:text-gray-200 group-hover:text-gray-200'>Admin</p>- <p className='mt-1 text-sm text-gray-500 group-hover:text-gray-200'>View stats and settings project</p>- </div>- <span className='text-indigo-600 group-hover:text-gray-200'>- <CheckIcon className='w-7 h-7 pt-px ml-1' />- </span>- </li>- {/* next element */}- <li className='p-4 hover:bg-indigo-600 group cursor-pointer flex justify-between items-center'>- <div>- <p className='font-bold text-gray-700 dark:text-gray-200 group-hover:text-gray-200'>Viewer</p>- <p className='mt-1 text-sm text-gray-500 group-hover:text-gray-200'>View stats only</p>- </div>- </li>- </ul>- )}- </div>- </div>- </li>- {/* next element */}- <li className='py-4'>- <div className='flex justify-between'>- <p className='text-gray-700 dark:text-gray-200'>[email protected]</p>- <button type='button' className='inline-flex items-center shadow-sm px-2.5 py-0.5 border border-gray-200 dark:border-gray-500 text-sm leading-5 font-medium rounded-full bg-white dark:bg-gray-700 text-gray-700 text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-800'>- Viewer- <svg className='w-4 h-4 pt-px ml-1' fill='currentColor' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg'><path fillRule='evenodd' d='M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z' clipRule='evenodd' /></svg>- </button>- </div>- </li>- </ul>- </div>- <Button type='submit' className='mt-3 ' primary regular>- save- </Button>- </div>- )-}--export default Peoplediff --git a/src/pages/Project/Settings/People/AddUser.jsx b/src/pages/Project/Settings/People/AddUser.jsxnew file mode 100644index 000000000..fa0d820c7--- /dev/null+++ b/src/pages/Project/Settings/People/AddUser.jsx@@ -0,0 +1,82 @@+import React, { useState, useEffect } from 'react'+import { useTranslation } from 'react-i18next'+import Input from 'ui/Input'+import { isValidEmail } from 'utils/validator'+import _keys from 'lodash/keys'+import _isEmpty from 'lodash/isEmpty'++const AddUser = ({ projectName }) => {+ const { t } = useTranslation('common')+ const [form, setForm] = useState({})+ const [beenSubmitted, setBeenSubmitted] = useState(false)+ const [errors, setErrors] = useState({})+ const [validated, setValidated] = useState(false)++ const validate = () => {+ const allErrors = {}++ if (!isValidEmail(form.email)) {+ allErrors.email = t('auth.common.badEmailError')+ }++ const valid = _isEmpty(_keys(allErrors))++ setErrors(allErrors)+ setValidated(valid)+ }++ useEffect(() => {+ validate()+ }, [form]) // eslint-disable-line++ const handleInput = ({ target }) => {+ const value = target.type === 'checkbox' ? target.checked : target.value++ setForm(oldForm => ({+ ...oldForm,+ [target.name]: value,+ }))+ }+ const onSubmit = () => {+ console.log('work')+ }+ const handleSubmit = e => {+ e.preventDefault()+ e.stopPropagation()+ setBeenSubmitted(true)++ if (validated) {+ onSubmit(form)+ }+ }++ return (+ <form onSubmit={handleSubmit}>+ <h2 className='text-xl font-bold text-gray-700 dark:text-gray-200'>+ Invite member to+ {' '}+ {projectName}+ </h2>+ <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>+ Enter the email address and role of the person you want to invite. We+ will contact them over email to offer them access to ads analytics.+ </p>+ <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>+ The invitation will expire in 48 hours+ </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}+ />+ </form>+ )+}++export default AddUserdiff --git a/src/pages/Project/Settings/People/People.jsx b/src/pages/Project/Settings/People/People.jsxnew file mode 100644index 000000000..01ee5b09b--- /dev/null+++ b/src/pages/Project/Settings/People/People.jsx@@ -0,0 +1,332 @@+import React, { useState, useEffect } from 'react'+import Button from 'ui/Button'+import { ChevronDownIcon, CheckIcon } from '@heroicons/react/solid'+import { ActivePin, InactivePin } from 'ui/Pin'+import Modal from 'ui/Modal'+import { useTranslation } from 'react-i18next'+import Input from 'ui/Input'+import { isValidEmail } from 'utils/validator'+import _keys from 'lodash/keys'+import _isEmpty from 'lodash/isEmpty'+import cx from 'clsx'+import _map from 'lodash/map'+import _filter from 'lodash/filter'++const roles = [+ {+ name: 'Admin',+ role: 'admin',+ description: 'Can manage the project',+ },+ {+ name: 'Viewer',+ role: 'viewer',+ description: 'Can view the project',+ },+]++const UsersList = ({ data, onRemove }) => {+ const [open, setOpen] = useState(false)++ return (+ <li className='py-4'>+ <div className='flex justify-between'>+ <p className='text-gray-700 dark:text-gray-200'>+ {data.gmail}+ </p>+ <div className='relative'>+ {+ data.pandding ? (+ <>+ <ActivePin+ label='Pannding'+ className='inline-flex items-center shadow-sm px-2.5 py-0.5 mr-3'+ />+ <span onClick={() => onRemove(data.gmail)}>+ <InactivePin+ label='Remove'+ className='cursor-pointer inline-flex items-center shadow-sm px-2.5 py-0.5 hover:text-red-400 hover:dark:text-red-400'+ />+ </span>+ </>+ ) : (+ <>+ <button+ onClick={() => setOpen(!open)}+ type='button'+ className='inline-flex items-center shadow-sm pl-2 pr-1 py-0.5 border border-gray-200 dark:border-gray-500 text-sm leading-5 font-medium rounded-full bg-white dark:bg-gray-700 text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-800'+ >+ Viewer+ <ChevronDownIcon+ style={{ transform: open ? 'rotate(180deg)' : '' }}+ className='w-4 h-4 pt-px ml-0.5'+ />+ </button>+ {open && (+ <ul className='origin-top-right absolute z-10 right-0 mt-2 w-72 rounded-md shadow-lg overflow-hidden bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700 focus:outline-none'>+ {_map(roles, ({ name, role, description }) => (+ <li onClick={() => setOpen(false)} className='p-4 hover:bg-indigo-600 group cursor-pointer flex justify-between items-center' key={role}>+ <div>+ <p className='font-bold text-gray-700 dark:text-gray-200 group-hover:text-gray-200'>+ {name}+ </p>+ <p className='mt-1 text-sm text-gray-500 group-hover:text-gray-200'>+ {description}+ </p>+ </div>+ { role === 'admin' && (+ <span className='text-indigo-600 group-hover:text-gray-200'>+ <CheckIcon className='w-7 h-7 pt-px ml-1' />+ </span>+ )}+ </li>+ ))}+ <li onClick={() => { setOpen(false); onRemove(data.gmail) }} className='p-4 hover:bg-gray-900 group cursor-pointer flex justify-between items-center'>+ <div>+ <p className='font-bold text-red-600 group-hover:text-red-600'>+ Remove member+ </p>+ </div>+ </li>+ </ul>+ )}++ </>+ )+ }+ </div>+ </div>+ </li>+ )+}++const People = ({ projectName }) => {+ const [showModal, setShowModal] = useState(false)+ const { t } = useTranslation('common')+ const [form, setForm] = useState({+ email: '',+ role: '',+ })+ const [beenSubmitted, setBeenSubmitted] = useState(false)+ const [errors, setErrors] = useState({})+ const [validated, setValidated] = useState(false)++ const [users, setUsers] = useState([+ {+ gmail: '[email protected]',+ pandding: true,+ role: 'admin',+ },+ {+ gmail: '[email protected]',+ pandding: false,+ role: 'viewer',+ },+ {+ gmail: '[email protected]',+ pandding: false,+ role: 'viewer',+ },+ {+ gmail: '[email protected]',+ pandding: false,+ role: 'admin',+ },+ {+ gmail: '[email protected]',+ pandding: true,+ role: 'admin',+ },+ {+ gmail: '[email protected]',+ pandding: true,+ role: 'admin',+ },+ ])++ const validate = () => {+ const allErrors = {}++ if (!isValidEmail(form.email)) {+ allErrors.email = t('auth.common.badEmailError')+ }++ if (form.role === '') {+ allErrors.role = 'Please select a role.'+ }++ const valid = _isEmpty(_keys(allErrors))++ setErrors(allErrors)+ setValidated(valid)+ }++ useEffect(() => {+ if (showModal) {+ validate()+ }+ }, [form]) // eslint-disable-line++ const handleInput = ({ target }) => {+ const value = target.type === 'checkbox' ? target.checked : target.value++ setForm(oldForm => ({+ ...oldForm,+ [target.name]: value,+ }))+ }++ const onSubmit = () => {+ setShowModal(false)+ setUsers((oldUsers) => {+ return [+ {+ gmail: form.email,+ pandding: true,+ role: form.role,+ },+ ...oldUsers,+ ]+ })+ setForm({ email: '', role: '' })+ setErrors({})+ setValidated(false)+ }++ const handleSubmit = e => {+ e.preventDefault()+ e.stopPropagation()+ setBeenSubmitted(true)+ if (validated) {+ onSubmit()+ } else {+ validate()+ }+ }++ const closeModal = () => {+ setShowModal(false)+ setForm({ email: '', role: '' })+ setErrors({})+ }++ const onRemove = gmail => {+ console.log(gmail)+ setUsers(oldUsers => _filter(oldUsers, user => user.gmail !== gmail))+ }+ return (+ <div className='mt-6 mb-6'>+ <div className='flex justify-between items-center mb-3'>+ <div>+ <h3 className='mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>+ People+ </h3>+ <p className='text-sm text-gray-500 dark:text-gray-400'>+ Invite your coworkers+ </p>+ </div>+ <Button+ className='h-8'+ primary+ regular+ type='button'+ onClick={() => setShowModal(true)}+ >+ Add Users+ </Button>+ </div>+ <div>+ <ul className='divide-y divide-gray-200 dark:divide-gray-700'>+ {_map(users, user => (<UsersList data={user} key={user.gmail} onRemove={onRemove} />))}+ </ul>+ </div>+ <Modal+ onClose={closeModal}+ onSubmit={handleSubmit}+ submitText='Add'+ closeText={t('common.no')}+ message={(+ <div>+ <h2 className='text-xl font-bold text-gray-700 dark:text-gray-200'>+ Invite member to+ {' '}+ {projectName}+ </h2>+ <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>+ Enter the email address and role of the person you want to invite.+ We will contact them over email to offer them access to ads+ analytics.+ </p>+ <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>+ The invitation will expire in 48 hours+ </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}+ />+ <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'>Role</label>+ <div className={cx('mt-1 bg-white rounded-md -space-y-px dark:bg-gray-800', { 'border-red-300 border': errors.role })}>+ {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}+ <label className={cx('dark:border-gray-500 rounded-tl-md rounded-tr-md relative border p-4 flex cursor-pointer border-gray-200', { 'bg-indigo-50 border-indigo-200 dark:bg-indigo-500 dark:border-indigo-800 z-10': form.role === 'admin', 'border-gray-200': form.role !== 'admin' })}>+ <input+ name='role'+ className='focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300'+ id='role_admin'+ type='radio'+ value='admin'+ onChange={handleInput}+ />+ <div className='ml-3 flex flex-col'>+ <span className={cx('block text-sm font-medium', { 'text-indigo-900 dark:text-white': form.role === 'admin', 'text-gray-700 dark:text-gray-200': form.role !== 'admin' })}>+ Admin+ </span>+ <span className={cx('block text-sm', { 'text-indigo-700 dark:text-gray-100': form.role === 'admin', 'text-gray-700 dark:text-gray-200': form.role !== 'admin' })}>+ Can view stats, change site settings and invite other members+ </span>+ </div>+ </label>+ {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}+ <label className={cx('dark:border-gray-500 rounded-bl-md rounded-br-md relative border p-4 flex cursor-pointer border-gray-200', { 'bg-indigo-50 border-indigo-200 dark:bg-indigo-500 dark:border-indigo-800 z-10': form.role === 'viewer', 'border-gray-200': form.role !== 'viewer' })}>+ <input+ name='role'+ className='focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300'+ id='role_viewer'+ type='radio'+ value='viewer'+ onChange={handleInput}+ />+ <div className='ml-3 flex flex-col'>+ <span className={cx('block text-sm font-medium', { 'text-indigo-900 dark:text-white': form.role === 'viewer', 'text-gray-700 dark:text-gray-200': form.role !== 'viewer' })}>+ Viewer+ </span>+ <span className={cx('block text-sm', { 'text-indigo-700 dark:text-gray-100': form.role === 'viewer', 'text-gray-700 dark:text-gray-200': form.role !== 'viewer' })}>+ Can view stats but cannot access settings or invite members+ </span>+ </div>+ </label>+ </div>+ {errors.role && (+ <p className='mt-2 text-sm text-red-600 dark:text-red-500' id='email-error'>{errors.role}</p>+ )}+ </fieldset>+ </div>+ )}+ isOpened={showModal}+ />+ <Button type='submit' className='mt-3' primary regular>+ save+ </Button>+ </div>+ )+}++export default Peoplediff --git a/src/pages/Project/Settings/ProjectSettings.jsx b/src/pages/Project/Settings/ProjectSettings.jsxindex c69986fdc..63bac82cd 100644--- a/src/pages/Project/Settings/ProjectSettings.jsx+++ b/src/pages/Project/Settings/ProjectSettings.jsx@@ -25,7 +25,7 @@ import Modal from 'ui/Modal'import { nanoid } from 'utils/random'import routes from 'routes'-import People from './People'+import People from './People/People'const MAX_NAME_LENGTH = 50const MAX_ORIGINS_LENGTH = 300@@ -243,7 +243,7 @@ const ProjectSettings = ({<hr className='mt-5' />- <People />+ <People projectName={form.name} /><hr className='mt-5' />diff --git a/src/ui/Modal.jsx b/src/ui/Modal.jsxindex 2eee53898..d97b419c7 100644--- a/src/ui/Modal.jsx+++ b/src/ui/Modal.jsx@@ -63,7 +63,7 @@ const Modal = ({<ExclamationIcon className='h-6 w-6 text-amber-600' aria-hidden='true' /></div>)}- <div className='mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left w-full'>+ <div className='mt-3 text-center sm:mt-0 sm:text-left w-full'>{title && (<Dialog.Title as='h3' className='text-lg leading-6 font-medium text-gray-900 dark:text-gray-50'>{title}