From b77dcfb98c434a27c470a4aefe55f60ba79d9ae7 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Fri, 9 Mar 2018 12:38:46 +0100 Subject: [PATCH] Changed editor panel links --- mixins/AnimeEditorList.pixy | 2 +- pages/database/database.go | 2 +- pages/database/database.pixy | 4 ++-- pages/editor/anilist.go | 2 +- pages/editor/editor.go | 2 +- pages/editor/editor.pixy | 26 +++++++++++++++----------- pages/editor/genres.go | 2 +- pages/editor/mal.go | 2 +- pages/editor/mal.pixy | 4 ++-- pages/editor/shoboi.go | 2 +- pages/index.go | 20 ++++++++++---------- 11 files changed, 36 insertions(+), 32 deletions(-) diff --git a/mixins/AnimeEditorList.pixy b/mixins/AnimeEditorList.pixy index 82a94fd6..909bbb24 100644 --- a/mixins/AnimeEditorList.pixy +++ b/mixins/AnimeEditorList.pixy @@ -1,5 +1,5 @@ component AnimeEditorListFull(title string, missing []*arn.Anime, count int, pageURI string, generateSearchLink func(*arn.Anime) string) - EditorTabs + EditorTabs(pageURI) h1.editor-list-title.mountable= title .footer.editor-list-entry-count.mountable= strconv.Itoa(count) + " anime" AnimeEditorList(missing, pageURI, generateSearchLink) diff --git a/pages/database/database.go b/pages/database/database.go index b2cf4b24..fc396b59 100644 --- a/pages/database/database.go +++ b/pages/database/database.go @@ -7,5 +7,5 @@ import ( // Get the dashboard. func Get(ctx *aero.Context) string { - return ctx.HTML(components.Database()) + return ctx.HTML(components.Database(ctx.URI())) } diff --git a/pages/database/database.pixy b/pages/database/database.pixy index 7d3f4b87..c3a16638 100644 --- a/pages/database/database.pixy +++ b/pages/database/database.pixy @@ -1,5 +1,5 @@ -component Database - EditorTabs +component Database(url string) + EditorTabs(url) .widget-form .widget diff --git a/pages/editor/anilist.go b/pages/editor/anilist.go index b0641a6f..b2404e13 100644 --- a/pages/editor/anilist.go +++ b/pages/editor/anilist.go @@ -51,7 +51,7 @@ func AniList(ctx *aero.Context) string { "Anime without Anilist links", missing, count, - "/editor/anilist", + "/editor/anime/missing/anilist", func(anime *arn.Anime) string { return "https://anilist.co/search?type=anime&q=" + anime.Title.Canonical }, diff --git a/pages/editor/editor.go b/pages/editor/editor.go index 3abccc97..0f57dd44 100644 --- a/pages/editor/editor.go +++ b/pages/editor/editor.go @@ -14,5 +14,5 @@ func Get(ctx *aero.Context) string { return ctx.Redirect("/") } - return ctx.HTML(components.Editor()) + return ctx.HTML(components.Editor(ctx.URI(), user)) } diff --git a/pages/editor/editor.pixy b/pages/editor/editor.pixy index 1fb7f5b6..b9f1a3a2 100644 --- a/pages/editor/editor.pixy +++ b/pages/editor/editor.pixy @@ -1,17 +1,21 @@ -component Editor - EditorTabs +component Editor(url string, user *arn.User) + EditorTabs(url) h1.page-title Editor Panel - p.text-center.mountable Welcome to the Editor Panel! + p.text-center.mountable= "Welcome to the Editor Panel, " + user.Nick + "!" -component EditorTabs +component EditorTabs(url string) .tabs Tab("Editor", "pencil", "/editor") - Tab("Shoboi", "list", "/editor/shoboi") - Tab("AniList", "list", "/editor/anilist") - Tab("Genres", "list", "/editor/genres") - Tab("MAL", "list", "/editor/mal") + Tab("MAL", "exchange", "/editor/anime/maldiff") + Tab("Missing", "list", "/editor/anime/missing/shoboi") Tab("Search", "search", "/database") - //- a.tab.ajax(href="/admin", aria-label="Admin") - //- Icon("wrench") - //- span.tab-text Admin \ No newline at end of file + if strings.Contains(url, "/editor/anime/missing/") + .tabs + Tab("Shoboi", "list", "/editor/anime/missing/shoboi") + Tab("AniList", "list", "/editor/anime/missing/anilist") + Tab("Genres", "list", "/editor/anime/missing/genres") + + //- a.tab.ajax(href="/admin", aria-label="Admin") + //- Icon("wrench") + //- span.tab-text Admin \ No newline at end of file diff --git a/pages/editor/genres.go b/pages/editor/genres.go index 5ac45032..d3983d45 100644 --- a/pages/editor/genres.go +++ b/pages/editor/genres.go @@ -51,7 +51,7 @@ func Genres(ctx *aero.Context) string { "Anime without genres", missing, count, - "/editor/genres", + "/editor/anime/missing/genres", nil, )) } diff --git a/pages/editor/mal.go b/pages/editor/mal.go index 959b96d8..93030233 100644 --- a/pages/editor/mal.go +++ b/pages/editor/mal.go @@ -109,5 +109,5 @@ func CompareMAL(ctx *aero.Context) string { } } - return ctx.HTML(components.CompareMAL(comparisons, user)) + return ctx.HTML(components.CompareMAL(comparisons, ctx.URI(), user)) } diff --git a/pages/editor/mal.pixy b/pages/editor/mal.pixy index 068f71e6..b15eb169 100644 --- a/pages/editor/mal.pixy +++ b/pages/editor/mal.pixy @@ -1,5 +1,5 @@ -component CompareMAL(comparisons []*utils.MALComparison, user *arn.User) - EditorTabs +component CompareMAL(comparisons []*utils.MALComparison, url string, user *arn.User) + EditorTabs(url) h1.mountable MAL comparison .data-comparisons diff --git a/pages/editor/shoboi.go b/pages/editor/shoboi.go index f6d37820..c5c46700 100644 --- a/pages/editor/shoboi.go +++ b/pages/editor/shoboi.go @@ -51,7 +51,7 @@ func Shoboi(ctx *aero.Context) string { "Anime without Shoboi links", missing, count, - "/editor/shoboi", + "/editor/anime/missing/shoboi", func(anime *arn.Anime) string { return "http://cal.syoboi.jp/find?type=quick&sd=1&kw=" + anime.Title.Japanese }, diff --git a/pages/index.go b/pages/index.go index 16963798..c2f5c4db 100644 --- a/pages/index.go +++ b/pages/index.go @@ -199,16 +199,16 @@ func Configure(app *aero.Application) { // Editor l.Page("/editor", editor.Get) - l.Page("/editor/anilist", editor.AniList) - l.Page("/editor/anilist/:year", editor.AniList) - l.Page("/editor/anilist/:year/:type", editor.AniList) - l.Page("/editor/shoboi", editor.Shoboi) - l.Page("/editor/shoboi/:year", editor.Shoboi) - l.Page("/editor/shoboi/:year/:type", editor.Shoboi) - l.Page("/editor/genres", editor.Genres) - l.Page("/editor/genres/:year", editor.Genres) - l.Page("/editor/genres/:year/:type", editor.Genres) - l.Page("/editor/mal", editor.CompareMAL) + l.Page("/editor/anime/missing/anilist", editor.AniList) + l.Page("/editor/anime/missing/anilist/:year", editor.AniList) + l.Page("/editor/anime/missing/anilist/:year/:type", editor.AniList) + l.Page("/editor/anime/missing/shoboi", editor.Shoboi) + l.Page("/editor/anime/missing/shoboi/:year", editor.Shoboi) + l.Page("/editor/anime/missing/shoboi/:year/:type", editor.Shoboi) + l.Page("/editor/anime/missing/genres", editor.Genres) + l.Page("/editor/anime/missing/genres/:year", editor.Genres) + l.Page("/editor/anime/missing/genres/:year/:type", editor.Genres) + l.Page("/editor/anime/maldiff", editor.CompareMAL) // Mixed l.Page("/database", database.Get)