From fd03d311874b44030684ae6c07d3ddcf6b104158 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sat, 21 Oct 2017 19:23:40 +0200 Subject: [PATCH] Improved anime list comparison --- pages/compare/animelist.go | 14 ++++++++++++-- pages/compare/animelist.pixy | 6 ++++-- pages/compare/animelist.scarlet | 7 +++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pages/compare/animelist.go b/pages/compare/animelist.go index 2c825c6e..784c661d 100644 --- a/pages/compare/animelist.go +++ b/pages/compare/animelist.go @@ -30,12 +30,16 @@ func AnimeList(ctx *aero.Context) string { } comparisons := []*utils.Comparison{} + countA := 0 + countB := 0 for _, item := range a.AnimeList().Items { if item.Status == arn.AnimeListStatusPlanned { continue } + countA++ + comparisons = append(comparisons, &utils.Comparison{ Anime: item.Anime(), ItemA: item, @@ -44,7 +48,13 @@ func AnimeList(ctx *aero.Context) string { } for _, item := range b.AnimeList().Items { - if Contains(comparisons, item.AnimeID) || item.Status == arn.AnimeListStatusPlanned { + if item.Status == arn.AnimeListStatusPlanned { + continue + } + + countB++ + + if Contains(comparisons, item.AnimeID) { continue } @@ -59,7 +69,7 @@ func AnimeList(ctx *aero.Context) string { return comparisons[i].Anime.Popularity.Total() > comparisons[j].Anime.Popularity.Total() }) - return ctx.HTML(components.CompareAnimeList(a, b, comparisons, user)) + return ctx.HTML(components.CompareAnimeList(a, b, countA, countB, comparisons, user)) } // Contains ... diff --git a/pages/compare/animelist.pixy b/pages/compare/animelist.pixy index 5afbe1b8..d1aeadee 100644 --- a/pages/compare/animelist.pixy +++ b/pages/compare/animelist.pixy @@ -1,5 +1,7 @@ -component CompareAnimeList(a *arn.User, b *arn.User, comparisons []*utils.Comparison, user *arn.User) - h1= "Anime list comparison between " + a.Nick + " and " + b.Nick +component CompareAnimeList(a *arn.User, b *arn.User, countA int, countB int, comparisons []*utils.Comparison, user *arn.User) + h1 Anime list comparison + + p.comparison-info= a.Nick + "'s list contains " + strconv.Itoa(countA) + " anime and " + b.Nick + "'s list contains " + strconv.Itoa(countB) + " anime." table.anime-list thead diff --git a/pages/compare/animelist.scarlet b/pages/compare/animelist.scarlet index 741684a8..13ca95ae 100644 --- a/pages/compare/animelist.scarlet +++ b/pages/compare/animelist.scarlet @@ -1,3 +1,10 @@ +.comparison-info + text-align center + font-size 0.9rem + opacity 0.5 + margin-top 0 + margin-bottom content-padding + .comparison width 100px text-align center