From 942fdf54864c1a4c92fbbbb9f83ad26a7ab0f936 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 31 Aug 2021 01:30:21 -0600 Subject: [PATCH] Update components --- resources/assets/js/app.js | 28 +++- resources/assets/js/components/Activity.vue | 15 ++ .../assets/js/components/ComposeModal.vue | 17 +- .../assets/js/components/DirectMessage.vue | 150 ++++++++++------- .../assets/js/components/NotificationCard.vue | 15 ++ .../assets/js/components/PostComponent.vue | 15 +- resources/assets/js/components/Profile.vue | 19 +-- .../js/components/StoryTimelineComponent.vue | 158 +++++++++++------- resources/assets/js/components/Timeline.vue | 5 +- .../js/components/partials/StatusCard.vue | 4 +- 10 files changed, 267 insertions(+), 159 deletions(-) diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 8471cd6d4..07c7fe8e6 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -103,6 +103,32 @@ window.App.util = { } return Math.floor(seconds) + "s"; }), + timeAhead: (function(ts) { + let date = Date.parse(ts); + let diff = date - Date.parse(new Date()); + let seconds = Math.floor((diff) / 1000); + let interval = Math.floor(seconds / 63072000); + if (interval >= 1) { + return interval + "y"; + } + interval = Math.floor(seconds / 604800); + if (interval >= 1) { + return interval + "w"; + } + interval = Math.floor(seconds / 86400); + if (interval >= 1) { + return interval + "d"; + } + interval = Math.floor(seconds / 3600); + if (interval >= 1) { + return interval + "h"; + } + interval = Math.floor(seconds / 60); + if (interval >= 1) { + return interval + "m"; + } + return Math.floor(seconds) + "s"; + }), rewriteLinks: (function(i) { let tag = i.innerText; @@ -233,7 +259,7 @@ window.App.util = { $('#navbarDropdown img').attr('src',window._sharedData.curUser.avatar) .removeClass('d-none') .addClass('rounded-circle border shadow') - .attr('width', 34).attr('height', 34); + .attr('width', 38).attr('height', 38); }) }; diff --git a/resources/assets/js/components/Activity.vue b/resources/assets/js/components/Activity.vue index 6e03b1779..2b3e68686 100644 --- a/resources/assets/js/components/Activity.vue +++ b/resources/assets/js/components/Activity.vue @@ -27,6 +27,21 @@ {{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} commented on your post.

+
+

+ {{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} commented on your group post. +

+
+
+

+ {{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} reacted to your story. +

+
+
+

+ {{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} commented on your story. +

+

{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} mentioned you. diff --git a/resources/assets/js/components/ComposeModal.vue b/resources/assets/js/components/ComposeModal.vue index 076a0c746..acc332f2d 100644 --- a/resources/assets/js/components/ComposeModal.vue +++ b/resources/assets/js/components/ComposeModal.vue @@ -68,7 +68,7 @@

- +
@@ -241,7 +241,7 @@
- +

@@ -253,7 +253,7 @@

-
+
@@ -275,7 +275,7 @@
-
+
@@ -285,13 +285,13 @@ BETA

-

Add Photo to Story

+

Add to your story

- +
@@ -313,8 +313,8 @@
-
- +
+

@@ -329,7 +329,6 @@

-

Help

diff --git a/resources/assets/js/components/DirectMessage.vue b/resources/assets/js/components/DirectMessage.vue index 3f2346870..09861c78c 100644 --- a/resources/assets/js/components/DirectMessage.vue +++ b/resources/assets/js/components/DirectMessage.vue @@ -80,14 +80,32 @@

{{convo.text}}

+

+ + + {{convo.meta.reaction}} + +

+ + + + {{convo.meta.caption}} + +

{{convo.text}}

-

{{convo.timeAgo}}

+

+ {{ convo.meta.story_actor_username }} reacted your story +

+

+ {{ convo.meta.story_actor_username }} replied to your story +

+

{{convo.timeAgo}}

 

-
+

@@ -127,10 +145,28 @@

{{convo.text}}

+

+ + + {{convo.meta.reaction}} + +

+ + + + {{convo.meta.caption}} + +

{{convo.text}}

-

{{convo.timeAgo}} +

+ You reacted to {{ convo.meta.story_username }}'s story +

+

+ You replied to {{ convo.meta.story_username }}'s story +

+

{{convo.timeAgo}}

 

@@ -262,60 +298,60 @@ - diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 88dffefa7..b04cc298d 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -10,7 +10,7 @@
- +
@@ -103,6 +103,7 @@ :class="{ 'border-top': index === 0 }" :status="status" :reaction-bar="reactionBar" + size="small" v-on:status-delete="deleteStatus" v-on:comment-focus="commentFocus" /> @@ -942,7 +943,7 @@ }, hasStory() { - axios.get('/api/stories/v0/exists/'+this.profile.id) + axios.get('/api/web/stories/v1/exists/'+this.profile.id) .then(res => { this.userStory = res.data; }) diff --git a/resources/assets/js/components/partials/StatusCard.vue b/resources/assets/js/components/partials/StatusCard.vue index 04cc34226..d7e04144e 100644 --- a/resources/assets/js/components/partials/StatusCard.vue +++ b/resources/assets/js/components/partials/StatusCard.vue @@ -125,8 +125,8 @@

- -

+ +