️ feat: update global styles and color variables for improved theming

refactor: change import paths for DeviceContext and GravatarAvatar components

fix: adjust login form API call and update UI text for clarity

feat: add post API for listing posts with pagination and filtering options

feat: implement BlogCard component for displaying blog posts with enhanced UI

feat: create Badge component for consistent styling of labels and indicators

refactor: reintroduce DeviceContext with improved functionality for theme and language management

feat: define Label and Post models for better type safety and structure
This commit is contained in:
2025-07-24 13:12:59 +08:00
parent 21a1726f71
commit abe1099711
30 changed files with 935 additions and 288 deletions

View File

@ -3,28 +3,105 @@ package v1
import ( import (
"context" "context"
"github.com/cloudwego/hertz/pkg/app" "github.com/cloudwego/hertz/pkg/app"
"github.com/cloudwego/hertz/pkg/common/utils"
"github.com/snowykami/neo-blog/internal/dto"
"github.com/snowykami/neo-blog/internal/service"
"github.com/snowykami/neo-blog/pkg/errs"
"github.com/snowykami/neo-blog/pkg/resps"
"strconv"
) )
type labelType struct{} type LabelController struct {
service *service.LabelService
var Label = new(labelType)
func (l *labelType) Create(ctx context.Context, c *app.RequestContext) {
// TODO: Impl
} }
func (l *labelType) Delete(ctx context.Context, c *app.RequestContext) { func NewLabelController() *LabelController {
// TODO: Impl return &LabelController{
service: service.NewLabelService(),
}
} }
func (l *labelType) Get(ctx context.Context, c *app.RequestContext) { func (l *LabelController) Create(ctx context.Context, c *app.RequestContext) {
// TODO: Impl var req dto.LabelDto
if err := c.BindAndValidate(&req); err != nil {
resps.BadRequest(c, resps.ErrParamInvalid)
return
}
labelID, err := l.service.CreateLabel(&req)
if err != nil {
serviceErr := errs.AsServiceError(err)
resps.Custom(c, serviceErr.Code, serviceErr.Message, nil)
return
}
resps.Ok(c, resps.Success, utils.H{"id": labelID})
} }
func (l *labelType) Update(ctx context.Context, c *app.RequestContext) { func (l *LabelController) Delete(ctx context.Context, c *app.RequestContext) {
// TODO: Impl id := c.Param("id")
if id == "" {
resps.BadRequest(c, resps.ErrParamInvalid)
return
}
err := l.service.DeleteLabel(id)
if err != nil {
serviceErr := errs.AsServiceError(err)
resps.Custom(c, serviceErr.Code, serviceErr.Message, nil)
return
}
resps.Ok(c, resps.Success, nil)
} }
func (l *labelType) List(ctx context.Context, c *app.RequestContext) { func (l *LabelController) Get(ctx context.Context, c *app.RequestContext) {
// TODO: Impl id := c.Param("id")
if id == "" {
resps.BadRequest(c, resps.ErrParamInvalid)
return
}
label, err := l.service.GetLabelByID(id)
if err != nil {
serviceErr := errs.AsServiceError(err)
resps.Custom(c, serviceErr.Code, serviceErr.Message, nil)
return
}
if label == nil {
resps.NotFound(c, resps.ErrNotFound)
return
}
resps.Ok(c, resps.Success, label)
}
func (l *LabelController) Update(ctx context.Context, c *app.RequestContext) {
var req dto.LabelDto
if err := c.BindAndValidate(&req); err != nil {
resps.BadRequest(c, resps.ErrParamInvalid)
return
}
id := c.Param("id")
if id == "" {
resps.BadRequest(c, resps.ErrParamInvalid)
return
}
idInt, err := strconv.Atoi(id)
if err != nil {
resps.BadRequest(c, "Invalid label ID")
return
}
req.ID = uint(idInt)
labelID, err := l.service.UpdateLabel(&req)
if err != nil {
serviceErr := errs.AsServiceError(err)
resps.Custom(c, serviceErr.Code, serviceErr.Message, nil)
return
}
resps.Ok(c, resps.Success, utils.H{"id": labelID})
}
func (l *LabelController) List(ctx context.Context, c *app.RequestContext) {
labels, err := l.service.ListLabels()
if err != nil {
serviceErr := errs.AsServiceError(err)
resps.Custom(c, serviceErr.Code, serviceErr.Message, nil)
return
}
resps.Ok(c, resps.Success, labels)
} }

View File

@ -3,6 +3,7 @@ package v1
import ( import (
"context" "context"
"github.com/cloudwego/hertz/pkg/app" "github.com/cloudwego/hertz/pkg/app"
"github.com/cloudwego/hertz/pkg/common/utils"
"github.com/snowykami/neo-blog/internal/ctxutils" "github.com/snowykami/neo-blog/internal/ctxutils"
"github.com/snowykami/neo-blog/internal/dto" "github.com/snowykami/neo-blog/internal/dto"
"github.com/snowykami/neo-blog/internal/service" "github.com/snowykami/neo-blog/internal/service"
@ -28,12 +29,13 @@ func (p *PostController) Create(ctx context.Context, c *app.RequestContext) {
if err := c.BindAndValidate(&req); err != nil { if err := c.BindAndValidate(&req); err != nil {
resps.BadRequest(c, resps.ErrParamInvalid) resps.BadRequest(c, resps.ErrParamInvalid)
} }
if err := p.service.CreatePost(ctx, &req); err != nil { postID, err := p.service.CreatePost(ctx, &req)
if err != nil {
serviceErr := errs.AsServiceError(err) serviceErr := errs.AsServiceError(err)
resps.Custom(c, serviceErr.Code, serviceErr.Message, nil) resps.Custom(c, serviceErr.Code, serviceErr.Message, nil)
return return
} }
resps.Ok(c, resps.Success, nil) resps.Ok(c, resps.Success, utils.H{"id": postID})
} }
func (p *PostController) Delete(ctx context.Context, c *app.RequestContext) { func (p *PostController) Delete(ctx context.Context, c *app.RequestContext) {
@ -80,16 +82,20 @@ func (p *PostController) Update(ctx context.Context, c *app.RequestContext) {
resps.BadRequest(c, resps.ErrParamInvalid) resps.BadRequest(c, resps.ErrParamInvalid)
return return
} }
if err := p.service.UpdatePost(ctx, id, &req); err != nil { postID, err := p.service.UpdatePost(ctx, id, &req)
if err != nil {
serviceErr := errs.AsServiceError(err) serviceErr := errs.AsServiceError(err)
resps.Custom(c, serviceErr.Code, serviceErr.Message, nil) resps.Custom(c, serviceErr.Code, serviceErr.Message, nil)
return return
} }
resps.Ok(c, resps.Success, nil) resps.Ok(c, resps.Success, utils.H{"id": postID})
} }
func (p *PostController) List(ctx context.Context, c *app.RequestContext) { func (p *PostController) List(ctx context.Context, c *app.RequestContext) {
pagination := ctxutils.GetPaginationParams(c) pagination := ctxutils.GetPaginationParams(c)
if pagination.OrderedBy == "" {
pagination.OrderedBy = constant.OrderedByUpdatedAt
}
if pagination.OrderedBy != "" && !slices.Contains(constant.OrderedByEnumPost, pagination.OrderedBy) { if pagination.OrderedBy != "" && !slices.Contains(constant.OrderedByEnumPost, pagination.OrderedBy) {
resps.BadRequest(c, "无效的排序字段") resps.BadRequest(c, "无效的排序字段")
return return
@ -103,11 +109,11 @@ func (p *PostController) List(ctx context.Context, c *app.RequestContext) {
OrderedBy: pagination.OrderedBy, OrderedBy: pagination.OrderedBy,
Reverse: pagination.Reverse, Reverse: pagination.Reverse,
} }
resp, err := p.service.ListPosts(ctx, req) posts, err := p.service.ListPosts(ctx, req)
if err != nil { if err != nil {
serviceErr := errs.AsServiceError(err) serviceErr := errs.AsServiceError(err)
resps.Custom(c, serviceErr.Code, serviceErr.Message, nil) resps.Custom(c, serviceErr.Code, serviceErr.Message, nil)
return return
} }
resps.Ok(c, resps.Success, resp) resps.Ok(c, resps.Success, posts)
} }

View File

@ -70,15 +70,13 @@ func (u *UserController) Logout(ctx context.Context, c *app.RequestContext) {
} }
func (u *UserController) OidcList(ctx context.Context, c *app.RequestContext) { func (u *UserController) OidcList(ctx context.Context, c *app.RequestContext) {
resp, err := u.service.ListOidcConfigs() oidcConfigs, err := u.service.ListOidcConfigs()
if err != nil { if err != nil {
serviceErr := errs.AsServiceError(err) serviceErr := errs.AsServiceError(err)
resps.Custom(c, serviceErr.Code, serviceErr.Message, nil) resps.Custom(c, serviceErr.Code, serviceErr.Message, nil)
return return
} }
resps.Ok(c, resps.Success, map[string]any{ resps.Ok(c, resps.Success, oidcConfigs)
"oidc_configs": resp.OidcConfigs,
})
} }
func (u *UserController) OidcLogin(ctx context.Context, c *app.RequestContext) { func (u *UserController) OidcLogin(ctx context.Context, c *app.RequestContext) {
@ -109,7 +107,12 @@ func (u *UserController) GetUser(ctx context.Context, c *app.RequestContext) {
userID := c.Param("id") userID := c.Param("id")
userIDInt, err := strconv.Atoi(userID) userIDInt, err := strconv.Atoi(userID)
if err != nil || userIDInt <= 0 { if err != nil || userIDInt <= 0 {
userIDInt = int(ctxutils.GetCurrentUserID(ctx)) currentUserID, ok := ctxutils.GetCurrentUserID(ctx)
if !ok {
resps.Unauthorized(c, resps.ErrUnauthorized)
return
}
userIDInt = int(currentUserID)
} }
resp, err := u.service.GetUser(&dto.GetUserReq{UserID: uint(userIDInt)}) resp, err := u.service.GetUser(&dto.GetUserReq{UserID: uint(userIDInt)})
@ -138,8 +141,8 @@ func (u *UserController) UpdateUser(ctx context.Context, c *app.RequestContext)
return return
} }
updateUserReq.ID = uint(userIDInt) updateUserReq.ID = uint(userIDInt)
currentUser := ctxutils.GetCurrentUser(ctx) currentUser, ok := ctxutils.GetCurrentUser(ctx)
if currentUser == nil { if !ok {
resps.Unauthorized(c, resps.ErrUnauthorized) resps.Unauthorized(c, resps.ErrUnauthorized)
return return
} }

View File

@ -4,25 +4,29 @@ import (
"context" "context"
"github.com/snowykami/neo-blog/internal/model" "github.com/snowykami/neo-blog/internal/model"
"github.com/snowykami/neo-blog/internal/repo" "github.com/snowykami/neo-blog/internal/repo"
"github.com/snowykami/neo-blog/pkg/constant"
) )
func GetCurrentUser(ctx context.Context) *model.User { // GetCurrentUser 从上下文中获取当前用户
userIDValue := ctx.Value("user_id").(uint) func GetCurrentUser(ctx context.Context) (*model.User, bool) {
if userIDValue <= 0 { val := ctx.Value(constant.ContextKeyUserID)
return nil if val == nil {
return nil, false
} }
user, err := repo.User.GetUserByID(userIDValue) user, err := repo.User.GetUserByID(val.(uint))
if err != nil || user == nil || user.ID == 0 { if err != nil {
return nil return nil, false
} }
return user
return user, true
} }
// GetCurrentUserID 获取当前用户ID如果未认证则返回0 // GetCurrentUserID 从上下文中获取当前用户ID
func GetCurrentUserID(ctx context.Context) uint { func GetCurrentUserID(ctx context.Context) (uint, bool) {
user := GetCurrentUser(ctx) user, ok := GetCurrentUser(ctx)
if user == nil { if !ok || user == nil {
return 0 return 0, false
} }
return user.ID
return user.ID, true
} }

View File

@ -1,6 +1,7 @@
package dto package dto
type LabelDto struct { type LabelDto struct {
ID uint `json:"id"` // 标签ID
Key string `json:"key"` Key string `json:"key"`
Value string `json:"value"` Value string `json:"value"`
Color string `json:"color"` Color string `json:"color"`

View File

@ -1,22 +1,30 @@
package dto package dto
import "time"
type PostDto struct { type PostDto struct {
ID uint `json:"id"` // 帖子ID ID uint `json:"id"` // 帖子ID
UserID uint `json:"user_id"` // 发布者的用户ID UserID uint `json:"user_id"` // 发布者的用户ID
Title string `json:"title"` // 帖子标题 Title string `json:"title"` // 帖子标题
Content string `json:"content"` Content string `json:"content"`
Cover string `json:"cover"` // 帖子封面图
Type string `json:"type"` // 帖子类型 markdown / html / text
Labels []LabelDto `json:"labels"` // 关联的标签 Labels []LabelDto `json:"labels"` // 关联的标签
IsPrivate bool `json:"is_private"` // 是否为私密帖子 IsPrivate bool `json:"is_private"` // 是否为私密帖子
LikeCount uint64 `json:"like_count"` // 点赞数 LikeCount uint64 `json:"like_count"` // 点赞数
CommentCount uint64 `json:"comment_count"` // 评论数 CommentCount uint64 `json:"comment_count"` // 评论数
ViewCount uint64 `json:"view_count"` // 浏览数 ViewCount uint64 `json:"view_count"` // 浏览数
Heat uint64 `json:"heat"` // 热度 Heat uint64 `json:"heat"` // 热度
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"` // 更新时间
} }
type CreateOrUpdatePostReq struct { type CreateOrUpdatePostReq struct {
Title string `json:"title"` Title string `json:"title"`
Content string `json:"content"` Content string `json:"content"`
Cover string `json:"cover"`
IsPrivate bool `json:"is_private"` IsPrivate bool `json:"is_private"`
Type string `json:"type"`
Labels []uint `json:"labels"` // 标签ID列表 Labels []uint `json:"labels"` // 标签ID列表
} }

View File

@ -20,7 +20,7 @@ func UseAuth(block bool) app.HandlerFunc {
// 尝试用普通 token 认证 // 尝试用普通 token 认证
tokenClaims, err := utils.Jwt.ParseJsonWebTokenWithoutState(token) tokenClaims, err := utils.Jwt.ParseJsonWebTokenWithoutState(token)
if err == nil && tokenClaims != nil { if err == nil && tokenClaims != nil {
ctx = context.WithValue(ctx, "user_id", tokenClaims.UserID) ctx = context.WithValue(ctx, constant.ContextKeyUserID, tokenClaims.UserID)
c.Next(ctx) c.Next(ctx)
return return
} }
@ -30,8 +30,7 @@ func UseAuth(block bool) app.HandlerFunc {
if err == nil && refreshTokenClaims != nil { if err == nil && refreshTokenClaims != nil {
ok, err := isStatefulJwtValid(refreshTokenClaims) ok, err := isStatefulJwtValid(refreshTokenClaims)
if err == nil && ok { if err == nil && ok {
ctx = context.WithValue(ctx, "user_id", refreshTokenClaims.UserID) ctx = context.WithValue(ctx, constant.ContextKeyUserID, refreshTokenClaims.UserID)
// 生成新 token // 生成新 token
newTokenClaims := utils.Jwt.NewClaims( newTokenClaims := utils.Jwt.NewClaims(
refreshTokenClaims.UserID, refreshTokenClaims.UserID,

View File

@ -7,7 +7,7 @@ import (
type Label struct { type Label struct {
gorm.Model gorm.Model
Key string `gorm:"uniqueIndex"` // 标签键,唯一标识 Key string `gorm:"index"` // 标签键,唯一标识
Value string `gorm:"type:text"` // 标签值,描述标签的内容 Value string `gorm:"type:text"` // 标签值,描述标签的内容
Color string `gorm:"type:text"` // 前端可用颜色代码 Color string `gorm:"type:text"` // 前端可用颜色代码
TailwindClassName string `gorm:"type:text"` // Tailwind CSS 的类名,用于前端样式 TailwindClassName string `gorm:"type:text"` // Tailwind CSS 的类名,用于前端样式

View File

@ -11,7 +11,9 @@ type Post struct {
UserID uint `gorm:"index"` // 发布者的用户ID UserID uint `gorm:"index"` // 发布者的用户ID
User User `gorm:"foreignKey:UserID;references:ID"` // 关联的用户 User User `gorm:"foreignKey:UserID;references:ID"` // 关联的用户
Title string `gorm:"type:text;not null"` // 帖子标题 Title string `gorm:"type:text;not null"` // 帖子标题
Cover string `gorm:"type:text"` // 帖子封面图
Content string `gorm:"type:text;not null"` // 帖子内容 Content string `gorm:"type:text;not null"` // 帖子内容
Type string `gorm:"type:text;default:markdown"` // markdown类型支持markdown或html
CategoryID uint `gorm:"index"` // 帖子分类ID CategoryID uint `gorm:"index"` // 帖子分类ID
Category Category `gorm:"foreignKey:CategoryID;references:ID"` // 关联的分类 Category Category `gorm:"foreignKey:CategoryID;references:ID"` // 关联的分类
Labels []Label `gorm:"many2many:post_labels;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"` // 关联的标签 Labels []Label `gorm:"many2many:post_labels;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"` // 关联的标签
@ -48,10 +50,14 @@ func (p *Post) ToDto() dto.PostDto {
UserID: p.UserID, UserID: p.UserID,
Title: p.Title, Title: p.Title,
Content: p.Content, Content: p.Content,
Cover: p.Cover,
Type: p.Type,
IsPrivate: p.IsPrivate, IsPrivate: p.IsPrivate,
LikeCount: p.LikeCount, LikeCount: p.LikeCount,
CommentCount: p.CommentCount, CommentCount: p.CommentCount,
ViewCount: p.ViewCount, ViewCount: p.ViewCount,
Heat: p.Heat, Heat: p.Heat,
CreatedAt: p.CreatedAt,
UpdatedAt: p.UpdatedAt,
} }
} }

View File

@ -6,13 +6,7 @@ type labelRepo struct{}
var Label = &labelRepo{} var Label = &labelRepo{}
func (l *labelRepo) CreateLabel(key, value, color, tailwindClassName string) error { func (l *labelRepo) CreateLabel(label *model.Label) error {
label := &model.Label{
Key: key,
Value: value,
Color: color,
TailwindClassName: tailwindClassName,
}
return GetDB().Create(label).Error return GetDB().Create(label).Error
} }
@ -24,7 +18,7 @@ func (l *labelRepo) GetLabelByKey(key string) (*model.Label, error) {
return &label, nil return &label, nil
} }
func (l *labelRepo) GetLabelByID(id uint) (*model.Label, error) { func (l *labelRepo) GetLabelByID(id string) (*model.Label, error) {
var label model.Label var label model.Label
if err := GetDB().Where("id = ?", id).First(&label).Error; err != nil { if err := GetDB().Where("id = ?", id).First(&label).Error; err != nil {
return nil, err return nil, err
@ -47,7 +41,7 @@ func (l *labelRepo) UpdateLabel(label *model.Label) error {
return nil return nil
} }
func (l *labelRepo) DeleteLabel(id uint) error { func (l *labelRepo) DeleteLabel(id string) error {
if err := GetDB().Where("id = ?", id).Delete(&model.Label{}).Error; err != nil { if err := GetDB().Where("id = ?", id).Delete(&model.Label{}).Error; err != nil {
return err return err
} }

View File

@ -7,14 +7,15 @@ import (
) )
func registerLabelRoutes(group *route.RouterGroup) { func registerLabelRoutes(group *route.RouterGroup) {
labelController := v1.NewLabelController()
labelGroup := group.Group("/label").Use(middleware.UseAuth(true)) labelGroup := group.Group("/label").Use(middleware.UseAuth(true))
labelGroupWithoutAuth := group.Group("/label").Use(middleware.UseAuth(false)) labelGroupWithoutAuth := group.Group("/label").Use(middleware.UseAuth(false))
{ {
labelGroupWithoutAuth.GET("/l/:id", v1.Label.Get) labelGroupWithoutAuth.GET("/l/:id", labelController.Get)
labelGroupWithoutAuth.GET("/list", v1.Label.List) labelGroupWithoutAuth.GET("/list", labelController.List)
labelGroup.POST("/l", v1.Label.Create) labelGroup.POST("/l", labelController.Create)
labelGroup.DELETE("/l/:id", v1.Label.Delete) labelGroup.DELETE("/l/:id", labelController.Delete)
labelGroup.PUT("/l/:id", v1.Label.Update) labelGroup.PUT("/l/:id", labelController.Update)
} }
} }

View File

@ -1 +1,85 @@
package service package service
import (
"github.com/snowykami/neo-blog/internal/dto"
"github.com/snowykami/neo-blog/internal/model"
"github.com/snowykami/neo-blog/internal/repo"
"gorm.io/gorm"
)
type LabelService struct{}
func NewLabelService() *LabelService {
return &LabelService{}
}
func (l *LabelService) CreateLabel(req *dto.LabelDto) (uint, error) {
label := &model.Label{
Key: req.Key,
Value: req.Value,
Color: req.Color,
TailwindClassName: req.TailwindClassName,
}
return label.ID, repo.Label.CreateLabel(label)
}
func (l *LabelService) UpdateLabel(req *dto.LabelDto) (uint, error) {
label := &model.Label{
Model: gorm.Model{ID: req.ID},
Key: req.Key,
Value: req.Value,
Color: req.Color,
TailwindClassName: req.TailwindClassName,
}
return label.ID, repo.Label.UpdateLabel(label)
}
func (l *LabelService) DeleteLabel(id string) error {
return repo.Label.DeleteLabel(id)
}
func (l *LabelService) GetLabelByKey(key string) (*dto.LabelDto, error) {
label, err := repo.Label.GetLabelByKey(key)
if err != nil {
return nil, err
}
return &dto.LabelDto{
ID: label.ID,
Key: label.Key,
Value: label.Value,
Color: label.Color,
TailwindClassName: label.TailwindClassName,
}, nil
}
func (l *LabelService) GetLabelByID(id string) (*dto.LabelDto, error) {
label, err := repo.Label.GetLabelByID(id)
if err != nil {
return nil, err
}
return &dto.LabelDto{
ID: label.ID,
Key: label.Key,
Value: label.Value,
Color: label.Color,
TailwindClassName: label.TailwindClassName,
}, nil
}
func (l *LabelService) ListLabels() ([]dto.LabelDto, error) {
labels, err := repo.Label.ListLabels()
var labelDtos []dto.LabelDto
if err != nil {
return labelDtos, err
}
for _, label := range labels {
labelDtos = append(labelDtos, dto.LabelDto{
ID: label.ID,
Key: label.Key,
Value: label.Value,
Color: label.Color,
TailwindClassName: label.TailwindClassName,
})
}
return labelDtos, nil
}

View File

@ -7,6 +7,7 @@ import (
"github.com/snowykami/neo-blog/internal/model" "github.com/snowykami/neo-blog/internal/model"
"github.com/snowykami/neo-blog/internal/repo" "github.com/snowykami/neo-blog/internal/repo"
"github.com/snowykami/neo-blog/pkg/errs" "github.com/snowykami/neo-blog/pkg/errs"
"strconv"
) )
type PostService struct{} type PostService struct{}
@ -15,10 +16,10 @@ func NewPostService() *PostService {
return &PostService{} return &PostService{}
} }
func (p *PostService) CreatePost(ctx context.Context, req *dto.CreateOrUpdatePostReq) error { func (p *PostService) CreatePost(ctx context.Context, req *dto.CreateOrUpdatePostReq) (uint, error) {
currentUser := ctxutils.GetCurrentUser(ctx) currentUser, ok := ctxutils.GetCurrentUser(ctx)
if currentUser == nil { if !ok {
return errs.ErrUnauthorized return 0, errs.ErrUnauthorized
} }
post := &model.Post{ post := &model.Post{
Title: req.Title, Title: req.Title,
@ -27,7 +28,7 @@ func (p *PostService) CreatePost(ctx context.Context, req *dto.CreateOrUpdatePos
Labels: func() []model.Label { Labels: func() []model.Label {
labelModels := make([]model.Label, 0) labelModels := make([]model.Label, 0)
for _, labelID := range req.Labels { for _, labelID := range req.Labels {
labelModel, err := repo.Label.GetLabelByID(labelID) labelModel, err := repo.Label.GetLabelByID(strconv.Itoa(int(labelID)))
if err == nil { if err == nil {
labelModels = append(labelModels, *labelModel) labelModels = append(labelModels, *labelModel)
} }
@ -37,14 +38,14 @@ func (p *PostService) CreatePost(ctx context.Context, req *dto.CreateOrUpdatePos
IsPrivate: req.IsPrivate, IsPrivate: req.IsPrivate,
} }
if err := repo.Post.CreatePost(post); err != nil { if err := repo.Post.CreatePost(post); err != nil {
return err return 0, err
} }
return nil return post.ID, nil
} }
func (p *PostService) DeletePost(ctx context.Context, id string) error { func (p *PostService) DeletePost(ctx context.Context, id string) error {
currentUser := ctxutils.GetCurrentUser(ctx) currentUser, ok := ctxutils.GetCurrentUser(ctx)
if currentUser == nil { if !ok {
return errs.ErrUnauthorized return errs.ErrUnauthorized
} }
if id == "" { if id == "" {
@ -64,8 +65,8 @@ func (p *PostService) DeletePost(ctx context.Context, id string) error {
} }
func (p *PostService) GetPost(ctx context.Context, id string) (*dto.PostDto, error) { func (p *PostService) GetPost(ctx context.Context, id string) (*dto.PostDto, error) {
currentUser := ctxutils.GetCurrentUser(ctx) currentUser, ok := ctxutils.GetCurrentUser(ctx)
if currentUser == nil { if !ok {
return nil, errs.ErrUnauthorized return nil, errs.ErrUnauthorized
} }
if id == "" { if id == "" {
@ -92,20 +93,20 @@ func (p *PostService) GetPost(ctx context.Context, id string) (*dto.PostDto, err
}, nil }, nil
} }
func (p *PostService) UpdatePost(ctx context.Context, id string, req *dto.CreateOrUpdatePostReq) error { func (p *PostService) UpdatePost(ctx context.Context, id string, req *dto.CreateOrUpdatePostReq) (uint, error) {
currentUser := ctxutils.GetCurrentUser(ctx) currentUser, ok := ctxutils.GetCurrentUser(ctx)
if currentUser == nil { if !ok {
return errs.ErrUnauthorized return 0, errs.ErrUnauthorized
} }
if id == "" { if id == "" {
return errs.ErrBadRequest return 0, errs.ErrBadRequest
} }
post, err := repo.Post.GetPostByID(id) post, err := repo.Post.GetPostByID(id)
if err != nil { if err != nil {
return errs.New(errs.ErrNotFound.Code, "post not found", err) return 0, errs.New(errs.ErrNotFound.Code, "post not found", err)
} }
if post.UserID != currentUser.ID { if post.UserID != currentUser.ID {
return errs.ErrForbidden return 0, errs.ErrForbidden
} }
post.Title = req.Title post.Title = req.Title
post.Content = req.Content post.Content = req.Content
@ -113,7 +114,7 @@ func (p *PostService) UpdatePost(ctx context.Context, id string, req *dto.Create
post.Labels = func() []model.Label { post.Labels = func() []model.Label {
labelModels := make([]model.Label, len(req.Labels)) labelModels := make([]model.Label, len(req.Labels))
for _, labelID := range req.Labels { for _, labelID := range req.Labels {
labelModel, err := repo.Label.GetLabelByID(labelID) labelModel, err := repo.Label.GetLabelByID(strconv.Itoa(int(labelID)))
if err == nil { if err == nil {
labelModels = append(labelModels, *labelModel) labelModels = append(labelModels, *labelModel)
} }
@ -121,14 +122,14 @@ func (p *PostService) UpdatePost(ctx context.Context, id string, req *dto.Create
return labelModels return labelModels
}() }()
if err := repo.Post.UpdatePost(post); err != nil { if err := repo.Post.UpdatePost(post); err != nil {
return errs.ErrInternalServer return 0, errs.ErrInternalServer
} }
return nil return post.ID, nil
} }
func (p *PostService) ListPosts(ctx context.Context, req *dto.ListPostReq) (*dto.ListPostResp, error) { func (p *PostService) ListPosts(ctx context.Context, req *dto.ListPostReq) ([]dto.PostDto, error) {
postDtos := make([]dto.PostDto, 0) postDtos := make([]dto.PostDto, 0)
currentUserID := ctxutils.GetCurrentUserID(ctx) currentUserID, _ := ctxutils.GetCurrentUserID(ctx)
posts, err := repo.Post.ListPosts(currentUserID, req.Keywords, req.Page, req.Size, req.OrderedBy, req.Reverse) posts, err := repo.Post.ListPosts(currentUserID, req.Keywords, req.Page, req.Size, req.OrderedBy, req.Reverse)
if err != nil { if err != nil {
return nil, errs.New(errs.ErrInternalServer.Code, "failed to list posts", err) return nil, errs.New(errs.ErrInternalServer.Code, "failed to list posts", err)
@ -136,10 +137,5 @@ func (p *PostService) ListPosts(ctx context.Context, req *dto.ListPostReq) (*dto
for _, post := range posts { for _, post := range posts {
postDtos = append(postDtos, post.ToDto()) postDtos = append(postDtos, post.ToDto())
} }
return &dto.ListPostResp{ return postDtos, nil
Posts: postDtos,
Total: uint64(len(posts)),
OrderedBy: req.OrderedBy,
Reverse: req.Reverse,
}, nil
} }

View File

@ -140,7 +140,7 @@ func (s *UserService) RequestVerifyEmail(req *dto.VerifyEmailReq) (*dto.VerifyEm
return &dto.VerifyEmailResp{Success: true}, nil return &dto.VerifyEmailResp{Success: true}, nil
} }
func (s *UserService) ListOidcConfigs() (*dto.ListOidcConfigResp, error) { func (s *UserService) ListOidcConfigs() ([]dto.UserOidcConfigDto, error) {
enabledOidcConfigs, err := repo.Oidc.ListOidcConfigs(true) enabledOidcConfigs, err := repo.Oidc.ListOidcConfigs(true)
if err != nil { if err != nil {
return nil, errs.ErrInternalServer return nil, errs.ErrInternalServer
@ -187,9 +187,7 @@ func (s *UserService) ListOidcConfigs() (*dto.ListOidcConfigResp, error) {
LoginUrl: loginUrl, LoginUrl: loginUrl,
}) })
} }
return &dto.ListOidcConfigResp{ return oidcConfigsDtos, nil
OidcConfigs: oidcConfigsDtos,
}, nil
} }
func (s *UserService) OidcLogin(req *dto.OidcLoginReq) (*dto.OidcLoginResp, error) { func (s *UserService) OidcLogin(req *dto.OidcLoginReq) (*dto.OidcLoginResp, error) {

View File

@ -5,6 +5,7 @@ const (
CaptchaTypeHCaptcha = "hcaptcha" // HCaptcha验证码 CaptchaTypeHCaptcha = "hcaptcha" // HCaptcha验证码
CaptchaTypeTurnstile = "turnstile" // Turnstile验证码 CaptchaTypeTurnstile = "turnstile" // Turnstile验证码
CaptchaTypeReCaptcha = "recaptcha" // ReCaptcha验证码 CaptchaTypeReCaptcha = "recaptcha" // ReCaptcha验证码
ContextKeyUserID = "user_id" // 上下文键用户ID
ModeDev = "dev" ModeDev = "dev"
ModeProd = "prod" ModeProd = "prod"
RoleUser = "user" RoleUser = "user"

View File

@ -3,12 +3,12 @@ import { camelToSnakeObj, snakeToCamelObj } from "field-conv";
const API_SUFFIX = "/api/v1"; const API_SUFFIX = "/api/v1";
const axiosInstance = axios.create({ const axiosClient = axios.create({
baseURL: API_SUFFIX, baseURL: API_SUFFIX,
timeout: 10000, timeout: 10000,
}); });
axiosInstance.interceptors.request.use((config) => { axiosClient.interceptors.request.use((config) => {
if (config.data && typeof config.data === "object") { if (config.data && typeof config.data === "object") {
config.data = camelToSnakeObj(config.data); config.data = camelToSnakeObj(config.data);
} }
@ -18,7 +18,7 @@ axiosInstance.interceptors.request.use((config) => {
return config; return config;
}); });
axiosInstance.interceptors.response.use( axiosClient.interceptors.response.use(
(response) => { (response) => {
if (response.data && typeof response.data === "object") { if (response.data && typeof response.data === "object") {
response.data = snakeToCamelObj(response.data); response.data = snakeToCamelObj(response.data);
@ -28,4 +28,4 @@ axiosInstance.interceptors.response.use(
(error) => Promise.reject(error), (error) => Promise.reject(error),
); );
export default axiosInstance; export default axiosClient;

30
web/src/api/post.ts Normal file
View File

@ -0,0 +1,30 @@
import type { BaseResponse } from "@/models/resp";
import type { Post } from "@/models/post";
import axiosClient from "./client";
interface ListPostsParams {
page?: number;
size?: number;
orderedBy?: string;
reverse?: boolean;
keywords?: string;
}
export async function listPosts({
page = 1,
size = 10,
orderedBy = 'updated_at',
reverse = false,
keywords = ''
}: ListPostsParams = {}): Promise<BaseResponse<Post[]>> {
const res = await axiosClient.get<BaseResponse<Post[]>>("/post/list", {
params: {
page,
size,
orderedBy,
reverse,
keywords
}
});
return res.data;
}

View File

@ -1,56 +1,46 @@
import axiosInstance from "./client"; import axiosClient from "./client";
import type { OidcConfig } from "@/models/oidc-config"; import type { OidcConfig } from "@/models/oidc-config";
import type { User } from "@/models/user"; import type { User } from "@/models/user";
import type { BaseResponse } from "@/models/resp"; import type { BaseResponse } from "@/models/resp";
export function userLogin( export interface LoginRequest {
username: string, username: string;
password: string password: string;
): Promise<BaseResponse<{ token: string; user: User }>> { rememberMe?: boolean; // 可以轻松添加新字段
return axiosInstance captcha?: string;
.post<BaseResponse<{ token: string; user: User }>>(
"/user/login",
{
username,
password,
}
)
.then(res => res.data);
} }
export function userRegister( export interface RegisterRequest {
username: string, username: string;
password: string, password: string;
nickname: string, nickname: string;
email: string, email: string;
verificationCode?: string verificationCode?: string;
): Promise<BaseResponse<{ token: string; user: User }>> {
return axiosInstance
.post<BaseResponse<{ token: string; user: User }>>(
"/user/register",
{
username,
password,
nickname,
email,
verificationCode,
}
)
.then(res => res.data);
} }
export function ListOidcConfigs(): Promise<BaseResponse<{ oidcConfigs: OidcConfig[] }>> { export async function userLogin(
return axiosInstance data: LoginRequest
.get<BaseResponse<{ oidcConfigs: OidcConfig[] }>>("/user/oidc/list") ): Promise<BaseResponse<{ token: string; user: User }>> {
.then(res => { const res = await axiosClient.post<BaseResponse<{ token: string; user: User }>>(
const data = res.data; "/user/login",
if ('configs' in data) { data
return { );
...data, return res.data;
oidcConfigs: data.configs, }
};
} export async function userRegister(
return data; data: RegisterRequest
}); ): Promise<BaseResponse<{ token: string; user: User }>> {
const res = await axiosClient.post<BaseResponse<{ token: string; user: User }>>(
"/user/register",
data
);
return res.data;
}
export async function ListOidcConfigs(): Promise<BaseResponse<OidcConfig[]>> {
const res = await axiosClient.get<BaseResponse<OidcConfig[]>>(
"/user/oidc/list"
);
return res.data;
} }

View File

@ -1,4 +1,4 @@
import { Navbar } from "@/components/Navbar"; import { Navbar } from "@/components/navbar";
export default function RootLayout({ export default function RootLayout({
children, children,

View File

@ -1,104 +1,189 @@
import { NavigationMenu } from "@/components/ui/navigation-menu"; "use client";
import Image from "next/image";
import { BlogCardGrid } from "@/components/blog-card";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Search, TrendingUp, Clock, Heart, Eye } from "lucide-react";
import { Badge } from "@/components/ui/badge";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import config from '../../config';
import type { Label } from "@/models/label";
import type { Post } from "@/models/post";
import { listPosts } from "@/api/post";
import { useEffect, useState } from "react";
export default function Home() { export default function Home() {
return ( const [labels, setLabels] = useState<Label[]>([]);
<div className="font-sans grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 pb-20 gap-16 sm:p-20"> const [posts, setPosts] = useState<Post[]>([]);
<main className="flex flex-col gap-[32px] row-start-2 items-center sm:items-start bg-amber-500">
<Image
className="dark:invert"
src="/next.svg"
alt="Next.js logo"
width={180}
height={38}
priority
/>
<ol className="font-mono list-inside list-decimal text-sm/6 text-center sm:text-left">
<li className="mb-2 tracking-[-.01em]">
Get started by editing{" "}
<code className="bg-black/[.05] dark:bg-white/[.06] font-mono font-semibold px-1 py-0.5 rounded">
src/app/page.tsx
</code>
.
</li>
<li className="tracking-[-.01em]">
Save and see your changes instantly.
</li>
</ol>
<div className="flex gap-4 items-center flex-col sm:flex-row"> useEffect(() => {
<a listPosts().then(data => {
className="rounded-full border border-solid border-transparent transition-colors flex items-center justify-center bg-foreground text-background gap-2 hover:bg-[#383838] dark:hover:bg-[#ccc] font-medium text-sm sm:text-base h-10 sm:h-12 px-4 sm:px-5 sm:w-auto" setPosts(data.data);
href="https://vercel.com/new?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app" console.log(posts);
target="_blank" }).catch(error => {
rel="noopener noreferrer" console.error("Failed to fetch posts:", error);
> });
<Image }, []);
className="dark:invert"
src="/vercel.svg"
alt="Vercel logomark" return (
width={20} <div className="min-h-screen bg-gradient-to-br from-slate-50 via-blue-50 to-indigo-50">
height={20} {/* Hero Section */}
/> <section className="relative py-10 lg:py-16 overflow-hidden">
Deploy now {/* 背景装饰 */}
</a> <div className="absolute inset-0 bg-grid-white/[0.02] bg-grid-16 pointer-events-none" />
<a
className="rounded-full border border-solid border-black/[.08] dark:border-white/[.145] transition-colors flex items-center justify-center hover:bg-[#f2f2f2] dark:hover:bg-[#1a1a1a] hover:border-transparent font-medium text-sm sm:text-base h-10 sm:h-12 px-4 sm:px-5 w-full sm:w-auto md:w-[158px]" {/* 容器 - 关键布局 */}
href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app" <div className="container mx-auto px-4 sm:px-6 lg:px-8 max-w-7xl">
target="_blank" <div className="text-center max-w-4xl mx-auto">
rel="noopener noreferrer" <h1 className="text-4xl md:text-6xl lg:text-7xl font-bold mb-6 bg-gradient-to-r from-slate-900 via-blue-900 to-slate-900 bg-clip-text text-transparent">
> Snowykami's Blog
Read our docs </h1>
</a> <p className="text-xl md:text-2xl text-slate-600 mb-8 max-w-2xl mx-auto leading-relaxed">
{config.metadata.description}
</p>
{/* 搜索框 */}
<div className="relative max-w-md mx-auto mb-12">
<Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-slate-400 w-5 h-5" />
<Input
placeholder="搜索文章..."
className="pl-10 pr-4 py-3 text-lg border-slate-200 focus:border-blue-500 rounded-full"
/>
</div>
{/* 热门标签 */}
<div className="flex flex-wrap justify-center gap-2 mb-8">
{['React', 'TypeScript', 'Next.js', 'Node.js', 'AI', ''].map((tag) => (
<Badge
key={tag}
variant="secondary"
className="px-4 py-2 hover:bg-blue-100 cursor-pointer transition-colors"
>
{tag}
</Badge>
))}
</div>
</div> </div>
</main> </div>
<footer className="row-start-3 flex gap-[24px] flex-wrap items-center justify-center"> </section>
<a
className="flex items-center gap-2 hover:underline hover:underline-offset-4" {/* 主内容区域 */}
href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app" <section className="py-16">
target="_blank" {/* 容器 - 关键布局 */}
rel="noopener noreferrer" <div className="container mx-auto px-4 sm:px-6 lg:px-8 max-w-7xl">
> <div className="grid grid-cols-1 lg:grid-cols-4 gap-8">
<Image {/* 主要内容区域 */}
aria-hidden <div className="lg:col-span-3">
src="/file.svg" {/* 文章列表标题 */}
alt="File icon" <div className="flex items-center justify-between mb-8">
width={16} <h2 className="text-3xl font-bold text-slate-900">最新文章</h2>
height={16} <div className="flex items-center gap-4">
/> <Button variant="outline" size="sm">
Learn <Clock className="w-4 h-4 mr-2" />
</a> 最新
<a </Button>
className="flex items-center gap-2 hover:underline hover:underline-offset-4" <Button variant="outline" size="sm">
href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app" <TrendingUp className="w-4 h-4 mr-2" />
target="_blank" 热门
rel="noopener noreferrer" </Button>
> </div>
<Image </div>
aria-hidden
src="/window.svg" {/* 博客卡片网格 */}
alt="Window icon" <BlogCardGrid posts={posts} />
width={16}
height={16} {/* 加载更多按钮 */}
/> <div className="text-center mt-12">
Examples <Button size="lg" className="px-8">
</a> 加载更多文章
<a </Button>
className="flex items-center gap-2 hover:underline hover:underline-offset-4" </div>
href="https://nextjs.org?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app" </div>
target="_blank"
rel="noopener noreferrer" {/* 侧边栏 */}
> <div className="lg:col-span-1 space-y-6">
<Image {/* 关于我 */}
aria-hidden <Card>
src="/globe.svg" <CardHeader>
alt="Globe icon" <CardTitle className="flex items-center gap-2">
width={16} <Heart className="w-5 h-5 text-red-500" />
height={16} 关于我
/> </CardTitle>
Go to nextjs.org </CardHeader>
</a> <CardContent>
</footer> <div className="text-center mb-4">
<div className="w-20 h-20 mx-auto mb-3 bg-gradient-to-br from-blue-400 to-purple-500 rounded-full flex items-center justify-center text-white text-2xl font-bold">
S
</div>
<h3 className="font-semibold text-lg">{config.owner.name}</h3>
<p className="text-sm text-slate-600">{config.owner.motto}</p>
</div>
<p className="text-sm text-slate-600 leading-relaxed">
{config.owner.description}
</p>
</CardContent>
</Card>
{/* 热门文章 */}
<Card>
<CardHeader>
<CardTitle className="flex items-center gap-2">
<TrendingUp className="w-5 h-5 text-orange-500" />
热门文章
</CardTitle>
</CardHeader>
<CardContent className="space-y-4">
{posts.slice(0, 3).map((post, index) => (
<div key={post.id} className="flex items-start gap-3">
<span className="flex-shrink-0 w-6 h-6 bg-blue-100 text-blue-600 rounded-full flex items-center justify-center text-sm font-semibold">
{index + 1}
</span>
<div className="flex-1 min-w-0">
<h4 className="font-medium text-sm line-clamp-2 mb-1">
{post.title}
</h4>
<div className="flex items-center gap-2 text-xs text-slate-500">
<span className="flex items-center gap-1">
<Eye className="w-3 h-3" />
{post.viewCount}
</span>
<span className="flex items-center gap-1">
<Heart className="w-3 h-3" />
{post.likeCount}
</span>
</div>
</div>
</div>
))}
</CardContent>
</Card>
{/* 标签云 */}
<Card>
<CardHeader>
<CardTitle>标签云</CardTitle>
</CardHeader>
<CardContent>
<div className="flex flex-wrap gap-2">
{['React', 'TypeScript', 'Next.js', 'Node.js', 'JavaScript', 'CSS', 'HTML', 'Vue', 'Angular', 'Webpack'].map((tag) => (
<Badge
key={tag}
variant="outline"
className="text-xs hover:bg-blue-50 cursor-pointer"
>
{tag}
</Badge>
))}
</div>
</CardContent>
</Card>
</div>
</div>
</div>
</section>
</div> </div>
); );
} }

View File

@ -44,72 +44,72 @@
} }
:root { :root {
--radius: 0.625rem; --radius: 0.65rem;
--background: oklch(1 0 0); --background: oklch(1 0 0);
--foreground: oklch(0.145 0 0); --foreground: oklch(0.141 0.005 285.823);
--card: oklch(1 0 0); --card: oklch(1 0 0);
--card-foreground: oklch(0.145 0 0); --card-foreground: oklch(0.141 0.005 285.823);
--popover: oklch(1 0 0); --popover: oklch(1 0 0);
--popover-foreground: oklch(0.145 0 0); --popover-foreground: oklch(0.141 0.005 285.823);
--primary: oklch(0.205 0 0); --primary: oklch(0.623 0.214 259.815);
--primary-foreground: oklch(0.985 0 0); --primary-foreground: oklch(0.97 0.014 254.604);
--secondary: oklch(0.97 0 0); --secondary: oklch(0.967 0.001 286.375);
--secondary-foreground: oklch(0.205 0 0); --secondary-foreground: oklch(0.21 0.006 285.885);
--muted: oklch(0.97 0 0); --muted: oklch(0.967 0.001 286.375);
--muted-foreground: oklch(0.556 0 0); --muted-foreground: oklch(0.552 0.016 285.938);
--accent: oklch(0.97 0 0); --accent: oklch(0.967 0.001 286.375);
--accent-foreground: oklch(0.205 0 0); --accent-foreground: oklch(0.21 0.006 285.885);
--destructive: oklch(0.577 0.245 27.325); --destructive: oklch(0.577 0.245 27.325);
--border: oklch(0.922 0 0); --border: oklch(0.92 0.004 286.32);
--input: oklch(0.922 0 0); --input: oklch(0.92 0.004 286.32);
--ring: oklch(0.708 0 0); --ring: oklch(0.623 0.214 259.815);
--chart-1: oklch(0.646 0.222 41.116); --chart-1: oklch(0.646 0.222 41.116);
--chart-2: oklch(0.6 0.118 184.704); --chart-2: oklch(0.6 0.118 184.704);
--chart-3: oklch(0.398 0.07 227.392); --chart-3: oklch(0.398 0.07 227.392);
--chart-4: oklch(0.828 0.189 84.429); --chart-4: oklch(0.828 0.189 84.429);
--chart-5: oklch(0.769 0.188 70.08); --chart-5: oklch(0.769 0.188 70.08);
--sidebar: oklch(0.985 0 0); --sidebar: oklch(0.985 0 0);
--sidebar-foreground: oklch(0.145 0 0); --sidebar-foreground: oklch(0.141 0.005 285.823);
--sidebar-primary: oklch(0.205 0 0); --sidebar-primary: oklch(0.623 0.214 259.815);
--sidebar-primary-foreground: oklch(0.985 0 0); --sidebar-primary-foreground: oklch(0.97 0.014 254.604);
--sidebar-accent: oklch(0.97 0 0); --sidebar-accent: oklch(0.967 0.001 286.375);
--sidebar-accent-foreground: oklch(0.205 0 0); --sidebar-accent-foreground: oklch(0.21 0.006 285.885);
--sidebar-border: oklch(0.922 0 0); --sidebar-border: oklch(0.92 0.004 286.32);
--sidebar-ring: oklch(0.708 0 0); --sidebar-ring: oklch(0.623 0.214 259.815);
} }
.dark { .dark {
--background: oklch(0.145 0 0); --background: oklch(0.141 0.005 285.823);
--foreground: oklch(0.985 0 0); --foreground: oklch(0.985 0 0);
--card: oklch(0.205 0 0); --card: oklch(0.21 0.006 285.885);
--card-foreground: oklch(0.985 0 0); --card-foreground: oklch(0.985 0 0);
--popover: oklch(0.205 0 0); --popover: oklch(0.21 0.006 285.885);
--popover-foreground: oklch(0.985 0 0); --popover-foreground: oklch(0.985 0 0);
--primary: oklch(0.922 0 0); --primary: oklch(0.546 0.245 262.881);
--primary-foreground: oklch(0.205 0 0); --primary-foreground: oklch(0.379 0.146 265.522);
--secondary: oklch(0.269 0 0); --secondary: oklch(0.274 0.006 286.033);
--secondary-foreground: oklch(0.985 0 0); --secondary-foreground: oklch(0.985 0 0);
--muted: oklch(0.269 0 0); --muted: oklch(0.274 0.006 286.033);
--muted-foreground: oklch(0.708 0 0); --muted-foreground: oklch(0.705 0.015 286.067);
--accent: oklch(0.269 0 0); --accent: oklch(0.274 0.006 286.033);
--accent-foreground: oklch(0.985 0 0); --accent-foreground: oklch(0.985 0 0);
--destructive: oklch(0.704 0.191 22.216); --destructive: oklch(0.704 0.191 22.216);
--border: oklch(1 0 0 / 10%); --border: oklch(1 0 0 / 10%);
--input: oklch(1 0 0 / 15%); --input: oklch(1 0 0 / 15%);
--ring: oklch(0.556 0 0); --ring: oklch(0.488 0.243 264.376);
--chart-1: oklch(0.488 0.243 264.376); --chart-1: oklch(0.488 0.243 264.376);
--chart-2: oklch(0.696 0.17 162.48); --chart-2: oklch(0.696 0.17 162.48);
--chart-3: oklch(0.769 0.188 70.08); --chart-3: oklch(0.769 0.188 70.08);
--chart-4: oklch(0.627 0.265 303.9); --chart-4: oklch(0.627 0.265 303.9);
--chart-5: oklch(0.645 0.246 16.439); --chart-5: oklch(0.645 0.246 16.439);
--sidebar: oklch(0.205 0 0); --sidebar: oklch(0.21 0.006 285.885);
--sidebar-foreground: oklch(0.985 0 0); --sidebar-foreground: oklch(0.985 0 0);
--sidebar-primary: oklch(0.488 0.243 264.376); --sidebar-primary: oklch(0.546 0.245 262.881);
--sidebar-primary-foreground: oklch(0.985 0 0); --sidebar-primary-foreground: oklch(0.379 0.146 265.522);
--sidebar-accent: oklch(0.269 0 0); --sidebar-accent: oklch(0.274 0.006 286.033);
--sidebar-accent-foreground: oklch(0.985 0 0); --sidebar-accent-foreground: oklch(0.985 0 0);
--sidebar-border: oklch(1 0 0 / 10%); --sidebar-border: oklch(1 0 0 / 10%);
--sidebar-ring: oklch(0.556 0 0); --sidebar-ring: oklch(0.488 0.243 264.376);
} }
@layer base { @layer base {

View File

@ -1,8 +1,7 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Geist, Geist_Mono } from "next/font/google"; import { Geist, Geist_Mono } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { Navbar } from "@/components/Navbar"; import { DeviceProvider } from "@/contexts/device-context";
import { DeviceProvider } from "@/contexts/DeviceContext";
const geistSans = Geist({ const geistSans = Geist({
variable: "--font-geist-sans", variable: "--font-geist-sans",

View File

@ -12,8 +12,8 @@ import {
NavigationMenuTrigger, NavigationMenuTrigger,
navigationMenuTriggerStyle, navigationMenuTriggerStyle,
} from "@/components/ui/navigation-menu" } from "@/components/ui/navigation-menu"
import GravatarAvatar from "./Gravatar" import GravatarAvatar from "@/components/gravatar"
import { useDevice } from "@/contexts/DeviceContext" import { useDevice } from "@/contexts/device-context"
const components: { title: string; href: string }[] = [ const components: { title: string; href: string }[] = [
{ {

View File

@ -0,0 +1,289 @@
import { Post } from "@/models/post";
import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import Link from "next/link";
import Image from "next/image";
import { Calendar, Clock, Eye, Heart, MessageCircle, Lock } from "lucide-react";
import { cn } from "@/lib/utils";
import config from "@/config";
interface BlogCardProps {
post: Post;
className?: string;
}
export function BlogCard({ post, className }: BlogCardProps) {
// 格式化日期
const formatDate = (dateString: string) => {
const date = new Date(dateString);
return date.toLocaleDateString('zh-CN', {
year: 'numeric',
month: '2-digit',
day: '2-digit'
});
};
// 计算阅读时间(估算)
const getReadingTime = (content: string) => {
const wordsPerMinute = 200;
const wordCount = content.length;
const minutes = Math.ceil(wordCount / wordsPerMinute);
return `${minutes} 分钟阅读`;
};
// 根据内容类型获取图标
const getContentTypeIcon = (type: Post['type']) => {
switch (type) {
case 'markdown':
return '📝';
case 'html':
return '🌐';
case 'text':
return '📄';
default:
return '📝';
}
};
return (
<Card className={cn(
"group overflow-hidden hover:shadow-xl transition-all duration-300 h-full flex flex-col cursor-pointer",
className
)}>
{/* 封面图片区域 */}
<div className="relative aspect-[16/9] overflow-hidden">
{/* 自定义封面图片 */}
{(post.cover || config.defaultCover) ? (
<Image
src={post.cover || config.defaultCover}
alt={post.title}
fill
className="object-cover w-full h-full transition-transform duration-300 group-hover:scale-105"
sizes="(max-width: 768px) 100vw, 33vw"
priority={false}
/>
) : (
// 默认渐变背景 - 基于热度生成颜色
<div
className={cn(
"w-full h-full bg-gradient-to-br",
post.heat > 80 ? "from-red-400 via-pink-500 to-orange-500" :
post.heat > 60 ? "from-orange-400 via-yellow-500 to-red-500" :
post.heat > 40 ? "from-blue-400 via-purple-500 to-pink-500" :
post.heat > 20 ? "from-green-400 via-blue-500 to-purple-500" :
"from-gray-400 via-slate-500 to-gray-600"
)}
/>
)}
{/* 覆盖层 */}
<div className="absolute inset-0 bg-gradient-to-t from-black/60 via-transparent to-transparent" />
{/* 私有文章标识 */}
{post.isPrivate && (
<Badge
variant="destructive"
className="absolute top-4 left-4 bg-red-500/90 text-white hover:bg-red-500"
>
<Lock className="w-3 h-3 mr-1" />
</Badge>
)}
{/* 内容类型标签 */}
<Badge
variant="secondary"
className="absolute top-4 right-4 bg-white/90 text-gray-700 hover:bg-white"
>
{getContentTypeIcon(post.type)} {post.type.toUpperCase()}
</Badge>
{/* 热度指示器 */}
{post.heat > 50 && (
<div className="absolute bottom-4 right-4">
<Badge className="bg-gradient-to-r from-orange-500 to-red-500 text-white border-0">
🔥 {post.heat}
</Badge>
</div>
)}
</div>
{/* Card Header - 标题区域 */}
<CardHeader className="pb-3">
<CardTitle className="line-clamp-2 group-hover:text-primary transition-colors text-lg leading-tight">
{post.title}
</CardTitle>
<CardDescription className="line-clamp-3 leading-relaxed">
{post.content.replace(/[#*`]/g, '').substring(0, 150)}
{post.content.length > 150 ? '...' : ''}
</CardDescription>
</CardHeader>
{/* Card Content - 主要内容 */}
<CardContent className="flex-1 pb-3">
{/* 标签列表 */}
{post.labels && post.labels.length > 0 && (
<div className="flex flex-wrap gap-2 mb-4">
{post.labels.slice(0, 3).map((label) => (
<Badge
key={label.id}
variant="outline"
className="text-xs hover:bg-primary/10"
style={{
borderColor: label.color || '#e5e7eb',
color: label.color || '#6b7280'
}}
>
{label.key}
</Badge>
))}
{post.labels.length > 3 && (
<Badge variant="outline" className="text-xs">
+{post.labels.length - 3}
</Badge>
)}
</div>
)}
{/* 统计信息 */}
<div className="grid grid-cols-2 gap-4 text-sm text-muted-foreground">
<div className="flex items-center gap-3">
{/* 点赞数 */}
<div className="flex items-center gap-1">
<Heart className="w-4 h-4" />
<span>{post.likeCount}</span>
</div>
{/* 评论数 */}
<div className="flex items-center gap-1">
<MessageCircle className="w-4 h-4" />
<span>{post.commentCount}</span>
</div>
</div>
<div className="flex items-center justify-end gap-3">
{/* 阅读量 */}
<div className="flex items-center gap-1">
<Eye className="w-4 h-4" />
<span>{post.viewCount}</span>
</div>
{/* 阅读时间 */}
<div className="flex items-center gap-1">
<Clock className="w-4 h-4" />
<span>{getReadingTime(post.content)}</span>
</div>
</div>
</div>
</CardContent>
{/* Card Footer - 日期和操作区域 */}
<CardFooter className="pt-3 border-t border-border/50 flex items-center justify-between">
{/* 创建日期 */}
<div className="flex items-center gap-1 text-sm text-muted-foreground">
<Calendar className="w-4 h-4" />
<time dateTime={post.createdAt}>
{formatDate(post.createdAt)}
</time>
</div>
{/* 更新日期(如果与创建日期不同)或阅读提示 */}
{post.updatedAt !== post.createdAt ? (
<div className="text-xs text-muted-foreground">
{formatDate(post.updatedAt)}
</div>
) : (
<div className="text-sm text-primary">
</div>
)}
</CardFooter>
</Card>
);
}
// 骨架屏加载组件 - 使用 shadcn Card 结构
export function BlogCardSkeleton() {
return (
<Card className="overflow-hidden h-full flex flex-col">
{/* 封面图片骨架 */}
<div className="aspect-[16/9] bg-muted animate-pulse" />
{/* Header 骨架 */}
<CardHeader className="pb-3">
<div className="h-6 bg-muted rounded animate-pulse mb-2" />
<div className="space-y-2">
<div className="h-4 bg-muted rounded animate-pulse" />
<div className="h-4 bg-muted rounded w-3/4 animate-pulse" />
<div className="h-4 bg-muted rounded w-1/2 animate-pulse" />
</div>
</CardHeader>
{/* Content 骨架 */}
<CardContent className="flex-1 pb-3">
<div className="flex gap-2 mb-4">
<div className="h-6 w-16 bg-muted rounded animate-pulse" />
<div className="h-6 w-20 bg-muted rounded animate-pulse" />
<div className="h-6 w-14 bg-muted rounded animate-pulse" />
</div>
<div className="grid grid-cols-2 gap-4">
<div className="h-4 bg-muted rounded animate-pulse" />
<div className="h-4 bg-muted rounded animate-pulse" />
</div>
</CardContent>
{/* Footer 骨架 */}
<CardFooter className="pt-3 border-t">
<div className="h-4 w-24 bg-muted rounded animate-pulse" />
<div className="h-4 w-20 bg-muted rounded animate-pulse ml-auto" />
</CardFooter>
</Card>
);
}
// 网格布局的博客卡片列表
export function BlogCardGrid({
posts,
isLoading,
showPrivate = false
}: {
posts: Post[];
isLoading?: boolean;
showPrivate?: boolean;
}) {
const filteredPosts = showPrivate ? posts : posts.filter(post => !post.isPrivate);
if (isLoading) {
return (
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
{Array.from({ length: 6 }).map((_, index) => (
<BlogCardSkeleton key={index} />
))}
</div>
);
}
if (filteredPosts.length === 0) {
return (
<Card className="p-12 text-center">
<CardContent>
<p className="text-muted-foreground text-lg"></p>
<p className="text-sm text-muted-foreground mt-2">
{showPrivate ? '没有找到任何文章' : '没有找到公开的文章'}
</p>
</CardContent>
</Card>
);
}
return (
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
{filteredPosts.map((post) => (
<Link key={post.id} href={`/posts/${post.id}`} className="block h-full">
<BlogCard post={post} />
</Link>
))}
</div>
);
}

View File

@ -15,7 +15,7 @@ import Image from "next/image"
import { useEffect, useState } from "react" import { useEffect, useState } from "react"
import type { OidcConfig } from "@/models/oidc-config" import type { OidcConfig } from "@/models/oidc-config"
import { ListOidcConfigs, userLogin } from "@/api/user" import { ListOidcConfigs, userLogin } from "@/api/user"
import Link from "next/link" // 使用 Next.js 的 Link 而不是 lucide 的 Link import Link from "next/link"
import { useRouter, useSearchParams } from "next/navigation" import { useRouter, useSearchParams } from "next/navigation"
export function LoginForm({ export function LoginForm({
@ -32,8 +32,7 @@ export function LoginForm({
useEffect(() => { useEffect(() => {
ListOidcConfigs() ListOidcConfigs()
.then((res) => { .then((res) => {
setOidcConfigs(res.data.oidcConfigs || []) // 确保是数组 setOidcConfigs(res.data || []) // 确保是数组
console.log("OIDC configs fetched:", res.data.oidcConfigs)
}) })
.catch((error) => { .catch((error) => {
console.error("Error fetching OIDC configs:", error) console.error("Error fetching OIDC configs:", error)
@ -44,7 +43,7 @@ export function LoginForm({
const handleLogin = async (e: React.FormEvent) => { const handleLogin = async (e: React.FormEvent) => {
e.preventDefault() e.preventDefault()
try { try {
const res = await userLogin(username, password) const res = await userLogin({username, password})
console.log("Login successful:", res) console.log("Login successful:", res)
router.push(redirectBack) router.push(redirectBack)
} catch (error) { } catch (error) {
@ -58,7 +57,7 @@ export function LoginForm({
<CardHeader className="text-center"> <CardHeader className="text-center">
<CardTitle className="text-xl">Welcome back</CardTitle> <CardTitle className="text-xl">Welcome back</CardTitle>
<CardDescription> <CardDescription>
Login with Open ID Connect or your email and password. Login with Open ID Connect.
</CardDescription> </CardDescription>
</CardHeader> </CardHeader>
<CardContent> <CardContent>

View File

@ -0,0 +1,46 @@
import * as React from "react"
import { Slot } from "@radix-ui/react-slot"
import { cva, type VariantProps } from "class-variance-authority"
import { cn } from "@/lib/utils"
const badgeVariants = cva(
"inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden",
{
variants: {
variant: {
default:
"border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90",
secondary:
"border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90",
destructive:
"border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
outline:
"text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground",
},
},
defaultVariants: {
variant: "default",
},
}
)
function Badge({
className,
variant,
asChild = false,
...props
}: React.ComponentProps<"span"> &
VariantProps<typeof badgeVariants> & { asChild?: boolean }) {
const Comp = asChild ? Slot : "span"
return (
<Comp
data-slot="badge"
className={cn(badgeVariants({ variant }), className)}
{...props}
/>
)
}
export { Badge, badgeVariants }

View File

@ -2,6 +2,13 @@ const config = {
metadata: { metadata: {
name: "Snowykami's Blog", name: "Snowykami's Blog",
icon: "https://cdn.liteyuki.org/snowykami/avatar.jpg", icon: "https://cdn.liteyuki.org/snowykami/avatar.jpg",
description: "分享一些好玩的东西"
},
defaultCover: "https://cdn.liteyuki.org/blog/background.png",
owner: {
name: "Snowykami",
description: "全栈开发工程师,喜欢分享技术心得和生活感悟。",
motto: "And now that story unfolds into a journey that, alone, I set out to"
} }
} }

7
web/src/models/label.ts Normal file
View File

@ -0,0 +1,7 @@
export interface Label {
id: number;
key: string;
value: string;
color: string;
className?: string;
}

17
web/src/models/post.ts Normal file
View File

@ -0,0 +1,17 @@
import type { Label } from "@/models/label";
export interface Post {
id: number;
title: string;
content: string;
cover: string | null; // 封面可以为空
type: "markdown" | "html" | "text";
labels: Label[] | null; // 标签可以为空
isPrivate: boolean;
likeCount: number;
commentCount: number;
viewCount: number;
heat: number;
createdAt: string;
updatedAt: string;
}