大调整

This commit is contained in:
Liu 宇阳
2024-11-09 20:17:20 +08:00
parent 9b143cde5f
commit 3b724e4678
12 changed files with 48 additions and 74 deletions

View File

@@ -1,9 +1,7 @@
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import DropdownMessage from './DropdownComment';
import DropdownNotification from './DropdownNotification';
import DropdownUser from './DropdownUser'; import DropdownUser from './DropdownUser';
import LogoIcon from '../../images/logo/logo-icon.svg';
import DarkModeSwitcher from './DarkModeSwitcher'; import DarkModeSwitcher from './DarkModeSwitcher';
import logo from '@/images/logo/logo.png'
const Header = (props: { const Header = (props: {
sidebarOpen: string | boolean | undefined; sidebarOpen: string | boolean | undefined;
@@ -12,8 +10,8 @@ const Header = (props: {
return ( return (
<header className="sticky top-0 z-999 flex w-full bg-white drop-shadow-1 dark:bg-boxdark dark:drop-shadow-none"> <header className="sticky top-0 z-999 flex w-full bg-white drop-shadow-1 dark:bg-boxdark dark:drop-shadow-none">
<div className="flex flex-grow items-center justify-between px-4 py-4 shadow-2 md:px-6 2xl:px-11"> <div className="flex flex-grow items-center justify-between px-4 py-4 shadow-2 md:px-6 2xl:px-11">
<div className="flex items-center gap-2 sm:gap-4 lg:hidden"> <div className='flex items-center'>
{/* <!-- Hamburger Toggle BTN --> */} <div className="flex items-center gap-4 lg:hidden">
<button <button
aria-controls="sidebar" aria-controls="sidebar"
onClick={(e) => { onClick={(e) => {
@@ -49,18 +47,18 @@ const Header = (props: {
</span> </span>
</span> </span>
</button> </button>
{/* <!-- Hamburger Toggle BTN --> */}
<Link className="block flex-shrink-0 lg:hidden" to="/"> <Link className="block flex-shrink-0 lg:hidden" to="/">
<img src={LogoIcon} alt="Logo" /> <img src={logo} alt="logo" className='w-8' />
</Link> </Link>
</div> </div>
<div className="hidden sm:block"></div> <div className="hidden xs:block ml-5 2xl:ml-0"></div>
</div>
<div className="flex items-center gap-3 2xsm:gap-7"> <div className="flex items-center gap-3 2xsm:gap-7">
<ul className="flex items-center gap-2 2xsm:gap-4"> <ul className="flex items-center gap-2 2xsm:gap-4">
<li> <li className='hidden md:block'>
<a href="https://github.com/LiuYuYang01/ThriveX-Blog" target='_blank' className='hover:text-primary'>Star吧</a> <a href="https://github.com/LiuYuYang01/ThriveX-Blog" target='_blank' className='hover:text-primary'>Star吧</a>
</li> </li>

View File

@@ -15,7 +15,6 @@ import Footprint from '@/pages/Footprint';
import Setup from '@/pages/Setup'; import Setup from '@/pages/Setup';
import Rss from '@/pages/Rss'; import Rss from '@/pages/Rss';
import File from "@/pages/File"; import File from "@/pages/File";
import Stats from '@/pages/Stats';
import Iterative from '@/pages/Iterative'; import Iterative from '@/pages/Iterative';
import Page from '@/pages/Route'; import Page from '@/pages/Route';
import Role from '@/pages/Role'; import Role from '@/pages/Role';
@@ -51,7 +50,6 @@ export default () => {
{ path: "/role", title: "角色管理", component: <Role /> }, { path: "/role", title: "角色管理", component: <Role /> },
{ path: "/rss", title: "订阅中心", component: <Rss /> }, { path: "/rss", title: "订阅中心", component: <Rss /> },
{ path: "/file", title: "文件管理", component: <File /> }, { path: "/file", title: "文件管理", component: <File /> },
{ path: "/stats", title: "数据可视化", component: <Stats /> },
{ path: "/iter", title: "项目更新记录", component: <Iterative /> }, { path: "/iter", title: "项目更新记录", component: <Iterative /> },
{ path: "/work", title: "工作台", component: <Work /> }, { path: "/work", title: "工作台", component: <Work /> },
]; ];

View File

@@ -30,7 +30,6 @@ const Sidebar = ({ sidebarOpen, setSidebarOpen }: SidebarProps) => {
storedSidebarExpanded === null ? false : storedSidebarExpanded === 'true' storedSidebarExpanded === null ? false : storedSidebarExpanded === 'true'
); );
// close on click outside
useEffect(() => { useEffect(() => {
const clickHandler = ({ target }: MouseEvent) => { const clickHandler = ({ target }: MouseEvent) => {
if (!sidebar.current || !trigger.current) return; if (!sidebar.current || !trigger.current) return;
@@ -46,7 +45,6 @@ const Sidebar = ({ sidebarOpen, setSidebarOpen }: SidebarProps) => {
return () => document.removeEventListener('click', clickHandler); return () => document.removeEventListener('click', clickHandler);
}); });
// close if the esc key is pressed
useEffect(() => { useEffect(() => {
const keyHandler = ({ keyCode }: KeyboardEvent) => { const keyHandler = ({ keyCode }: KeyboardEvent) => {
if (!sidebarOpen || keyCode !== 27) return; if (!sidebarOpen || keyCode !== 27) return;
@@ -206,12 +204,6 @@ const Sidebar = ({ sidebarOpen, setSidebarOpen }: SidebarProps) => {
icon: <BiFolderOpen className='text-[22px]' />, icon: <BiFolderOpen className='text-[22px]' />,
name: "文件系统" name: "文件系统"
}, },
{
to: "/stats",
path: "stats",
icon: <BiLineChart className='text-[22px]' />,
name: "数据可视化"
},
{ {
to: "/iter", to: "/iter",
path: "iter", path: "iter",
@@ -268,21 +260,7 @@ const Sidebar = ({ sidebarOpen, setSidebarOpen }: SidebarProps) => {
aria-controls="sidebar" aria-controls="sidebar"
aria-expanded={sidebarOpen} aria-expanded={sidebarOpen}
className="block lg:hidden" className="block lg:hidden"
>
<svg
className="fill-current"
width="20"
height="18"
viewBox="0 0 20 18"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M19 8.175H2.98748L9.36248 1.6875C9.69998 1.35 9.69998 0.825 9.36248 0.4875C9.02498 0.15 8.49998 0.15 8.16248 0.4875L0.399976 8.3625C0.0624756 8.7 0.0624756 9.225 0.399976 9.5625L8.16248 17.4375C8.31248 17.5875 8.53748 17.7 8.76248 17.7C8.98748 17.7 9.17498 17.625 9.36248 17.475C9.69998 17.1375 9.69998 16.6125 9.36248 16.275L3.02498 9.8625H19C19.45 9.8625 19.825 9.4875 19.825 9.0375C19.825 8.55 19.45 8.175 19 8.175Z"
fill=""
/> />
</svg>
</button>
</div> </div>
<div className="no-scrollbar flex flex-col overflow-y-auto duration-300 ease-linear"> <div className="no-scrollbar flex flex-col overflow-y-auto duration-300 ease-linear">

View File

@@ -1,5 +1,6 @@
import { Card } from 'antd'; import { Card } from 'antd';
import HeaderInfo from './components/HeaderInfo'; import HeaderInfo from './components/HeaderInfo';
import Stats from './components/Stats';
const Home = () => { const Home = () => {
return ( return (
@@ -8,9 +9,7 @@ const Home = () => {
<HeaderInfo /> <HeaderInfo />
</Card> </Card>
<Card className='mt-2'> <Stats />
</Card>
</> </>
); );
}; };

View File

@@ -15,6 +15,7 @@ module.exports = {
screens: { screens: {
'2xsm': '375px', '2xsm': '375px',
xsm: '425px', xsm: '425px',
xs: '550px',
'3xl': '2000px', '3xl': '2000px',
...defaultTheme.screens, ...defaultTheme.screens,
}, },