From f78823ac0c7425da8b49f0d38d220ea665cf9f8a Mon Sep 17 00:00:00 2001 From: fro11o Date: Sun, 2 Oct 2022 12:45:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=8F=9B=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E7=9A=84=20url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/app/desktop/src/tsx/app/main_routes.tsx | 6 +++--- frontend/app/desktop/src/tsx/board_list.tsx | 14 +++++++------- .../app/desktop/src/tsx/left_panel/browse_bar.tsx | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/app/desktop/src/tsx/app/main_routes.tsx b/frontend/app/desktop/src/tsx/app/main_routes.tsx index 7ffb4bde..36fd84eb 100644 --- a/frontend/app/desktop/src/tsx/app/main_routes.tsx +++ b/frontend/app/desktop/src/tsx/app/main_routes.tsx @@ -6,7 +6,7 @@ import { Navigate, } from 'react-router-dom'; -import { BoardList, HotBoardList, SubscribeBoardList } from '../board_list'; +import { AllBoardList, HotBoardList, SubscribeBoardList } from '../board_list'; import { SignupPage } from '../signup_page'; import { ResetPassword } from '../reset_password'; import { KeepAliveUserPage } from '../profile/user_page'; @@ -30,8 +30,8 @@ export function MainRoutes(): JSX.Element { } /> } /> } /> - } /> - } /> + } /> + } /> } /> } /> } /> diff --git a/frontend/app/desktop/src/tsx/board_list.tsx b/frontend/app/desktop/src/tsx/board_list.tsx index 57aa174f..420ce5e4 100644 --- a/frontend/app/desktop/src/tsx/board_list.tsx +++ b/frontend/app/desktop/src/tsx/board_list.tsx @@ -38,7 +38,7 @@ async function fetchHotBoards(): Promise { return boards; } -function AllBoardList(props: {boards: Board[]}): JSX.Element { +function AllBoardListElement(props: {boards: Board[]}): JSX.Element { return
{ @@ -92,7 +92,7 @@ function SubscribeBoardListElement(props: {boards: Board[], subscribe_boards: Su
; } -function BoardList(): JSX.Element { +function AllBoardList(): JSX.Element { const { setCurrentLocation } = LocationState.useContainer(); let [all_boards, setAllBoards] = React.useState([]); @@ -114,8 +114,8 @@ function BoardList(): JSX.Element { link="/app/hot_board_list" element={<>}/> } /> + link="/app/all_board_list" + element={} /> ; } @@ -150,7 +150,7 @@ function HotBoardList(): JSX.Element { link="/app/hot_board_list" element={} /> }/> ; } @@ -178,9 +178,9 @@ function SubscribeBoardList(): JSX.Element { link="/app/hot_board_list" element={<>}/> }/> ; } -export { BoardList, HotBoardList, SubscribeBoardList }; \ No newline at end of file +export { AllBoardList, HotBoardList, SubscribeBoardList }; \ No newline at end of file diff --git a/frontend/app/desktop/src/tsx/left_panel/browse_bar.tsx b/frontend/app/desktop/src/tsx/left_panel/browse_bar.tsx index 5e38858f..a8c50c87 100644 --- a/frontend/app/desktop/src/tsx/left_panel/browse_bar.tsx +++ b/frontend/app/desktop/src/tsx/left_panel/browse_bar.tsx @@ -80,7 +80,7 @@ export function BrowseBar(props: { onLinkClick: () => void }): JSX.Element { 🔥 全站熱門
- +
🛹 所有看板
From c8b7ee03ba3fd15445eda86423cdd3fca85d6c89 Mon Sep 17 00:00:00 2001 From: fro11o Date: Sun, 2 Oct 2022 13:03:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A5=97=E7=94=A8=20tab=20panel=20?= =?UTF-8?q?=E5=88=B0=E5=85=A8=E7=AB=99=E7=86=B1=E9=96=80=E5=92=8C=E6=88=91?= =?UTF-8?q?=E7=9A=84=E8=BF=BD=E8=B9=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/desktop/src/tsx/pop_article_page.tsx | 16 ++++++++++++++-- .../desktop/src/tsx/subscribe_article_page.tsx | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/frontend/app/desktop/src/tsx/pop_article_page.tsx b/frontend/app/desktop/src/tsx/pop_article_page.tsx index 9c9d41e8..bd09dcf6 100644 --- a/frontend/app/desktop/src/tsx/pop_article_page.tsx +++ b/frontend/app/desktop/src/tsx/pop_article_page.tsx @@ -4,11 +4,12 @@ import { ArticleCard } from './article_card'; import { ArticleMetaWithBonds } from 'carbonbond-api/api_trait'; import { toastErr } from './utils'; import { LocationState, SimpleLocation } from './global_state/location'; +import { TabPanelWithLink, TabPanelWithLinkItem } from './components/tab_panel'; import style from '../css/pop_article_page.module.css'; import '../css/layout.css'; -export function PopularArticlePage(): JSX.Element { +function PopularArticlePageElement(): JSX.Element { const [articles, setArticles] = React.useState([]); const { setCurrentLocation } = LocationState.useContainer(); const [fetching, setFetching] = React.useState(true); @@ -50,4 +51,15 @@ function Articles(props: {articles: ArticleMetaWithBonds[]}): JSX.Element { async function fetchPopArticles(): Promise { return unwrap_or(await API_FETCHER.articleQuery.searchPopArticle(30), []); -} \ No newline at end of file +} + +export function PopularArticlePage(): JSX.Element { + return + } /> + }/> + ; +} diff --git a/frontend/app/desktop/src/tsx/subscribe_article_page.tsx b/frontend/app/desktop/src/tsx/subscribe_article_page.tsx index 58eb0ed4..9095f7b3 100644 --- a/frontend/app/desktop/src/tsx/subscribe_article_page.tsx +++ b/frontend/app/desktop/src/tsx/subscribe_article_page.tsx @@ -5,11 +5,12 @@ import { ArticleMetaWithBonds } from 'carbonbond-api/api_trait'; import { UserState } from './global_state/user'; import { toastErr } from './utils'; import { LocationState, SimpleLocation } from './global_state/location'; +import { TabPanelWithLink, TabPanelWithLinkItem } from './components/tab_panel'; import style from '../css/pop_article_page.module.css'; import '../css/layout.css'; -export function SubscribeArticlePage(): JSX.Element { +export function SubscribeArticlePageElement(): JSX.Element { const [articles, setArticles] = React.useState([]); const { user_state } = UserState.useContainer(); const { setCurrentLocation } = LocationState.useContainer(); @@ -47,4 +48,15 @@ function Articles(props: {articles: ArticleMetaWithBonds[]}): JSX.Element { async function fetchSubscribeArticles(): Promise { return unwrap_or(await API_FETCHER.articleQuery.getSubscribeArticle(10), []); -} \ No newline at end of file +} + +export function SubscribeArticlePage(): JSX.Element { + return + } /> + }/> + ; +}