From 5cb933a27829a37820d0850366765ca36ec8eb10 Mon Sep 17 00:00:00 2001 From: QuentinHsu Date: Mon, 4 Mar 2024 16:39:42 +0800 Subject: [PATCH] fix: restore the set of StatusContext --- web/src/components/SiderBar.js | 4 +++- web/src/pages/Home/index.js | 22 +++++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/web/src/components/SiderBar.js b/web/src/components/SiderBar.js index 0d72b97..744f82a 100644 --- a/web/src/components/SiderBar.js +++ b/web/src/components/SiderBar.js @@ -1,6 +1,7 @@ import React, { useContext, useEffect, useLayoutEffect, useMemo, useState } from 'react'; import {Link, useNavigate} from 'react-router-dom'; import {UserContext} from '../context/User'; +import { StatusContext } from '../context/Status'; import { API, getLogo, getSystemName, isAdmin, isMobile, showError, showSuccess } from '../helpers'; import '../index.css'; @@ -24,6 +25,7 @@ import {Nav, Avatar, Dropdown, Layout} from '@douyinfe/semi-ui'; const SiderBar = () => { const [userState, userDispatch] = useContext(UserContext); + const [statusState, statusDispatch] = useContext(StatusContext); const defaultIsCollapsed = isMobile() || localStorage.getItem('default_collapse_sidebar') === 'true'; let navigate = useNavigate(); @@ -118,7 +120,7 @@ const SiderBar = () => { const { success, data } = res.data; if (success) { localStorage.setItem('status', JSON.stringify(data)); - // statusDispatch({ type: 'set', payload: data }); + statusDispatch({ type: 'set', payload: data }); localStorage.setItem('system_name', data.system_name); localStorage.setItem('logo', data.logo); localStorage.setItem('footer_html', data.footer_html); diff --git a/web/src/pages/Home/index.js b/web/src/pages/Home/index.js index 9baed20..4dd3f37 100644 --- a/web/src/pages/Home/index.js +++ b/web/src/pages/Home/index.js @@ -5,7 +5,7 @@ import { StatusContext } from '../../context/Status'; import { marked } from 'marked'; const Home = () => { - const [statusState, statusDispatch] = useContext(StatusContext); + const [statusState] = useContext(StatusContext); const [homePageContentLoaded, setHomePageContentLoaded] = useState(false); const [homePageContent, setHomePageContent] = useState(''); @@ -66,8 +66,8 @@ const Home = () => { 系统信息总览}> -

名称:{statusState?.system_name}

-

版本:{statusState?.version ? statusState?.version : "unknown"}

+

名称:{statusState?.status?.system_name}

+

版本:{statusState?.status?.version ? statusState?.status?.version : "unknown"}

源码: { headerExtraContent={系统配置总览}>

邮箱验证: - {statusState?.email_verification === true - ? '已启用' - : '未启用'} + {statusState?.status?.email_verification === true ? '已启用': '未启用'}

GitHub 身份验证: - {statusState?.github_oauth === true - ? '已启用' - : '未启用'} + {statusState?.status?.github_oauth === true ? '已启用' : '未启用'}

微信身份验证: - {statusState?.wechat_login === true - ? '已启用' - : '未启用'} + {statusState?.status?.wechat_login === true ? '已启用' : '未启用'}

Turnstile 用户校验: - {statusState?.turnstile_check === true - ? '已启用' - : '未启用'} + {statusState?.status?.turnstile_check === true ? '已启用' : '未启用'}