Merge pull request #197 from crupest/front-dev

Front: Highlight and bookmark timeline and new home page.

5 files changed, 41 insertions, 41 deletions

diff --git a/FrontEnd/src/app/views/admin/Admin.tsx b/FrontEnd/src/app/views/admin/Admin.tsx
index 446cd36d..0b6d1f05 100644
--- a/FrontEnd/src/app/views/admin/Admin.tsx
+++ b/FrontEnd/src/app/views/admin/Admin.tsx
@@ -7,7 +7,7 @@ import { AuthUser } from "@/services/user";
 
 import AdminNav from "./AdminNav";
 import UserAdmin from "./UserAdmin";
-import HighlightTimelineAdmin from "./HighlightTimelineAdmin";
+import MoreAdmin from "./MoreAdmin";
 
 interface AdminProps {
   user: AuthUser;
@@ -32,8 +32,8 @@ const Admin: React.FC<AdminProps> = ({ user }) => {
                 {(() => {
                   if (name === "users") {
                     return <UserAdmin user={user} />;
-                  } else if (name === "highlighttimelines") {
-                    return <HighlightTimelineAdmin user={user} />;
+                  } else if (name === "more") {
+                    return <MoreAdmin user={user} />;
                   }
                 })()}
               </Container>
diff --git a/FrontEnd/src/app/views/admin/AdminNav.tsx b/FrontEnd/src/app/views/admin/AdminNav.tsx
index f376beda..47e2138f 100644
--- a/FrontEnd/src/app/views/admin/AdminNav.tsx
+++ b/FrontEnd/src/app/views/admin/AdminNav.tsx
@@ -29,12 +29,12 @@ const AdminNav: React.FC = () => {
       </Nav.Item>
       <Nav.Item>
         <Nav.Link
-          active={name === "highlighttimelines"}
+          active={name === "more"}
           onClick={() => {
-            toggle("highlighttimelines");
+            toggle("more");
           }}
         >
-          {t("admin:nav.highlightTimelines")}
+          {t("admin:nav.more")}
         </Nav.Link>
       </Nav.Item>
     </Nav>
diff --git a/FrontEnd/src/app/views/admin/HighlightTimelineAdmin.tsx b/FrontEnd/src/app/views/admin/HighlightTimelineAdmin.tsx
deleted file mode 100644
index 3de7d5a6..00000000
--- a/FrontEnd/src/app/views/admin/HighlightTimelineAdmin.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from "react";
-
-import { AuthUser } from "@/services/user";
-
-export interface HighlightTimelineAdminProps {
-  user: AuthUser;
-}
-
-const HighlightTimelineAdmin: React.FC<HighlightTimelineAdminProps> = () => {
-  return <>This is highlight timeline administration page.</>;
-};
-
-export default HighlightTimelineAdmin;
diff --git a/FrontEnd/src/app/views/admin/MoreAdmin.tsx b/FrontEnd/src/app/views/admin/MoreAdmin.tsx
new file mode 100644
index 00000000..042789a0
--- /dev/null
+++ b/FrontEnd/src/app/views/admin/MoreAdmin.tsx
@@ -0,0 +1,13 @@
+import React from "react";
+
+import { AuthUser } from "@/services/user";
+
+export interface MoreAdminProps {
+  user: AuthUser;
+}
+
+const MoreAdmin: React.FC<MoreAdminProps> = () => {
+  return <>More...</>;
+};
+
+export default MoreAdmin;
diff --git a/FrontEnd/src/app/views/admin/UserAdmin.tsx b/FrontEnd/src/app/views/admin/UserAdmin.tsx
index 948cbb25..d66abbec 100644
--- a/FrontEnd/src/app/views/admin/UserAdmin.tsx
+++ b/FrontEnd/src/app/views/admin/UserAdmin.tsx
@@ -1,8 +1,6 @@
 import React, { useState, useEffect } from "react";
 import clsx from "clsx";
 import { ListGroup, Row, Col, Spinner, Button } from "react-bootstrap";
-import InlineSVG from "react-inlinesvg";
-import PencilSquareIcon from "bootstrap-icons/icons/pencil-square.svg";
 
 import OperationDialog, {
   OperationBoolInputInfo,
@@ -62,10 +60,9 @@ const UsernameLabel: React.FC = (props) => {
   return <span style={{ color: "blue" }}>{props.children}</span>;
 };
 
-const UserDeleteDialog: React.FC<DialogProps<
-  { username: string },
-  unknown
->> = ({ open, close, token, data: { username }, onSuccess }) => {
+const UserDeleteDialog: React.FC<
+  DialogProps<{ username: string }, unknown>
+> = ({ open, close, token, data: { username }, onSuccess }) => {
   return (
     <OperationDialog
       open={open}
@@ -83,12 +80,14 @@ const UserDeleteDialog: React.FC<DialogProps<
   );
 };
 
-const UserModifyDialog: React.FC<DialogProps<
-  {
-    oldUser: HttpUser;
-  },
-  HttpUser
->> = ({ open, close, token, data: { oldUser }, onSuccess }) => {
+const UserModifyDialog: React.FC<
+  DialogProps<
+    {
+      oldUser: HttpUser;
+    },
+    HttpUser
+  >
+> = ({ open, close, token, data: { oldUser }, onSuccess }) => {
   return (
     <OperationDialog
       open={open}
@@ -131,13 +130,15 @@ const UserModifyDialog: React.FC<DialogProps<
   );
 };
 
-const UserPermissionModifyDialog: React.FC<DialogProps<
-  {
-    username: string;
-    permissions: UserPermission[];
-  },
-  UserPermission[]
->> = ({ open, close, token, data: { username, permissions }, onSuccess }) => {
+const UserPermissionModifyDialog: React.FC<
+  DialogProps<
+    {
+      username: string;
+      permissions: UserPermission[];
+    },
+    UserPermission[]
+  >
+> = ({ open, close, token, data: { username, permissions }, onSuccess }) => {
   const oldPermissionBoolList: boolean[] = kUserPermissionList.map(
     (permission) => permissions.includes(permission)
   );
@@ -217,9 +218,8 @@ const UserItem: React.FC<UserItemProps> = ({ user, on }) => {
 
   return (
     <ListGroup.Item className="admin-user-item">
-      <InlineSVG
-        src={PencilSquareIcon}
-        className="float-right icon-button text-warning"
+      <i
+        className="bi-pencil-square float-right icon-button text-warning"
         onClick={() => setEditMaskVisible(true)}
       />
       <h4 className="text-primary">{user.username}</h4>