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!

Socialised to remix

Maksim Mrug6fafd534a45f
diff --git a/app/pages/Auth/Socialised/index.tsx b/app/pages/Auth/Socialised/index.tsx
index 2e0c91f16..cfd9f10b7 100644
--- a/app/pages/Auth/Socialised/index.tsx
+++ b/app/pages/Auth/Socialised/index.tsx
@@ -1,7 +1,7 @@
import React, {
useEffect, useState, memo,
} from 'react'
-import { Link } from 'react-router-dom'
+import { Link } from '@remix-run/react'
import { useTranslation } from 'react-i18next'
import { CheckCircleIcon, XCircleIcon } from '@heroicons/react/24/solid'
import _split from 'lodash/split'
@@ -9,9 +9,8 @@ import _replace from 'lodash/replace'
import { processSSOToken } from 'api'
import { SSO_PROVIDERS } from 'redux/constants'
-import Title from 'components/Title'
import Loader from 'ui/Loader'
-import routes from 'routes'
+import routes from 'routesPath'
const Socialised = (): JSX.Element => {
const { t }: {
@@ -69,60 +68,54 @@ const Socialised = (): JSX.Element => {
if (loading) {
return (
- <Title title={t('titles.socialisation')}>
- <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 (isError) {
return (
- <Title title={t('titles.socialisation')}>
- <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'>
- {t('apiNotifications.socialisationGenericError')}
- </h1>
- </div>
- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
- <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.socialisation')}>
<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('auth.socialisation.success')}
+ {t('apiNotifications.socialisationGenericError')}
</h1>
</div>
+ <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
+ <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('auth.socialisation.success')}
+ </h1>
+ </div>
+ </div>
+ </main>
+ </div>
+ </div>
)
}
diff --git a/app/routesPath/index.ts b/app/routesPath/index.ts
index 61125c30d..6666ce850 100644
--- a/app/routesPath/index.ts
+++ b/app/routesPath/index.ts
@@ -3,7 +3,7 @@ const routes = Object.freeze({
signup: '/signup',
reset_password: '/recovery',
new_password_form: '/password-reset/:id',
- confirm_share: 'project/confirm_share/:id',
+ confirm_share: '/share/:id',
confirm_subcription: '/projects/:id/subscribers/invite',
main: '/',
dashboard: '/dashboard',