From 10ef00a81032f399261c4e77d9db2ed7c39a0349 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sat, 1 Jul 2017 01:16:25 +0200 Subject: [PATCH] Cleanup --- .../active-users/{main.go => active-users.go} | 0 .../airing-anime/{main.go => airing-anime.go} | 0 .../{main.go => anime-ratings.go} | 0 jobs/avatars/{main.go => avatars.go} | 0 jobs/discord/{main.go => discord.go} | 0 .../{main.go => forum-activity.go} | 0 jobs/{main.go => jobs.go} | 2 +- .../{main.go => popular-anime.go} | 0 .../{main.go => refresh-track-titles.go} | 0 .../search-index/{main.go => search-index.go} | 0 jobs/sync-anime/{main.go => sync-anime.go} | 0 jobs/sync-shoboi/{main.go => sync-shoboi.go} | 0 main.go | 4 ++-- mixins/Navigation.pixy | 4 ++-- .../popular.go => explore/explore.go} | 4 ++-- pages/explore/explore.pixy | 9 +++++++++ pages/popularanime/old/popular.pixy | 16 ---------------- pages/popularanime/old/popular.scarlet | 19 ------------------- pages/popularanime/popular.pixy | 6 ------ .../{main.go => add-anime-lists.go} | 0 .../{main.go => add-empty-episodes.go} | 0 .../{main.go => add-last-seen.go} | 0 .../add-mappings/{main.go => add-mappings.go} | 0 .../{main.go => anime-list-item-status.go} | 0 .../{main.go => clear-anime-ratings.go} | 0 .../{main.go => clear-sessions.go} | 0 .../{main.go => delete-private-data.go} | 0 patches/post-texts/{main.go => post-texts.go} | 0 .../thread-posts/{main.go => thread-posts.go} | 0 .../{main.go => user-references.go} | 0 .../{main.go => video-id-to-service-id.go} | 0 31 files changed, 16 insertions(+), 48 deletions(-) rename jobs/active-users/{main.go => active-users.go} (100%) rename jobs/airing-anime/{main.go => airing-anime.go} (100%) rename jobs/anime-ratings/{main.go => anime-ratings.go} (100%) rename jobs/avatars/{main.go => avatars.go} (100%) rename jobs/discord/{main.go => discord.go} (100%) rename jobs/forum-activity/{main.go => forum-activity.go} (100%) rename jobs/{main.go => jobs.go} (98%) rename jobs/popular-anime/{main.go => popular-anime.go} (100%) rename jobs/refresh-track-titles/{main.go => refresh-track-titles.go} (100%) rename jobs/search-index/{main.go => search-index.go} (100%) rename jobs/sync-anime/{main.go => sync-anime.go} (100%) rename jobs/sync-shoboi/{main.go => sync-shoboi.go} (100%) rename pages/{popularanime/popular.go => explore/explore.go} (81%) create mode 100644 pages/explore/explore.pixy delete mode 100644 pages/popularanime/old/popular.pixy delete mode 100644 pages/popularanime/old/popular.scarlet delete mode 100644 pages/popularanime/popular.pixy rename patches/add-anime-lists/{main.go => add-anime-lists.go} (100%) rename patches/add-empty-episodes/{main.go => add-empty-episodes.go} (100%) rename patches/add-last-seen/{main.go => add-last-seen.go} (100%) rename patches/add-mappings/{main.go => add-mappings.go} (100%) rename patches/anime-list-item-status/{main.go => anime-list-item-status.go} (100%) rename patches/clear-anime-ratings/{main.go => clear-anime-ratings.go} (100%) rename patches/clear-sessions/{main.go => clear-sessions.go} (100%) rename patches/delete-private-data/{main.go => delete-private-data.go} (100%) rename patches/post-texts/{main.go => post-texts.go} (100%) rename patches/thread-posts/{main.go => thread-posts.go} (100%) rename patches/user-references/{main.go => user-references.go} (100%) rename patches/video-id-to-service-id/{main.go => video-id-to-service-id.go} (100%) diff --git a/jobs/active-users/main.go b/jobs/active-users/active-users.go similarity index 100% rename from jobs/active-users/main.go rename to jobs/active-users/active-users.go diff --git a/jobs/airing-anime/main.go b/jobs/airing-anime/airing-anime.go similarity index 100% rename from jobs/airing-anime/main.go rename to jobs/airing-anime/airing-anime.go diff --git a/jobs/anime-ratings/main.go b/jobs/anime-ratings/anime-ratings.go similarity index 100% rename from jobs/anime-ratings/main.go rename to jobs/anime-ratings/anime-ratings.go diff --git a/jobs/avatars/main.go b/jobs/avatars/avatars.go similarity index 100% rename from jobs/avatars/main.go rename to jobs/avatars/avatars.go diff --git a/jobs/discord/main.go b/jobs/discord/discord.go similarity index 100% rename from jobs/discord/main.go rename to jobs/discord/discord.go diff --git a/jobs/forum-activity/main.go b/jobs/forum-activity/forum-activity.go similarity index 100% rename from jobs/forum-activity/main.go rename to jobs/forum-activity/forum-activity.go diff --git a/jobs/main.go b/jobs/jobs.go similarity index 98% rename from jobs/main.go rename to jobs/jobs.go index e98738d6..861992dc 100644 --- a/jobs/main.go +++ b/jobs/jobs.go @@ -27,10 +27,10 @@ var jobs = map[string]time.Duration{ "forum-activity": 1 * time.Minute, "anime-ratings": 10 * time.Minute, "airing-anime": 10 * time.Minute, + "popular-anime": 20 * time.Minute, "avatars": 30 * time.Minute, "refresh-track-titles": 10 * time.Hour, "sync-anime": 12 * time.Hour, - "popular-anime": 12 * time.Hour, "search-index": 12 * time.Hour, } diff --git a/jobs/popular-anime/main.go b/jobs/popular-anime/popular-anime.go similarity index 100% rename from jobs/popular-anime/main.go rename to jobs/popular-anime/popular-anime.go diff --git a/jobs/refresh-track-titles/main.go b/jobs/refresh-track-titles/refresh-track-titles.go similarity index 100% rename from jobs/refresh-track-titles/main.go rename to jobs/refresh-track-titles/refresh-track-titles.go diff --git a/jobs/search-index/main.go b/jobs/search-index/search-index.go similarity index 100% rename from jobs/search-index/main.go rename to jobs/search-index/search-index.go diff --git a/jobs/sync-anime/main.go b/jobs/sync-anime/sync-anime.go similarity index 100% rename from jobs/sync-anime/main.go rename to jobs/sync-anime/sync-anime.go diff --git a/jobs/sync-shoboi/main.go b/jobs/sync-shoboi/sync-shoboi.go similarity index 100% rename from jobs/sync-shoboi/main.go rename to jobs/sync-shoboi/sync-shoboi.go diff --git a/main.go b/main.go index c5c0127e..21e4e7d6 100644 --- a/main.go +++ b/main.go @@ -16,13 +16,13 @@ import ( "github.com/animenotifier/notify.moe/pages/dashboard" "github.com/animenotifier/notify.moe/pages/editanime" "github.com/animenotifier/notify.moe/pages/embed" + "github.com/animenotifier/notify.moe/pages/explore" "github.com/animenotifier/notify.moe/pages/forum" "github.com/animenotifier/notify.moe/pages/forums" "github.com/animenotifier/notify.moe/pages/login" "github.com/animenotifier/notify.moe/pages/music" "github.com/animenotifier/notify.moe/pages/newsoundtrack" "github.com/animenotifier/notify.moe/pages/newthread" - "github.com/animenotifier/notify.moe/pages/popularanime" "github.com/animenotifier/notify.moe/pages/posts" "github.com/animenotifier/notify.moe/pages/profile" "github.com/animenotifier/notify.moe/pages/search" @@ -57,7 +57,7 @@ func configure(app *aero.Application) *aero.Application { // Ajax routes app.Ajax("/", dashboard.Get) - app.Ajax("/anime", popularanime.Get) + app.Ajax("/anime", explore.Get) app.Ajax("/anime/:id", anime.Get) app.Ajax("/anime/:id/edit", editanime.Get) app.Ajax("/forum", forums.Get) diff --git a/mixins/Navigation.pixy b/mixins/Navigation.pixy index dbf99a82..d57e9aa8 100644 --- a/mixins/Navigation.pixy +++ b/mixins/Navigation.pixy @@ -15,7 +15,7 @@ component LoggedOutMenu .extra-navigation NavigationButton("Users", "/users", "globe") - NavigationButton("Airing", "/airing", "th") + NavigationButton("Anime", "/anime", "th") NavigationButton("Login", "/login", "sign-in") component LoggedInMenu(user *arn.User) @@ -34,7 +34,7 @@ component LoggedInMenu(user *arn.User) NavigationButton("Users", "/users", "globe") .extra-navigation - NavigationButton("Airing", "/airing", "th") + NavigationButton("Anime", "/anime", "th") NavigationButton("Settings", "/settings", "cog") diff --git a/pages/popularanime/popular.go b/pages/explore/explore.go similarity index 81% rename from pages/popularanime/popular.go rename to pages/explore/explore.go index 1d80e7ef..18896117 100644 --- a/pages/popularanime/popular.go +++ b/pages/explore/explore.go @@ -1,4 +1,4 @@ -package popularanime +package explore import ( "net/http" @@ -16,5 +16,5 @@ func Get(ctx *aero.Context) string { return ctx.Error(http.StatusInternalServerError, "Error fetching popular anime", err) } - return ctx.HTML(components.PopularAnime(animeList)) + return ctx.HTML(components.ExploreAnime(nil, nil, animeList)) } diff --git a/pages/explore/explore.pixy b/pages/explore/explore.pixy new file mode 100644 index 00000000..744423f0 --- /dev/null +++ b/pages/explore/explore.pixy @@ -0,0 +1,9 @@ +component ExploreAnime(overall []*arn.Anime, story []*arn.Anime, airing []*arn.Anime) + h2 Highest Rating + AnimeGrid(overall) + + h2 Best Story + AnimeGrid(story) + + h2 Currently Airing + AnimeGrid(airing) \ No newline at end of file diff --git a/pages/popularanime/old/popular.pixy b/pages/popularanime/old/popular.pixy deleted file mode 100644 index 4d650c83..00000000 --- a/pages/popularanime/old/popular.pixy +++ /dev/null @@ -1,16 +0,0 @@ -component OldPopularAnime(popularAnime []*arn.Anime, titleCount int, animeCount int) - //- h2 Anime - - //- #search-container - //- input#search(type="text", placeholder="Search...", onkeyup="$.searchAnime();", onfocus="this.select();", disabled="disabled", data-count=titleCount, data-anime-count=animeCount) - - //- #search-results-container - //- #search-results - - //- if popularAnime != nil - //- h3.popular-title Popular - - //- .popular-anime-list - //- each anime in popularAnime - //- a.popular-anime.ajax(href="/anime/" + toString(anime.ID), title=anime.Title.Romaji + " (" + arn.Plural(anime.Watching(), "user") + " watching)") - //- img.anime-image.popular-anime-image(src=anime.Image, alt=anime.Title.Romaji) \ No newline at end of file diff --git a/pages/popularanime/old/popular.scarlet b/pages/popularanime/old/popular.scarlet deleted file mode 100644 index 6ee9f2dd..00000000 --- a/pages/popularanime/old/popular.scarlet +++ /dev/null @@ -1,19 +0,0 @@ -// .popular-title -// text-align center - -// .popular-anime-list -// display flex -// flex-flow row wrap -// justify-content center - -// .popular-anime -// padding 0.5em -// display block - -// .popular-anime-image -// width 100px !important -// height 141px !important -// border-radius 3px -// object-fit cover -// default-transition -// shadow-up \ No newline at end of file diff --git a/pages/popularanime/popular.pixy b/pages/popularanime/popular.pixy deleted file mode 100644 index 3d5aeec7..00000000 --- a/pages/popularanime/popular.pixy +++ /dev/null @@ -1,6 +0,0 @@ -component PopularAnime(animeList []*arn.Anime) - h2 Top 3 - AnimeGrid(animeList[:3]) - - h2 Popular - AnimeGrid(animeList[3:]) \ No newline at end of file diff --git a/patches/add-anime-lists/main.go b/patches/add-anime-lists/add-anime-lists.go similarity index 100% rename from patches/add-anime-lists/main.go rename to patches/add-anime-lists/add-anime-lists.go diff --git a/patches/add-empty-episodes/main.go b/patches/add-empty-episodes/add-empty-episodes.go similarity index 100% rename from patches/add-empty-episodes/main.go rename to patches/add-empty-episodes/add-empty-episodes.go diff --git a/patches/add-last-seen/main.go b/patches/add-last-seen/add-last-seen.go similarity index 100% rename from patches/add-last-seen/main.go rename to patches/add-last-seen/add-last-seen.go diff --git a/patches/add-mappings/main.go b/patches/add-mappings/add-mappings.go similarity index 100% rename from patches/add-mappings/main.go rename to patches/add-mappings/add-mappings.go diff --git a/patches/anime-list-item-status/main.go b/patches/anime-list-item-status/anime-list-item-status.go similarity index 100% rename from patches/anime-list-item-status/main.go rename to patches/anime-list-item-status/anime-list-item-status.go diff --git a/patches/clear-anime-ratings/main.go b/patches/clear-anime-ratings/clear-anime-ratings.go similarity index 100% rename from patches/clear-anime-ratings/main.go rename to patches/clear-anime-ratings/clear-anime-ratings.go diff --git a/patches/clear-sessions/main.go b/patches/clear-sessions/clear-sessions.go similarity index 100% rename from patches/clear-sessions/main.go rename to patches/clear-sessions/clear-sessions.go diff --git a/patches/delete-private-data/main.go b/patches/delete-private-data/delete-private-data.go similarity index 100% rename from patches/delete-private-data/main.go rename to patches/delete-private-data/delete-private-data.go diff --git a/patches/post-texts/main.go b/patches/post-texts/post-texts.go similarity index 100% rename from patches/post-texts/main.go rename to patches/post-texts/post-texts.go diff --git a/patches/thread-posts/main.go b/patches/thread-posts/thread-posts.go similarity index 100% rename from patches/thread-posts/main.go rename to patches/thread-posts/thread-posts.go diff --git a/patches/user-references/main.go b/patches/user-references/user-references.go similarity index 100% rename from patches/user-references/main.go rename to patches/user-references/user-references.go diff --git a/patches/video-id-to-service-id/main.go b/patches/video-id-to-service-id/video-id-to-service-id.go similarity index 100% rename from patches/video-id-to-service-id/main.go rename to patches/video-id-to-service-id/video-id-to-service-id.go