🎛️ refactor: HeaderBar into modular components, add shared skeletons, and primary-colored nav hover
Summary
- Split HeaderBar into maintainable components and hooks
- Centralized skeleton loading UI via a reusable SkeletonWrapper
- Improved navigation UX with primary-colored hover indication
- Preserved API surface and passed linters
Why
- Improve readability, reusability, and testability of the header
- Remove duplicated skeleton logic across files
- Provide clearer hover feedback consistent with the theme
What’s changed
- Components (web/src/components/layout/HeaderBar/)
- New container: index.js
- New UI components: HeaderLogo.js, Navigation.js, ActionButtons.js, UserArea.js, MobileMenuButton.js, NewYearButton.js, NotificationButton.js, ThemeToggle.js, LanguageSelector.js
- New shared skeleton: SkeletonWrapper.js
- Updated entry: HeaderBar.js now re-exports ./HeaderBar/index.js
- Hooks (web/src/hooks/common/)
- New: useHeaderBar.js (state and actions for header)
- New: useNotifications.js (announcements state, unread calc, open/close)
- New: useNavigation.js (main nav link config)
- Skeleton refactor
- Navigation.js: replaced inline skeletons with <SkeletonWrapper type="navigation" .../>
- UserArea.js: replaced inline skeletons with <SkeletonWrapper type="userArea" .../>
- HeaderLogo.js: replaced image/title skeletons with <SkeletonWrapper type="image"/>, <SkeletonWrapper type="title"/>
- Navigation hover UX
- Added primary-colored hover to nav items for clearer pointer feedback
- Final hover style: hover:text-semi-color-primary (kept rounded + transition classes)
Non-functional
- No breaking API changes; HeaderBar usage stays the same
- All modified files pass lint checks
Notes for future work
- SkeletonWrapper is extensible: add new cases (e.g., card) in one place
- Components are small and test-friendly; unit tests can be added per component
Affected files (key)
- web/src/components/layout/HeaderBar.js
- web/src/components/layout/HeaderBar/index.js
- web/src/components/layout/HeaderBar/Navigation.js
- web/src/components/layout/HeaderBar/UserArea.js
- web/src/components/layout/HeaderBar/HeaderLogo.js
- web/src/components/layout/HeaderBar/ActionButtons.js
- web/src/components/layout/HeaderBar/MobileMenuButton.js
- web/src/components/layout/HeaderBar/NewYearButton.js
- web/src/components/layout/HeaderBar/NotificationButton.js
- web/src/components/layout/HeaderBar/ThemeToggle.js
- web/src/components/layout/HeaderBar/LanguageSelector.js
- web/src/components/layout/HeaderBar/SkeletonWrapper.js
- web/src/hooks/common/useHeaderBar.js
- web/src/hooks/common/useNotifications.js
- web/src/hooks/common/useNavigation.js
2025-08-18 03:20:56 +08:00
|
|
|
/*
|
|
|
|
|
Copyright (C) 2025 QuantumNous
|
|
|
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU Affero General Public License as
|
|
|
|
|
published by the Free Software Foundation, either version 3 of the
|
|
|
|
|
License, or (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU Affero General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Affero General Public License
|
|
|
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
For commercial licensing, please contact support@quantumnous.com
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
import React from 'react';
|
2025-08-18 04:14:35 +08:00
|
|
|
import { useHeaderBar } from '../../../hooks/common/useHeaderBar';
|
|
|
|
|
import { useNotifications } from '../../../hooks/common/useNotifications';
|
|
|
|
|
import { useNavigation } from '../../../hooks/common/useNavigation';
|
|
|
|
|
import NoticeModal from '../NoticeModal';
|
|
|
|
|
import MobileMenuButton from './MobileMenuButton';
|
|
|
|
|
import HeaderLogo from './HeaderLogo';
|
|
|
|
|
import Navigation from './Navigation';
|
|
|
|
|
import ActionButtons from './ActionButtons';
|
🎛️ refactor: HeaderBar into modular components, add shared skeletons, and primary-colored nav hover
Summary
- Split HeaderBar into maintainable components and hooks
- Centralized skeleton loading UI via a reusable SkeletonWrapper
- Improved navigation UX with primary-colored hover indication
- Preserved API surface and passed linters
Why
- Improve readability, reusability, and testability of the header
- Remove duplicated skeleton logic across files
- Provide clearer hover feedback consistent with the theme
What’s changed
- Components (web/src/components/layout/HeaderBar/)
- New container: index.js
- New UI components: HeaderLogo.js, Navigation.js, ActionButtons.js, UserArea.js, MobileMenuButton.js, NewYearButton.js, NotificationButton.js, ThemeToggle.js, LanguageSelector.js
- New shared skeleton: SkeletonWrapper.js
- Updated entry: HeaderBar.js now re-exports ./HeaderBar/index.js
- Hooks (web/src/hooks/common/)
- New: useHeaderBar.js (state and actions for header)
- New: useNotifications.js (announcements state, unread calc, open/close)
- New: useNavigation.js (main nav link config)
- Skeleton refactor
- Navigation.js: replaced inline skeletons with <SkeletonWrapper type="navigation" .../>
- UserArea.js: replaced inline skeletons with <SkeletonWrapper type="userArea" .../>
- HeaderLogo.js: replaced image/title skeletons with <SkeletonWrapper type="image"/>, <SkeletonWrapper type="title"/>
- Navigation hover UX
- Added primary-colored hover to nav items for clearer pointer feedback
- Final hover style: hover:text-semi-color-primary (kept rounded + transition classes)
Non-functional
- No breaking API changes; HeaderBar usage stays the same
- All modified files pass lint checks
Notes for future work
- SkeletonWrapper is extensible: add new cases (e.g., card) in one place
- Components are small and test-friendly; unit tests can be added per component
Affected files (key)
- web/src/components/layout/HeaderBar.js
- web/src/components/layout/HeaderBar/index.js
- web/src/components/layout/HeaderBar/Navigation.js
- web/src/components/layout/HeaderBar/UserArea.js
- web/src/components/layout/HeaderBar/HeaderLogo.js
- web/src/components/layout/HeaderBar/ActionButtons.js
- web/src/components/layout/HeaderBar/MobileMenuButton.js
- web/src/components/layout/HeaderBar/NewYearButton.js
- web/src/components/layout/HeaderBar/NotificationButton.js
- web/src/components/layout/HeaderBar/ThemeToggle.js
- web/src/components/layout/HeaderBar/LanguageSelector.js
- web/src/components/layout/HeaderBar/SkeletonWrapper.js
- web/src/hooks/common/useHeaderBar.js
- web/src/hooks/common/useNotifications.js
- web/src/hooks/common/useNavigation.js
2025-08-18 03:20:56 +08:00
|
|
|
|
|
|
|
|
const HeaderBar = ({ onMobileMenuToggle, drawerOpen }) => {
|
|
|
|
|
const {
|
|
|
|
|
userState,
|
|
|
|
|
statusState,
|
|
|
|
|
isMobile,
|
|
|
|
|
collapsed,
|
|
|
|
|
logoLoaded,
|
|
|
|
|
currentLang,
|
|
|
|
|
isLoading,
|
|
|
|
|
systemName,
|
|
|
|
|
logo,
|
|
|
|
|
isNewYear,
|
|
|
|
|
isSelfUseMode,
|
|
|
|
|
docsLink,
|
|
|
|
|
isDemoSiteMode,
|
|
|
|
|
isConsoleRoute,
|
|
|
|
|
theme,
|
|
|
|
|
logout,
|
|
|
|
|
handleLanguageChange,
|
|
|
|
|
handleThemeToggle,
|
|
|
|
|
handleMobileMenuToggle,
|
|
|
|
|
navigate,
|
|
|
|
|
t,
|
|
|
|
|
} = useHeaderBar({ onMobileMenuToggle, drawerOpen });
|
|
|
|
|
|
|
|
|
|
const {
|
|
|
|
|
noticeVisible,
|
|
|
|
|
unreadCount,
|
|
|
|
|
handleNoticeOpen,
|
|
|
|
|
handleNoticeClose,
|
|
|
|
|
getUnreadKeys,
|
|
|
|
|
} = useNotifications(statusState);
|
|
|
|
|
|
|
|
|
|
const { mainNavLinks } = useNavigation(t, docsLink);
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<header className="text-semi-color-text-0 sticky top-0 z-50 transition-colors duration-300 bg-white/75 dark:bg-zinc-900/75 backdrop-blur-lg">
|
|
|
|
|
<NoticeModal
|
|
|
|
|
visible={noticeVisible}
|
|
|
|
|
onClose={handleNoticeClose}
|
|
|
|
|
isMobile={isMobile}
|
|
|
|
|
defaultTab={unreadCount > 0 ? 'system' : 'inApp'}
|
|
|
|
|
unreadKeys={getUnreadKeys()}
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
<div className="w-full px-2">
|
|
|
|
|
<div className="flex items-center justify-between h-16">
|
|
|
|
|
<div className="flex items-center">
|
|
|
|
|
<MobileMenuButton
|
|
|
|
|
isConsoleRoute={isConsoleRoute}
|
|
|
|
|
isMobile={isMobile}
|
|
|
|
|
drawerOpen={drawerOpen}
|
|
|
|
|
collapsed={collapsed}
|
|
|
|
|
onToggle={handleMobileMenuToggle}
|
|
|
|
|
t={t}
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
<HeaderLogo
|
|
|
|
|
isMobile={isMobile}
|
|
|
|
|
isConsoleRoute={isConsoleRoute}
|
|
|
|
|
logo={logo}
|
|
|
|
|
logoLoaded={logoLoaded}
|
|
|
|
|
isLoading={isLoading}
|
|
|
|
|
systemName={systemName}
|
|
|
|
|
isSelfUseMode={isSelfUseMode}
|
|
|
|
|
isDemoSiteMode={isDemoSiteMode}
|
|
|
|
|
t={t}
|
|
|
|
|
/>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<Navigation
|
|
|
|
|
mainNavLinks={mainNavLinks}
|
|
|
|
|
isMobile={isMobile}
|
|
|
|
|
isLoading={isLoading}
|
|
|
|
|
userState={userState}
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
<ActionButtons
|
|
|
|
|
isNewYear={isNewYear}
|
|
|
|
|
unreadCount={unreadCount}
|
|
|
|
|
onNoticeOpen={handleNoticeOpen}
|
|
|
|
|
theme={theme}
|
|
|
|
|
onThemeToggle={handleThemeToggle}
|
|
|
|
|
currentLang={currentLang}
|
|
|
|
|
onLanguageChange={handleLanguageChange}
|
|
|
|
|
userState={userState}
|
|
|
|
|
isLoading={isLoading}
|
|
|
|
|
isMobile={isMobile}
|
|
|
|
|
isSelfUseMode={isSelfUseMode}
|
|
|
|
|
logout={logout}
|
|
|
|
|
navigate={navigate}
|
|
|
|
|
t={t}
|
|
|
|
|
/>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</header>
|
|
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
export default HeaderBar;
|