diff --git a/ghost/admin/app/components/posts/post-activity-feed.hbs b/ghost/admin/app/components/posts/post-activity-feed.hbs index d4f47fa849..7669d4c3d2 100644 --- a/ghost/admin/app/components/posts/post-activity-feed.hbs +++ b/ghost/admin/app/components/posts/post-activity-feed.hbs @@ -9,71 +9,104 @@ {{/if}} - {{#each eventsFetcher.data as |event|}} - {{#let (parse-member-event event) as |parsedEvent|}} -
-
- - {{parsedEvent.subject}} -
-
- {{svg-jar parsedEvent.icon }} - - - {{capitalize-first-letter parsedEvent.action}} + {{#if (eq eventsFetcher.totalEvents 0)}} +
+
+ {{#if (eq this.eventType "sent")}} + {{svg-jar "empty-sent"}} +

No members have received your email yet

+

Once someone receives your email, you'll be able to see the member activity here.

+ {{else if (eq this.eventType "opened")}} + {{svg-jar "empty-opened"}} +

No members have opened your email yet

+

Once someone opens your email, you'll be able to see the member activity here.

+ {{else if (eq this.eventType "clicked")}} + {{svg-jar "empty-clicked"}} +

No members have clicked in your email yet

+

Once someone clicks in your email, you'll be able to see the member activity here.

+ {{else if (eq this.eventType "feedback")}} + {{svg-jar "empty-feedback"}} +

No members have responded with feedback yet

+

Once someone has responded with feedback, you'll be able to see the member activity here.

+ {{else if (eq this.eventType "conversion")}} + {{svg-jar "empty-conversion"}} +

No members have signed up or upgraded yet

+

Once someone has signed up or upgraded, you'll be able to see the member activity here.

+ {{/if}} +
+
+ {{else}} + {{#each eventsFetcher.data as |event|}} + {{#let (parse-member-event event) as |parsedEvent|}} +
+
+ + {{parsedEvent.subject}} +
+
+ {{svg-jar parsedEvent.icon }} + + + {{capitalize-first-letter parsedEvent.action}} + - +
+
+ {{moment-from-now parsedEvent.timestamp}} +
-
- {{moment-from-now parsedEvent.timestamp}} -
-
- {{/let}} - {{/each}} - - {{#let (compute (fn this.getAmountOfStubs eventsFetcher)) as |stubs|}} - {{#each stubs}} -
+ {{/let}} {{/each}} - {{/let}} -
-
-
- + {{#let (compute (fn this.getAmountOfStubs eventsFetcher)) as |stubs|}} + {{#each stubs}} +
+
+
+
+
+ {{/each}} + {{/let}} - +
+
+
+ + + +
+ + Showing {{eventsFetcher.previousEvents}}-{{eventsFetcher.shownEvents}} of {{eventsFetcher.totalEvents}}
- Showing {{eventsFetcher.previousEvents}}-{{eventsFetcher.shownEvents}} of {{eventsFetcher.totalEvents}} + {{#if (and @linkQuery @linkText)}} + + {{svg-jar "filter"}} + {{@linkText}} + + {{/if}}
- {{#if (and @linkQuery @linkText)}} - - {{svg-jar "filter"}} - {{@linkText}} - - {{/if}} -
+ {{/if}} {{/let}}
\ No newline at end of file diff --git a/ghost/admin/app/components/posts/post-activity-feed.js b/ghost/admin/app/components/posts/post-activity-feed.js index e02f6ae145..c487c27693 100644 --- a/ghost/admin/app/components/posts/post-activity-feed.js +++ b/ghost/admin/app/components/posts/post-activity-feed.js @@ -32,6 +32,10 @@ export default class PostActivityFeed extends Component { return this._pageSize; } + get eventType() { + return this.args.eventType; + } + // calculate amount of empty rows which require to keep table height the same for each tab/page @action getAmountOfStubs({data}) { diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css index 896b0f8c5e..f8e140a884 100644 --- a/ghost/admin/app/styles/layouts/content.css +++ b/ghost/admin/app/styles/layouts/content.css @@ -1694,6 +1694,33 @@ a.gh-post-list-cta.stats.is-hovered:hover > * { font-size: 1.25rem; } +.gh-post-activity-feed .gh-dashboard-list-item { + align-items: center; +} + +.gh-post-activity-feed .gh-post-activity-feed-dummy { + width: 40%; + height: 8px; + border-radius: 3px; + background: linear-gradient(90deg, #F2F6F7 0%, rgba(242, 246, 247, 0.842589) 62.56%, rgba(247, 250, 252, 0.75) 99.36%); +} + +.gh-post-activity-feed .gh-post-activity-feed-dummy:nth-child(2) { + width: 30%; +} + +.gh-post-activity-feed .gh-post-activity-feed-dummy:nth-child(3) { + width: 10%; +} + +.gh-post-activity-feed-empty { + width: 100%; + height: 277px; + display: flex; + justify-content: center; + align-items: center; +} + .gh-post-activity-feed-pagination svg { width: 7px; height: 12px; @@ -1706,7 +1733,7 @@ a.gh-post-list-cta.stats.is-hovered:hover > * { align-items: center; justify-content: space-between; gap: 16px; - margin-top: 16px; + margin-top: 2px; border-top: 1px solid #eceef0; padding: 18px 0; } diff --git a/ghost/admin/app/styles/layouts/dashboard.css b/ghost/admin/app/styles/layouts/dashboard.css index a9523ebf8b..74479ddf82 100644 --- a/ghost/admin/app/styles/layouts/dashboard.css +++ b/ghost/admin/app/styles/layouts/dashboard.css @@ -1231,6 +1231,8 @@ Dashboard Attribution */ line-height: 1.45em; margin: 0; padding: 0; + font-size: 1.4rem; + font-weight: 500; } .attribution-list-empty svg { diff --git a/ghost/admin/public/assets/icons/empty-clicked.svg b/ghost/admin/public/assets/icons/empty-clicked.svg new file mode 100644 index 0000000000..00917ca16d --- /dev/null +++ b/ghost/admin/public/assets/icons/empty-clicked.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ghost/admin/public/assets/icons/empty-conversion.svg b/ghost/admin/public/assets/icons/empty-conversion.svg new file mode 100644 index 0000000000..d6693e3437 --- /dev/null +++ b/ghost/admin/public/assets/icons/empty-conversion.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ghost/admin/public/assets/icons/empty-feedback.svg b/ghost/admin/public/assets/icons/empty-feedback.svg new file mode 100644 index 0000000000..f68ed6ac0c --- /dev/null +++ b/ghost/admin/public/assets/icons/empty-feedback.svg @@ -0,0 +1,3 @@ + + + diff --git a/ghost/admin/public/assets/icons/empty-opened.svg b/ghost/admin/public/assets/icons/empty-opened.svg new file mode 100644 index 0000000000..76b86926a2 --- /dev/null +++ b/ghost/admin/public/assets/icons/empty-opened.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ghost/admin/public/assets/icons/empty-sent.svg b/ghost/admin/public/assets/icons/empty-sent.svg new file mode 100644 index 0000000000..352a57e217 --- /dev/null +++ b/ghost/admin/public/assets/icons/empty-sent.svg @@ -0,0 +1,11 @@ + + + + + + + + + + +