yv1ing/MollyBlog
1
0
Fork 0
mirror of https://github.com/yv1ing/MollyBlog.git synced 2025-09-16 14:53:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Adjust the tab layout and fix some bugs

Browse Source
This commit is contained in:
yvling
2024-12-19 09:38:00 +08:00
parent d9756a06ed
commit 0d419dabd1
7 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/mApp/mApp.go
View File

@@ -27,6 +27,7 @@ type MApp struct {
IndexedPosts map[uint64]*model.MPost
Tags map[string]string
TagsHash map[string]string
TagsCount map[string]int
Categories map[string]string
CategoriesCount map[string]int
@@ -76,6 +77,7 @@ func NewMApp(cfg *config.MConfig) *MApp {
IndexedPosts: make(map[uint64]*model.MPost),
Tags: make(map[string]string),
TagsHash: make(map[string]string),
TagsCount: make(map[string]int),
Categories: make(map[string]string),
@@ -93,6 +95,8 @@ func NewMApp(cfg *config.MConfig) *MApp {
func (ma *MApp) resetStorage() error {
ma.Posts = nil
ma.Tags = nil
ma.TagsHash = nil
ma.TagsCount = nil
ma.Categories = nil
ma.CategoriesCount = nil
ma.TaggedPosts = nil
@@ -100,6 +104,7 @@ func (ma *MApp) resetStorage() error {
ma.SrcFiles = nil
ma.Tags = make(map[string]string)
ma.TagsHash = make(map[string]string)
ma.TagsCount = make(map[string]int)
ma.Categories = make(map[string]string)
ma.CategoriesCount = make(map[string]int)

10
internal/mApp/mHandler.go
View File

@@ -165,7 +165,7 @@ func (ma *MApp) TagHandler(ctx *gin.Context) {
}
for tag, num := range ma.TagsCount {
tagList = append(tagList, []interface{}{tag, num})
tagList = append(tagList, []interface{}{tag, num, ma.TagsHash[tag]})
}
}
@@ -198,7 +198,7 @@ func (ma *MApp) TagHandler(ctx *gin.Context) {
func (ma *MApp) CategoryHandler(ctx *gin.Context) {
categoryHash := ctx.Param("hash")
categoryName := ma.Tags[categoryHash]
categoryName := ma.Categories[categoryHash]
// paging logic processing
page, _ := strconv.Atoi(ctx.DefaultQuery("page", "1"))
@@ -235,7 +235,6 @@ func (ma *MApp) CategoryHandler(ctx *gin.Context) {
offset := curPage * size
var categorizedPosts []model.MPost
//var tagList [][]interface{}
if start >= 0 {
for i := start; i < utils.Min(len(ma.CategorizedPosts[categoryHash]), offset); i++ {
tmpPost := *ma.CategorizedPosts[categoryHash][i]
@@ -243,12 +242,8 @@ func (ma *MApp) CategoryHandler(ctx *gin.Context) {
categorizedPosts = append(categorizedPosts, tmpPost)
}
//for tag, num := range ma.TagsCount {
// tagList = append(tagList, []interface{}{tag, num})
//}
}
//tagListJson, _ := json.Marshal(tagList)
resData := gin.H{
"site_info": gin.H{
"logo": ma.Config.MSite.Info.Logo,
@@ -268,7 +263,6 @@ func (ma *MApp) CategoryHandler(ctx *gin.Context) {
"title": fmt.Sprintf("%s - %s", ma.Config.MSite.Post.Category.Title, categoryName),
"posts": categorizedPosts,
"category_hash": categoryHash,
//"tag_list": string(tagListJson),
},
}

1
internal/mApp/mMarkdown.go
View File

@@ -120,6 +120,7 @@ func (ma *MApp) parseMarkdowns() error {
})
ma.Tags[tagHash] = tag
ma.TagsHash[tag] = tagHash
ma.TagsCount[tag] += 1
ma.TaggedPosts[tagHash] = append(ma.TaggedPosts[tagHash], &post)