From ea93ff2a48829408ca4970a90490e1fcb0397689 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Thu, 8 Sep 2022 09:42:07 +0100 Subject: [PATCH] Moved posts list components no issue - relocated screen-specific components into a separate `posts-list/` directory as part of the move to keep the top-level `components/` directory for re-usable components --- .../content-filter.hbs} | 0 .../content-filter.js} | 2 +- .../{gh-posts-list-item.hbs => posts-list/list-item.hbs} | 0 .../{gh-posts-list-item.js => posts-list/list-item.js} | 2 +- ghost/admin/app/templates/pages-loading.hbs | 2 +- ghost/admin/app/templates/pages.hbs | 7 ++++--- ghost/admin/app/templates/posts-loading.hbs | 2 +- ghost/admin/app/templates/posts.hbs | 9 +++++---- 8 files changed, 13 insertions(+), 11 deletions(-) rename ghost/admin/app/components/{gh-contentfilter.hbs => posts-list/content-filter.hbs} (100%) rename ghost/admin/app/components/{gh-contentfilter.js => posts-list/content-filter.js} (94%) rename ghost/admin/app/components/{gh-posts-list-item.hbs => posts-list/list-item.hbs} (100%) rename ghost/admin/app/components/{gh-posts-list-item.js => posts-list/list-item.js} (92%) diff --git a/ghost/admin/app/components/gh-contentfilter.hbs b/ghost/admin/app/components/posts-list/content-filter.hbs similarity index 100% rename from ghost/admin/app/components/gh-contentfilter.hbs rename to ghost/admin/app/components/posts-list/content-filter.hbs diff --git a/ghost/admin/app/components/gh-contentfilter.js b/ghost/admin/app/components/posts-list/content-filter.js similarity index 94% rename from ghost/admin/app/components/gh-contentfilter.js rename to ghost/admin/app/components/posts-list/content-filter.js index 72736c778a..5d9011d545 100644 --- a/ghost/admin/app/components/gh-contentfilter.js +++ b/ghost/admin/app/components/posts-list/content-filter.js @@ -2,7 +2,7 @@ import Component from '@glimmer/component'; import {get} from '@ember/object'; import {inject as service} from '@ember/service'; -export default class GhContentfilterComponent extends Component { +export default class PostsListContentFilter extends Component { @service customViews; @service feature; @service router; diff --git a/ghost/admin/app/components/gh-posts-list-item.hbs b/ghost/admin/app/components/posts-list/list-item.hbs similarity index 100% rename from ghost/admin/app/components/gh-posts-list-item.hbs rename to ghost/admin/app/components/posts-list/list-item.hbs diff --git a/ghost/admin/app/components/gh-posts-list-item.js b/ghost/admin/app/components/posts-list/list-item.js similarity index 92% rename from ghost/admin/app/components/gh-posts-list-item.js rename to ghost/admin/app/components/posts-list/list-item.js index 3c62f6b1b5..08d299aeee 100644 --- a/ghost/admin/app/components/gh-posts-list-item.js +++ b/ghost/admin/app/components/posts-list/list-item.js @@ -4,7 +4,7 @@ import {formatPostTime} from 'ghost-admin/helpers/gh-format-post-time'; import {inject as service} from '@ember/service'; import {tracked} from '@glimmer/tracking'; -export default class GhPostsListItemComponent extends Component { +export default class PostsListItem extends Component { @service feature; @service session; @service settings; diff --git a/ghost/admin/app/templates/pages-loading.hbs b/ghost/admin/app/templates/pages-loading.hbs index 6c5f1ce7eb..69375fa0c8 100644 --- a/ghost/admin/app/templates/pages-loading.hbs +++ b/ghost/admin/app/templates/pages-loading.hbs @@ -3,7 +3,7 @@
-
- + data-test-page-id={{page.id}} + /> {{else}}
  • diff --git a/ghost/admin/app/templates/posts-loading.hbs b/ghost/admin/app/templates/posts-loading.hbs index 9b3ff67c67..b0dcf4b11d 100644 --- a/ghost/admin/app/templates/posts-loading.hbs +++ b/ghost/admin/app/templates/posts-loading.hbs @@ -2,7 +2,7 @@
    -
    -
    Title
    - + {{#if (and this.feature.memberAttribution (not this.session.user.isContributor)) }}
    Signups
    @@ -49,9 +49,10 @@ {{/if}} {{#each this.postsInfinityModel as |post|}} - + data-test-post-id={{post.id}} + /> {{else}}