diff --git a/src/views/NewActivityView.vue b/src/views/NewActivityView.vue index f1f0ed1a..1f01b408 100644 --- a/src/views/NewActivityView.vue +++ b/src/views/NewActivityView.vue @@ -32,9 +32,9 @@ @click="expandOffersToUserAndMarkRead()" /> - + See all - +
@@ -99,9 +99,12 @@ @click="expandOffersToUserProjectsAndMarkRead()" />
- + See all - +
@@ -246,7 +249,7 @@ export default class NewActivityView extends Vue { async expandOffersToUserAndMarkRead() { this.showOffersDetails = !this.showOffersDetails; - if (this.showOffersDetails) { + if (this.showOffersDetails && this.newOffersToUser.length > 0) { await this.$updateSettings({ lastAckedOfferToUserJwtId: this.newOffersToUser[0].jwtId, }); @@ -283,7 +286,10 @@ export default class NewActivityView extends Vue { async expandOffersToUserProjectsAndMarkRead() { this.showOffersToUserProjectsDetails = !this.showOffersToUserProjectsDetails; - if (this.showOffersToUserProjectsDetails) { + if ( + this.showOffersToUserProjectsDetails && + this.newOffersToUserProjects.length > 0 + ) { await this.$updateSettings({ lastAckedOfferToUserProjectsJwtId: this.newOffersToUserProjects[0].jwtId, @@ -291,7 +297,7 @@ export default class NewActivityView extends Vue { // note that we don't update this.lastAckedOfferToUserProjectsJwtId in case // they later choose the last one to keep the offers as new this.notify.info( - "The offers are now marked as viewed. Click in the list to keep them as new.", + "The offers are marked as viewed. Click in the list to keep them as new.", TIMEOUTS.LONG, ); } @@ -319,5 +325,13 @@ export default class NewActivityView extends Vue { TIMEOUTS.STANDARD, ); } + + async handleSeeAllOffersToUser() { + this.$router.push("/recent-offers-to-user"); + } + + async handleSeeAllOffersToUserProjects() { + this.$router.push("/recent-offers-to-user-projects"); + } } diff --git a/src/views/RecentOffersToUserProjectsView.vue b/src/views/RecentOffersToUserProjectsView.vue index 9c7d9e14..455098bb 100644 --- a/src/views/RecentOffersToUserProjectsView.vue +++ b/src/views/RecentOffersToUserProjectsView.vue @@ -32,20 +32,20 @@
-