From eb3ecc18d6ba496b031f4b5a830cfbb75359e063 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Tue, 7 Nov 2017 14:53:02 +0100 Subject: [PATCH] Added soundtrack search --- pages/search/search.go | 5 +++-- pages/search/search.pixy | 20 +++++++++++++------- pages/search/search.scarlet | 3 ++- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pages/search/search.go b/pages/search/search.go index 791821bf..ad17cbd7 100644 --- a/pages/search/search.go +++ b/pages/search/search.go @@ -10,11 +10,12 @@ const maxUsers = 25 const maxAnime = 25 const maxPosts = 3 const maxThreads = 3 +const maxTracks = 5 // Get search page. func Get(ctx *aero.Context) string { term := ctx.Query("q") - userResults, animeResults, postResults, threadResults := arn.Search(term, maxUsers, maxAnime, maxPosts, maxThreads) - return ctx.HTML(components.SearchResults(term, userResults, animeResults, postResults, threadResults)) + users, animes, posts, threads, tracks := arn.Search(term, maxUsers, maxAnime, maxPosts, maxThreads, maxTracks) + return ctx.HTML(components.SearchResults(term, users, animes, posts, threads, tracks)) } diff --git a/pages/search/search.pixy b/pages/search/search.pixy index ad630b01..9785ed83 100644 --- a/pages/search/search.pixy +++ b/pages/search/search.pixy @@ -1,4 +1,4 @@ -component SearchResults(term string, users []*arn.User, animeResults []*arn.Anime, postResults []*arn.Post, threadResults []*arn.Thread) +component SearchResults(term string, users []*arn.User, animes []*arn.Anime, posts []*arn.Post, threads []*arn.Thread, tracks []*arn.SoundTrack) h1.page-title= "Search: " + term .search @@ -8,10 +8,10 @@ component SearchResults(term string, users []*arn.User, animeResults []*arn.Anim span Anime .profile-watching-list.anime-search - if len(animeResults) == 0 + if len(animes) == 0 p.no-search-results.mountable No anime found. else - each anime in animeResults + each anime in animes a.profile-watching-list-item.mountable.ajax(href=anime.Link(), title=anime.Title.Canonical, data-mountable-type="anime") img.anime-cover-image.anime-search-result(src=anime.Image.Tiny, alt=anime.Title.Canonical) @@ -20,10 +20,10 @@ component SearchResults(term string, users []*arn.User, animeResults []*arn.Anim Icon("comment") span Forum - if len(postResults) == 0 && len(threadResults) == 0 + if len(posts) == 0 && len(threads) == 0 p.no-search-results.mountable No posts found. else - each thread in threadResults + each thread in threads .mountable(data-mountable-type="forum") .forum-search-result a.forum-search-result-title.ajax(href=thread.Link())= thread.Title @@ -31,7 +31,7 @@ component SearchResults(term string, users []*arn.User, animeResults []*arn.Anim .forum-search-result-author= thread.Author().Nick .forum-search-result-sample= thread.Text - each post in postResults + each post in posts .mountable(data-mountable-type="forum") .forum-search-result a.forum-search-result-title.ajax(href=post.Link(), data-mountable-type="forum")= post.Thread().Title @@ -44,7 +44,13 @@ component SearchResults(term string, users []*arn.User, animeResults []*arn.Anim Icon("music") span Soundtracks - p.no-search-results.mountable Soundtrack search coming soon. + if len(tracks) == 0 + p.no-search-results.mountable No soundtracks found. + else + ul.soundtrack-search + each track in tracks + li + a.ajax(href=track.Link())= track.Title .widget h3.widget-title diff --git a/pages/search/search.scarlet b/pages/search/search.scarlet index aa66687d..e28c14da 100644 --- a/pages/search/search.scarlet +++ b/pages/search/search.scarlet @@ -1,5 +1,6 @@ .anime-search, -.user-search +.user-search, +.soundtrack-search justify-content flex-start .anime-search-result