From 2fd56207d2bc7cfe642bed77c893bef3447e9b7a Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Wed, 14 Mar 2018 20:23:45 +0100 Subject: [PATCH] More cleanup --- pages/animelist/{status.go => animelist.go} | 6 ++-- pages/animelist/full.pixy | 33 ------------------- pages/animelist/profileanimelist.go | 36 --------------------- pages/animelist/status.pixy | 3 -- 4 files changed, 3 insertions(+), 75 deletions(-) rename pages/animelist/{status.go => animelist.go} (90%) delete mode 100644 pages/animelist/full.pixy delete mode 100644 pages/animelist/profileanimelist.go delete mode 100644 pages/animelist/status.pixy diff --git a/pages/animelist/status.go b/pages/animelist/animelist.go similarity index 90% rename from pages/animelist/status.go rename to pages/animelist/animelist.go index 1ffbfa73..c54bb8ed 100644 --- a/pages/animelist/status.go +++ b/pages/animelist/animelist.go @@ -22,12 +22,12 @@ func FilterByStatus(status string) aero.Handle { return frontpage.Get(ctx) } - return HomeAnimeList(ctx, user, status) + return AnimeList(ctx, user, status) } } -// HomeAnimeList renders the anime list items. -func HomeAnimeList(ctx *aero.Context, user *arn.User, status string) string { +// AnimeList renders the anime list items. +func AnimeList(ctx *aero.Context, user *arn.User, status string) string { nick := ctx.Get("nick") index, _ := ctx.GetInt("index") viewUser, err := arn.GetUserByNick(nick) diff --git a/pages/animelist/full.pixy b/pages/animelist/full.pixy deleted file mode 100644 index 108cd08a..00000000 --- a/pages/animelist/full.pixy +++ /dev/null @@ -1,33 +0,0 @@ -//- component ProfileAnimeLists(animeLists map[string]*arn.AnimeList, viewUser *arn.User, user *arn.User, uri string) -//- ProfileHeader(viewUser, user, uri) -//- h1.page-title.anime-list-owner= viewUser.Nick + "'s collection" -//- AnimeLists(animeLists, viewUser, user) - -//- component AnimeLists(animeLists map[string]*arn.AnimeList, viewUser *arn.User, user *arn.User) -//- if len(animeLists[arn.AnimeListStatusWatching].Items) == 0 && len(animeLists[arn.AnimeListStatusCompleted].Items) == 0 && len(animeLists[arn.AnimeListStatusPlanned].Items) == 0 && len(animeLists[arn.AnimeListStatusHold].Items) == 0 && len(animeLists[arn.AnimeListStatusDropped].Items) == 0 -//- p.no-data.mountable= viewUser.Nick + " hasn't added any anime yet." -//- else -//- if len(animeLists[arn.AnimeListStatusWatching].Items) > 0 -//- .anime-list-container -//- h3.status-name Watching -//- AnimeList(animeLists[arn.AnimeListStatusWatching].Items, -1, viewUser, user) - -//- if len(animeLists[arn.AnimeListStatusCompleted].Items) > 0 -//- .anime-list-container -//- h3.status-name Completed -//- AnimeList(animeLists[arn.AnimeListStatusCompleted].Items, -1, viewUser, user) - -//- if len(animeLists[arn.AnimeListStatusPlanned].Items) > 0 -//- .anime-list-container -//- h3.status-name Planned -//- AnimeList(animeLists[arn.AnimeListStatusPlanned].Items, -1, viewUser, user) - -//- if len(animeLists[arn.AnimeListStatusHold].Items) > 0 -//- .anime-list-container -//- h3.status-name On hold -//- AnimeList(animeLists[arn.AnimeListStatusHold].Items, -1, viewUser, user) - -//- if len(animeLists[arn.AnimeListStatusDropped].Items) > 0 -//- .anime-list-container -//- h3.status-name Dropped -//- AnimeList(animeLists[arn.AnimeListStatusDropped].Items, -1, viewUser, user) \ No newline at end of file diff --git a/pages/animelist/profileanimelist.go b/pages/animelist/profileanimelist.go deleted file mode 100644 index 336ae4eb..00000000 --- a/pages/animelist/profileanimelist.go +++ /dev/null @@ -1,36 +0,0 @@ -package animelist - -// // ProfileFilterByStatus returns a handler for the given anime list item status. -// func ProfileFilterByStatus(status string) aero.Handle { -// return func(ctx *aero.Context) string { -// user := utils.GetUser(ctx) -// list, response := statusList(ctx, status) - -// if response != "" { -// return response -// } - -// return ctx.HTML(components.ProfileAnimeListItems(list.Items, list.User(), user, status, ctx.URI())) -// } -// } - -// // statusList handles the request for an anime list with a given status. -// func statusList(ctx *aero.Context, status string) (*arn.AnimeList, string) { -// nick := ctx.Get("nick") -// viewUser, err := arn.GetUserByNick(nick) - -// if err != nil { -// return nil, ctx.Error(http.StatusNotFound, "User not found", err) -// } - -// animeList := viewUser.AnimeList() - -// if animeList == nil { -// return nil, ctx.Error(http.StatusNotFound, "Anime list not found", nil) -// } - -// watchingList := animeList.FilterStatus(status) -// watchingList.Sort() - -// return watchingList, "" -// } diff --git a/pages/animelist/status.pixy b/pages/animelist/status.pixy deleted file mode 100644 index 3c1f5be7..00000000 --- a/pages/animelist/status.pixy +++ /dev/null @@ -1,3 +0,0 @@ -component ProfileAnimeListItems(animeListItems []*arn.AnimeListItem, viewUser *arn.User, user *arn.User, status string, uri string) - ProfileHeader(viewUser, user, uri) - AnimeListItems(animeListItems, -1, viewUser, user) \ No newline at end of file