diff --git a/gui/rpk-gui/public/locales/EN/common.json b/gui/rpk-gui/public/locales/EN/common.json
index 6ad95a6..e17251d 100644
--- a/gui/rpk-gui/public/locales/EN/common.json
+++ b/gui/rpk-gui/public/locales/EN/common.json
@@ -1,5 +1,8 @@
{
"pages": {
+ "home": {
+ "title": "Home"
+ },
"login": {
"title": "Sign in to your account",
"signin": "Sign in",
diff --git a/gui/rpk-gui/public/locales/FR/common.json b/gui/rpk-gui/public/locales/FR/common.json
index 4897684..f2a98fa 100644
--- a/gui/rpk-gui/public/locales/FR/common.json
+++ b/gui/rpk-gui/public/locales/FR/common.json
@@ -1,5 +1,8 @@
{
"pages": {
+ "home": {
+ "title": "Page d'accueil"
+ },
"login": {
"title": "Authentification",
"signin": "S'authentifier",
@@ -85,7 +88,7 @@
"buttons": {
"create": "Créer",
"save": "Sauvegarder",
- "logout": "Se déconnecter",
+ "logout": "Déconnexion",
"delete": "Supprimer",
"edit": "Modifier",
"cancel": "Annuler",
diff --git a/gui/rpk-gui/src/App.tsx b/gui/rpk-gui/src/App.tsx
index d10e16f..27ec401 100644
--- a/gui/rpk-gui/src/App.tsx
+++ b/gui/rpk-gui/src/App.tsx
@@ -27,7 +27,6 @@ import { FirmRoutes } from "./pages/firm";
import rpcTheme from "./theme";
function App() {
-
const { t, i18n } = useTranslation();
const i18nProvider: I18nProvider = {
@@ -78,7 +77,7 @@ function App() {
}>
+ }>
)}
@@ -86,13 +85,13 @@ function App() {
} />
} />
- }>
+ }>
} />
} />
} />
} />
- HOME
>} />
+ {t("pages.home.title")}
>} />
diff --git a/gui/rpk-gui/src/components/auth/Login.tsx b/gui/rpk-gui/src/components/auth/Login.tsx
index 0b9dbab..80af178 100644
--- a/gui/rpk-gui/src/components/auth/Login.tsx
+++ b/gui/rpk-gui/src/components/auth/Login.tsx
@@ -1,14 +1,8 @@
+import { useSearchParams, Navigate } from "react-router";
+import { useTranslation } from "@refinedev/core";
import { AuthPage } from "@refinedev/mui";
-
import GoogleIcon from "@mui/icons-material/Google";
import DiscordIcon from "../../components/DiscordIcon";
-import {useSearchParams, Navigate, Link} from "react-router";
-import MuiLink from "@mui/material/Link";
-import * as React from "react";
-import Typography from "@mui/material/Typography";
-import Box from "@mui/material/Box";
-import Stack from "@mui/material/Stack";
-import { useTranslation } from "@refinedev/core";
export const Login = () => {
const { translate } = useTranslation();
@@ -35,58 +29,6 @@ export const Login = () => {
icon: (),
},
]}
- forgotPasswordLink={
-
-
- {translate("pages.login.buttons.forgotPassword")}
-
-
- }
- registerLink={
-
-
- {translate("pages.login.buttons.noAccount")}
-
-
- {translate("pages.login.signup")}
-
-
- }
/>
);
};
diff --git a/gui/rpk-gui/src/components/auth/Logout.tsx b/gui/rpk-gui/src/components/auth/Logout.tsx
index 807a1a7..08067aa 100644
--- a/gui/rpk-gui/src/components/auth/Logout.tsx
+++ b/gui/rpk-gui/src/components/auth/Logout.tsx
@@ -1,8 +1,10 @@
import { Button } from "@mui/material";
import { useLogout } from "@refinedev/core";
+import { useTranslation } from "@refinedev/core";
export const Logout = () => {
+ const { translate } = useTranslation();
const { mutate: logout } = useLogout();
- return ;
+ return ;
};
diff --git a/gui/rpk-gui/src/components/auth/Register.tsx b/gui/rpk-gui/src/components/auth/Register.tsx
index a979d96..cb022c7 100644
--- a/gui/rpk-gui/src/components/auth/Register.tsx
+++ b/gui/rpk-gui/src/components/auth/Register.tsx
@@ -1,51 +1,5 @@
import { AuthPage } from "@refinedev/mui";
-import Box from "@mui/material/Box";
-import Typography from "@mui/material/Typography";
-import MuiLink from "@mui/material/Link";
-import * as React from "react";
-import { useTranslation } from "@refinedev/core";
-import { Link } from "react-router";
export const Register = () => {
- const { translate } = useTranslation();
- const loginLink = (
-
-
- {translate(
- "pages.register.buttons.haveAccount",
- translate(
- "pages.login.buttons.haveAccount",
- "Have an account?",
- ),
- )}
-
-
- {translate(
- "pages.register.signin",
- translate("pages.login.signin", "Sign in"),
- )}
-
-
- )
-
- return ;
+ return ;
};
diff --git a/gui/rpk-gui/src/components/header/index.tsx b/gui/rpk-gui/src/components/header/index.tsx
index aa9125a..a2fc8d9 100644
--- a/gui/rpk-gui/src/components/header/index.tsx
+++ b/gui/rpk-gui/src/components/header/index.tsx
@@ -131,7 +131,7 @@ export const Header: React.FC = ({
)}
{!user && (
-
+
)}
diff --git a/gui/rpk-gui/src/providers/auth-provider.tsx b/gui/rpk-gui/src/providers/auth-provider.tsx
index cd4b30e..b1d4f15 100644
--- a/gui/rpk-gui/src/providers/auth-provider.tsx
+++ b/gui/rpk-gui/src/providers/auth-provider.tsx
@@ -72,7 +72,7 @@ const authProvider: AuthProvider = {
if (get_user() == null) {
return {
authenticated: false,
- redirectTo: "/auth/login",
+ redirectTo: "/login",
logout: true
}
}
@@ -154,7 +154,7 @@ const authProvider: AuthProvider = {
if (error?.status === 401) {
forget_user();
return {
- redirectTo: "/auth/login",
+ redirectTo: "/login",
logout: true,
error: { message: "Authentication required" },
} as OnErrorResponse;