Skip to content

📈 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!

confirm-share to remix and add routing

Maksim Mrugebb13acb5ad9
diff --git a/app/pages/Project/ConfirmShare/index.tsx b/app/pages/Project/ConfirmShare/index.tsx
index 7ace398dc..461a152d8 100644
--- a/app/pages/Project/ConfirmShare/index.tsx
+++ b/app/pages/Project/ConfirmShare/index.tsx
@@ -1,14 +1,13 @@
import React, { useState, useEffect, memo } from 'react'
import { useDispatch } from 'react-redux'
-import { useParams, Link } from 'react-router-dom'
+import { useParams, Link } from '@remix-run/react'
import { useTranslation } from 'react-i18next'
import { CheckCircleIcon, XCircleIcon } from '@heroicons/react/24/solid'
import _split from 'lodash/split'
-import Title from 'components/Title'
import sagaActions from 'redux/sagas/actions'
import Loader from 'ui/Loader'
-import routes from 'routes'
+import routes from 'routesPath'
import { AppDispatch } from 'redux/store'
const ConfirmShare = () => {
@@ -16,9 +15,7 @@ const ConfirmShare = () => {
t: (key: string) => string
} = useTranslation('common')
const dispatch: AppDispatch = useDispatch()
- const { id }: {
- id: string
- } = useParams()
+ const { id } = useParams()
const [loading, setLoading] = useState<boolean>(true)
const [error, setError] = useState<string>('')
@@ -26,6 +23,12 @@ const ConfirmShare = () => {
setLoading(true)
const path = _split(window.location.pathname, '/')[1]
+ if (!id) {
+ setError(t('common.error'))
+ setLoading(false)
+ return
+ }
+
dispatch(
sagaActions.shareVerifyAsync(
{ path, id },
@@ -40,59 +43,22 @@ const ConfirmShare = () => {
if (loading) {
return (
- <Title title={t('titles.invitation')}>
- <div className='min-h-page bg-gray-50 dark:bg-slate-900'>
- <Loader />
- </div>
- </Title>
+ <div className='min-h-page bg-gray-50 dark:bg-slate-900'>
+ <Loader />
+ </div>
)
}
if (error) {
return (
- <Title title={t('titles.invitation')}>
- <div className='bg-gray-50 dark:bg-slate-900 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-slate-800 dark:hover:bg-slate-700 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-slate-900 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' />
+ <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'>
- {t('apiNotifications.acceptInvitation')}
+ {error}
</h1>
</div>
<div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
@@ -102,12 +68,43 @@ const ConfirmShare = () => {
>
{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-slate-800 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
+ >
+ {t('notFoundPage.support')}
+ </Link>
</div>
</div>
</main>
</div>
</div>
- </Title>
+ )
+ }
+
+ return (
+ <div className='bg-gray-50 dark:bg-slate-900 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>
)
}
diff --git a/app/routes/share.$id.tsx b/app/routes/share.$id.tsx
new file mode 100644
index 000000000..d35a9bc49
--- /dev/null
+++ b/app/routes/share.$id.tsx
@@ -0,0 +1,15 @@
+import ConfirmShare from 'pages/Project/ConfirmShare'
+import type { V2_MetaFunction } from '@remix-run/node'
+
+export const meta: V2_MetaFunction = () => {
+ return [
+ {
+ title: 'ConfirmShare',
+ description: 'ConfirmShare',
+ },
+ ]
+}
+
+export default function Index() {
+ return <ConfirmShare />
+}
diff --git a/app/routesPath/index.ts b/app/routesPath/index.ts
index f87b4838a..1b2e23fe1 100644
--- a/app/routesPath/index.ts
+++ b/app/routesPath/index.ts
@@ -3,7 +3,7 @@ const routes = Object.freeze({
signup: '/signup', // add
reset_password: '/recovery', // add
new_password_form: '/password-reset/:id', // add
- confirm_share: '/share/:id',
+ confirm_share: '/share/:id', // add
confirm_subcription: '/projects/:id/subscribers/invite',
main: '/', // add
dashboard: '/dashboard', // add