refactor: 重写导航栏布局与交互
- 导航项重新排序:首页、投稿、信封图标、头像下拉菜单 - 铃铛图标替换为信封图标 - 用户名/设置/退出移入头像 hover 下拉菜单 - 设置改名为个人中心,退出改名为退出登录 - 头像点击跳转 /space,hover 展开下拉菜单 - 无头像时显示用户名首字彩色圆形占位 - Avatar 数据链路打通:Session→Middleware→BuildPageData→模板 - FindByIDForAuth 查询增加 avatar 列 - 新增 substr 模板函数
This commit is contained in:
@ -86,6 +86,9 @@ func BuildPageData(c *gin.Context, extra gin.H) gin.H {
|
|||||||
data["IsLoggedIn"] = true
|
data["IsLoggedIn"] = true
|
||||||
data["Username"] = username
|
data["Username"] = username
|
||||||
}
|
}
|
||||||
|
if avatar, exists := c.Get("avatar"); exists {
|
||||||
|
data["Avatar"] = avatar
|
||||||
|
}
|
||||||
// 注入 CSRF token(由 CSRF 中间件设置到上下文中)
|
// 注入 CSRF token(由 CSRF 中间件设置到上下文中)
|
||||||
if token, exists := c.Get("csrf_token"); exists {
|
if token, exists := c.Get("csrf_token"); exists {
|
||||||
data["CSRFToken"] = token
|
data["CSRFToken"] = token
|
||||||
|
|||||||
@ -77,6 +77,7 @@ func injectSessionContext(c *gin.Context, s *session.Session) {
|
|||||||
c.Set("uid", s.UserID)
|
c.Set("uid", s.UserID)
|
||||||
c.Set("email", s.Email)
|
c.Set("email", s.Email)
|
||||||
c.Set("username", s.Username)
|
c.Set("username", s.Username)
|
||||||
|
c.Set("avatar", s.Avatar)
|
||||||
c.Set("role", s.Role)
|
c.Set("role", s.Role)
|
||||||
c.Set("sid", s.ID)
|
c.Set("sid", s.ID)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -74,11 +74,10 @@ func (r *UserRepo) ExistsByEmailExclude(email string, excludeUID uint) (bool, er
|
|||||||
return count > 0, err
|
return count > 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// FindByIDForAuth 认证专用查询:返回 uid/email/username/role/status
|
// FindByIDForAuth 认证专用查询:返回 uid/email/username/avatar/role/status
|
||||||
// 比 FindByID 轻量(不查 avatar、bio 等无用字段),避免全量 SELECT *
|
|
||||||
func (r *UserRepo) FindByIDForAuth(userID uint) (*model.User, error) {
|
func (r *UserRepo) FindByIDForAuth(userID uint) (*model.User, error) {
|
||||||
var user model.User
|
var user model.User
|
||||||
err := r.db.Select("uid", "email", "username", "role", "status").
|
err := r.db.Select("uid", "email", "username", "avatar", "role", "status").
|
||||||
First(&user, userID).Error
|
First(&user, userID).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@ -37,6 +37,7 @@ func (m *Manager) Create(user *model.User, rememberMe bool, ip, userAgent string
|
|||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
Email: user.Email,
|
Email: user.Email,
|
||||||
Username: user.Username,
|
Username: user.Username,
|
||||||
|
Avatar: user.Avatar,
|
||||||
Role: user.Role,
|
Role: user.Role,
|
||||||
RememberMe: rememberMe,
|
RememberMe: rememberMe,
|
||||||
IP: ip,
|
IP: ip,
|
||||||
|
|||||||
@ -12,6 +12,7 @@ type Session struct {
|
|||||||
UserID uint // 用户 ID
|
UserID uint // 用户 ID
|
||||||
Email string // 邮箱
|
Email string // 邮箱
|
||||||
Username string // 用户名
|
Username string // 用户名
|
||||||
|
Avatar string // 头像 URL
|
||||||
Role string // 角色
|
Role string // 角色
|
||||||
RememberMe bool // 是否持久化(决定 cookie maxAge)
|
RememberMe bool // 是否持久化(决定 cookie maxAge)
|
||||||
IP string // 登录 IP
|
IP string // 登录 IP
|
||||||
|
|||||||
@ -24,6 +24,17 @@ func LoadTemplates(roots ...TemplateRoot) (*template.Template, error) {
|
|||||||
"subtract": func(a, b int) int { return a - b },
|
"subtract": func(a, b int) int { return a - b },
|
||||||
"formatTTL": formatTTL,
|
"formatTTL": formatTTL,
|
||||||
"assetV": common.AssetV,
|
"assetV": common.AssetV,
|
||||||
|
"substr": func(s string, start, length int) string {
|
||||||
|
runes := []rune(s)
|
||||||
|
if start >= len(runes) {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
end := start + length
|
||||||
|
if end > len(runes) {
|
||||||
|
end = len(runes)
|
||||||
|
}
|
||||||
|
return string(runes[start:end])
|
||||||
|
},
|
||||||
// derefUint 安全解引用 *uint 指针。
|
// derefUint 安全解引用 *uint 指针。
|
||||||
// Go 1.26 的模板引擎在将 *uint 传给 printf/print 时不会自动解引用,
|
// Go 1.26 的模板引擎在将 *uint 传给 printf/print 时不会自动解引用,
|
||||||
// 导致打印指针地址而非值。通过此函数显式解引用后传给 printf。
|
// 导致打印指针地址而非值。通过此函数显式解引用后传给 printf。
|
||||||
|
|||||||
@ -6,21 +6,31 @@
|
|||||||
</button>
|
</button>
|
||||||
<ul class="nav-links" id="navLinks">
|
<ul class="nav-links" id="navLinks">
|
||||||
<li><a href="/">首页</a></li>
|
<li><a href="/">首页</a></li>
|
||||||
<li><a href="/posts">帖子</a></li>
|
|
||||||
{{if .IsLoggedIn}}
|
{{if .IsLoggedIn}}
|
||||||
<li><a href="/studio/write" class="nav-contribute">
|
<li><a href="/studio/write" class="nav-contribute">
|
||||||
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 20h9"/><path d="M16.5 3.5a2.121 2.121 0 0 1 3 3L7 19l-4 1 1-4L16.5 3.5z"/></svg>
|
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 20h9"/><path d="M16.5 3.5a2.121 2.121 0 0 1 3 3L7 19l-4 1 1-4L16.5 3.5z"/></svg>
|
||||||
投稿
|
投稿
|
||||||
</a></li>
|
</a></li>
|
||||||
<li>
|
<li>
|
||||||
<a href="/messages" class="nav-messages" id="messagesBell" title="消息中心">
|
<a href="/messages" class="nav-envelope" id="messagesEnvelope" title="消息中心">
|
||||||
<svg class="nav-bell-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"/><path d="M13.73 21a2 2 0 0 1-3.46 0"/></svg>
|
<svg class="nav-envelope-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z"/><polyline points="22,6 12,13 2,6"/></svg>
|
||||||
<span class="nav-bell-badge" id="msgBadge" style="display:none">0</span>
|
<span class="nav-envelope-badge" id="msgBadge" style="display:none">0</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li><a href="/space" class="nav-user">{{.Username}}</a></li>
|
<li class="nav-avatar-wrapper">
|
||||||
<li><a href="/settings/profile" class="nav-settings">设置</a></li>
|
<a href="/space" class="nav-avatar-link">
|
||||||
<li><a href="javascript:void(0)" class="nav-logout" id="logoutBtn">退出</a></li>
|
{{if .Avatar}}
|
||||||
|
<img src="{{.Avatar}}" alt="" class="nav-avatar">
|
||||||
|
{{else}}
|
||||||
|
<span class="nav-avatar nav-avatar-default">{{substr .Username 0 1}}</span>
|
||||||
|
{{end}}
|
||||||
|
</a>
|
||||||
|
<div class="nav-dropdown">
|
||||||
|
<div class="nav-dropdown-header">{{.Username}}</div>
|
||||||
|
<a href="/settings/profile" class="nav-dropdown-item">个人中心</a>
|
||||||
|
<a href="javascript:void(0)" class="nav-dropdown-item nav-logout" id="logoutBtn">退出登录</a>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
{{else}}
|
{{else}}
|
||||||
<li><a href="/auth/login" class="nav-login">登录</a></li>
|
<li><a href="/auth/login" class="nav-login">登录</a></li>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|||||||
@ -79,13 +79,16 @@ header {
|
|||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: .6rem 0;
|
max-width: 1200px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: .6rem 2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.logo {
|
.logo {
|
||||||
font-size: 1.4rem;
|
font-size: 1.4rem;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
color: var(--color-primary);
|
color: var(--color-primary);
|
||||||
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.logo span {
|
.logo span {
|
||||||
@ -94,11 +97,19 @@ header {
|
|||||||
|
|
||||||
.nav-links {
|
.nav-links {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
gap: 2rem;
|
gap: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-links li {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-links a {
|
.nav-links a {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
padding: .5rem 0;
|
padding: .5rem 0;
|
||||||
position: relative;
|
position: relative;
|
||||||
@ -131,26 +142,11 @@ header {
|
|||||||
font-weight: 600 !important;
|
font-weight: 600 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-user {
|
|
||||||
color: var(--color-accent) !important;
|
|
||||||
font-weight: 600 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-settings {
|
|
||||||
font-size: .9rem;
|
|
||||||
color: var(--color-secondary) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-logout {
|
|
||||||
color: var(--color-secondary) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------- Nav Contribute ---------- */
|
/* ---------- Nav Contribute ---------- */
|
||||||
.nav-contribute {
|
.nav-contribute {
|
||||||
display: inline-flex !important;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
vertical-align: middle;
|
gap: .25rem;
|
||||||
line-height: 1;
|
|
||||||
color: var(--color-accent) !important;
|
color: var(--color-accent) !important;
|
||||||
font-weight: 600 !important;
|
font-weight: 600 !important;
|
||||||
}
|
}
|
||||||
@ -158,36 +154,35 @@ header {
|
|||||||
.nav-contribute .icon {
|
.nav-contribute .icon {
|
||||||
width: 16px;
|
width: 16px;
|
||||||
height: 16px;
|
height: 16px;
|
||||||
display: block;
|
|
||||||
margin-right: 4px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-contribute:hover {
|
/* ---------- Nav Envelope ---------- */
|
||||||
opacity: .8;
|
.nav-envelope {
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------- Nav Messages Bell ---------- */
|
|
||||||
.nav-messages {
|
|
||||||
position: relative;
|
position: relative;
|
||||||
display: inline-flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
padding: 6px;
|
padding: 4px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
transition: background .15s ease;
|
transition: background .15s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-messages:hover {
|
.nav-links .nav-envelope::after,
|
||||||
|
.nav-links .nav-envelope:hover::after {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-envelope:hover {
|
||||||
background: rgba(52, 152, 219, .08);
|
background: rgba(52, 152, 219, .08);
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-bell-icon {
|
.nav-envelope-icon {
|
||||||
width: 20px;
|
width: 20px;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-bell-badge {
|
.nav-envelope-badge {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: -2px;
|
right: -2px;
|
||||||
@ -205,6 +200,97 @@ header {
|
|||||||
line-height: 1;
|
line-height: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ---------- Nav Avatar Dropdown ---------- */
|
||||||
|
.nav-avatar-wrapper {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-avatar-link {
|
||||||
|
display: flex !important;
|
||||||
|
align-items: center;
|
||||||
|
padding: 2px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-links .nav-avatar-link::after,
|
||||||
|
.nav-links .nav-avatar-link:hover::after {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-avatar {
|
||||||
|
width: 32px;
|
||||||
|
height: 32px;
|
||||||
|
border-radius: 50%;
|
||||||
|
object-fit: cover;
|
||||||
|
border: 2px solid var(--color-border);
|
||||||
|
transition: border-color .2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-avatar-default {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
background: var(--color-accent);
|
||||||
|
color: #fff;
|
||||||
|
font-size: .85rem;
|
||||||
|
font-weight: 600;
|
||||||
|
object-fit: unset;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-avatar-wrapper:hover .nav-avatar {
|
||||||
|
border-color: var(--color-accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-dropdown {
|
||||||
|
position: absolute;
|
||||||
|
top: calc(100% + 8px);
|
||||||
|
right: 0;
|
||||||
|
min-width: 160px;
|
||||||
|
background: var(--color-surface);
|
||||||
|
border-radius: var(--radius);
|
||||||
|
box-shadow: 0 4px 16px rgba(0,0,0,.12);
|
||||||
|
opacity: 0;
|
||||||
|
visibility: hidden;
|
||||||
|
transform: translateY(-4px);
|
||||||
|
transition: opacity .2s ease, visibility .2s ease, transform .2s ease;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-avatar-wrapper:hover .nav-dropdown {
|
||||||
|
opacity: 1;
|
||||||
|
visibility: visible;
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-dropdown-header {
|
||||||
|
padding: .75rem 1rem;
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: .9rem;
|
||||||
|
color: var(--color-text);
|
||||||
|
border-bottom: 1px solid var(--color-border);
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-dropdown-item {
|
||||||
|
display: block !important;
|
||||||
|
padding: .6rem 1rem !important;
|
||||||
|
font-size: .9rem;
|
||||||
|
color: var(--color-text-light) !important;
|
||||||
|
transition: background .15s ease, color .15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-dropdown-item::after {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-dropdown-item:hover {
|
||||||
|
background: var(--color-bg);
|
||||||
|
color: var(--color-accent) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-dropdown-item.nav-logout:hover {
|
||||||
|
color: var(--color-danger) !important;
|
||||||
|
}
|
||||||
|
|
||||||
.mobile-menu-btn {
|
.mobile-menu-btn {
|
||||||
display: none;
|
display: none;
|
||||||
background: none;
|
background: none;
|
||||||
@ -309,6 +395,9 @@ footer {
|
|||||||
|
|
||||||
/* ---------- Responsive (共享:导航) ---------- */
|
/* ---------- Responsive (共享:导航) ---------- */
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
|
.nav-container {
|
||||||
|
padding: .6rem 1rem;
|
||||||
|
}
|
||||||
.nav-links {
|
.nav-links {
|
||||||
display: none;
|
display: none;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
@ -317,13 +406,28 @@ footer {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
background: var(--color-surface);
|
background: var(--color-surface);
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
padding: 1.5rem;
|
padding: 1rem;
|
||||||
box-shadow: 0 10px 15px rgba(0,0,0,.1);
|
box-shadow: 0 10px 15px rgba(0,0,0,.1);
|
||||||
text-align: center;
|
|
||||||
}
|
}
|
||||||
.nav-links.active {
|
.nav-links.active {
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
.nav-links li {
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
.nav-avatar-wrapper {
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
.nav-dropdown {
|
||||||
|
position: static;
|
||||||
|
opacity: 1;
|
||||||
|
visibility: visible;
|
||||||
|
transform: none;
|
||||||
|
box-shadow: none;
|
||||||
|
border-top: 1px solid var(--color-border);
|
||||||
|
border-radius: 0;
|
||||||
|
margin-top: .5rem;
|
||||||
|
}
|
||||||
.mobile-menu-btn {
|
.mobile-menu-btn {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user