...

3 files changed, 9 insertions, 11 deletions

diff --git a/FrontEnd/src/views/admin/Admin.tsx b/FrontEnd/src/views/admin/Admin.tsx
index adb1e458..e8d86487 100644
--- a/FrontEnd/src/views/admin/Admin.tsx
+++ b/FrontEnd/src/views/admin/Admin.tsx
@@ -17,8 +17,8 @@ const Admin: React.FC = () => {
         <AdminNav className="mt-2" />
         <Routes>
           <Route index element={<UserAdmin />} />
-          <Route path="/admin/user" element={<UserAdmin />} />
-          <Route path="/admin/more" element={<MoreAdmin />} />
+          <Route path="user" element={<UserAdmin />} />
+          <Route path="more" element={<MoreAdmin />} />
         </Routes>
       </div>
     </>
diff --git a/FrontEnd/src/views/admin/AdminNav.tsx b/FrontEnd/src/views/admin/AdminNav.tsx
index dc8b7dd0..49817cf8 100644
--- a/FrontEnd/src/views/admin/AdminNav.tsx
+++ b/FrontEnd/src/views/admin/AdminNav.tsx
@@ -1,12 +1,11 @@
 import React from "react";
-import { useParams } from "react-router-dom";
+import { useLocation } from "react-router-dom";
 
 import Tabs from "../common/tab/Tabs";
 
 const AdminNav: React.FC<{ className?: string }> = ({ className }) => {
-  const params = useParams();
-
-  const name = params.name;
+  const location = useLocation();
+  const name = location.pathname.split("/")[2] ?? "user";
 
   return (
     <Tabs
@@ -14,9 +13,9 @@ const AdminNav: React.FC<{ className?: string }> = ({ className }) => {
       activeTabName={name}
       tabs={[
         {
-          name: "users",
+          name: "user",
           text: "admin:nav.users",
-          link: "/admin/users",
+          link: "/admin/user",
         },
         {
           name: "more",
diff --git a/FrontEnd/src/views/admin/UserAdmin.tsx b/FrontEnd/src/views/admin/UserAdmin.tsx
index d6480bf4..e85281e3 100644
--- a/FrontEnd/src/views/admin/UserAdmin.tsx
+++ b/FrontEnd/src/views/admin/UserAdmin.tsx
@@ -136,7 +136,7 @@ const UserPermissionModifyDialog: React.FC<{
       inputScheme={kUserPermissionList.map<OperationDialogBoolInput>(
         (permission, index) => ({
           type: "bool",
-          label: permission,
+          label: { type: "custom", value: permission },
           initValue: oldPermissionBoolList[index],
         })
       )}
@@ -184,7 +184,6 @@ const UserItem: React.FC<UserItemProps> = ({ user, onChange }) => {
       <div className="admin-user-item">
         <IconButton
           icon="pencil-square"
-          color="primary-enhance"
           className="cru-float-right"
           onClick={() => setEditMaskVisible(true)}
         />
@@ -202,7 +201,7 @@ const UserItem: React.FC<UserItemProps> = ({ user, onChange }) => {
           {user.permissions.map((permission) => {
             return (
               <span key={permission} className="cru-color-danger">
-                {permission}{" "}
+                {permission}
               </span>
             );
           })}