Added soundtracks to dashboard
This commit is contained in:
parent
990a8032f3
commit
064a3e1fa5
@ -11,6 +11,7 @@ import (
|
|||||||
|
|
||||||
const maxPosts = 5
|
const maxPosts = 5
|
||||||
const maxFollowing = 5
|
const maxFollowing = 5
|
||||||
|
const maxSoundTracks = 5
|
||||||
|
|
||||||
// Get the dashboard or the frontpage when logged out.
|
// Get the dashboard or the frontpage when logged out.
|
||||||
func Get(ctx *aero.Context) string {
|
func Get(ctx *aero.Context) string {
|
||||||
@ -26,22 +27,43 @@ func Get(ctx *aero.Context) string {
|
|||||||
// Render the dashboard.
|
// Render the dashboard.
|
||||||
func dashboard(ctx *aero.Context) string {
|
func dashboard(ctx *aero.Context) string {
|
||||||
var posts []*arn.Post
|
var posts []*arn.Post
|
||||||
var err error
|
|
||||||
var userList interface{}
|
var userList interface{}
|
||||||
var followingList []*arn.User
|
var followingList []*arn.User
|
||||||
|
var soundTracks []*arn.SoundTrack
|
||||||
|
|
||||||
user := utils.GetUser(ctx)
|
user := utils.GetUser(ctx)
|
||||||
|
|
||||||
flow.Parallel(func() {
|
flow.Parallel(func() {
|
||||||
|
var err error
|
||||||
posts, err = arn.AllPosts()
|
posts, err = arn.AllPosts()
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
arn.SortPostsLatestFirst(posts)
|
arn.SortPostsLatestFirst(posts)
|
||||||
posts = arn.FilterPostsWithUniqueThreads(posts, maxPosts)
|
posts = arn.FilterPostsWithUniqueThreads(posts, maxPosts)
|
||||||
}, func() {
|
}, func() {
|
||||||
// threads, err = arn.AllThreadsSlice()
|
var err error
|
||||||
// arn.SortPostsLatestFirst(posts)
|
soundTracks, err = arn.AllSoundTracks()
|
||||||
// posts = arn.FilterPostsWithUniqueThreads(posts, maxPosts)
|
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
arn.SortSoundTracksLatestFirst(soundTracks)
|
||||||
|
|
||||||
|
if len(soundTracks) > maxSoundTracks {
|
||||||
|
soundTracks = soundTracks[:maxSoundTracks]
|
||||||
|
}
|
||||||
}, func() {
|
}, func() {
|
||||||
|
var err error
|
||||||
userList, err = arn.DB.GetMany("User", user.Following)
|
userList, err = arn.DB.GetMany("User", user.Following)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
followingList = userList.([]*arn.User)
|
followingList = userList.([]*arn.User)
|
||||||
followingList = arn.SortUsersLastSeen(followingList)
|
followingList = arn.SortUsersLastSeen(followingList)
|
||||||
|
|
||||||
@ -50,9 +72,5 @@ func dashboard(ctx *aero.Context) string {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
if err != nil {
|
return ctx.HTML(components.Dashboard(posts, soundTracks, followingList))
|
||||||
return ctx.Error(500, "Error displaying dashboard", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return ctx.HTML(components.Dashboard(posts, followingList))
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
component Dashboard(posts []*arn.Post, following []*arn.User)
|
component Dashboard(posts []*arn.Post, soundTracks []*arn.SoundTrack, following []*arn.User)
|
||||||
h2.page-title Dash
|
h2.page-title Dash
|
||||||
|
|
||||||
.widgets
|
.widgets
|
||||||
@ -30,13 +30,19 @@ component Dashboard(posts []*arn.Post, following []*arn.User)
|
|||||||
span ...
|
span ...
|
||||||
|
|
||||||
.widget.mountable
|
.widget.mountable
|
||||||
h3.widget-title Messages
|
h3.widget-title Soundtracks
|
||||||
|
|
||||||
for i := 1; i <= 5; i++
|
for i := 0; i <= 4; i++
|
||||||
.widget-element
|
if i < len(soundTracks)
|
||||||
.widget-element-text
|
a.widget-element.ajax(href="/music")
|
||||||
Icon("comment")
|
.widget-element-text
|
||||||
span ...
|
Icon("music")
|
||||||
|
span= soundTracks[i].MainAnime().Title.Canonical
|
||||||
|
else
|
||||||
|
.widget-element
|
||||||
|
.widget-element-text
|
||||||
|
Icon("music")
|
||||||
|
span ...
|
||||||
|
|
||||||
.widget.mountable
|
.widget.mountable
|
||||||
h3.widget-title Contacts
|
h3.widget-title Contacts
|
||||||
|
@ -2,7 +2,6 @@ package music
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"sort"
|
|
||||||
|
|
||||||
"github.com/aerogo/aero"
|
"github.com/aerogo/aero"
|
||||||
"github.com/animenotifier/arn"
|
"github.com/animenotifier/arn"
|
||||||
@ -19,10 +18,6 @@ func Get(ctx *aero.Context) string {
|
|||||||
return ctx.Error(http.StatusInternalServerError, "Error fetching soundtracks", err)
|
return ctx.Error(http.StatusInternalServerError, "Error fetching soundtracks", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
sort.Slice(tracks, func(i, j int) bool {
|
|
||||||
return tracks[i].Created > tracks[j].Created
|
|
||||||
})
|
|
||||||
|
|
||||||
if len(tracks) > maxTracks {
|
if len(tracks) > maxTracks {
|
||||||
tracks = tracks[:maxTracks]
|
tracks = tracks[:maxTracks]
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user