From b3f80cafdc4a04259742ec0ea4fc199b09c70996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=A2=E5=A5=8B=E7=8C=AB?= Date: Wed, 24 Jan 2024 17:54:32 +0800 Subject: [PATCH] feat(home): use new style home page --- frontend/src/components/Navbar.tsx | 75 ++++++++----------- .../src/screens/HomeScreen/GroupedNotes.tsx | 41 ++++++++++ frontend/src/screens/HomeScreen/index.tsx | 74 +++++++++--------- 3 files changed, 110 insertions(+), 80 deletions(-) create mode 100644 frontend/src/screens/HomeScreen/GroupedNotes.tsx diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx index ae4ca70..06bf52b 100644 --- a/frontend/src/components/Navbar.tsx +++ b/frontend/src/components/Navbar.tsx @@ -1,4 +1,4 @@ -import { Link, useLocation, useNavigate, useSearchParams } from 'react-router-dom' +import { Link, useNavigate, useSearchParams } from 'react-router-dom' import React, { useEffect, useState } from 'react' import useTheme from '@/hooks/useTheme.ts' import { hasPasscode, hasPermission, onSearch as search } from '@/utils' @@ -7,12 +7,10 @@ import { getAxiosInstance } from '@/config/http.ts' interface Props {} const Navbar: React.FC = () => { - const location = useLocation() const navigate = useNavigate() const [searchParams] = useSearchParams() const keywords = searchParams.get('keywords') || '' const [input, setInput] = useState(keywords) - const isHome = location.pathname === '/' const [theme, setTheme] = useTheme() const [showMenu, setShowMenu] = useState(true) @@ -34,53 +32,46 @@ const Navbar: React.FC = () => { setTimeout(() => setShowMenu(true), 500) } - const navbarBg = isHome ? '' : 'bg-white dark:bg-black dark:bg-transparent-20' - const navbarBorder = isHome - ? 'border-b border-transparent' - : 'border-b border-gray-200 dark:border-white dark:border-opacity-10' + const navbarBg = 'bg-white dark:bg-black dark:bg-transparent-20' + const navbarBorder = 'border-b border-gray-200 dark:border-white dark:border-opacity-10' return (
- {isHome &&
} - {!isHome && ( - - - - VoRteX - - - )} - {!isHome && ( -
-
- setInput(e.target.value)} - placeholder="Search" - className="w-full px-4 py-2 outline-none rounded-md bg-transparent" - onKeyDown={e => e.key === 'Enter' && onSearch()} - autoComplete="off" - required - /> - -
-
- )} + + + + VoRteX + + +
+
+ setInput(e.target.value)} + placeholder="Search" + className="w-full px-4 py-2 outline-none rounded-md bg-transparent" + onKeyDown={e => e.key === 'Enter' && onSearch()} + autoComplete="off" + required + /> + +
+