From 9c0cb8f8d3944c813ef28ff9f736f148fd701a66 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Mon, 11 Apr 2022 22:59:41 +0800
Subject: ...

---
 FrontEnd/src/views/home/TimelineListView.tsx | 24 +++++++++++++-----------
 FrontEnd/src/views/home/index.tsx            | 14 ++++++++------
 2 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'FrontEnd/src/views')

diff --git a/FrontEnd/src/views/home/TimelineListView.tsx b/FrontEnd/src/views/home/TimelineListView.tsx
index 2f283e1c..b26f1f70 100644
--- a/FrontEnd/src/views/home/TimelineListView.tsx
+++ b/FrontEnd/src/views/home/TimelineListView.tsx
@@ -1,13 +1,13 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
 
 import { convertI18nText, I18nText } from "@/common";
 
-import { HttpTimelineInfo } from "@/http/timeline";
-import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
+import { TimelineBookmark } from "@/http/bookmark";
 
 interface TimelineListItemProps {
-  timeline: HttpTimelineInfo;
+  timeline: TimelineBookmark;
 }
 
 const TimelineListItem: React.FC<TimelineListItemProps> = ({ timeline }) => {
@@ -21,12 +21,9 @@ const TimelineListItem: React.FC<TimelineListItemProps> = ({ timeline }) => {
         />
       </svg>
       <div>
-        <div>{timeline.title}</div>
-        <div>
-          <small className="text-secondary">{timeline.description}</small>
-        </div>
+        {timeline.timelineOwner}/{timeline.timelineName}
       </div>
-      <Link to={`${timeline.owner.username}/${timeline.nameV2}`}>
+      <Link to={`${timeline.timelineOwner}/${timeline.timelineName}`}>
         <i className="icon-button bi-arrow-right ms-3" />
       </Link>
     </div>
@@ -60,7 +57,7 @@ const TimelineListArrow: React.FC = () => {
 
 interface TimelineListViewProps {
   headerText?: I18nText;
-  timelines?: HttpTimelineInfo[];
+  timelines?: TimelineBookmark[];
 }
 
 const TimelineListView: React.FC<TimelineListViewProps> = ({
@@ -83,7 +80,12 @@ const TimelineListView: React.FC<TimelineListViewProps> = ({
         <h3>{convertI18nText(headerText, t)}</h3>
       </div>
       {timelines != null
-        ? timelines.map((t) => <TimelineListItem key={t.nameV2} timeline={t} />)
+        ? timelines.map((t) => (
+            <TimelineListItem
+              key={`${t.timelineOwner}/${t.timelineName}`}
+              timeline={t}
+            />
+          ))
         : null}
       <TimelineListArrow />
     </div>
diff --git a/FrontEnd/src/views/home/index.tsx b/FrontEnd/src/views/home/index.tsx
index 9533ea5a..0eeb4b77 100644
--- a/FrontEnd/src/views/home/index.tsx
+++ b/FrontEnd/src/views/home/index.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import { useNavigate } from "react-router-dom";
 
-import { HttpTimelineInfo } from "@/http/timeline";
-import { getHttpHighlightClient } from "@/http/highlight";
+import { Page } from "@/http/common";
+import { getHttpBookmarkClient, TimelineBookmark } from "@/http/bookmark";
 
 import SearchInput from "../common/SearchInput";
 import TimelineListView from "./TimelineListView";
@@ -10,6 +10,8 @@ import WebsiteIntroduction from "./WebsiteIntroduction";
 
 import "./index.css";
 
+const highlightTimelineUsername = "crupest";
+
 const highlightTimelineMessageMap = {
   loading: "home.loadingHighlightTimelines",
   done: "home.loadedHighlightTimelines",
@@ -25,14 +27,14 @@ const HomeV2: React.FC = () => {
     "loading" | "done" | "error"
   >("loading");
   const [highlightTimelines, setHighlightTimelines] = React.useState<
-    HttpTimelineInfo[] | undefined
+    Page<TimelineBookmark> | undefined
   >();
 
   React.useEffect(() => {
     if (highlightTimelineState === "loading") {
       let subscribe = true;
-      void getHttpHighlightClient()
-        .list()
+      void getHttpBookmarkClient()
+        .list(highlightTimelineUsername)
         .then(
           (data) => {
             if (subscribe) {
@@ -67,7 +69,7 @@ const HomeV2: React.FC = () => {
       <WebsiteIntroduction className="m-2" />
       <TimelineListView
         headerText={highlightTimelineMessageMap[highlightTimelineState]}
-        timelines={highlightTimelines}
+        timelines={highlightTimelines?.items}
       />
     </>
   );
-- 
cgit v1.2.3