diff --git a/web/source/settings/index.tsx b/web/source/settings/index.tsx
index d0af8524d..e75b6531c 100644
--- a/web/source/settings/index.tsx
+++ b/web/source/settings/index.tsx
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-import React, { StrictMode } from "react";
+import React, { StrictMode, Suspense, useMemo } from "react";
import "./style.css";
import { createRoot } from "react-dom/client";
@@ -29,18 +29,21 @@ import Loading from "./components/loading";
import { Account } from "./lib/types/account";
import { BaseUrlContext, RoleContext } from "./lib/navigation/util";
import { SidebarMenu } from "./lib/navigation/menu";
-import { UserMenu, UserRouter } from "./views/user/routes";
-import { ModerationMenu, ModerationRouter } from "./views/moderation/routes";
-import { AdminMenu, AdminRouter } from "./views/admin/routes";
import { Redirect, Route, Router } from "wouter";
+import AdminMenu from "./views/admin/menu";
+import ModerationMenu from "./views/moderation/menu";
+import UserMenu from "./views/user/menu";
+import UserRouter from "./views/user/router";
+import { ErrorBoundary } from "./lib/navigation/error";
+import ModerationRouter from "./views/moderation/router";
+import AdminRouter from "./views/admin/router";
interface AppProps {
account: Account;
}
export function App({ account }: AppProps) {
- const roles: string[] = [ account.role.name ];
-
+ const roles: string[] = useMemo(() => [ account.role.name ], [account]);
return (
@@ -51,15 +54,19 @@ export function App({ account }: AppProps) {
-
-
-
- {/*
- Redirect to first part of UserRouter if
- just the bare settings page is open, so
- user isn't greeted with a blank page.
- */}
-
+
+ }>
+
+
+
+ {/*
+ Redirect to first part of UserRouter if
+ just the bare settings page is open, so
+ user isn't greeted with a blank page.
+ */}
+
+
+
diff --git a/web/source/settings/style.css b/web/source/settings/style.css
index 57f8bf4cf..5af9dbc67 100644
--- a/web/source/settings/style.css
+++ b/web/source/settings/style.css
@@ -601,31 +601,33 @@ span.form-info {
@media screen and (max-width: 60rem) {
/* vertical layout */
#root {
- padding: 1rem;
+ padding: 0.5rem;
+ margin: 0;
grid-template-columns: 100%;
grid-template-rows: auto auto;
- .sidebar {
+ div.sidebar {
justify-self: auto;
- margin-bottom: 2rem;
+ margin-bottom: 0;
}
- .sidebar, section.with-sidebar {
+ div.sidebar, section.with-sidebar {
border-top-left-radius: $br;
border-top-right-radius: $br;
border-bottom-left-radius: $br;
border-bottom-right-radius: $br;
}
- .sidebar a:first-child h2 {
+ section.with-sidebar {
+ grid-column: 1;
+ padding: 1rem;
+ }
+
+ div.sidebar a:first-child h2 {
border-top-right-radius: $br;
}
}
- section {
- grid-column: 1;
- }
-
.user-profile .overview {
grid-template-columns: auto;
grid-template-rows: auto 1fr;
diff --git a/web/source/settings/views/admin/menu.tsx b/web/source/settings/views/admin/menu.tsx
new file mode 100644
index 000000000..2cf5a35c2
--- /dev/null
+++ b/web/source/settings/views/admin/menu.tsx
@@ -0,0 +1,129 @@
+/*
+ GoToSocial
+ Copyright (C) GoToSocial Authors admin@gotosocial.org
+ SPDX-License-Identifier: AGPL-3.0-or-later
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+import { MenuItem } from "../../lib/navigation/menu";
+import React from "react";
+import { useHasPermission } from "../../lib/navigation/util";
+
+/*
+ EXPORTED COMPONENTS
+*/
+
+/**
+ * - /settings/admin/instance/settings
+ * - /settings/admin/instance/rules
+ * - /settings/admin/instance/rules/:ruleId
+ * - /settings/admin/emojis
+ * - /settings/admin/emojis/local
+ * - /settings/admin/emojis/local/:emojiId
+ * - /settings/admin/emojis/remote
+ * - /settings/admin/actions
+ * - /settings/admin/actions/media
+ * - /settings/admin/actions/keys
+ */
+export default function AdminMenu() {
+ const permissions = ["admin"];
+ const admin = useHasPermission(permissions);
+ if (!admin) {
+ return null;
+ }
+
+ return (
+
+ );
+}
+
+/*
+ INTERNAL COMPONENTS
+*/
+
+function AdminInstanceMenu() {
+ return (
+
+ );
+}
+
+function AdminActionsMenu() {
+ return (
+
+
+
+
+ );
+}
+
+function AdminEmojisMenu() {
+ return (
+
+
+
+
+ );
+}
diff --git a/web/source/settings/views/admin/router.tsx b/web/source/settings/views/admin/router.tsx
new file mode 100644
index 000000000..95d146510
--- /dev/null
+++ b/web/source/settings/views/admin/router.tsx
@@ -0,0 +1,151 @@
+/*
+ GoToSocial
+ Copyright (C) GoToSocial Authors admin@gotosocial.org
+ SPDX-License-Identifier: AGPL-3.0-or-later
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+import React from "react";
+import { BaseUrlContext, useBaseUrl, useHasPermission } from "../../lib/navigation/util";
+import { Redirect, Route, Router, Switch } from "wouter";
+import { ErrorBoundary } from "../../lib/navigation/error";
+import InstanceSettings from "./instance/settings";
+import InstanceRules from "./instance/rules";
+import InstanceRuleDetail from "./instance/ruledetail";
+import Media from "./actions/media";
+import Keys from "./actions/keys";
+import EmojiOverview from "./emoji/local/overview";
+import EmojiDetail from "./emoji/local/detail";
+import RemoteEmoji from "./emoji/remote";
+
+/*
+ EXPORTED COMPONENTS
+*/
+
+/**
+ * - /settings/instance/settings
+ * - /settings/instance/rules
+ * - /settings/instance/rules/:ruleId
+ * - /settings/admin/emojis
+ * - /settings/admin/emojis/local
+ * - /settings/admin/emojis/local/:emojiId
+ * - /settings/admin/emojis/remote
+ * - /settings/admin/actions
+ * - /settings/admin/actions/media
+ * - /settings/admin/actions/keys
+ */
+export default function AdminRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/admin";
+ const absBase = parentUrl + thisBase;
+
+ return (
+
+
+
+
+
+
+
+ );
+}
+
+/*
+ INTERNAL COMPONENTS
+*/
+
+/**
+ * - /settings/admin/emojis
+ * - /settings/admin/emojis/local
+ * - /settings/admin/emojis/local/:emojiId
+ * - /settings/admin/emojis/remote
+ */
+function AdminEmojisRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/emojis";
+ const absBase = parentUrl + thisBase;
+
+ const permissions = ["admin"];
+ const admin = useHasPermission(permissions);
+ if (!admin) {
+ return null;
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+/**
+ * - /settings/admin/actions
+ * - /settings/admin/actions/media
+ * - /settings/admin/actions/keys
+ */
+function AdminActionsRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/actions";
+ const absBase = parentUrl + thisBase;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+/**
+ * - /settings/instance/settings
+ * - /settings/instance/rules
+ * - /settings/instance/rules/:ruleId
+ */
+function AdminInstanceRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/instance";
+ const absBase = parentUrl + thisBase;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/web/source/settings/views/admin/routes.tsx b/web/source/settings/views/admin/routes.tsx
deleted file mode 100644
index 56dc75976..000000000
--- a/web/source/settings/views/admin/routes.tsx
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- GoToSocial
- Copyright (C) GoToSocial Authors admin@gotosocial.org
- SPDX-License-Identifier: AGPL-3.0-or-later
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-*/
-
-import { MenuItem } from "../../lib/navigation/menu";
-import React, { Suspense, lazy } from "react";
-import { BaseUrlContext, useBaseUrl, useHasPermission } from "../../lib/navigation/util";
-import { Redirect, Route, Router, Switch } from "wouter";
-import Loading from "../../components/loading";
-import { ErrorBoundary } from "../../lib/navigation/error";
-
-/*
- EXPORTED COMPONENTS
-*/
-
-/**
- * - /settings/admin/instance/settings
- * - /settings/admin/instance/rules
- * - /settings/admin/instance/rules/:ruleId
- * - /settings/admin/emojis
- * - /settings/admin/emojis/local
- * - /settings/admin/emojis/local/:emojiId
- * - /settings/admin/emojis/remote
- * - /settings/admin/actions
- * - /settings/admin/actions/media
- * - /settings/admin/actions/keys
- */
-export function AdminMenu() {
- // Don't route if logged-in user
- // doesn't have permissions to access.
- if (!useHasPermission(["admin"])) {
- return null;
- }
-
- return (
-
-
-
-
-
- );
-}
-
-/**
- * - /settings/instance/settings
- * - /settings/instance/rules
- * - /settings/instance/rules/:ruleId
- * - /settings/admin/emojis
- * - /settings/admin/emojis/local
- * - /settings/admin/emojis/local/:emojiId
- * - /settings/admin/emojis/remote
- * - /settings/admin/actions
- * - /settings/admin/actions/media
- * - /settings/admin/actions/keys
- */
-export function AdminRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/admin";
- const absBase = parentUrl + thisBase;
-
- return (
-
-
-
-
-
-
-
- );
-}
-
-/*
- INTERNAL COMPONENTS
-*/
-
-/*
- MENUS
-*/
-
-function AdminInstanceMenu() {
- return (
-
-
-
-
- );
-}
-
-function AdminActionsMenu() {
- return (
-
-
-
-
- );
-}
-
-function AdminEmojisMenu() {
- return (
-
-
-
-
- );
-}
-
-/*
- ROUTERS
-*/
-
-/**
- * - /settings/admin/emojis
- * - /settings/admin/emojis/local
- * - /settings/admin/emojis/local/:emojiId
- * - /settings/admin/emojis/remote
- */
-function AdminEmojisRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/emojis";
- const absBase = parentUrl + thisBase;
-
- const EmojiOverview = lazy(() => import('./emoji/local/overview'));
- const EmojiDetail = lazy(() => import('./emoji/local/detail'));
- const RemoteEmoji = lazy(() => import('./emoji/remote'));
-
- return (
-
-
-
- }>
-
-
-
-
-
-
-
-
-
-
- );
-}
-
-/**
- * - /settings/admin/actions
- * - /settings/admin/actions/media
- * - /settings/admin/actions/keys
- */
-function AdminActionsRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/actions";
- const absBase = parentUrl + thisBase;
-
- const Media = lazy(() => import('./actions/media'));
- const Keys = lazy(() => import('./actions/keys'));
-
- return (
-
-
-
- }>
-
-
-
-
-
-
-
-
-
- );
-}
-
-/**
- * - /settings/instance/settings
- * - /settings/instance/rules
- * - /settings/instance/rules/:ruleId
- */
-function AdminInstanceRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/instance";
- const absBase = parentUrl + thisBase;
-
- const InstanceSettings = lazy(() => import('./instance/settings'));
- const InstanceRules = lazy(() => import("./instance/rules"));
- const InstanceRuleDetail = lazy(() => import('./instance/ruledetail'));
-
- return (
-
-
-
- }>
-
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/web/source/settings/views/moderation/menu.tsx b/web/source/settings/views/moderation/menu.tsx
new file mode 100644
index 000000000..4f01e0798
--- /dev/null
+++ b/web/source/settings/views/moderation/menu.tsx
@@ -0,0 +1,121 @@
+/*
+ GoToSocial
+ Copyright (C) GoToSocial Authors admin@gotosocial.org
+ SPDX-License-Identifier: AGPL-3.0-or-later
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+import { MenuItem } from "../../lib/navigation/menu";
+import React from "react";
+import { useHasPermission } from "../../lib/navigation/util";
+
+/*
+ EXPORTED COMPONENTS
+*/
+
+/**
+ * - /settings/moderation/reports/overview
+ * - /settings/moderation/reports/:reportId
+ * - /settings/moderation/accounts/overview
+ * - /settings/moderation/accounts/pending
+ * - /settings/moderation/accounts/:accountID
+ * - /settings/moderation/domain-permissions/:permType
+ * - /settings/moderation/domain-permissions/:permType/:domain
+ * - /settings/moderation/domain-permissions/import-export
+ * - /settings/moderation/domain-permissions/process
+ */
+export default function ModerationMenu() {
+ const permissions = ["moderator"];
+ const moderator = useHasPermission(permissions);
+ if (!moderator) {
+ return null;
+ }
+
+ return (
+
+
+
+
+
+ );
+}
+
+/*
+ INTERNAL COMPONENTS
+*/
+
+function ModerationReportsMenu() {
+ return (
+
+ );
+}
+
+function ModerationAccountsMenu() {
+ return (
+
+
+
+
+ );
+}
+
+function ModerationDomainPermsMenu() {
+ return (
+
+
+
+
+
+ );
+}
diff --git a/web/source/settings/views/moderation/router.tsx b/web/source/settings/views/moderation/router.tsx
new file mode 100644
index 000000000..37344462b
--- /dev/null
+++ b/web/source/settings/views/moderation/router.tsx
@@ -0,0 +1,149 @@
+/*
+ GoToSocial
+ Copyright (C) GoToSocial Authors admin@gotosocial.org
+ SPDX-License-Identifier: AGPL-3.0-or-later
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+import React from "react";
+import { BaseUrlContext, useBaseUrl, useHasPermission } from "../../lib/navigation/util";
+import { Redirect, Route, Router, Switch } from "wouter";
+import { ReportOverview } from "./reports/overview";
+import ReportDetail from "./reports/detail";
+import { ErrorBoundary } from "../../lib/navigation/error";
+import ImportExport from "./domain-permissions/import-export";
+import DomainPermissionsOverview from "./domain-permissions/overview";
+import DomainPermDetail from "./domain-permissions/detail";
+import AccountsOverview from "./accounts";
+import AccountsPending from "./accounts/pending";
+import AccountDetail from "./accounts/detail";
+
+/*
+ EXPORTED COMPONENTS
+*/
+
+/**
+ * - /settings/moderation/reports/overview
+ * - /settings/moderation/reports/:reportId
+ * - /settings/moderation/accounts/overview
+ * - /settings/moderation/accounts/pending
+ * - /settings/moderation/accounts/:accountID
+ * - /settings/moderation/domain-permissions/:permType
+ * - /settings/moderation/domain-permissions/:permType/:domain
+ * - /settings/moderation/domain-permissions/import-export
+ * - /settings/moderation/domain-permissions/process
+ */
+export default function ModerationRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/moderation";
+ const absBase = parentUrl + thisBase;
+
+ const permissions = ["moderator"];
+ const moderator = useHasPermission(permissions);
+ if (!moderator) {
+ return null;
+ }
+
+ return (
+
+
+
+
+
+
+
+ );
+}
+
+/*
+ INTERNAL COMPONENTS
+*/
+
+/**
+ * - /settings/moderation/reports/overview
+ * - /settings/moderation/reports/:reportId
+ */
+function ModerationReportsRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/reports";
+ const absBase = parentUrl + thisBase;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+/**
+ * - /settings/moderation/accounts/overview
+ * - /settings/moderation/accounts/pending
+ * - /settings/moderation/accounts/:accountID
+ */
+function ModerationAccountsRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/accounts";
+ const absBase = parentUrl + thisBase;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+/**
+ * - /settings/moderation/domain-permissions/:permType
+ * - /settings/moderation/domain-permissions/:permType/:domain
+ * - /settings/moderation/domain-permissions/import-export
+ * - /settings/moderation/domain-permissions/process
+ */
+function ModerationDomainPermsRouter() {
+ const parentUrl = useBaseUrl();
+ const thisBase = "/domain-permissions";
+ const absBase = parentUrl + thisBase;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/web/source/settings/views/moderation/routes.tsx b/web/source/settings/views/moderation/routes.tsx
deleted file mode 100644
index ee45d800b..000000000
--- a/web/source/settings/views/moderation/routes.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- GoToSocial
- Copyright (C) GoToSocial Authors admin@gotosocial.org
- SPDX-License-Identifier: AGPL-3.0-or-later
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-*/
-
-import { MenuItem } from "../../lib/navigation/menu";
-import React, { lazy, Suspense } from "react";
-import { BaseUrlContext, useBaseUrl, useHasPermission } from "../../lib/navigation/util";
-import { Redirect, Route, Router, Switch } from "wouter";
-import { ReportOverview } from "./reports/overview";
-import ReportDetail from "./reports/detail";
-import { ErrorBoundary } from "../../lib/navigation/error";
-import Loading from "../../components/loading";
-
-/*
- EXPORTED COMPONENTS
-*/
-
-/**
- * Moderation menu. Reports, accounts,
- * domain permissions import + export.
- */
-export function ModerationMenu() {
- return (
-
-
-
-
-
- );
-}
-
-/**
- * Moderation router. Reports, accounts,
- * domain permissions import + export.
- */
-export function ModerationRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/moderation";
- const absBase = parentUrl + thisBase;
-
- // Don't route if logged-in user
- // doesn't have permissions to access.
- if (!useHasPermission(["moderator"])) {
- return null;
- }
-
- return (
-
-
-
-
-
-
-
- );
-}
-
-/*
- INTERNAL COMPONENTS
-*/
-
-/*
- MENUS
-*/
-
-function ModerationReportsMenu() {
- return (
-
- );
-}
-
-function ModerationAccountsMenu() {
- return (
-
-
-
-
- );
-}
-
-function ModerationDomainPermsMenu() {
- return (
-
-
-
-
-
- );
-}
-
-/*
- ROUTERS
-*/
-
-function ModerationReportsRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/reports";
- const absBase = parentUrl + thisBase;
-
- return (
-
-
-
-
-
-
-
-
- );
-}
-
-/**
- * - /settings/moderation/accounts/overview
- * - /settings/moderation/accounts/pending
- * - /settings/moderation/accounts/:accountID
- */
-function ModerationAccountsRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/accounts";
- const absBase = parentUrl + thisBase;
-
- const AccountsOverview = lazy(() => import('./accounts'));
- const AccountsPending = lazy(() => import('./accounts/pending'));
- const AccountDetail = lazy(() => import('./accounts/detail'));
-
- return (
-
-
-
- }>
-
-
-
-
-
-
-
-
-
-
- );
-}
-
-/**
- * - /settings/moderation/domain-permissions/:permType
- * - /settings/moderation/domain-permissions/:permType/:domain
- * - /settings/moderation/domain-permissions/import-export
- * - /settings/moderation/domain-permissions/process
- */
-function ModerationDomainPermsRouter() {
- const parentUrl = useBaseUrl();
- const thisBase = "/domain-permissions";
- const absBase = parentUrl + thisBase;
-
- const DomainPermissionsOverview = lazy(() => import('./domain-permissions/overview'));
- const DomainPermDetail = lazy(() => import('./domain-permissions/detail'));
- const ImportExport = lazy(() => import('./domain-permissions/import-export'));
-
- return (
-
-
-
- }>
-
-
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/web/source/settings/views/user/menu.tsx b/web/source/settings/views/user/menu.tsx
new file mode 100644
index 000000000..578bd8ae0
--- /dev/null
+++ b/web/source/settings/views/user/menu.tsx
@@ -0,0 +1,52 @@
+/*
+ GoToSocial
+ Copyright (C) GoToSocial Authors admin@gotosocial.org
+ SPDX-License-Identifier: AGPL-3.0-or-later
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+import { MenuItem } from "../../lib/navigation/menu";
+import React from "react";
+
+/**
+ * - /settings/user/profile
+ * - /settings/user/settings
+ * - /settings/user/migration
+ */
+export default function UserMenu() {
+ return (
+
+
+
+
+
+ );
+}
diff --git a/web/source/settings/views/user/routes.tsx b/web/source/settings/views/user/router.tsx
similarity index 52%
rename from web/source/settings/views/user/routes.tsx
rename to web/source/settings/views/user/router.tsx
index ef897ae13..e763c0c2b 100644
--- a/web/source/settings/views/user/routes.tsx
+++ b/web/source/settings/views/user/router.tsx
@@ -17,73 +17,34 @@
along with this program. If not, see .
*/
-import { MenuItem } from "../../lib/navigation/menu";
-import React, { lazy, Suspense } from "react";
+import React from "react";
import { BaseUrlContext, useBaseUrl } from "../../lib/navigation/util";
import { Redirect, Route, Router, Switch } from "wouter";
import { ErrorBoundary } from "../../lib/navigation/error";
-import Loading from "../../components/loading";
+import UserProfile from "./profile";
+import UserMigration from "./migration";
+import UserSettings from "./settings";
/**
* - /settings/user/profile
* - /settings/user/settings
* - /settings/user/migration
*/
-export function UserMenu() {
- return (
-
- {/* Profile */}
-
- {/* Settings */}
-
- {/* Migration */}
-
-
- );
-}
-
-/**
- * - /settings/user/profile
- * - /settings/user/settings
- * - /settings/user/migration
- */
-export function UserRouter() {
+export default function UserRouter() {
const baseUrl = useBaseUrl();
const thisBase = "/user";
const absBase = baseUrl + thisBase;
- const UserProfile = lazy(() => import('./profile'));
- const UserSettings = lazy(() => import('./settings'));
- const UserMigration = lazy(() => import('./migration'));
-
return (
- }>
-
-
-
-
-
-
-
+
+
+
+
+
+