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!

auth/singup to remix

Maksim Mrug8e2aa7d93ca2
diff --git a/app/pages/Auth/Signup/BasicSignup.tsx b/app/pages/Auth/Signup/BasicSignup.tsx
index 9f393569f..b56ab1358 100644
--- a/app/pages/Auth/Signup/BasicSignup.tsx
+++ b/app/pages/Auth/Signup/BasicSignup.tsx
@@ -1,7 +1,7 @@
import React, { memo, useState, useEffect } from 'react'
import sagaActions from 'redux/sagas/actions'
import { useTranslation, Trans } from 'react-i18next'
-import { useHistory } from 'react-router-dom'
+import { useNavigate } from '@remix-run/react'
import _size from 'lodash/size'
import _keys from 'lodash/keys'
import _isEmpty from 'lodash/isEmpty'
@@ -19,7 +19,7 @@ import { trackCustom } from 'utils/analytics'
import { useAppDispatch } from 'redux/store'
import GoogleAuth from 'components/GoogleAuth'
import GithubAuth from 'components/GithubAuth'
-import routes from 'routes'
+import routes from 'routesPath'
interface ISignUpForm {
email: string,
@@ -36,7 +36,7 @@ const BasicSignup = (): JSX.Element => {
[key: string]: string | number,
}) => string,
} = useTranslation('common')
- const history = useHistory()
+ const navigate = useNavigate()
const dispatch = useAppDispatch()
const [form, setForm] = useState<ISignUpForm>({
email: '',
@@ -59,7 +59,7 @@ const BasicSignup = (): JSX.Element => {
const signUpCallback = (result: boolean) => {
if (result) {
trackCustom('SIGNUP_BASIC')
- history.push(routes.dashboard)
+ navigate(routes.dashboard)
} else {
setIsLoading(false)
}
diff --git a/app/pages/Auth/Signup/Signup.tsx b/app/pages/Auth/Signup/Signup.tsx
index c2da709c9..e23700011 100644
--- a/app/pages/Auth/Signup/Signup.tsx
+++ b/app/pages/Auth/Signup/Signup.tsx
@@ -1,5 +1,5 @@
import React, { useState, useEffect, memo } from 'react'
-import { Link } from 'react-router-dom'
+import { Link } from '@remix-run/react'
import PropTypes from 'prop-types'
import { useTranslation, Trans } from 'react-i18next'
import _size from 'lodash/size'
@@ -7,11 +7,10 @@ import _keys from 'lodash/keys'
import _omit from 'lodash/omit'
import _isEmpty from 'lodash/isEmpty'
-import Title from 'components/Title'
import GoogleAuth from 'components/GoogleAuth'
import GithubAuth from 'components/GithubAuth'
import { withAuthentication, auth } from 'hoc/protected'
-import routes from 'routes'
+import routes from 'routesPath'
import Input from 'ui/Input'
import Checkbox from 'ui/Checkbox'
import Tooltip from 'ui/Tooltip'
@@ -143,7 +142,7 @@ const Signup = ({ signup, authSSO }: ISignup): JSX.Element => {
}
return (
- <Title title={t('titles.signup')}>
+ <div>
<div className='min-h-page bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>
<form className='max-w-7xl w-full mx-auto' onSubmit={handleSubmit}>
<h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>
@@ -270,7 +269,7 @@ const Signup = ({ signup, authSSO }: ISignup): JSX.Element => {
</div>
</form>
</div>
- </Title>
+ </div>
)
}