From 9d2efb381bdd4e3f162a502a1260542a9a7db44b Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Fri, 16 Apr 2021 18:01:38 +0800
Subject: ...

---
 FrontEnd/src/app/views/center/BoardWithUser.tsx    | 111 ---------------------
 FrontEnd/src/app/views/center/BoardWithoutUser.tsx |  33 ------
 FrontEnd/src/app/views/center/CenterBoards.tsx     | 107 ++++++++++++++++++++
 FrontEnd/src/app/views/center/index.tsx            |  17 +---
 4 files changed, 112 insertions(+), 156 deletions(-)
 delete mode 100644 FrontEnd/src/app/views/center/BoardWithUser.tsx
 delete mode 100644 FrontEnd/src/app/views/center/BoardWithoutUser.tsx
 create mode 100644 FrontEnd/src/app/views/center/CenterBoards.tsx

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

diff --git a/FrontEnd/src/app/views/center/BoardWithUser.tsx b/FrontEnd/src/app/views/center/BoardWithUser.tsx
deleted file mode 100644
index 3263c745..00000000
--- a/FrontEnd/src/app/views/center/BoardWithUser.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import React from "react";
-import { Row, Col } from "react-bootstrap";
-import { useTranslation } from "react-i18next";
-
-import { AuthUser } from "@/services/user";
-import { pushAlert } from "@/services/alert";
-
-import { getHttpHighlightClient } from "@/http/highlight";
-import { getHttpTimelineClient } from "@/http/timeline";
-import { getHttpBookmarkClient } from "@/http/bookmark";
-
-import TimelineBoard from "./TimelineBoard";
-
-const BoardWithUser: React.FC<{ user: AuthUser }> = ({ user }) => {
-  const { t } = useTranslation();
-
-  return (
-    <>
-      <Row className="my-3 justify-content-center">
-        <Col xs="12" md="6">
-          <TimelineBoard
-            title={t("home.bookmarkTimeline")}
-            load={() => getHttpBookmarkClient().list()}
-            editHandler={{
-              onDelete: (timeline) => {
-                return getHttpBookmarkClient()
-                  .delete(timeline)
-                  .catch((e) => {
-                    pushAlert({
-                      message: "home.message.deleteBookmarkFail",
-                      type: "danger",
-                    });
-                    throw e;
-                  });
-              },
-              onMove: (timeline, index, offset) => {
-                return getHttpBookmarkClient()
-                  .move(
-                    { timeline, newPosition: index + offset + 1 } // +1 because backend contract: index starts at 1
-                  )
-                  .catch((e) => {
-                    pushAlert({
-                      message: "home.message.moveBookmarkFail",
-                      type: "danger",
-                    });
-                    throw e;
-                  });
-              },
-            }}
-          />
-        </Col>
-        <Col xs="12" md="6" className="my-3 my-md-0">
-          <TimelineBoard
-            title={t("home.relatedTimeline")}
-            load={() =>
-              getHttpTimelineClient().listTimeline({ relate: user.username })
-            }
-          />
-        </Col>
-      </Row>
-      <Row className="my-3 justify-content-center">
-        <Col xs="12" md="6">
-          <TimelineBoard
-            title={t("home.highlightTimeline")}
-            load={() => getHttpHighlightClient().list()}
-            editHandler={
-              user.hasHighlightTimelineAdministrationPermission
-                ? {
-                    onDelete: (timeline) => {
-                      return getHttpHighlightClient()
-                        .delete(timeline)
-                        .catch((e) => {
-                          pushAlert({
-                            message: "home.message.deleteHighlightFail",
-                            type: "danger",
-                          });
-                          throw e;
-                        });
-                    },
-                    onMove: (timeline, index, offset) => {
-                      return getHttpHighlightClient()
-                        .move(
-                          { timeline, newPosition: index + offset + 1 } // +1 because backend contract: index starts at 1
-                        )
-                        .catch((e) => {
-                          pushAlert({
-                            message: "home.message.moveHighlightFail",
-                            type: "danger",
-                          });
-                          throw e;
-                        });
-                    },
-                  }
-                : undefined
-            }
-          />
-        </Col>
-        <Col xs="12" md="6" className="my-3 my-md-0">
-          <TimelineBoard
-            title={t("home.publicTimeline")}
-            load={() =>
-              getHttpTimelineClient().listTimeline({ visibility: "Public" })
-            }
-          />
-        </Col>
-      </Row>
-    </>
-  );
-};
-
-export default BoardWithUser;
diff --git a/FrontEnd/src/app/views/center/BoardWithoutUser.tsx b/FrontEnd/src/app/views/center/BoardWithoutUser.tsx
deleted file mode 100644
index d9c7fcf4..00000000
--- a/FrontEnd/src/app/views/center/BoardWithoutUser.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from "react";
-import { Row, Col } from "react-bootstrap";
-import { useTranslation } from "react-i18next";
-
-import { getHttpHighlightClient } from "@/http/highlight";
-import { getHttpTimelineClient } from "@/http/timeline";
-
-import TimelineBoard from "./TimelineBoard";
-
-const BoardWithoutUser: React.FC = () => {
-  const { t } = useTranslation();
-
-  return (
-    <Row className="my-3 justify-content-center">
-      <Col xs="12" md="6">
-        <TimelineBoard
-          title={t("home.highlightTimeline")}
-          load={() => getHttpHighlightClient().list()}
-        />
-      </Col>
-      <Col xs="12" md="6" className="my-3 my-md-0">
-        <TimelineBoard
-          title={t("home.publicTimeline")}
-          load={() =>
-            getHttpTimelineClient().listTimeline({ visibility: "Public" })
-          }
-        />
-      </Col>
-    </Row>
-  );
-};
-
-export default BoardWithoutUser;
diff --git a/FrontEnd/src/app/views/center/CenterBoards.tsx b/FrontEnd/src/app/views/center/CenterBoards.tsx
new file mode 100644
index 00000000..f5200415
--- /dev/null
+++ b/FrontEnd/src/app/views/center/CenterBoards.tsx
@@ -0,0 +1,107 @@
+import React from "react";
+import { Row, Col } from "react-bootstrap";
+import { useTranslation } from "react-i18next";
+
+import { pushAlert } from "@/services/alert";
+import { useUserLoggedIn } from "@/services/user";
+
+import { getHttpTimelineClient } from "@/http/timeline";
+import { getHttpBookmarkClient } from "@/http/bookmark";
+import { getHttpHighlightClient } from "@/http/highlight";
+
+import TimelineBoard from "./TimelineBoard";
+
+const CenterBoards: React.FC = () => {
+  const { t } = useTranslation();
+
+  const user = useUserLoggedIn();
+
+  return (
+    <>
+      <Row className="justify-content-center">
+        <Col xs="12" md="6">
+          <Row>
+            <Col xs="12" className="my-2">
+              <TimelineBoard
+                title={t("home.bookmarkTimeline")}
+                load={() => getHttpBookmarkClient().list()}
+                editHandler={{
+                  onDelete: (timeline) => {
+                    return getHttpBookmarkClient()
+                      .delete(timeline)
+                      .catch((e) => {
+                        pushAlert({
+                          message: "home.message.deleteBookmarkFail",
+                          type: "danger",
+                        });
+                        throw e;
+                      });
+                  },
+                  onMove: (timeline, index, offset) => {
+                    return getHttpBookmarkClient()
+                      .move(
+                        { timeline, newPosition: index + offset + 1 } // +1 because backend contract: index starts at 1
+                      )
+                      .catch((e) => {
+                        pushAlert({
+                          message: "home.message.moveBookmarkFail",
+                          type: "danger",
+                        });
+                        throw e;
+                      });
+                  },
+                }}
+              />
+            </Col>
+            <Col xs="12" className="my-2">
+              <TimelineBoard
+                title={t("home.highlightTimeline")}
+                load={() => getHttpHighlightClient().list()}
+                editHandler={
+                  user.hasHighlightTimelineAdministrationPermission
+                    ? {
+                        onDelete: (timeline) => {
+                          return getHttpHighlightClient()
+                            .delete(timeline)
+                            .catch((e) => {
+                              pushAlert({
+                                message: "home.message.deleteHighlightFail",
+                                type: "danger",
+                              });
+                              throw e;
+                            });
+                        },
+                        onMove: (timeline, index, offset) => {
+                          return getHttpHighlightClient()
+                            .move(
+                              { timeline, newPosition: index + offset + 1 } // +1 because backend contract: index starts at 1
+                            )
+                            .catch((e) => {
+                              pushAlert({
+                                message: "home.message.moveHighlightFail",
+                                type: "danger",
+                              });
+                              throw e;
+                            });
+                        },
+                      }
+                    : undefined
+                }
+              />
+            </Col>
+          </Row>
+        </Col>
+        <Col xs="12" md="6" className="my-2">
+          <TimelineBoard
+            title={t("home.relatedTimeline")}
+            load={() =>
+              getHttpTimelineClient().listTimeline({ relate: user.username })
+            }
+          />
+        </Col>
+      </Row>
+    </>
+  );
+};
+
+export default CenterBoards;
diff --git a/FrontEnd/src/app/views/center/index.tsx b/FrontEnd/src/app/views/center/index.tsx
index bcf6ad6e..0a2abb2c 100644
--- a/FrontEnd/src/app/views/center/index.tsx
+++ b/FrontEnd/src/app/views/center/index.tsx
@@ -3,11 +3,10 @@ import { useHistory } from "react-router";
 import { useTranslation } from "react-i18next";
 import { Row, Container, Button, Col } from "react-bootstrap";
 
-import { useUser } from "@/services/user";
-import SearchInput from "../common/SearchInput";
+import { useUserLoggedIn } from "@/services/user";
 
-import BoardWithoutUser from "./BoardWithoutUser";
-import BoardWithUser from "./BoardWithUser";
+import SearchInput from "../common/SearchInput";
+import CenterBoards from "./CenterBoards";
 import TimelineCreateDialog from "./TimelineCreateDialog";
 
 const HomePage: React.FC = () => {
@@ -15,7 +14,7 @@ const HomePage: React.FC = () => {
 
   const { t } = useTranslation();
 
-  const user = useUser();
+  const user = useUserLoggedIn();
 
   const [navText, setNavText] = React.useState<string>("");
 
@@ -48,13 +47,7 @@ const HomePage: React.FC = () => {
             />
           </Col>
         </Row>
-        {(() => {
-          if (user == null) {
-            return <BoardWithoutUser />;
-          } else {
-            return <BoardWithUser user={user} />;
-          }
-        })()}
+        <CenterBoards />
       </Container>
       {dialog === "create" && (
         <TimelineCreateDialog
-- 
cgit v1.2.3