From f648f196869eaf053cb50d6e51a7835e1e0e775e Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Thu, 29 Jun 2017 23:27:21 +0200 Subject: [PATCH] Improved anime lists --- pages/animelist/animelist.go | 2 +- pages/animelist/animelist.pixy | 33 ++++++++++++++++++++++++++++++- pages/animelist/animelist.scarlet | 6 +++++- pages/embed/embed.go | 4 +++- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/pages/animelist/animelist.go b/pages/animelist/animelist.go index b10a09c9..e404d300 100644 --- a/pages/animelist/animelist.go +++ b/pages/animelist/animelist.go @@ -27,5 +27,5 @@ func Get(ctx *aero.Context) string { animeList.Sort() - return ctx.HTML(components.AnimeList(animeList, user)) + return ctx.HTML(components.AnimeLists(animeList.SplitByStatus(), animeList.User(), user)) } diff --git a/pages/animelist/animelist.pixy b/pages/animelist/animelist.pixy index 7432aaa0..281cc8a0 100644 --- a/pages/animelist/animelist.pixy +++ b/pages/animelist/animelist.pixy @@ -1,5 +1,36 @@ +component AnimeLists(animeLists map[string]*arn.AnimeList, viewUser *arn.User, user *arn.User) + h2.anime-list-owner= viewUser.Nick + "'s collection" + + if len(animeLists[arn.AnimeListStatusWatching].Items) > 0 + .anime-list-container + h3.status-name Watching + AnimeList(animeLists[arn.AnimeListStatusWatching], user) + + if len(animeLists[arn.AnimeListStatusCompleted].Items) > 0 + .anime-list-container + h3.status-name Completed + AnimeList(animeLists[arn.AnimeListStatusCompleted], user) + + if len(animeLists[arn.AnimeListStatusPlanned].Items) > 0 + .anime-list-container + h3.status-name Planned + AnimeList(animeLists[arn.AnimeListStatusPlanned], user) + + if len(animeLists[arn.AnimeListStatusHold].Items) > 0 + .anime-list-container + h3.status-name On hold + AnimeList(animeLists[arn.AnimeListStatusHold], user) + + if len(animeLists[arn.AnimeListStatusDropped].Items) > 0 + .anime-list-container + h3.status-name Dropped + AnimeList(animeLists[arn.AnimeListStatusDropped], user) + + //- for status, animeList := range animeLists + //- h3= status + //- AnimeList(animeList, user) + component AnimeList(animeList *arn.AnimeList, user *arn.User) - h2.anime-list-owner= animeList.User().Nick + "'s collection" table.anime-list thead tr diff --git a/pages/animelist/animelist.scarlet b/pages/animelist/animelist.scarlet index 4a32d6b2..fa271dd9 100644 --- a/pages/animelist/animelist.scarlet +++ b/pages/animelist/animelist.scarlet @@ -1,8 +1,12 @@ -.anime-list +.anime-list-container vertical width 100% max-width 1200px margin 0 auto + margin-bottom 1rem + +.anime-list + vertical tr horizontal diff --git a/pages/embed/embed.go b/pages/embed/embed.go index 13009cef..53ba9158 100644 --- a/pages/embed/embed.go +++ b/pages/embed/embed.go @@ -4,6 +4,7 @@ import ( "net/http" "github.com/aerogo/aero" + "github.com/animenotifier/arn" "github.com/animenotifier/notify.moe/components" "github.com/animenotifier/notify.moe/utils" ) @@ -23,6 +24,7 @@ func Get(ctx *aero.Context) string { } animeList.Sort() + watchingList := animeList.SplitByStatus()[arn.AnimeListStatusWatching] - return utils.AllowEmbed(ctx, ctx.HTML(components.AnimeList(animeList, user))) + return utils.AllowEmbed(ctx, ctx.HTML(components.AnimeList(watchingList, user))) }