web/notify.moe
Code Issues Pull Requests Activity

Improved activity overview

Browse Source
This commit is contained in:
Eduard Urbach
2019-08-30 10:02:22 +09:00
parent 17f734da1e
commit 4976e5ab35
6 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
pages/activity/activity.pixy
View File

@ -26,35 +26,43 @@ component ActivitiesScrollable(entries []arn.Activity, user *arn.User)
Activity(entry, user)
component Activity(activity arn.Activity, user *arn.User)
.activity.post-parent.mountable(id=fmt.Sprintf("activity-%s", activity.GetID()), data-api=utils.ActivityAPILink(activity))
.post-author
Avatar(activity.Creator())
.post-content
.post-header
.post-creator
a(href=activity.Creator().Link())= activity.Creator().Nick
if activity.TypeName() == "ActivityCreate"
ActivityCreate(activity.(*arn.ActivityCreate), user)
else if activity.TypeName() == "ActivityConsumeAnime"
ActivityConsumeAnime(activity.(*arn.ActivityConsumeAnime), user)
if activity.TypeName() == "ActivityCreate"
ActivityCreateMeta(activity.(*arn.ActivityCreate), user)
//- .activity.post-parent.mountable(id=fmt.Sprintf("activity-%s", activity.GetID()), data-api=utils.ActivityAPILink(activity))
//- .post-author
//- Avatar(activity.Creator())
//- .post-content
//- .post-header
//- .post-creator
//- a(href=activity.Creator().Link())= activity.Creator().Nick
//- if activity.TypeName() == "ActivityCreate"
//- ActivityCreateMeta(activity.(*arn.ActivityCreate), user)
if user != nil
//- button.post-action.tip.action(data-action="like", data-trigger="click", aria-label="Like")
//- Icon("heart")
//- if activity.TypeName() == "ActivityCreate"
//- span= activity.(*arn.ActivityCreate).Object().CountLikes()
//- else
//- span= len(activity.(*arn.ActivityConsumeAnime).Likes)
//- if user != nil
//- //- button.post-action.tip.action(data-action="like", data-trigger="click", aria-label="Like")
//- //- Icon("heart")
//- //- if activity.TypeName() == "ActivityCreate"
//- //- span= activity.(*arn.ActivityCreate).Object().CountLikes()
//- //- else
//- //- span= len(activity.(*arn.ActivityConsumeAnime).Likes)
if user.ID == activity.GetCreatedBy() && activity.TypeName() == "ActivityConsumeAnime"
button.post-action.tip.action(data-action="deleteObject", data-trigger="click", aria-label="Delete", data-return-path="/activity", data-confirm-type="activity")
RawIcon("trash")
//- if user.ID == activity.GetCreatedBy() && activity.TypeName() == "ActivityConsumeAnime"
//- button.post-action.tip.action(data-action="deleteObject", data-trigger="click", aria-label="Delete", data-return-path="/activity", data-confirm-type="activity")
//- RawIcon("trash")
.post-date.utc-date(data-date=activity.GetCreated())
//- .post-date.utc-date(data-date=activity.GetCreated())
if activity.TypeName() == "ActivityCreate"
ActivityCreateText(activity.(*arn.ActivityCreate), user)
else if activity.TypeName() == "ActivityConsumeAnime"
ActivityConsumeAnimeText(activity.(*arn.ActivityConsumeAnime), user)
//- if activity.TypeName() == "ActivityCreate"
//- ActivityCreateText(activity.(*arn.ActivityCreate), user)
//- else if activity.TypeName() == "ActivityConsumeAnime"
//- ActivityConsumeAnimeText(activity.(*arn.ActivityConsumeAnime), user)
component ActivityConsumeAnime(activity *arn.ActivityConsumeAnime, user *arn.User)
h1 TODO
component ActivityConsumeAnimeText(activity *arn.ActivityConsumeAnime, user *arn.User)
span watched
@ -65,6 +73,9 @@ component ActivityConsumeAnimeText(activity *arn.ActivityConsumeAnime, user *arn
else
span= fmt.Sprintf(" episode %d.", activity.ToEpisode)
component ActivityCreate(activity *arn.ActivityCreate, user *arn.User)
Postable(activity.Postable(), user, false, true, "")
component ActivityCreateMeta(activity *arn.ActivityCreate, user *arn.User)
if activity.ObjectType == "Post"
if activity.Postable().GetParentType() != "User"

8
pages/post/post.pixy
View File

@ -1,11 +1,9 @@
component Post(post *arn.Post, user *arn.User)
.thread
.posts
Postable(post, user, true, "")
Postable(post, user, true, true, "")
.side-note-container.mountable
if user != nil && user.Role == "admin"
if user != nil && user.Role == "admin"
.side-note-container.mountable
a.side-note.tip(href=post.Link() + "/edit", aria-label="Admin Edit")
Icon("edit")
a.side-note(href=post.Parent().Link())= post.Parent().TitleByUser(user)

2
pages/thread/thread.pixy
View File

@ -3,7 +3,7 @@ component Thread(thread *arn.Thread, user *arn.User)
#thread.thread(data-id=thread.ID)
.posts
Postable(thread, user, true, thread.Creator().ID)
Postable(thread, user, true, false, thread.Creator().ID)
//- Reply
if user != nil