From e7854c1ed8facc2955ef9ad96f0bb2513041bba9 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Mon, 16 Nov 2020 16:30:32 +0800
Subject: ...

---
 FrontEnd/src/app/views/home/BoardWithUser.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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<
-- 
cgit v1.2.3


From 5c1cad30c608b279502ab8fd641b0b95066b6808 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Fri, 20 Nov 2020 20:56:59 +0800
Subject: ...

---
 FrontEnd/src/app/views/admin/UserAdmin.tsx                  |  8 ++++----
 FrontEnd/src/app/views/common/OperationDialog.tsx           | 13 +++----------
 FrontEnd/src/app/views/home/TimelineCreateDialog.tsx        |  2 +-
 FrontEnd/src/app/views/settings/index.tsx                   |  2 +-
 .../views/timeline-common/TimelinePropertyChangeDialog.tsx  |  1 -
 FrontEnd/src/app/views/timeline/TimelineDeleteDialog.tsx    |  2 +-
 FrontEnd/src/app/views/user/ChangeNicknameDialog.tsx        |  1 -
 7 files changed, 10 insertions(+), 19 deletions(-)

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

diff --git a/FrontEnd/src/app/views/admin/UserAdmin.tsx b/FrontEnd/src/app/views/admin/UserAdmin.tsx
index 3cfd5880..948cbb25 100644
--- a/FrontEnd/src/app/views/admin/UserAdmin.tsx
+++ b/FrontEnd/src/app/views/admin/UserAdmin.tsx
@@ -34,7 +34,7 @@ const CreateUserDialog: React.FC<DialogProps<undefined, HttpUser>> = ({
   return (
     <OperationDialog
       title="admin:user.dialog.create.title"
-      titleColor="create"
+      themeColor="success"
       inputPrompt="admin:user.dialog.create.prompt"
       inputScheme={
         [
@@ -71,7 +71,7 @@ const UserDeleteDialog: React.FC<DialogProps<
       open={open}
       close={close}
       title="admin:user.dialog.delete.title"
-      titleColor="dangerous"
+      themeColor="danger"
       inputPrompt={() => (
         <Trans i18nKey="admin:user.dialog.delete.prompt">
           0<UsernameLabel>{username}</UsernameLabel>2
@@ -94,7 +94,7 @@ const UserModifyDialog: React.FC<DialogProps<
       open={open}
       close={close}
       title="admin:user.dialog.modify.title"
-      titleColor="dangerous"
+      themeColor="danger"
       inputPrompt={() => (
         <Trans i18nKey="admin:user.dialog.modify.prompt">
           0<UsernameLabel>{oldUser.username}</UsernameLabel>2
@@ -147,7 +147,7 @@ const UserPermissionModifyDialog: React.FC<DialogProps<
       open={open}
       close={close}
       title="admin:user.dialog.modifyPermissions.title"
-      titleColor="dangerous"
+      themeColor="danger"
       inputPrompt={() => (
         <Trans i18nKey="admin:user.dialog.modifyPermissions.prompt">
           0<UsernameLabel>{username}</UsernameLabel>2
diff --git a/FrontEnd/src/app/views/common/OperationDialog.tsx b/FrontEnd/src/app/views/common/OperationDialog.tsx
index bca5cb87..77ed851f 100644
--- a/FrontEnd/src/app/views/common/OperationDialog.tsx
+++ b/FrontEnd/src/app/views/common/OperationDialog.tsx
@@ -99,7 +99,7 @@ export interface OperationDialogProps<
   open: boolean;
   close: () => void;
   title: I18nText | (() => React.ReactNode);
-  titleColor?: "default" | "dangerous" | "create" | string;
+  themeColor?: "danger" | "success" | string;
   onProcess: (
     inputs: MapOperationInputInfoValueTypeList<OperationInputInfoList>
   ) => Promise<TData>;
@@ -313,7 +313,7 @@ const OperationDialog = <
             {t("operationDialog.cancel")}
           </Button>
           <LoadingButton
-            variant="primary"
+            variant={props.themeColor}
             loading={process}
             disabled={!canProcess}
             onClick={() => {
@@ -362,14 +362,7 @@ const OperationDialog = <
     <Modal show={props.open} onHide={close}>
       <Modal.Header
         className={
-          props.titleColor != null
-            ? "text-" +
-              (props.titleColor === "create"
-                ? "success"
-                : props.titleColor === "dangerous"
-                ? "danger"
-                : props.titleColor)
-            : undefined
+          props.themeColor != null ? "text-" + props.themeColor : undefined
         }
       >
         {title}
diff --git a/FrontEnd/src/app/views/home/TimelineCreateDialog.tsx b/FrontEnd/src/app/views/home/TimelineCreateDialog.tsx
index 786ebb5d..12bbfb54 100644
--- a/FrontEnd/src/app/views/home/TimelineCreateDialog.tsx
+++ b/FrontEnd/src/app/views/home/TimelineCreateDialog.tsx
@@ -18,7 +18,7 @@ const TimelineCreateDialog: React.FC<TimelineCreateDialogProps> = (props) => {
     <OperationDialog
       open={props.open}
       close={props.close}
-      titleColor="success"
+      themeColor="success"
       title="home.createDialog.title"
       inputScheme={
         [
diff --git a/FrontEnd/src/app/views/settings/index.tsx b/FrontEnd/src/app/views/settings/index.tsx
index 1e0517d4..cbdae8ac 100644
--- a/FrontEnd/src/app/views/settings/index.tsx
+++ b/FrontEnd/src/app/views/settings/index.tsx
@@ -20,7 +20,7 @@ const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props) => {
     <OperationDialog
       open={props.open}
       title="settings.dialogChangePassword.title"
-      titleColor="dangerous"
+      themeColor="danger"
       inputPrompt="settings.dialogChangePassword.prompt"
       inputScheme={[
         {
diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePropertyChangeDialog.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePropertyChangeDialog.tsx
index ee49586e..aae227e6 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelinePropertyChangeDialog.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelinePropertyChangeDialog.tsx
@@ -33,7 +33,6 @@ const TimelinePropertyChangeDialog: React.FC<TimelinePropertyChangeDialogProps>
   return (
     <OperationDialog
       title={"timeline.dialogChangeProperty.title"}
-      titleColor="default"
       inputScheme={[
         {
           type: "text",
diff --git a/FrontEnd/src/app/views/timeline/TimelineDeleteDialog.tsx b/FrontEnd/src/app/views/timeline/TimelineDeleteDialog.tsx
index 33609158..0d3199d6 100644
--- a/FrontEnd/src/app/views/timeline/TimelineDeleteDialog.tsx
+++ b/FrontEnd/src/app/views/timeline/TimelineDeleteDialog.tsx
@@ -22,7 +22,7 @@ const TimelineDeleteDialog: React.FC<TimelineDeleteDialog> = (props) => {
       open={props.open}
       close={props.close}
       title="timeline.deleteDialog.title"
-      titleColor="danger"
+      themeColor="danger"
       inputPrompt={() => {
         return (
           <Trans i18nKey="timeline.deleteDialog.inputPrompt">
diff --git a/FrontEnd/src/app/views/user/ChangeNicknameDialog.tsx b/FrontEnd/src/app/views/user/ChangeNicknameDialog.tsx
index 0e95b05b..f319ac37 100644
--- a/FrontEnd/src/app/views/user/ChangeNicknameDialog.tsx
+++ b/FrontEnd/src/app/views/user/ChangeNicknameDialog.tsx
@@ -13,7 +13,6 @@ const ChangeNicknameDialog: React.FC<ChangeNicknameDialogProps> = (props) => {
     <OperationDialog
       open={props.open}
       title="userPage.dialogChangeNickname.title"
-      titleColor="default"
       inputScheme={[
         { type: "text", label: "userPage.dialogChangeNickname.inputLabel" },
       ]}
-- 
cgit v1.2.3