From d228666d81cefaa12e1323849878f2585479ae4b Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sat, 19 Dec 2020 21:02:56 +0800
Subject: chore: Fix code format.

---
 FrontEnd/src/app/views/admin/UserAdmin.tsx | 37 ++++++++++++++++--------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'FrontEnd/src/app/views/admin')

diff --git a/FrontEnd/src/app/views/admin/UserAdmin.tsx b/FrontEnd/src/app/views/admin/UserAdmin.tsx
index 948cbb25..e1d2c3da 100644
--- a/FrontEnd/src/app/views/admin/UserAdmin.tsx
+++ b/FrontEnd/src/app/views/admin/UserAdmin.tsx
@@ -62,10 +62,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 +82,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 +132,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)
   );
-- 
cgit v1.2.3


From 2adc29ac56167e5c46b8fecdd0eff8cbd9384378 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sat, 19 Dec 2020 21:35:47 +0800
Subject: feat: Remove highlight from admin.

---
 FrontEnd/src/app/locales/en/admin.json                  |  2 +-
 FrontEnd/src/app/locales/zh/admin.json                  |  2 +-
 FrontEnd/src/app/views/admin/Admin.tsx                  |  6 +++---
 FrontEnd/src/app/views/admin/AdminNav.tsx               |  6 +++---
 FrontEnd/src/app/views/admin/HighlightTimelineAdmin.tsx | 13 -------------
 FrontEnd/src/app/views/admin/MoreAdmin.tsx              | 13 +++++++++++++
 6 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 FrontEnd/src/app/views/admin/HighlightTimelineAdmin.tsx
 create mode 100644 FrontEnd/src/app/views/admin/MoreAdmin.tsx

(limited to 'FrontEnd/src/app/views/admin')

diff --git a/FrontEnd/src/app/locales/en/admin.json b/FrontEnd/src/app/locales/en/admin.json
index 098ffb1f..ddb3ffad 100644
--- a/FrontEnd/src/app/locales/en/admin.json
+++ b/FrontEnd/src/app/locales/en/admin.json
@@ -1,7 +1,7 @@
 {
   "nav": {
     "users": "Users",
-    "highlightTimelines": "Highlight Timelines"
+    "more": "More"
   },
   "create": "Create",
   "user": {
diff --git a/FrontEnd/src/app/locales/zh/admin.json b/FrontEnd/src/app/locales/zh/admin.json
index fed39b2d..edd1cabd 100644
--- a/FrontEnd/src/app/locales/zh/admin.json
+++ b/FrontEnd/src/app/locales/zh/admin.json
@@ -1,7 +1,7 @@
 {
   "nav": {
     "users": "用户",
-    "highlightTimelines": "高光时间线"
+    "more": "更多"
   },
   "create": "创建",
   "user": {
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;
-- 
cgit v1.2.3


From 02aff31ef153ed400d9348b2f9518861993778d2 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 31 Dec 2020 21:07:52 +0800
Subject: ...

---
 FrontEnd/src/app/index.sass                                 |  7 +++----
 FrontEnd/src/app/views/admin/UserAdmin.tsx                  |  7 ++-----
 FrontEnd/src/app/views/timeline-common/CollapseButton.tsx   | 12 ++++++------
 .../src/app/views/timeline-common/TimelineCardTemplate.tsx  | 13 ++++---------
 FrontEnd/src/app/views/timeline-common/TimelineItem.tsx     | 13 ++++---------
 FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx | 11 +++++------
 6 files changed, 24 insertions(+), 39 deletions(-)

(limited to 'FrontEnd/src/app/views/admin')

diff --git a/FrontEnd/src/app/index.sass b/FrontEnd/src/app/index.sass
index ae315715..1a833174 100644
--- a/FrontEnd/src/app/index.sass
+++ b/FrontEnd/src/app/index.sass
@@ -1,4 +1,5 @@
 @import '~bootstrap/scss/bootstrap'
+@import '~bootstrap-icons/font/bootstrap-icons.css'
 
 @import './views/common/common'
 @import './views/common/alert/alert'
@@ -34,12 +35,10 @@ small
     width: 40px
 
 .icon-button
-  width: 1.4em
-  height: 1.4em
+  font-size: 1.4em
   cursor: pointer
   &.large
-    width: 1.6em
-    height: 1.6em
+    font-size: 1.6em
 
 .cursor-pointer
   cursor: pointer
diff --git a/FrontEnd/src/app/views/admin/UserAdmin.tsx b/FrontEnd/src/app/views/admin/UserAdmin.tsx
index e1d2c3da..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,
@@ -220,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>
diff --git a/FrontEnd/src/app/views/timeline-common/CollapseButton.tsx b/FrontEnd/src/app/views/timeline-common/CollapseButton.tsx
index 3c52150f..da54f3fd 100644
--- a/FrontEnd/src/app/views/timeline-common/CollapseButton.tsx
+++ b/FrontEnd/src/app/views/timeline-common/CollapseButton.tsx
@@ -1,8 +1,5 @@
 import React from "react";
 import clsx from "clsx";
-import Svg from "react-inlinesvg";
-import arrowsAngleContractIcon from "bootstrap-icons/icons/arrows-angle-contract.svg";
-import arrowsAngleExpandIcon from "bootstrap-icons/icons/arrows-angle-expand.svg";
 
 const CollapseButton: React.FC<{
   collapse: boolean;
@@ -11,10 +8,13 @@ const CollapseButton: React.FC<{
   style?: React.CSSProperties;
 }> = ({ collapse, onClick, className, style }) => {
   return (
-    <Svg
-      src={collapse ? arrowsAngleExpandIcon : arrowsAngleContractIcon}
+    <i
       onClick={onClick}
-      className={clsx("text-primary icon-button", className)}
+      className={clsx(
+        collapse ? "bi-arrows-angle-expand" : "bi-arrows-angle-contract",
+        "text-primary icon-button",
+        className
+      )}
       style={style}
     />
   );
diff --git a/FrontEnd/src/app/views/timeline-common/TimelineCardTemplate.tsx b/FrontEnd/src/app/views/timeline-common/TimelineCardTemplate.tsx
index ffec1a90..b42b3aa3 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelineCardTemplate.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelineCardTemplate.tsx
@@ -2,9 +2,6 @@ import React from "react";
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
 import { Dropdown, Button } from "react-bootstrap";
-import Svg from "react-inlinesvg";
-import starIcon from "bootstrap-icons/icons/star.svg";
-import bookmarkIcon from "bootstrap-icons/icons/bookmark.svg";
 
 import { timelineVisibilityTooltipTranslationMap } from "@/services/timeline";
 
@@ -58,16 +55,14 @@ function TimelineCardTemplate({
         </small>
         <div className="text-right mt-2">
           {onHighlight != null ? (
-            <Svg
-              src={starIcon}
-              className="icon-button text-yellow mr-3"
+            <i
+              className="bi-star icon-button text-yellow mr-3"
               onClick={onHighlight}
             />
           ) : null}
           {onBookmark != null ? (
-            <Svg
-              src={bookmarkIcon}
-              className="icon-button text-yellow mr-3"
+            <i
+              className="bi-bookmark icon-button text-yellow mr-3"
               onClick={onBookmark}
             />
           ) : null}
diff --git a/FrontEnd/src/app/views/timeline-common/TimelineItem.tsx b/FrontEnd/src/app/views/timeline-common/TimelineItem.tsx
index 408c49a1..233c81bd 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelineItem.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelineItem.tsx
@@ -2,9 +2,6 @@ import React from "react";
 import clsx from "clsx";
 import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
-import Svg from "react-inlinesvg";
-import chevronDownIcon from "bootstrap-icons/icons/chevron-down.svg";
-import trashIcon from "bootstrap-icons/icons/trash.svg";
 import { Modal, Button } from "react-bootstrap";
 
 import { useAvatar } from "@/services/user";
@@ -98,9 +95,8 @@ const TimelineItem: React.FC<TimelineItemProps> = (props) => {
             <small className="text-dark">{props.post.author.nickname}</small>
           </span>
           {more != null ? (
-            <Svg
-              src={chevronDownIcon}
-              className="text-info icon-button"
+            <i
+              className="bi-chevron-down text-info icon-button"
               onClick={(e) => {
                 more.toggle();
                 e.stopPropagation();
@@ -139,9 +135,8 @@ const TimelineItem: React.FC<TimelineItemProps> = (props) => {
             className="position-absolute position-lt w-100 h-100 mask d-flex justify-content-center align-items-center"
             onClick={more.toggle}
           >
-            <Svg
-              src={trashIcon}
-              className="text-danger icon-button large"
+            <i
+              className="bi-trash text-danger icon-button large"
               onClick={(e) => {
                 setDeleteDialog(true);
                 e.stopPropagation();
diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx
index dfa2f879..207bf6af 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx
@@ -1,10 +1,7 @@
 import React from "react";
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
-import Svg from "react-inlinesvg";
 import { Button, Spinner, Row, Col, Form } from "react-bootstrap";
-import textIcon from "bootstrap-icons/icons/card-text.svg";
-import imageIcon from "bootstrap-icons/icons/image.svg";
 
 import { UiLogicError } from "@/common";
 
@@ -212,10 +209,12 @@ const TimelinePostEdit: React.FC<TimelinePostEditProps> = (props) => {
               return (
                 <>
                   <div className="d-block text-center mt-1 mb-2">
-                    <Svg
+                    <i
                       onLoad={notifyHeightChange}
-                      src={kind === "text" ? imageIcon : textIcon}
-                      className="icon-button"
+                      className={clsx(
+                        kind === "text" ? "bi-image" : "bi-card-text",
+                        "icon-button"
+                      )}
                       onClick={toggleKind}
                     />
                   </div>
-- 
cgit v1.2.3