diff --git a/commafeed-client/src/pages/ErrorPage.tsx b/commafeed-client/src/pages/ErrorPage.tsx index 26df286a..d2ab5594 100644 --- a/commafeed-client/src/pages/ErrorPage.tsx +++ b/commafeed-client/src/pages/ErrorPage.tsx @@ -1,7 +1,7 @@ import { Trans } from "@lingui/macro" -import { Box, Button, Center, Container, createStyles, Group, Stack, Text, Title } from "@mantine/core" -import { Logo } from "components/Logo" +import { Box, Button, Container, createStyles, Group, Text, Title } from "@mantine/core" import { TbRefresh } from "react-icons/tb" +import { PageTitle } from "./PageTitle" const useStyles = createStyles(theme => ({ root: { @@ -37,14 +37,7 @@ export function ErrorPage(props: { error: Error }) { return (
- -
- - - CommaFeed - -
-
+ Oops! diff --git a/commafeed-client/src/pages/LoadingPage.tsx b/commafeed-client/src/pages/LoadingPage.tsx index 4e7cded0..7f1071e2 100644 --- a/commafeed-client/src/pages/LoadingPage.tsx +++ b/commafeed-client/src/pages/LoadingPage.tsx @@ -1,6 +1,6 @@ -import { Center, Container, RingProgress, Text, Title, useMantineTheme } from "@mantine/core" -import { Logo } from "components/Logo" +import { Center, Container, RingProgress, Text, useMantineTheme } from "@mantine/core" import { useAppLoading } from "hooks/useAppLoading" +import { PageTitle } from "./PageTitle" export function LoadingPage() { const theme = useMantineTheme() @@ -8,12 +8,7 @@ export function LoadingPage() { return ( -
- - - CommaFeed - -
+
+ + + CommaFeed + +
+ ) +} diff --git a/commafeed-client/src/pages/auth/LoginPage.tsx b/commafeed-client/src/pages/auth/LoginPage.tsx index 1dcb573c..6dfb66e3 100644 --- a/commafeed-client/src/pages/auth/LoginPage.tsx +++ b/commafeed-client/src/pages/auth/LoginPage.tsx @@ -6,7 +6,7 @@ import { redirectToRootCategory } from "app/slices/redirect" import { useAppDispatch, useAppSelector } from "app/store" import { LoginRequest } from "app/types" import { Alert } from "components/Alert" -import { Logo } from "components/Logo" +import { PageTitle } from "pages/PageTitle" import { useAsyncCallback } from "react-async-hook" import { Link } from "react-router-dom" @@ -29,12 +29,7 @@ export function LoginPage() { return ( -
- - - CommaFeed - -
+ <Trans>Log in</Trans> diff --git a/commafeed-client/src/pages/auth/PasswordRecoveryPage.tsx b/commafeed-client/src/pages/auth/PasswordRecoveryPage.tsx index bad8b440..2d7e4a8d 100644 --- a/commafeed-client/src/pages/auth/PasswordRecoveryPage.tsx +++ b/commafeed-client/src/pages/auth/PasswordRecoveryPage.tsx @@ -4,7 +4,7 @@ import { useForm } from "@mantine/form" import { client, errorToStrings } from "app/client" import { PasswordResetRequest } from "app/types" import { Alert } from "components/Alert" -import { Logo } from "components/Logo" +import { PageTitle } from "pages/PageTitle" import { useState } from "react" import { useAsyncCallback } from "react-async-hook" import { Link } from "react-router-dom" @@ -26,12 +26,7 @@ export function PasswordRecoveryPage() { return ( <Container size="xs"> - <Center my="xl"> - <Logo size={48} /> - <Title order={1} ml="md"> - CommaFeed - - + <Trans>Password Recovery</Trans> diff --git a/commafeed-client/src/pages/auth/RegistrationPage.tsx b/commafeed-client/src/pages/auth/RegistrationPage.tsx index d410b73c..fc16b7c3 100644 --- a/commafeed-client/src/pages/auth/RegistrationPage.tsx +++ b/commafeed-client/src/pages/auth/RegistrationPage.tsx @@ -6,7 +6,7 @@ import { redirectToRootCategory } from "app/slices/redirect" import { useAppDispatch, useAppSelector } from "app/store" import { RegistrationRequest } from "app/types" import { Alert } from "components/Alert" -import { Logo } from "components/Logo" +import { PageTitle } from "pages/PageTitle" import { useAsyncCallback } from "react-async-hook" import { Link } from "react-router-dom" @@ -30,12 +30,7 @@ export function RegistrationPage() { return ( <Container size="xs"> - <Center my="xl"> - <Logo size={48} /> - <Title order={1} ml="md"> - CommaFeed - - + <Trans>Sign up</Trans>