📈 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
add: reject and confrim
kruzhambus3d8ead41c933
diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsxindex 34c759192..23ab289dc 100644--- a/src/pages/Dashboard/Dashboard.tsx+++ b/src/pages/Dashboard/Dashboard.tsx@@ -62,12 +62,13 @@ interface IProjectCart {userSharedUpdate: (message: string) => voidsharedProjectError: (message: string) => voidcaptcha?: boolean+ isTransferring?: boolean}const ProjectCart = ({name, created, active, overall, t, language, live, isPublic, confirmed, id, deleteProjectFailed,sharedProjects, setProjectsShareData, setUserShareData, shared, userSharedUpdate, sharedProjectError,- captcha,+ captcha, isTransferring,}: IProjectCart): JSX.Element => {const statsDidGrowUp = overall?.percChange ? overall?.percChange >= 0 : falseconst [showInviteModal, setShowInviteModal] = useState(false)@@ -109,6 +110,11 @@ const ProjectCart = ({))}+ {+ isTransferring && (+ <WarningPin className='mr-2 !bg-indigo-500 dark:!bg-indigo-600 !text-gray-300 dark:!text-gray-300' label={t('common.transferring')} />+ )+ }{active ? (<ActivePin label={t('dashboard.active')} />) : (@@ -215,6 +221,7 @@ ProjectCart.defaultProps = {id: '',name: '',live: 'N/A',+ isTransferring: false,}const NoProjects = ({ t }: {@@ -439,7 +446,7 @@ const Dashboard = ({<div className='shadow overflow-hidden sm:rounded-md'><ul className='divide-y divide-gray-200 dark:divide-gray-500'>{_map(_filter(projects, ({ uiHidden }) => !uiHidden), ({- name, id, created, active, overall, live, public: isPublic,+ name, id, created, active, overall, live, public: isPublic, isTransferring,}) => (<div key={id}><Link to={_replace(routes.project, ':id', id)}>@@ -459,6 +466,7 @@ const Dashboard = ({sharedProjects={[]}setProjectsShareData={() => {}}sharedProjectError={() => {}}+ isTransferring={isTransferring}/></Link></div>diff --git a/src/pages/Project/Settings/TransferProject/TransferProjectConfirm.tsx b/src/pages/Project/Settings/TransferProject/TransferProjectConfirm.tsxnew file mode 100644index 000000000..b845aafcb--- /dev/null+++ b/src/pages/Project/Settings/TransferProject/TransferProjectConfirm.tsx@@ -0,0 +1,119 @@+import React, { useState, useEffect, memo } from 'react'+import { useParams, Link } from 'react-router-dom'+import { useTranslation } from 'react-i18next'+import { CheckCircleIcon, XCircleIcon } from '@heroicons/react/24/solid'++import Title from 'components/Title'+import Loader from 'ui/Loader'++import { confirmTransferProject } from 'api'+import routes from 'routes'++const TransferProjectConfirm = (): JSX.Element => {+ const { t }: {+ t: (key: string) => string+ } = useTranslation('common')+ const { id }: {+ id: string+ } = useParams()+ const [loading, setLoading] = useState<boolean>(true)+ const [error, setError] = useState<string>('')++ const handleConfirm = async (token: string) => {+ try {+ await confirmTransferProject(token)+ } catch (e) {+ setError(t('apiNotifications.invalidToken'))+ } finally {+ setLoading(false)+ }+ }++ useEffect(() => {+ setLoading(true)+ const query = new URLSearchParams(window.location.search)+ const token = query.get('token')++ if (!token) {+ setError(t('apiNotifications.invalidToken'))+ setLoading(false)+ return+ }++ handleConfirm(token)+ }, []) // eslint-disable-line++ if (loading) {+ return (+ <Title title={t('titles.invitation')}>+ <div className='min-h-page bg-gray-50 dark:bg-gray-800'>+ <Loader />+ </div>+ </Title>+ )+ }++ if (error) {+ return (+ <Title title={t('titles.invitation')}>+ <div className='bg-gray-50 dark:bg-gray-800 min-h-page px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8'>+ <div className='max-w-max mx-auto'>+ <main className='sm:flex'>+ <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />+ <div className='sm:ml-6'>+ <div className='sm:border-l max-w-prose sm:border-gray-200 sm:pl-6'>+ <h1 className='text-4xl font-extrabold text-gray-900 dark:text-gray-50 tracking-tight sm:text-5xl'>+ {error}+ </h1>+ </div>+ <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>+ <Link+ to={routes.dashboard}+ className='inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500'+ >+ {t('common.dashboard')}+ </Link>+ <Link+ to={routes.contact}+ className='inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-indigo-700 bg-indigo-100 hover:bg-indigo-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:text-gray-50 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-50'+ >+ {t('notFoundPage.support')}+ </Link>+ </div>+ </div>+ </main>+ </div>+ </div>+ </Title>+ )+ }++ return (+ <Title title={t('titles.invitation')}>+ <div className='bg-gray-50 dark:bg-gray-800 min-h-page px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8'>+ <div className='max-w-max mx-auto'>+ <main className='sm:flex'>+ <CheckCircleIcon className='h-12 w-12 text-green-500 dark:text-green-400' aria-hidden='true' />+ <div className='sm:ml-6'>+ <div className='sm:border-l max-w-prose sm:border-gray-200 sm:pl-6'>+ <h1 className='text-4xl font-extrabold text-gray-900 dark:text-gray-50 tracking-tight sm:text-5xl'>+ {t('apiNotifications.acceptInvitation')}+ </h1>+ </div>+ <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>+ <Link+ to={routes.dashboard}+ className='inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500'+ >+ {t('common.dashboard')}+ </Link>+ </div>+ </div>+ </main>+ </div>+ </div>+ </Title>+ )+}++export default memo(TransferProjectConfirm)diff --git a/src/pages/Project/Settings/TransferProject/TransferProjectReject.tsx b/src/pages/Project/Settings/TransferProject/TransferProjectReject.tsxnew file mode 100644index 000000000..086cf5168--- /dev/null+++ b/src/pages/Project/Settings/TransferProject/TransferProjectReject.tsx@@ -0,0 +1,118 @@+import React, { useState, useEffect, memo } from 'react'+import { useParams, Link } from 'react-router-dom'+import { useTranslation } from 'react-i18next'+import { XCircleIcon, InformationCircleIcon } from '@heroicons/react/24/solid'++import Title from 'components/Title'+import Loader from 'ui/Loader'++import { rejectTransferProject } from 'api'+import routes from 'routes'++// http://localhost:3000/projects/dDfoJStW17Xv/subscribers/invite?token=5e1eab3b-c018-46d4-b051-ed7025b50405++const TransferProjectReject = (): JSX.Element => {+ const { t }: {+ t: (key: string) => string+ } = useTranslation('common')+ const [loading, setLoading] = useState<boolean>(true)+ const [error, setError] = useState<string>('')++ const handleConfirm = async (token: string) => {+ try {+ await rejectTransferProject(token)+ } catch (e) {+ setError(t('apiNotifications.invalidToken'))+ } finally {+ setLoading(false)+ }+ }++ useEffect(() => {+ setLoading(true)+ const query = new URLSearchParams(window.location.search)+ const token = query.get('token')++ if (!token) {+ setError(t('apiNotifications.invalidToken'))+ setLoading(false)+ return+ }++ handleConfirm(token)+ }, []) // eslint-disable-line++ if (loading) {+ return (+ <Title title={t('titles.invitation')}>+ <div className='min-h-page bg-gray-50 dark:bg-gray-800'>+ <Loader />+ </div>+ </Title>+ )+ }++ if (error) {+ return (+ <Title title={t('titles.invitation')}>+ <div className='bg-gray-50 dark:bg-gray-800 min-h-page px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8'>+ <div className='max-w-max mx-auto'>+ <main className='sm:flex'>+ <XCircleIcon className='h-12 w-12 text-red-400' aria-hidden='true' />+ <div className='sm:ml-6'>+ <div className='sm:border-l max-w-prose sm:border-gray-200 sm:pl-6'>+ <h1 className='text-4xl font-extrabold text-gray-900 dark:text-gray-50 tracking-tight sm:text-5xl'>+ {error}+ </h1>+ </div>+ <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>+ <Link+ to={routes.dashboard}+ className='inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500'+ >+ {t('common.dashboard')}+ </Link>+ <Link+ to={routes.contact}+ className='inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-indigo-700 bg-indigo-100 hover:bg-indigo-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:text-gray-50 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-50'+ >+ {t('notFoundPage.support')}+ </Link>+ </div>+ </div>+ </main>+ </div>+ </div>+ </Title>+ )+ }++ return (+ <Title title={t('titles.invitation')}>+ <div className='bg-gray-50 dark:bg-gray-800 min-h-page px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8'>+ <div className='max-w-max mx-auto'>+ <main className='sm:flex'>+ <InformationCircleIcon className='h-12 w-12 text-yellow-400' aria-hidden='true' />+ <div className='sm:ml-6'>+ <div className='sm:border-l max-w-prose sm:border-gray-200 sm:pl-6'>+ <h1 className='text-4xl font-extrabold text-gray-900 dark:text-gray-50 tracking-tight sm:text-5xl'>+ {t('apiNotifications.acceptInvitation')}+ </h1>+ </div>+ <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>+ <Link+ to={routes.dashboard}+ className='inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500'+ >+ {t('common.dashboard')}+ </Link>+ </div>+ </div>+ </main>+ </div>+ </div>+ </Title>+ )+}++export default memo(TransferProjectReject)diff --git a/src/redux/models/IProject.ts b/src/redux/models/IProject.tsindex 3185c308b..a89553be6 100644--- a/src/redux/models/IProject.ts+++ b/src/redux/models/IProject.ts@@ -48,6 +48,7 @@ export interface IProject {uiHidden: booleanisPublicVisitors?: booleanisPublic?: boolean+ isTransferring?: boolean}export interface ICaptchaProject {