Add AboutPage component and integrate sorting options in resource retrieval

This commit is contained in:
2025-05-25 11:27:24 +08:00
parent b610a5db9d
commit 6e78707d9e
11 changed files with 139 additions and 27 deletions

View File

@@ -101,7 +101,19 @@ func handleListResources(c fiber.Ctx) error {
if err != nil {
return model.NewRequestError("Invalid page number")
}
resources, maxPage, err := service.GetResourceList(page)
sortStr := c.Query("sort")
if sortStr == "" {
sortStr = "0"
}
sortInt, err := strconv.Atoi(sortStr)
if err != nil {
return model.NewRequestError("Invalid sort parameter")
}
if sortInt < 0 || sortInt > 5 {
return model.NewRequestError("Sort parameter out of range")
}
sort := model.RSort(sortInt)
resources, maxPage, err := service.GetResourceList(page, sort)
if err != nil {
return err
}

View File

@@ -37,7 +37,7 @@ func GetResourceByID(id uint) (model.Resource, error) {
return r, nil
}
func GetResourceList(page, pageSize int) ([]model.Resource, int, error) {
func GetResourceList(page, pageSize int, sort model.RSort) ([]model.Resource, int, error) {
// Retrieve a list of resources with pagination
var resources []model.Resource
var total int64
@@ -46,7 +46,25 @@ func GetResourceList(page, pageSize int) ([]model.Resource, int, error) {
return nil, 0, err
}
if err := db.Offset((page - 1) * pageSize).Limit(pageSize).Preload("User").Preload("Images").Preload("Tags").Order("created_at DESC").Find(&resources).Error; err != nil {
order := ""
switch sort {
case model.RSortTimeAsc:
order = "created_at ASC"
case model.RSortTimeDesc:
order = "created_at DESC"
case model.RSortViewsAsc:
order = "views ASC"
case model.RSortViewsDesc:
order = "views DESC"
case model.RSortDownloadsAsc:
order = "downloads ASC"
case model.RSortDownloadsDesc:
order = "downloads DESC"
default:
order = "created_at DESC" // Default sort order
}
if err := db.Offset((page - 1) * pageSize).Limit(pageSize).Preload("User").Preload("Images").Preload("Tags").Order(order).Find(&resources).Error; err != nil {
return nil, 0, err
}

12
server/model/sort.go Normal file
View File

@@ -0,0 +1,12 @@
package model
type RSort uint8
const (
RSortTimeAsc RSort = iota
RSortTimeDesc
RSortViewsAsc
RSortViewsDesc
RSortDownloadsAsc
RSortDownloadsDesc
)

View File

@@ -125,8 +125,8 @@ func GetResource(id uint, host string) (*model.ResourceDetailView, error) {
return &v, nil
}
func GetResourceList(page int) ([]model.ResourceView, int, error) {
resources, totalPages, err := dao.GetResourceList(page, pageSize)
func GetResourceList(page int, sort model.RSort) ([]model.ResourceView, int, error) {
resources, totalPages, err := dao.GetResourceList(page, pageSize, sort)
if err != nil {
return nil, 0, err
}