{error}
} +{error}
} +Email will be changed after activation
+ + {checked ? ( +{error}
+ ) : ( ++ Your account is now active +
+ )} + + ); +}; diff --git a/src/client/pages/App.tsx b/src/client/pages/App.tsx new file mode 100644 index 00000000..7161e7ce --- /dev/null +++ b/src/client/pages/App.tsx @@ -0,0 +1,125 @@ +import { useEffect } from 'react'; +import { Routes, Route, Link, useNavigate, NavLink } from 'react-router-dom'; + +import '@fortawesome/fontawesome-free/css/all.min.css'; +import 'bulma/css/bulma.css'; +import './styles.scss'; + +import { useAuth } from './components/AuthContext'; +import { usePageError } from './hooks/usePageError'; +import { Loader } from './components/Loader'; +import { HomePage } from './pages/HomePage'; +import { SignUpPage } from './pages/SignUpPage'; +import { AccountActivationPage } from './pages/AccountActivationPage'; +import { LoginPage } from './pages/LoginPage'; +import { RequireAuth } from './components/RequireAuth'; +import { ProfilePage } from './pages/ProfilePage'; +import { ChangePage } from './pages/ChangePage'; +import { catchError } from './utils/catchError'; +import { ResetPassPage } from './pages/ResetPassPage'; + +export function App() { + const navigate = useNavigate(); + const [error, setError] = usePageError(''); + const { isChecked, currentUser, logout, checkAuth } = useAuth(); + + useEffect(() => { + // eslint-disable-next-line @typescript-eslint/no-floating-promises + checkAuth(); + }, []); + + if (!isChecked) { + return{error}
} ++ We have sent you an email with the activation link +
+ ) : ( ++ Your account has been successfully updated +
+ ) + ) : ( + <> + {paramToChange === 'name' && ( +{error}
} +{error}
} +Page not found
+ +); diff --git a/src/client/pages/ProfilePage.tsx b/src/client/pages/ProfilePage.tsx new file mode 100644 index 00000000..45718532 --- /dev/null +++ b/src/client/pages/ProfilePage.tsx @@ -0,0 +1,24 @@ +import { Link } from 'react-router-dom'; +import { useAuth } from '../components/AuthContext'; + +export const ProfilePage = () => { + const { currentUser } = useAuth(); + + return ( +Hello, {currentUser?.name}!
+ +Change {item}
+ ++ Password successfully reset +
+ {!wasAuthenticated && ( + + Log in + + )} + + ) : ( ++ This reset link is invalid or expired +
+ ) + ) : sent ? ( ++ We have sent you an email with the reset link +
+ ) : wasAuthenticated ? ( +{error}
} +We have sent you an email with the activation link
++ Already have an account? Log in +
+{error}
} +The email address for your account has been successfully changed.
+Previous email: ${email}
+New email: ${maskEmail(newEmail)}
+ `; + + return send(email, 'Your email address has been changed', html); +} + +export const mailer = { + send, + sendActivationLink, + sendResetPasswordLink, + sendEmailChangeNotification, +}; diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts new file mode 100644 index 00000000..11f02fe2 --- /dev/null +++ b/src/vite-env.d.ts @@ -0,0 +1 @@ +///