web/notify.moe
Code Issues Pull Requests Activity

Anime list no longer embedded in profile

Browse Source
This commit is contained in:
Eduard Urbach 2018-03-14 20:13:20 +01:00
parent 04ac4057a9
commit 045879001f
17 changed files with 247 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/sidebar/sidebar.pixy
View File

@ -18,7 +18,7 @@ component Sidebar(user *arn.User)
//- Sidebar buttons //- Sidebar buttons
if user != nil if user != nil
SidebarButton("Home", "/animelist/watching", "home") SidebarButton("Home", "/+" + user.Nick + "/animelist/watching", "home")
else else
SidebarButton("Home", "/", "home") SidebarButton("Home", "/", "home")

59
mixins/AnimeList.pixy Normal file
View File

@ -0,0 +1,59 @@
component AnimeList(animeListItems []*arn.AnimeListItem, nextIndex int, viewUser *arn.User, user *arn.User)
#load-more-target.anime-list
AnimeListScrollable(animeListItems, viewUser, user)
if nextIndex != -1
.buttons
LoadMore(nextIndex)
component AnimeListScrollable(animeListItems []*arn.AnimeListItem, viewUser *arn.User, user *arn.User)
each item in animeListItems
.anime-list-item.mountable(title=item.Notes, data-api="/api/animelist/" + viewUser.ID + "/field/Items[AnimeID=\"" + item.AnimeID + "\"]")
.anime-list-item-image-container
a.anime-list-item-image-link.ajax(href=item.Anime().Link())
img.anime-list-item-image.lazy(data-src=item.Anime().Image("small"), data-webp="true", alt=item.Anime().Title.ByUser(user))
.anime-list-item-name
a.ajax(href=item.Link(viewUser.Nick))= item.Anime().Title.ByUser(user)
.anime-list-item-actions
if user != nil && item.Status == arn.AnimeListStatusWatching
//- if user.ID == "KpdWUlPzR"
//- a(href=arn.Nyaa.GetLink(item.Anime()), title="Search on Nyaa", target="_blank", rel="noopener")
//- RawIcon("download")
//- else
if item.Anime().EpisodeByNumber(item.Episodes + 1) != nil
for _, link := range item.Anime().EpisodeByNumber(item.Episodes + 1).Links
a(href=link, title="Watch episode " + toString(item.Episodes + 1) + " on twist.moe", target="_blank", rel="noopener")
RawIcon("eye")
.anime-list-item-airing-date
if (item.Status == arn.AnimeListStatusWatching || item.Status == arn.AnimeListStatusPlanned) && item.Anime().UpcomingEpisode() != nil
span.utc-airing-date(data-start-date=item.Anime().UpcomingEpisode().Episode.AiringDate.Start, data-end-date=item.Anime().UpcomingEpisode().Episode.AiringDate.End, data-episode-number=item.Anime().UpcomingEpisode().Episode.Number)
if item.Status != arn.AnimeListStatusCompleted
.anime-list-item-episodes
.anime-list-item-episodes-watched
.action(contenteditable=utils.SameUser(user, viewUser), data-field="Episodes", data-type="number", data-trigger="focusout", data-action="save")= item.Episodes
if item.Status == arn.AnimeListStatusWatching
.plus-episode.action(data-action="increaseEpisode", data-trigger="click") +
else
.plus-episode-dummy +
.anime-list-item-episodes-separator /
.anime-list-item-episodes-max= item.Anime().EpisodeCountString()
.anime-list-item-rating(title="Overall rating")
.action(contenteditable=utils.SameUser(user, viewUser), data-field="Rating.Overall", data-type="number", data-trigger="focusout", data-action="save")= utils.FormatRating(item.Rating.Overall)
//- if item.Status == arn.AnimeListStatusCompleted
//- .anime-list-item-rating(title="Story rating")
//- span.rating-label S:
//- .action(contenteditable=utils.SameUser(user, viewUser), data-field="Rating.Story", data-type="number", data-trigger="focusout", data-action="save")= fmt.Sprintf("%.1f", item.Rating.Story)
//- .anime-list-item-rating(title="Visuals rating")
//- span.rating-label V:
//- .action(contenteditable=utils.SameUser(user, viewUser), data-field="Rating.Visuals", data-type="number", data-trigger="focusout", data-action="save")= fmt.Sprintf("%.1f", item.Rating.Visuals)
//- .anime-list-item-rating(title="Soundtrack rating")
//- span.rating-label M:
//- .action(contenteditable=utils.SameUser(user, viewUser), data-field="Rating.Soundtrack", data-type="number", data-trigger="focusout", data-action="save")= fmt.Sprintf("%.1f", item.Rating.Soundtrack)

6
mixins/AnimeListItems.pixy Normal file
View File

@ -0,0 +1,6 @@
component AnimeListItems(animeListItems []*arn.AnimeListItem, nextIndex int, viewUser *arn.User, user *arn.User)
if len(animeListItems) == 0
p.no-data.mountable= viewUser.Nick + " hasn't added any anime to this list yet."
else
.anime-list-container
AnimeList(animeListItems, nextIndex, viewUser, user)

31
pages/animelist/animelist.go
View File

@ -1,31 +0,0 @@
package animelist
import (
"net/http"
"github.com/aerogo/aero"
"github.com/animenotifier/arn"
"github.com/animenotifier/notify.moe/components"
"github.com/animenotifier/notify.moe/utils"
)
// Get anime list.
func Get(ctx *aero.Context) string {
nick := ctx.Get("nick")
user := utils.GetUser(ctx)
viewUser, err := arn.GetUserByNick(nick)
if err != nil {
return ctx.Error(http.StatusNotFound, "User not found", err)
}
animeList := viewUser.AnimeList()
if animeList == nil {
return ctx.Error(http.StatusNotFound, "Anime list not found", nil)
}
animeList.Sort()
return ctx.HTML(components.ProfileAnimeLists(animeList.SplitByStatus(), animeList.User(), user, ctx.URI()))
}

104
pages/animelist/animelist.pixy
View File

@ -1,99 +1,9 @@
component ProfileAnimeLists(animeLists map[string]*arn.AnimeList, viewUser *arn.User, user *arn.User, uri string) component HomeAnimeList(animeListItems []*arn.AnimeListItem, nextIndex int, viewUser *arn.User, user *arn.User, status string)
ProfileHeader(viewUser, user, uri) h1.page-title= viewUser.Nick + "'s anime list"
h1.page-title.anime-list-owner= viewUser.Nick + "'s collection" if user.ID != viewUser.ID
.anime-list-user-avatar
Avatar(viewUser)
AnimeLists(animeLists, viewUser, user) StatusTabs("/+" + viewUser.Nick + "/animelist")
AnimeListItems(animeListItems, nextIndex, viewUser, user)
//- for status, animeList := range animeLists
//- h3= status
//- AnimeList(animeList, 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)
component AnimeList(animeListItems []*arn.AnimeListItem, nextIndex int, viewUser *arn.User, user *arn.User)
#load-more-target.anime-list
AnimeListScrollable(animeListItems, viewUser, user)
if nextIndex != -1
.buttons
LoadMore(nextIndex)
component AnimeListScrollable(animeListItems []*arn.AnimeListItem, viewUser *arn.User, user *arn.User)
each item in animeListItems
.anime-list-item.mountable(title=item.Notes, data-api="/api/animelist/" + viewUser.ID + "/field/Items[AnimeID=\"" + item.AnimeID + "\"]")
.anime-list-item-image-container
a.anime-list-item-image-link.ajax(href=item.Anime().Link())
img.anime-list-item-image.lazy(data-src=item.Anime().Image("small"), data-webp="true", alt=item.Anime().Title.ByUser(user))
.anime-list-item-name
a.ajax(href=item.Link(viewUser.Nick))= item.Anime().Title.ByUser(user)
.anime-list-item-actions
if user != nil && item.Status == arn.AnimeListStatusWatching
//- if user.ID == "KpdWUlPzR"
//- a(href=arn.Nyaa.GetLink(item.Anime()), title="Search on Nyaa", target="_blank", rel="noopener")
//- RawIcon("download")
//- else
if item.Anime().EpisodeByNumber(item.Episodes + 1) != nil
for _, link := range item.Anime().EpisodeByNumber(item.Episodes + 1).Links
a(href=link, title="Watch episode " + toString(item.Episodes + 1) + " on twist.moe", target="_blank", rel="noopener")
RawIcon("eye")
.anime-list-item-airing-date
if (item.Status == arn.AnimeListStatusWatching || item.Status == arn.AnimeListStatusPlanned) && item.Anime().UpcomingEpisode() != nil
span.utc-airing-date(data-start-date=item.Anime().UpcomingEpisode().Episode.AiringDate.Start, data-end-date=item.Anime().UpcomingEpisode().Episode.AiringDate.End, data-episode-number=item.Anime().UpcomingEpisode().Episode.Number)
if item.Status != arn.AnimeListStatusCompleted
.anime-list-item-episodes
.anime-list-item-episodes-watched
.action(contenteditable=utils.SameUser(user, viewUser), data-field="Episodes", data-type="number", data-trigger="focusout", data-action="save")= item.Episodes
if item.Status == arn.AnimeListStatusWatching
.plus-episode.action(data-action="increaseEpisode", data-trigger="click") +
else
.plus-episode-dummy +
.anime-list-item-episodes-separator /
.anime-list-item-episodes-max= item.Anime().EpisodeCountString()
.anime-list-item-rating(title="Overall rating")
.action(contenteditable=utils.SameUser(user, viewUser), data-field="Rating.Overall", data-type="number", data-trigger="focusout", data-action="save")= utils.FormatRating(item.Rating.Overall)
//- if item.Status == arn.AnimeListStatusCompleted
//- .anime-list-item-rating(title="Story rating")
//- span.rating-label S:
//- .action(contenteditable=utils.SameUser(user, viewUser), data-field="Rating.Story", data-type="number", data-trigger="focusout", data-action="save")= fmt.Sprintf("%.1f", item.Rating.Story)
//- .anime-list-item-rating(title="Visuals rating")
//- span.rating-label V:
//- .action(contenteditable=utils.SameUser(user, viewUser), data-field="Rating.Visuals", data-type="number", data-trigger="focusout", data-action="save")= fmt.Sprintf("%.1f", item.Rating.Visuals)
//- .anime-list-item-rating(title="Soundtrack rating")
//- span.rating-label M:
//- .action(contenteditable=utils.SameUser(user, viewUser), data-field="Rating.Soundtrack", data-type="number", data-trigger="focusout", data-action="save")= fmt.Sprintf("%.1f", item.Rating.Soundtrack)

8
pages/animelist/animelist.scarlet
View File

@ -1,3 +1,8 @@
.anime-list-user-avatar
position absolute
top calc(content-padding / 2)
left calc(content-padding / 2)
.anime-list-container .anime-list-container
width 100% width 100%
max-width 800px max-width 800px
@ -107,6 +112,9 @@
display none !important display none !important
> 700px > 700px
.anime-list-title
display block
.anime-list-item-airing-date .anime-list-item-airing-date
display flex !important display flex !important
text-align right text-align right

33
pages/animelist/full.pixy Normal file
View File

@ -0,0 +1,33 @@
//- 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)

45
pages/animelist/profileanimelist.go Normal file
View File

@ -0,0 +1,45 @@
package animelist
import (
"net/http"
"github.com/aerogo/aero"
"github.com/animenotifier/arn"
"github.com/animenotifier/notify.moe/components"
"github.com/animenotifier/notify.moe/utils"
)
// 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, ""
}

19
pages/animelist/redirect.go Normal file
View File

@ -0,0 +1,19 @@
package animelist
import (
"net/http"
"github.com/aerogo/aero"
"github.com/animenotifier/notify.moe/utils"
)
// Redirect to the full URL including the user nick.
func Redirect(ctx *aero.Context) string {
user := utils.GetUser(ctx)
if user == nil {
return ctx.Error(http.StatusUnauthorized, "Not logged in", nil)
}
return ctx.Redirect("/+" + user.Nick + ctx.URI())
}

48
pages/animelist/status.go
View File

@ -6,40 +6,66 @@ import (
"github.com/aerogo/aero" "github.com/aerogo/aero"
"github.com/animenotifier/arn" "github.com/animenotifier/arn"
"github.com/animenotifier/notify.moe/components" "github.com/animenotifier/notify.moe/components"
"github.com/animenotifier/notify.moe/pages/frontpage"
"github.com/animenotifier/notify.moe/utils" "github.com/animenotifier/notify.moe/utils"
"github.com/animenotifier/notify.moe/utils/infinitescroll"
) )
const maxAnimeListItems = 50
// FilterByStatus returns a handler for the given anime list item status. // FilterByStatus returns a handler for the given anime list item status.
func FilterByStatus(status string) aero.Handle { func FilterByStatus(status string) aero.Handle {
return func(ctx *aero.Context) string { return func(ctx *aero.Context) string {
user := utils.GetUser(ctx) user := utils.GetUser(ctx)
list, response := statusList(ctx, status)
if response != "" { if user == nil {
return response return frontpage.Get(ctx)
} }
return ctx.HTML(components.ProfileAnimeListFilteredByStatus(list, list.User(), user, status, ctx.URI())) return HomeAnimeList(ctx, user, status)
} }
} }
// statusList handles the request for an anime list with a given status. // HomeAnimeList renders the anime list items.
func statusList(ctx *aero.Context, status string) (*arn.AnimeList, string) { func HomeAnimeList(ctx *aero.Context, user *arn.User, status string) string {
nick := ctx.Get("nick") nick := ctx.Get("nick")
index, _ := ctx.GetInt("index")
viewUser, err := arn.GetUserByNick(nick) viewUser, err := arn.GetUserByNick(nick)
if err != nil { if err != nil {
return nil, ctx.Error(http.StatusNotFound, "User not found", err) return ctx.Error(http.StatusNotFound, "User not found", err)
} }
// Fetch all eligible items
animeList := viewUser.AnimeList() animeList := viewUser.AnimeList()
if animeList == nil { if animeList == nil {
return nil, ctx.Error(http.StatusNotFound, "Anime list not found", nil) return ctx.Error(http.StatusNotFound, "Anime list not found", nil)
} }
watchingList := animeList.FilterStatus(status) animeList = animeList.FilterStatus(status)
watchingList.Sort()
return watchingList, "" // Sort the items
animeList.Sort()
// These are all animer list items for the given status
allItems := animeList.Items
// Slice the part that we need
items := allItems[index:]
if len(items) > maxAnimeListItems {
items = items[:maxAnimeListItems]
}
// Next index
nextIndex := infinitescroll.NextIndex(ctx, len(allItems), maxAnimeListItems, index)
// In case we're scrolling, send items only (without the page frame)
if index > 0 {
return ctx.HTML(components.AnimeListScrollable(items, viewUser, user))
}
// Otherwise, send the full page
return ctx.HTML(components.HomeAnimeList(items, nextIndex, viewUser, user, status))
} }

13
pages/animelist/status.pixy
View File

@ -1,12 +1,3 @@
component ProfileAnimeListFilteredByStatus(animeList *arn.AnimeList, viewUser *arn.User, user *arn.User, status string, uri string) component ProfileAnimeListItems(animeListItems []*arn.AnimeListItem, viewUser *arn.User, user *arn.User, status string, uri string)
ProfileHeader(viewUser, user, uri) ProfileHeader(viewUser, user, uri)
AnimeListItems(animeListItems, -1, viewUser, user)
AnimeListFilteredByStatus(animeList.Items, -1, viewUser, user, status)
component AnimeListFilteredByStatus(animeListItems []*arn.AnimeListItem, nextIndex int, viewUser *arn.User, user *arn.User, status string)
if len(animeListItems) == 0
p.no-data.mountable= viewUser.Nick + " hasn't added any anime to this list yet."
else
.anime-list-container
//- h3.status-name= arn.ListItemStatusName(status)
AnimeList(animeListItems, nextIndex, viewUser, user)

2
pages/embed/embed.pixy
View File

@ -6,7 +6,7 @@ component ExtensionNavigation(user *arn.User)
button.action(data-trigger="click", data-action="toggleSidebar") button.action(data-trigger="click", data-action="toggleSidebar")
RawIcon("bars") RawIcon("bars")
if user != nil if user != nil && !user.IsPro()
.spacer .spacer
a.button(href="/support", target="_blank") a.button(href="/support", target="_blank")

88
pages/home/animelist.go
View File

@ -1,88 +0,0 @@
package home
import (
"net/http"
"github.com/aerogo/aero"
"github.com/animenotifier/arn"
"github.com/animenotifier/notify.moe/components"
"github.com/animenotifier/notify.moe/pages/frontpage"
"github.com/animenotifier/notify.moe/utils"
"github.com/animenotifier/notify.moe/utils/infinitescroll"
)
const maxAnimeListItems = 50
// FilterByStatus returns a handler for the given anime list item status.
func FilterByStatus(status string) aero.Handle {
return func(ctx *aero.Context) string {
user := utils.GetUser(ctx)
if user == nil {
return frontpage.Get(ctx)
}
return AnimeListItems(ctx, user, status)
}
}
// // AnimeList sends the anime list with the given status for given user.
// func AnimeList(ctx *aero.Context, user *arn.User, status string) string {
// viewUser := user
// animeList := viewUser.AnimeList()
// if animeList == nil {
// return ctx.Error(http.StatusNotFound, "Anime list not found", nil)
// }
// animeList = animeList.FilterStatus(status)
// animeList.Sort()
// items := animeList.Items
// if len(items) > maxAnimeListItems {
// items = items[:maxAnimeListItems]
// }
// fmt.Println(len(items))
// return ctx.HTML(components.Home(items, viewUser, user, status))
// }
// AnimeListItems renders the anime list items.
func AnimeListItems(ctx *aero.Context, user *arn.User, status string) string {
viewUser := user
index, _ := ctx.GetInt("index")
// Fetch all eligible items
animeList := viewUser.AnimeList()
if animeList == nil {
return ctx.Error(http.StatusNotFound, "Anime list not found", nil)
}
animeList = animeList.FilterStatus(status)
// Sort the items
animeList.Sort()
// These are all animer list items for the given status
allItems := animeList.Items
// Slice the part that we need
items := allItems[index:]
if len(items) > maxAnimeListItems {
items = items[:maxAnimeListItems]
}
// Next index
nextIndex := infinitescroll.NextIndex(ctx, len(allItems), maxAnimeListItems, index)
// In case we're scrolling, send items only (without the page frame)
if index > 0 {
return ctx.HTML(components.AnimeListScrollable(items, viewUser, user))
}
// Otherwise, send the full page
return ctx.HTML(components.Home(items, nextIndex, viewUser, user, status))
}

3
pages/home/home.go
View File

@ -14,6 +14,5 @@ func Get(ctx *aero.Context) string {
return frontpage.Get(ctx) return frontpage.Get(ctx)
} }
return ctx.Redirect("/animelist/watching") return ctx.Redirect("/+" + user.Nick + "/animelist/watching")
//return AnimeList(ctx, user, arn.AnimeListStatusWatching)
} }

3
pages/home/home.pixy
View File

@ -1,3 +0,0 @@
component Home(animeListItems []*arn.AnimeListItem, nextIndex int, viewUser *arn.User, user *arn.User, status string)
StatusTabs("/animelist")
AnimeListFilteredByStatus(animeListItems, nextIndex, viewUser, user, status)

32
pages/index.go
View File

@ -176,28 +176,28 @@ func Configure(app *aero.Application) {
l.Page("/user/:nick/soundtracks/liked/from/:index", profiletracks.Liked) l.Page("/user/:nick/soundtracks/liked/from/:index", profiletracks.Liked)
l.Page("/user/:nick/stats", profile.GetStatsByUser) l.Page("/user/:nick/stats", profile.GetStatsByUser)
l.Page("/user/:nick/followers", profile.GetFollowers) l.Page("/user/:nick/followers", profile.GetFollowers)
l.Page("/user/:nick/animelist", animelist.Get)
l.Page("/user/:nick/animelist/watching", animelist.FilterByStatus(arn.AnimeListStatusWatching))
l.Page("/user/:nick/animelist/completed", animelist.FilterByStatus(arn.AnimeListStatusCompleted))
l.Page("/user/:nick/animelist/planned", animelist.FilterByStatus(arn.AnimeListStatusPlanned))
l.Page("/user/:nick/animelist/hold", animelist.FilterByStatus(arn.AnimeListStatusHold))
l.Page("/user/:nick/animelist/dropped", animelist.FilterByStatus(arn.AnimeListStatusDropped))
l.Page("/user/:nick/animelist/anime/:id", animelistitem.Get) l.Page("/user/:nick/animelist/anime/:id", animelistitem.Get)
l.Page("/user/:nick/recommended/anime", recommended.Anime) l.Page("/user/:nick/recommended/anime", recommended.Anime)
l.Page("/user/:nick/notifications", notifications.ByUser) l.Page("/user/:nick/notifications", notifications.ByUser)
// Anime list // Anime list
l.Page("/animelist/watching", home.FilterByStatus(arn.AnimeListStatusWatching)) l.Page("/user/:nick/animelist/watching", animelist.FilterByStatus(arn.AnimeListStatusWatching))
l.Page("/animelist/completed", home.FilterByStatus(arn.AnimeListStatusCompleted)) l.Page("/user/:nick/animelist/completed", animelist.FilterByStatus(arn.AnimeListStatusCompleted))
l.Page("/animelist/planned", home.FilterByStatus(arn.AnimeListStatusPlanned)) l.Page("/user/:nick/animelist/planned", animelist.FilterByStatus(arn.AnimeListStatusPlanned))
l.Page("/animelist/hold", home.FilterByStatus(arn.AnimeListStatusHold)) l.Page("/user/:nick/animelist/hold", animelist.FilterByStatus(arn.AnimeListStatusHold))
l.Page("/animelist/dropped", home.FilterByStatus(arn.AnimeListStatusDropped)) l.Page("/user/:nick/animelist/dropped", animelist.FilterByStatus(arn.AnimeListStatusDropped))
l.Page("/animelist/watching/from/:index", home.FilterByStatus(arn.AnimeListStatusWatching)) l.Page("/user/:nick/animelist/watching/from/:index", animelist.FilterByStatus(arn.AnimeListStatusWatching))
l.Page("/animelist/completed/from/:index", home.FilterByStatus(arn.AnimeListStatusCompleted)) l.Page("/user/:nick/animelist/completed/from/:index", animelist.FilterByStatus(arn.AnimeListStatusCompleted))
l.Page("/animelist/planned/from/:index", home.FilterByStatus(arn.AnimeListStatusPlanned)) l.Page("/user/:nick/animelist/planned/from/:index", animelist.FilterByStatus(arn.AnimeListStatusPlanned))
l.Page("/animelist/hold/from/:index", home.FilterByStatus(arn.AnimeListStatusHold)) l.Page("/user/:nick/animelist/hold/from/:index", animelist.FilterByStatus(arn.AnimeListStatusHold))
l.Page("/animelist/dropped/from/:index", home.FilterByStatus(arn.AnimeListStatusDropped)) l.Page("/user/:nick/animelist/dropped/from/:index", animelist.FilterByStatus(arn.AnimeListStatusDropped))
l.Page("/animelist/watching", animelist.Redirect)
l.Page("/animelist/completed", animelist.Redirect)
l.Page("/animelist/planned", animelist.Redirect)
l.Page("/animelist/hold", animelist.Redirect)
l.Page("/animelist/dropped", animelist.Redirect)
// Compare // Compare
l.Page("/compare/animelist/:nick-1/:nick-2", compare.AnimeList) l.Page("/compare/animelist/:nick-1/:nick-2", compare.AnimeList)

13
pages/profile/profile.pixy
View File

@ -24,14 +24,15 @@ component Profile(viewUser *arn.User, user *arn.User, animeList *arn.AnimeList,
component ProfileTabs(viewUser *arn.User, uri string) component ProfileTabs(viewUser *arn.User, uri string)
.tabs .tabs
Tab("Anime", "th", "/+" + viewUser.Nick) Tab("Anime", "th", "/+" + viewUser.Nick)
Tab("Collection", "list", "/+" + viewUser.Nick + "/animelist/watching") //- Tab("Collection", "list", "/+" + viewUser.Nick + "/animelist/watching")
Tab("Forum", "comment", "/+" + viewUser.Nick + "/forum/threads") Tab("Forum", "comment", "/+" + viewUser.Nick + "/forum/threads")
Tab("Tracks", "music", "/+" + viewUser.Nick + "/soundtracks/liked") Tab("Tracks", "music", "/+" + viewUser.Nick + "/soundtracks/liked")
Tab("Stats", "area-chart", "/+" + viewUser.Nick + "/stats") Tab("Stats", "area-chart", "/+" + viewUser.Nick + "/stats")
Tab("Followers", "users", "/+" + viewUser.Nick + "/followers") Tab("Followers", "users", "/+" + viewUser.Nick + "/followers")
if strings.Contains(uri, "/animelist") //- if strings.Contains(uri, "/animelist")
StatusTabs("/+" + viewUser.Nick + "/animelist") //- StatusTabs("/+" + viewUser.Nick + "/animelist")
if strings.Contains(uri, "/soundtracks") if strings.Contains(uri, "/soundtracks")
.tabs .tabs
Tab("Liked", "heart", "/+" + viewUser.Nick + "/soundtracks/liked") Tab("Liked", "heart", "/+" + viewUser.Nick + "/soundtracks/liked")
@ -110,6 +111,12 @@ component ProfileHead(viewUser *arn.User, user *arn.User, uri string)
Icon("user-times") Icon("user-times")
span Unfollow span Unfollow
if user.ID != viewUser.ID
a.button.profile-action.ajax(href="/compare/animelist/" + user.Nick + "/" + viewUser.Nick) a.button.profile-action.ajax(href="/compare/animelist/" + user.Nick + "/" + viewUser.Nick)
Icon("exchange") Icon("exchange")
span Compare span Compare
a.button.profile-action.ajax(href="/+" + viewUser.Nick + "/animelist/watching")
Icon("list")
span Anime list