Merge pull request #15 from FM1337/go

Added dashboard following list
This commit is contained in:
2017-06-25 00:05:01 +02:00
committed by GitHub
2 changed files with 35 additions and 19 deletions

View File

@ -9,6 +9,7 @@ import (
) )
const maxPosts = 5 const maxPosts = 5
const maxFollowing = 5
// Get dashboard. // Get dashboard.
func Get(ctx *aero.Context) string { func Get(ctx *aero.Context) string {
@ -30,5 +31,19 @@ func Get(ctx *aero.Context) string {
posts = posts[:maxPosts] posts = posts[:maxPosts]
} }
return ctx.HTML(components.Dashboard(posts)) followIDList := user.Following
if len(followIDList) > maxFollowing {
followIDList = followIDList[:maxFollowing]
}
userList, err := arn.DB.GetMany("User", followIDList)
if err != nil {
return ctx.Error(500, "Error fetching followed users", err)
}
followingList := userList.([]*arn.User)
return ctx.HTML(components.Dashboard(posts, followingList))
} }

View File

@ -1,6 +1,6 @@
component Dashboard(posts []*arn.Post) component Dashboard(posts []*arn.Post, following []*arn.User)
h2.page-title Dash h2.page-title Dash
.widgets .widgets
.widget.mountable .widget.mountable
h3.widget-title Schedule h3.widget-title Schedule
@ -10,7 +10,7 @@ component Dashboard(posts []*arn.Post)
.widget-element-text .widget-element-text
Icon("calendar-o") Icon("calendar-o")
span ... span ...
.widget.mountable .widget.mountable
h3.widget-title Forums h3.widget-title Forums
@ -19,7 +19,7 @@ component Dashboard(posts []*arn.Post)
.widget-element-text .widget-element-text
Icon(arn.GetForumIcon(post.Thread().Tags[0])) Icon(arn.GetForumIcon(post.Thread().Tags[0]))
span= post.Thread().Title span= post.Thread().Title
.widget.mountable .widget.mountable
h3.widget-title Groups h3.widget-title Groups
@ -37,16 +37,17 @@ component Dashboard(posts []*arn.Post)
.widget-element-text .widget-element-text
Icon("comment") Icon("comment")
span ... span ...
.widget.mountable
h3.widget-title Contacts
for i := 1; i <= 5; i++ if len(following) > 0
.widget-element .widget.mountable
.widget-element-text h3.widget-title Contacts
Icon("address-card")
span ... each user in following
a.widget-element.ajax(href="/+" + user.Nick)
.widget-element-text
Icon("address-card")
span= user.Nick
.widget.mountable .widget.mountable
h3.widget-title Follow h3.widget-title Follow
@ -54,23 +55,23 @@ component Dashboard(posts []*arn.Post)
.widget-element-text .widget-element-text
Icon("microphone") Icon("microphone")
span Discord span Discord
a.widget-element(href="https://www.facebook.com/animenotifier", target="_blank", rel="noopener") a.widget-element(href="https://www.facebook.com/animenotifier", target="_blank", rel="noopener")
.widget-element-text .widget-element-text
Icon("facebook") Icon("facebook")
span Facebook span Facebook
a.widget-element(href="https://twitter.com/animenotifier", target="_blank", rel="noopener") a.widget-element(href="https://twitter.com/animenotifier", target="_blank", rel="noopener")
.widget-element-text .widget-element-text
Icon("twitter") Icon("twitter")
span Twitter span Twitter
a.widget-element(href="https://plus.google.com/+AnimeReleaseNotifierOfficial", target="_blank", rel="noopener") a.widget-element(href="https://plus.google.com/+AnimeReleaseNotifierOfficial", target="_blank", rel="noopener")
.widget-element-text .widget-element-text
Icon("google-plus") Icon("google-plus")
span Google+ span Google+
a.widget-element(href="https://github.com/animenotifier/notify.moe", target="_blank", rel="noopener") a.widget-element(href="https://github.com/animenotifier/notify.moe", target="_blank", rel="noopener")
.widget-element-text .widget-element-text
Icon("github") Icon("github")
span GitHub span GitHub