Added infinite scrolling

This commit is contained in:
2017-10-16 12:56:46 +02:00
parent 8fdeb97de9
commit 555582836c
7 changed files with 93 additions and 18 deletions

View File

@ -8,8 +8,8 @@ component Forum(tag string, threads []*arn.Thread, threadsPerPage int)
button#new-thread.action(data-action="load", data-trigger="click", data-url="/new/thread")
Icon("plus")
span New thread
if len(threads) == threadsPerPage
LoadMore
//- if len(threads) == threadsPerPage
//- LoadMore
component ThreadList(threads []*arn.Thread)
if len(threads) == 0

View File

@ -10,7 +10,7 @@ import (
"github.com/animenotifier/notify.moe/utils"
)
const maxTracks = 9
const maxTracks = 12
// Get renders the soundtracks page.
func Get(ctx *aero.Context) string {
@ -30,7 +30,7 @@ func Get(ctx *aero.Context) string {
tracks = tracks[:maxTracks]
}
return ctx.HTML(components.SoundTracks(tracks, user))
return ctx.HTML(components.SoundTracks(tracks, maxTracks, user))
}
// From renders the soundtracks from the given index.
@ -42,7 +42,7 @@ func From(ctx *aero.Context) string {
return ctx.Error(http.StatusBadRequest, "Invalid start index", err)
}
tracks, err := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
allTracks, err := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
return !track.IsDraft && len(track.Media) > 0
})
@ -50,17 +50,27 @@ func From(ctx *aero.Context) string {
return ctx.Error(http.StatusInternalServerError, "Error fetching soundtracks", err)
}
if index < 0 || index >= len(tracks) {
return ctx.Error(http.StatusBadRequest, "Invalid start index (maximum is "+strconv.Itoa(len(tracks))+")", nil)
if index < 0 || index >= len(allTracks) {
return ctx.Error(http.StatusBadRequest, "Invalid start index (maximum is "+strconv.Itoa(len(allTracks))+")", nil)
}
arn.SortSoundTracksLatestFirst(tracks)
arn.SortSoundTracksLatestFirst(allTracks)
tracks = tracks[index:]
tracks := allTracks[index:]
if len(tracks) > maxTracks {
tracks = tracks[:maxTracks]
}
nextIndex := index + maxTracks
if nextIndex >= len(allTracks) {
// End of data - no more scrolling
ctx.Response().Header().Set("X-LoadMore-Index", "-1")
} else {
// Send the index for the next request
ctx.Response().Header().Set("X-LoadMore-Index", strconv.Itoa(nextIndex))
}
return ctx.HTML(components.SoundTracksScrollable(tracks, user))
}

View File

@ -1,4 +1,4 @@
component SoundTracks(tracks []*arn.SoundTrack, user *arn.User)
component SoundTracks(tracks []*arn.SoundTrack, tracksPerPage int, user *arn.User)
h1 Soundtracks
.music-buttons
@ -15,8 +15,9 @@ component SoundTracks(tracks []*arn.SoundTrack, user *arn.User)
#load-more-target.sound-tracks
SoundTracksScrollable(tracks, user)
//- .buttons
//- LoadMore
if len(tracks) == tracksPerPage
.buttons
LoadMore(tracksPerPage)
component SoundTracksScrollable(tracks []*arn.SoundTrack, user *arn.User)
each track in tracks