feat(ui): introduce global top navigation bar for user actions

Relocate language, notifications, profile, and auth controls from the sidebar to a new sticky
topbar.
Update AppShell grid layout and responsive styles to accommodate the topbar across breakpoints.
This commit is contained in:
2026-05-04 13:08:23 +08:00
parent bd944556d9
commit 3dd3998a5c
3 changed files with 244 additions and 222 deletions

View File

@@ -8,6 +8,7 @@
- 前台以 Home 首页、PokedexMain Game / Event、Habitat DexMain Game / Event、CollectionsMain Game / Event / Ancient Artifacts、材料单、每日 CheckList、Life、Automation、Dish、Events、Actions、Dream Island、Clothes 为主要浏览入口。 - 前台以 Home 首页、PokedexMain Game / Event、Habitat DexMain Game / Event、CollectionsMain Game / Event / Ancient Artifacts、材料单、每日 CheckList、Life、Automation、Dish、Events、Actions、Dream Island、Clothes 为主要浏览入口。
- Home 首页路径为 `/`,用于聚合公开 Wiki 入口Logo 导航回到 Home用户可从 Home 进入核心资料、每日 CheckList、Life 和正在准备中的分区。 - Home 首页路径为 `/`,用于聚合公开 Wiki 入口Logo 导航回到 Home用户可从 Home 进入核心资料、每日 CheckList、Life 和正在准备中的分区。
- 桌面端使用侧边栏导航,侧边栏可折叠为图标栏;移动端继续使用抽屉式侧边栏。 - 桌面端使用侧边栏导航,侧边栏可折叠为图标栏;移动端继续使用抽屉式侧边栏。
- 全局顶部导航栏承载语言切换、通知、User Profile 和登录 / 退出等账号操作;除 User Profile 可展示用户名外,顶部操作以图标按钮呈现。
- 管理入口用于维护全局配置、语言、系统文案、列表排序和每日 CheckList。 - 管理入口用于维护全局配置、语言、系统文案、列表排序和每日 CheckList。
## 技术栈 ## 技术栈

View File

@@ -248,7 +248,9 @@ onBeforeUnmount(() => {
'app-shell--sidebar-collapsed': sidebarCollapsed 'app-shell--sidebar-collapsed': sidebarCollapsed
}" }"
> >
<header class="mobile-topbar"> <header class="site-topbar">
<div class="site-topbar__inner">
<div class="site-topbar__brand">
<button <button
class="sidebar-toggle" class="sidebar-toggle"
type="button" type="button"
@@ -260,13 +262,84 @@ onBeforeUnmount(() => {
<Icon :icon="sidebarOpen ? iconClose : iconMenu" class="ui-icon" aria-hidden="true" /> <Icon :icon="sidebarOpen ? iconClose : iconMenu" class="ui-icon" aria-hidden="true" />
</button> </button>
<RouterLink class="brand-lockup brand-lockup--mobile" to="/" aria-label="Pokopia Wiki" @click="closeSidebar"> <RouterLink class="brand-lockup brand-lockup--topbar" to="/" aria-label="Pokopia Wiki" @click="closeSidebar">
<PokeBallMark size="34px" /> <PokeBallMark size="34px" />
<span> <span>
<span class="pokemon-word">Pokopia</span> <span class="pokemon-word">Pokopia</span>
<span class="brand-subtitle">Community Wiki</span> <span class="brand-subtitle">Community Wiki</span>
</span> </span>
</RouterLink> </RouterLink>
</div>
<div class="site-topbar__spacer" aria-hidden="true"></div>
<div class="topbar-actions">
<div ref="languageMenu" class="language-menu" @keydown="onLanguageMenuKeydown">
<button
ref="languageMenuButton"
class="language-menu__trigger"
type="button"
:aria-label="t('nav.language')"
:aria-expanded="languageMenuOpen"
aria-haspopup="menu"
@click="toggleLanguageMenu"
>
<Icon :icon="iconTranslate" class="language-menu__icon" aria-hidden="true" />
</button>
<div v-if="languageMenuOpen" class="language-menu__dropdown" role="menu">
<button
v-for="language in languages"
:key="language.code"
class="language-menu__item"
:class="{ active: language.code === locale }"
type="button"
role="menuitemradio"
:aria-checked="language.code === locale"
@click="selectLocale(language.code)"
>
<span>{{ language.name }}</span>
<span class="language-menu__code">{{ language.code }}</span>
</button>
</div>
</div>
<template v-if="currentUser">
<NotificationBell :current-user="currentUser" />
<RouterLink class="auth-user" to="/profile" :aria-label="t('nav.profile')" @click="closeSidebar">
<Icon :icon="iconProfile" class="ui-icon auth-user__icon" aria-hidden="true" />
<span class="auth-user__name">{{ currentUser.displayName || currentUser.email }}</span>
</RouterLink>
<button
class="ui-button ui-button--ghost ui-button--small topbar-actions__icon-button"
type="button"
:aria-label="t('nav.logout')"
@click="requestLogout"
>
<Icon :icon="iconLogout" class="ui-icon" aria-hidden="true" />
</button>
</template>
<template v-else>
<RouterLink
class="ui-button ui-button--ghost ui-button--small topbar-actions__icon-button"
to="/login"
:aria-label="t('nav.login')"
@click="closeSidebar"
>
<Icon :icon="iconLogin" class="ui-icon" aria-hidden="true" />
</RouterLink>
<RouterLink
class="ui-button ui-button--primary ui-button--small topbar-actions__icon-button"
to="/register"
:aria-label="t('nav.register')"
@click="closeSidebar"
>
<Icon :icon="iconRegister" class="ui-icon" aria-hidden="true" />
</RouterLink>
</template>
</div>
</div>
</header> </header>
<button class="site-sidebar-scrim" type="button" :aria-label="t('nav.closeMenu')" @click="closeSidebar"></button> <button class="site-sidebar-scrim" type="button" :aria-label="t('nav.closeMenu')" @click="closeSidebar"></button>
@@ -378,100 +451,6 @@ onBeforeUnmount(() => {
</RouterLink> </RouterLink>
</template> </template>
</nav> </nav>
<div class="auth-actions">
<div ref="languageMenu" class="language-menu" @keydown="onLanguageMenuKeydown">
<button
ref="languageMenuButton"
class="language-menu__trigger"
type="button"
:aria-label="t('nav.language')"
:aria-expanded="languageMenuOpen"
aria-haspopup="menu"
@focus="showSidebarTooltip(t('nav.language'), $event)"
@blur="hideSidebarTooltip"
@pointerenter="showSidebarTooltip(t('nav.language'), $event)"
@pointerleave="hideSidebarTooltip"
@click="toggleLanguageMenu"
>
<Icon :icon="iconTranslate" class="language-menu__icon" aria-hidden="true" />
<span class="language-menu__glyph" aria-hidden="true">/A</span>
</button>
<div v-if="languageMenuOpen" class="language-menu__dropdown" role="menu">
<button
v-for="language in languages"
:key="language.code"
class="language-menu__item"
:class="{ active: language.code === locale }"
type="button"
role="menuitemradio"
:aria-checked="language.code === locale"
@click="selectLocale(language.code)"
>
<span>{{ language.name }}</span>
<span class="language-menu__code">{{ language.code }}</span>
</button>
</div>
</div>
<template v-if="currentUser">
<NotificationBell :current-user="currentUser" />
<RouterLink
class="auth-user"
to="/profile"
:aria-label="t('nav.profile')"
@focus="showSidebarTooltip(t('nav.profile'), $event)"
@blur="hideSidebarTooltip"
@pointerenter="showSidebarTooltip(t('nav.profile'), $event)"
@pointerleave="hideSidebarTooltip"
@click="closeSidebar"
>
<Icon :icon="iconProfile" class="ui-icon auth-user__icon" aria-hidden="true" />
<span class="auth-user__name">{{ currentUser.displayName || currentUser.email }}</span>
</RouterLink>
<button
class="ui-button ui-button--ghost ui-button--small"
type="button"
:aria-label="t('nav.logout')"
@focus="showSidebarTooltip(t('nav.logout'), $event)"
@blur="hideSidebarTooltip"
@pointerenter="showSidebarTooltip(t('nav.logout'), $event)"
@pointerleave="hideSidebarTooltip"
@click="requestLogout"
>
<Icon :icon="iconLogout" class="ui-icon" aria-hidden="true" />
<span class="auth-actions__label">{{ t('nav.logout') }}</span>
</button>
</template>
<template v-else>
<RouterLink
class="ui-button ui-button--ghost ui-button--small"
to="/login"
:aria-label="t('nav.login')"
@focus="showSidebarTooltip(t('nav.login'), $event)"
@blur="hideSidebarTooltip"
@pointerenter="showSidebarTooltip(t('nav.login'), $event)"
@pointerleave="hideSidebarTooltip"
@click="closeSidebar"
>
<Icon :icon="iconLogin" class="ui-icon" aria-hidden="true" />
<span class="auth-actions__label">{{ t('nav.login') }}</span>
</RouterLink>
<RouterLink
class="ui-button ui-button--primary ui-button--small"
to="/register"
:aria-label="t('nav.register')"
@focus="showSidebarTooltip(t('nav.register'), $event)"
@blur="hideSidebarTooltip"
@pointerenter="showSidebarTooltip(t('nav.register'), $event)"
@pointerleave="hideSidebarTooltip"
@click="closeSidebar"
>
<Icon :icon="iconRegister" class="ui-icon" aria-hidden="true" />
<span class="auth-actions__label">{{ t('nav.register') }}</span>
</RouterLink>
</template>
</div>
</div> </div>
</aside> </aside>

View File

@@ -109,6 +109,7 @@ svg {
min-height: 100vh; min-height: 100vh;
display: grid; display: grid;
grid-template-columns: 252px minmax(0, 1fr); grid-template-columns: 252px minmax(0, 1fr);
grid-template-rows: auto minmax(0, 1fr) auto;
transition: grid-template-columns 0.18s ease; transition: grid-template-columns 0.18s ease;
} }
@@ -118,15 +119,67 @@ svg {
padding: 0 24px; padding: 0 24px;
} }
.mobile-topbar,
.site-sidebar-scrim { .site-sidebar-scrim {
display: none; display: none;
} }
.site-topbar {
position: sticky;
top: 0;
z-index: 45;
grid-column: 2;
border-bottom: 1px solid rgba(31, 42, 59, 0.12);
background: color-mix(in srgb, var(--surface) 90%, transparent);
backdrop-filter: blur(18px);
}
.site-topbar__inner {
width: min(100%, var(--container));
min-height: 64px;
display: flex;
align-items: center;
justify-content: space-between;
gap: 14px;
margin: 0 auto;
padding: 10px 24px;
}
.site-topbar__brand {
min-width: 0;
display: none;
align-items: center;
gap: 10px;
}
.sidebar-toggle {
display: none;
}
.site-topbar__spacer {
flex: 1 1 auto;
}
.topbar-actions {
min-width: 0;
display: flex;
align-items: center;
justify-content: flex-end;
gap: 8px;
}
.topbar-actions__icon-button {
width: 44px;
min-width: 44px;
min-height: 44px;
padding: 0;
}
.site-sidebar { .site-sidebar {
position: sticky; position: sticky;
top: 0; top: 0;
z-index: 50; z-index: 50;
grid-column: 1;
grid-row: 1 / span 3;
align-self: start; align-self: start;
height: 100dvh; height: 100dvh;
border-right: 1px solid rgba(31, 42, 59, 0.12); border-right: 1px solid rgba(31, 42, 59, 0.12);
@@ -137,7 +190,7 @@ svg {
.site-sidebar__inner { .site-sidebar__inner {
height: 100%; height: 100%;
display: grid; display: grid;
grid-template-rows: auto minmax(0, 1fr) auto; grid-template-rows: auto minmax(0, 1fr);
gap: 18px; gap: 18px;
padding: 18px 14px; padding: 18px 14px;
} }
@@ -347,24 +400,6 @@ svg {
background: var(--pokemon-yellow); background: var(--pokemon-yellow);
} }
.auth-actions {
display: grid;
align-content: end;
gap: 8px;
min-width: 0;
}
.auth-actions .ui-button {
width: 100%;
justify-content: flex-start;
}
.auth-actions__label {
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
}
.language-menu { .language-menu {
position: relative; position: relative;
} }
@@ -373,19 +408,14 @@ svg {
position: relative; position: relative;
} }
.site-sidebar .notification-menu__trigger {
width: 100%;
min-height: 44px;
justify-content: flex-start;
}
.notification-menu__trigger { .notification-menu__trigger {
min-height: 38px; width: 44px;
min-width: 44px;
min-height: 44px;
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
gap: 8px; padding: 0;
padding: 7px 10px;
border: 2px solid var(--line); border: 2px solid var(--line);
border-radius: var(--radius-control); border-radius: var(--radius-control);
background: var(--surface); background: var(--surface);
@@ -426,10 +456,15 @@ svg {
} }
.notification-menu__label { .notification-menu__label {
min-width: 0; position: absolute !important;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; clip: rect(0, 0, 0, 0);
white-space: nowrap; white-space: nowrap;
border: 0;
} }
.notification-menu__badge { .notification-menu__badge {
@@ -467,13 +502,6 @@ svg {
box-shadow: var(--shadow-raised); box-shadow: var(--shadow-raised);
} }
.site-sidebar .notification-menu__dropdown {
top: auto;
right: auto;
bottom: calc(100% + 6px);
left: 0;
}
.notification-menu__header { .notification-menu__header {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -658,19 +686,14 @@ svg {
border-radius: 0; border-radius: 0;
} }
.site-sidebar .language-menu__trigger {
width: 100%;
min-height: 44px;
justify-content: flex-start;
}
.language-menu__trigger { .language-menu__trigger {
min-height: 38px; width: 44px;
min-width: 44px;
min-height: 44px;
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
gap: 6px; padding: 0;
padding: 7px 10px;
border: 2px solid var(--line); border: 2px solid var(--line);
border-radius: var(--radius-control); border-radius: var(--radius-control);
background: var(--surface); background: var(--surface);
@@ -704,10 +727,6 @@ svg {
height: 18px; height: 18px;
} }
.language-menu__glyph {
white-space: nowrap;
}
.language-menu__dropdown { .language-menu__dropdown {
position: absolute; position: absolute;
top: calc(100% + 6px); top: calc(100% + 6px);
@@ -723,14 +742,6 @@ svg {
box-shadow: var(--shadow-raised); box-shadow: var(--shadow-raised);
} }
.site-sidebar .language-menu__dropdown {
top: auto;
bottom: calc(100% + 6px);
right: auto;
left: 0;
width: min(220px, calc(100vw - 40px));
}
.language-menu__item { .language-menu__item {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -773,7 +784,7 @@ svg {
.auth-user { .auth-user {
min-height: 44px; min-height: 44px;
max-width: 100%; max-width: min(220px, 32vw);
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
gap: 8px; gap: 8px;
@@ -853,6 +864,11 @@ svg {
padding: 14px 10px; padding: 14px 10px;
} }
.app-shell--sidebar-collapsed .site-topbar__brand {
flex: 0 1 auto;
display: flex;
}
.app-shell--sidebar-collapsed .site-sidebar__header { .app-shell--sidebar-collapsed .site-sidebar__header {
display: grid; display: grid;
justify-items: center; justify-items: center;
@@ -865,11 +881,7 @@ svg {
} }
.app-shell--sidebar-collapsed .site-sidebar__header .brand-lockup > span, .app-shell--sidebar-collapsed .site-sidebar__header .brand-lockup > span,
.app-shell--sidebar-collapsed .side-nav__label, .app-shell--sidebar-collapsed .side-nav__label {
.app-shell--sidebar-collapsed .auth-user__name,
.app-shell--sidebar-collapsed .auth-actions__label,
.app-shell--sidebar-collapsed .notification-menu__label,
.app-shell--sidebar-collapsed .language-menu__glyph {
width: 0; width: 0;
min-width: 0; min-width: 0;
max-width: 0; max-width: 0;
@@ -878,20 +890,13 @@ svg {
} }
.app-shell--sidebar-collapsed .side-nav__link, .app-shell--sidebar-collapsed .side-nav__link,
.app-shell--sidebar-collapsed .auth-actions .ui-button, .app-shell--sidebar-collapsed .side-nav__group-trigger {
.app-shell--sidebar-collapsed .auth-user,
.app-shell--sidebar-collapsed .site-sidebar .notification-menu__trigger,
.app-shell--sidebar-collapsed .site-sidebar .language-menu__trigger {
justify-content: center; justify-content: center;
gap: 0; gap: 0;
padding-right: 8px; padding-right: 8px;
padding-left: 8px; padding-left: 8px;
} }
.app-shell--sidebar-collapsed .side-nav__group-trigger {
gap: 4px;
}
.app-shell--sidebar-collapsed .side-nav__chevron { .app-shell--sidebar-collapsed .side-nav__chevron {
width: 14px; width: 14px;
height: 14px; height: 14px;
@@ -913,19 +918,11 @@ svg {
display: none; display: none;
} }
.app-shell--sidebar-collapsed .site-sidebar .language-menu__dropdown {
bottom: 0;
left: calc(100% + 8px);
}
.app-shell--sidebar-collapsed .site-sidebar .notification-menu__dropdown {
bottom: 0;
left: calc(100% + 8px);
}
} }
.page { .page {
position: relative; position: relative;
grid-column: 2;
--page-padding-x: 24px; --page-padding-x: 24px;
width: min(100%, var(--container)); width: min(100%, var(--container));
margin: 0 auto; margin: 0 auto;
@@ -6843,27 +6840,39 @@ button:disabled,
.app-shell { .app-shell {
display: block; display: block;
padding-top: 58px; padding-top: 60px;
} }
.mobile-topbar { .site-topbar {
position: fixed; position: fixed;
inset: 0 0 auto; inset: 0 0 auto;
z-index: 55; z-index: 55;
min-height: 58px; }
display: flex;
align-items: center; .site-topbar__inner {
min-height: 60px;
gap: 10px; gap: 10px;
padding: 8px 12px; padding: 8px 12px;
border-bottom: 1px solid rgba(31, 42, 59, 0.12); }
background: color-mix(in srgb, var(--surface) 90%, transparent);
backdrop-filter: blur(18px); .site-topbar__brand {
flex: 1 1 auto;
display: flex;
}
.site-topbar__spacer {
display: none;
}
.topbar-actions {
flex: 0 0 auto;
gap: 6px;
} }
.sidebar-toggle { .sidebar-toggle {
width: 40px; width: 44px;
min-width: 40px; min-width: 44px;
min-height: 40px; min-height: 44px;
display: inline-grid; display: inline-grid;
place-items: center; place-items: center;
border: 2px solid var(--line); border: 2px solid var(--line);
@@ -6878,14 +6887,22 @@ button:disabled,
color: var(--pokemon-blue-deep); color: var(--pokemon-blue-deep);
} }
.brand-lockup--mobile .pokemon-word { .brand-lockup--topbar {
min-width: 0;
}
.brand-lockup--topbar .pokemon-word {
font-size: 22px; font-size: 22px;
} }
.brand-lockup--mobile .brand-subtitle { .brand-lockup--topbar .brand-subtitle {
font-size: 10px; font-size: 10px;
} }
.site-topbar .auth-user {
max-width: 130px;
}
.sidebar-collapse-toggle { .sidebar-collapse-toggle {
display: none; display: none;
} }
@@ -6929,11 +6946,6 @@ button:disabled,
padding: 7px 8px 7px 34px; padding: 7px 8px 7px 34px;
} }
.auth-actions {
gap: 6px;
padding-top: 10px;
}
.app-shell--sidebar-open .site-sidebar { .app-shell--sidebar-open .site-sidebar {
transform: translateX(0); transform: translateX(0);
} }
@@ -8137,40 +8149,54 @@ button:disabled,
@media (max-width: 430px) { @media (max-width: 430px) {
.app-shell { .app-shell {
padding-top: 52px; padding-top: 56px;
} }
.mobile-topbar { .site-topbar__inner {
min-height: 52px; min-height: 56px;
gap: 8px; gap: 8px;
padding: 6px 10px; padding: 6px 10px;
} }
.sidebar-toggle { .sidebar-toggle {
width: 36px; width: 44px;
min-width: 36px; min-width: 44px;
min-height: 36px; min-height: 44px;
} }
.brand-lockup, .brand-lockup,
.brand-lockup--mobile { .brand-lockup--topbar {
gap: 8px; gap: 8px;
} }
.brand-lockup--mobile .pokeball-mark { .brand-lockup--topbar .pokeball-mark {
--ball-size: 28px !important; --ball-size: 28px !important;
} }
.brand-lockup--mobile .pokemon-word { .brand-lockup--topbar .pokemon-word {
font-size: 19px; font-size: 19px;
-webkit-text-stroke-width: 1.5px; -webkit-text-stroke-width: 1.5px;
text-shadow: 1px 2px 0 var(--pokemon-blue); text-shadow: 1px 2px 0 var(--pokemon-blue);
} }
.brand-lockup--mobile .brand-subtitle { .brand-lockup--topbar .brand-subtitle,
.site-topbar .auth-user__name {
display: none; display: none;
} }
.site-topbar .auth-user {
width: 44px;
min-width: 44px;
min-height: 44px;
justify-content: center;
gap: 0;
padding: 0;
}
.topbar-actions {
gap: 4px;
}
.site-sidebar { .site-sidebar {
width: min(84vw, 264px); width: min(84vw, 264px);
max-width: calc(100vw - 28px); max-width: calc(100vw - 28px);
@@ -8497,4 +8523,20 @@ button:disabled,
border-left: 0; border-left: 0;
border-radius: 0; border-radius: 0;
} }
.site-topbar .topbar-actions__icon-button,
.site-topbar .auth-user,
.site-topbar .notification-menu__trigger,
.site-topbar .language-menu__trigger {
width: 44px;
min-width: 44px;
min-height: 44px;
padding: 0;
}
}
@media (max-width: 360px) {
.brand-lockup--topbar > span {
display: none;
}
} }