From baa0188c2711f8636f506a1e87e79837e8f034d9 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sat, 7 Apr 2018 16:32:37 +0200 Subject: [PATCH] New editor panel navigation --- pages/editor/editor.pixy | 68 ++++++++++----------- pages/editor/editor.scarlet | 10 ++- pages/editor/filteranime/{tba.go => all.go} | 8 +-- pages/index.go | 2 +- pages/support/support.scarlet | 14 +++-- styles/corner-buttons.scarlet | 11 +++- styles/include/config.scarlet | 7 ++- 7 files changed, 71 insertions(+), 49 deletions(-) rename pages/editor/filteranime/{tba.go => all.go} (71%) diff --git a/pages/editor/editor.pixy b/pages/editor/editor.pixy index d4be2d3d..0891c5b7 100644 --- a/pages/editor/editor.pixy +++ b/pages/editor/editor.pixy @@ -1,56 +1,54 @@ component Editor(url string, score int, scoreTitle string, scoreTypes map[string]int, user *arn.User) - EditorTabs(url, user) - h1.mountable= "Welcome to the Editor Panel, " + user.Nick + "!" - - .feature-cards - .feature-card.mountable(title=scoreTitle) - .feature-card-icon.editor-score= score - p.feature-card-text Your contribution score. + h1.mountable What would you like to edit? .feature-cards - a.feature-card.mountable(href="/editor/anime") - .feature-card-icon + a.feature-card.mountable(href="/editor/anime/all" + user.Settings().Editor.Filter.Suffix()) + .feature-card-icon.feature-card-color-anime RawIcon("tv") - p.feature-card-text Anime + .feature-card-text + p Anime + p.editor-score= arn.Plural(scoreTypes["Anime"], "contribution") - a.feature-card.mountable(href="/editor/tracks") - .feature-card-icon + a.feature-card.mountable(href="/editor/soundtracks/links") + .feature-card-icon.feature-card-color-soundtrack RawIcon("music") - p.feature-card-text SoundTracks + .feature-card-text + p SoundTracks + p.editor-score= arn.Plural(scoreTypes["SoundTrack"], "contribution") - a.feature-card.mountable(href="/editor/companies") - .feature-card-icon + a.feature-card.mountable(href="/editor/companies/description") + .feature-card-icon.feature-card-color-company RawIcon("building-o") - p.feature-card-text Companies + .feature-card-text + p Companies + p.editor-score= arn.Plural(scoreTypes["Company"], "contribution") - //- .footer - //- for objectType, score := range scoreTypes - //- .mountable - //- span= objectType + ": " - //- span= score - - //- .feature-cards.feature-cards-alternative-color - //- for objectType, score := range scoreTypes - //- .feature-card.mountable - //- .feature-card-icon.editor-score= score - //- p.feature-card-text= objectType + .footer.mountable + a.footer-element(href="/editor/mal/diff/anime" + user.Settings().Editor.Filter.Suffix()) MALdiff + a.footer-element(href="/editor/kitsu/new/anime") Kitsu + component EditorTabs(url string, user *arn.User) - .tabs - Tab("Editor", "pencil", "/editor") - Tab("MAL", "exchange", "/editor/mal/diff/anime" + user.Settings().Editor.Filter.Suffix()) - Tab("Anime", "tv", "/editor/anime/mapping/mal" + user.Settings().Editor.Filter.Suffix()) - Tab("Tracks", "music", "/editor/soundtracks/links") - Tab("Companies", "building", "/editor/companies/description") - Tab("Kitsu", "download", "/editor/kitsu/new/anime") + //- .tabs + //- Tab("Editor", "pencil", "/editor") + //- Tab("MAL", "exchange", "/editor/mal/diff/anime" + user.Settings().Editor.Filter.Suffix()) + //- Tab("Anime", "tv", "/editor/anime/mapping/mal" + user.Settings().Editor.Filter.Suffix()) + //- Tab("Tracks", "music", "/editor/soundtracks/links") + //- Tab("Companies", "building", "/editor/companies/description") + //- Tab("Kitsu", "download", "/editor/kitsu/new/anime") + + .corner-buttons-left + a.button(href="/editor") + Icon("arrow-left") + span Overview if strings.Contains(url, "/editor/anime/") .tabs + Tab("All", "list", "/editor/anime/all" + user.Settings().Editor.Filter.Suffix()) Tab("Mappings", "arrows-h", "/editor/anime/mapping/mal" + user.Settings().Editor.Filter.Suffix()) Tab("Images", "image", "/editor/anime/image/lowres" + user.Settings().Editor.Filter.Suffix()) Tab("Companies", "building", "/editor/anime/companies/studios" + user.Settings().Editor.Filter.Suffix()) Tab("Details", "search-plus", "/editor/anime/details/genres" + user.Settings().Editor.Filter.Suffix()) - Tab("TBA", "question-circle", "/editor/anime/tba" + user.Settings().Editor.Filter.Suffix()) if strings.Contains(url, "/editor/anime/details") .tabs diff --git a/pages/editor/editor.scarlet b/pages/editor/editor.scarlet index 4b90a326..f781057f 100644 --- a/pages/editor/editor.scarlet +++ b/pages/editor/editor.scarlet @@ -1,5 +1,6 @@ .editor-list-page-title margin-bottom 0 + margin-top 1rem .editor-list img @@ -7,6 +8,13 @@ .editor-list-entry-count margin-top 0 + margin-bottom content-padding .editor-score - line-height 1em \ No newline at end of file + feature-card-footer + +.feature-card-color-soundtrack + background hsl(200, feature-card-saturation, feature-card-lightness) !important + +.feature-card-color-company + background hsl(150, feature-card-saturation, feature-card-lightness) !important diff --git a/pages/editor/filteranime/tba.go b/pages/editor/filteranime/all.go similarity index 71% rename from pages/editor/filteranime/tba.go rename to pages/editor/filteranime/all.go index 05678b67..9b221a34 100644 --- a/pages/editor/filteranime/tba.go +++ b/pages/editor/filteranime/all.go @@ -5,13 +5,13 @@ import ( "github.com/animenotifier/arn" ) -// TBA ... -func TBA(ctx *aero.Context) string { +// All ... +func All(ctx *aero.Context) string { return editorList( ctx, - "Anime to be announced", + "All anime", func(anime *arn.Anime) bool { - return anime.Status == "tba" + return true }, func(anime *arn.Anime) string { return "https://www.google.com/search?q=" + anime.Title.Canonical diff --git a/pages/index.go b/pages/index.go index 55b82358..a00b810e 100644 --- a/pages/index.go +++ b/pages/index.go @@ -291,7 +291,7 @@ func Configure(app *aero.Application) { editorFilterable("/editor/anime/details/episodelength", filteranime.EpisodeLength) editorFilterable("/editor/anime/details/source", filteranime.Source) - editorFilterable("/editor/anime/tba", filteranime.TBA) + editorFilterable("/editor/anime/all", filteranime.All) // Editor - MALdiff editorFilterable("/editor/mal/diff/anime", editor.CompareMAL) diff --git a/pages/support/support.scarlet b/pages/support/support.scarlet index 25d095bf..22a5af79 100644 --- a/pages/support/support.scarlet +++ b/pages/support/support.scarlet @@ -1,13 +1,11 @@ -.feature-cards, -.payment-cards +mixin feature-cards horizontal-wrap justify-content center width 100% max-width 1200px margin content-padding auto -.feature-card, -.payment-card +mixin feature-card vertical flex-basis 240px border-radius 5px @@ -22,6 +20,14 @@ box-shadow shadow-medium text-shadow none +.feature-cards, +.payment-cards + feature-cards + +.feature-card, +.payment-card + feature-card + .payment-card :hover cursor pointer diff --git a/styles/corner-buttons.scarlet b/styles/corner-buttons.scarlet index 7cd88262..17dbb84b 100644 --- a/styles/corner-buttons.scarlet +++ b/styles/corner-buttons.scarlet @@ -1,12 +1,19 @@ -.corner-buttons +mixin corner-buttons display flex justify-content center margin-bottom content-padding - + z-index 1 position absolute top content-padding + +.corner-buttons + corner-buttons right content-padding +.corner-buttons-left + corner-buttons + left content-padding + .corner-buttons-hide-on-mobile display flex position absolute diff --git a/styles/include/config.scarlet b/styles/include/config.scarlet index ccd9a868..7bb8d1a8 100644 --- a/styles/include/config.scarlet +++ b/styles/include/config.scarlet @@ -78,8 +78,11 @@ calendar-entry-seen-hover-background = ui-background table-width-normal = 900px // Feature cards -feature-card-color = hsl(348, 83%, 47%) -feature-card-alternative-color = hsl(203, 83%, 47%) +const feature-card-saturation = 83% +const feature-card-lightness = 47% + +feature-card-color = hsl(348, feature-card-saturation, feature-card-lightness) +feature-card-alternative-color = hsl(203, feature-card-saturation, feature-card-lightness) feature-card-icon-color = white // Loading animation