aboutsummaryrefslogtreecommitdiff
path: root/FrontEnd/src/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'FrontEnd/src/app/views')
-rw-r--r--FrontEnd/src/app/views/admin/Admin.tsx4
-rw-r--r--FrontEnd/src/app/views/admin/UserAdmin.tsx4
-rw-r--r--FrontEnd/src/app/views/common/AppBar.tsx4
-rw-r--r--FrontEnd/src/app/views/home/BoardWithUser.tsx4
4 files changed, 8 insertions, 8 deletions
diff --git a/FrontEnd/src/app/views/admin/Admin.tsx b/FrontEnd/src/app/views/admin/Admin.tsx
index 9c0250e7..a64a9bc0 100644
--- a/FrontEnd/src/app/views/admin/Admin.tsx
+++ b/FrontEnd/src/app/views/admin/Admin.tsx
@@ -8,12 +8,12 @@ import {
} from "react-router";
import { Nav } from "react-bootstrap";
-import { UserWithToken } from "@/services/user";
+import { AuthUser } from "@/services/user";
import UserAdmin from "./UserAdmin";
interface AdminProps {
- user: UserWithToken;
+ user: AuthUser;
}
const Admin: React.FC<AdminProps> = (props) => {
diff --git a/FrontEnd/src/app/views/admin/UserAdmin.tsx b/FrontEnd/src/app/views/admin/UserAdmin.tsx
index 0f5f8796..4ad9ed09 100644
--- a/FrontEnd/src/app/views/admin/UserAdmin.tsx
+++ b/FrontEnd/src/app/views/admin/UserAdmin.tsx
@@ -10,7 +10,7 @@ import {
} from "react-bootstrap";
import OperationDialog from "../common/OperationDialog";
-import { User, UserWithToken } from "@/services/user";
+import { User, AuthUser } from "@/services/user";
const apiBaseUrl = "/api";
@@ -285,7 +285,7 @@ const UserChangePermissionDialog: React.FC<UserChangePermissionDialogProps> = (
};
interface UserAdminProps {
- user: UserWithToken;
+ user: AuthUser;
}
const UserAdmin: React.FC<UserAdminProps> = (props) => {
diff --git a/FrontEnd/src/app/views/common/AppBar.tsx b/FrontEnd/src/app/views/common/AppBar.tsx
index 8f35b482..11d3de04 100644
--- a/FrontEnd/src/app/views/common/AppBar.tsx
+++ b/FrontEnd/src/app/views/common/AppBar.tsx
@@ -15,7 +15,7 @@ const AppBar: React.FC = (_) => {
const { t } = useTranslation();
- const isAdministrator = user && user.administrator;
+ const hasAdministrationPermission = user && user.hasAdministrationPermission;
const [expand, setExpand] = React.useState<boolean>(false);
const collapse = (): void => setExpand(false);
@@ -56,7 +56,7 @@ const AppBar: React.FC = (_) => {
{t("nav.about")}
</NavLink>
- {isAdministrator && (
+ {hasAdministrationPermission && (
<NavLink
to="/admin"
className="nav-link"
diff --git a/FrontEnd/src/app/views/home/BoardWithUser.tsx b/FrontEnd/src/app/views/home/BoardWithUser.tsx
index fbe1dd89..bbef835a 100644
--- a/FrontEnd/src/app/views/home/BoardWithUser.tsx
+++ b/FrontEnd/src/app/views/home/BoardWithUser.tsx
@@ -2,14 +2,14 @@ import React from "react";
import { Row, Col } from "react-bootstrap";
import { useTranslation } from "react-i18next";
-import { UserWithToken } from "@/services/user";
+import { AuthUser } from "@/services/user";
import { TimelineInfo } from "@/services/timeline";
import { getHttpTimelineClient } from "@/http/timeline";
import TimelineBoard from "./TimelineBoard";
import OfflineBoard from "./OfflineBoard";
-const BoardWithUser: React.FC<{ user: UserWithToken }> = ({ user }) => {
+const BoardWithUser: React.FC<{ user: AuthUser }> = ({ user }) => {
const { t } = useTranslation();
const [ownTimelines, setOwnTimelines] = React.useState<