From 7582ab051eed3565299fd8fc85653dcab578f5b3 Mon Sep 17 00:00:00 2001 From: James Koster Date: Thu, 30 May 2024 12:38:20 +0100 Subject: [PATCH 1/4] Pages data view: Update view icons --- .../sidebar-dataviews/default-views.js | 8 ++++---- packages/icons/src/index.js | 1 + packages/icons/src/library/draft.js | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 packages/icons/src/library/draft.js diff --git a/packages/edit-site/src/components/sidebar-dataviews/default-views.js b/packages/edit-site/src/components/sidebar-dataviews/default-views.js index 6a10e0cd95d7b3..e3893e6c8d0030 100644 --- a/packages/edit-site/src/components/sidebar-dataviews/default-views.js +++ b/packages/edit-site/src/components/sidebar-dataviews/default-views.js @@ -2,7 +2,7 @@ * WordPress dependencies */ import { __ } from '@wordpress/i18n'; -import { trash, pages, drafts } from '@wordpress/icons'; +import { trash, pages, draft, page, calendar } from '@wordpress/icons'; /** * Internal dependencies @@ -57,7 +57,7 @@ export const DEFAULT_VIEWS = { { title: __( 'Published' ), slug: 'published', - icon: pages, + icon: page, view: { ...DEFAULT_PAGE_BASE, filters: [ @@ -72,7 +72,7 @@ export const DEFAULT_VIEWS = { { title: __( 'Scheduled' ), slug: 'future', - icon: pages, + icon: calendar, view: { ...DEFAULT_PAGE_BASE, filters: [ @@ -87,7 +87,7 @@ export const DEFAULT_VIEWS = { { title: __( 'Drafts' ), slug: 'drafts', - icon: drafts, + icon: draft, view: { ...DEFAULT_PAGE_BASE, filters: [ diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js index 5ee2eb6ba50c20..7414d8ee0ee1bc 100644 --- a/packages/icons/src/index.js +++ b/packages/icons/src/index.js @@ -70,6 +70,7 @@ export { default as currencyPound } from './library/currency-pound'; export { default as customPostType } from './library/custom-post-type'; export { default as desktop } from './library/desktop'; export { default as details } from './library/details'; +export { default as draft } from './library/draft'; export { default as drafts } from './library/drafts'; export { default as dragHandle } from './library/drag-handle'; export { default as drawerLeft } from './library/drawer-left'; diff --git a/packages/icons/src/library/draft.js b/packages/icons/src/library/draft.js new file mode 100644 index 00000000000000..ce00c68646812a --- /dev/null +++ b/packages/icons/src/library/draft.js @@ -0,0 +1,16 @@ +/** + * WordPress dependencies + */ +import { SVG, Path } from '@wordpress/primitives'; + +const draft = ( + + + +); + +export default draft; From 949ef76567fe49961d9cfb1cf651d521b800cf96 Mon Sep 17 00:00:00 2001 From: James Koster Date: Fri, 31 May 2024 14:58:43 +0100 Subject: [PATCH 2/4] Remove draft icon --- .../sidebar-dataviews/default-views.js | 4 ++-- packages/icons/src/index.js | 1 - packages/icons/src/library/draft.js | 16 ---------------- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 packages/icons/src/library/draft.js diff --git a/packages/edit-site/src/components/sidebar-dataviews/default-views.js b/packages/edit-site/src/components/sidebar-dataviews/default-views.js index e3893e6c8d0030..6ee44a862c9b22 100644 --- a/packages/edit-site/src/components/sidebar-dataviews/default-views.js +++ b/packages/edit-site/src/components/sidebar-dataviews/default-views.js @@ -2,7 +2,7 @@ * WordPress dependencies */ import { __ } from '@wordpress/i18n'; -import { trash, pages, draft, page, calendar } from '@wordpress/icons'; +import { trash, pages, drafts, page, calendar } from '@wordpress/icons'; /** * Internal dependencies @@ -87,7 +87,7 @@ export const DEFAULT_VIEWS = { { title: __( 'Drafts' ), slug: 'drafts', - icon: draft, + icon: drafts, view: { ...DEFAULT_PAGE_BASE, filters: [ diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js index 7414d8ee0ee1bc..5ee2eb6ba50c20 100644 --- a/packages/icons/src/index.js +++ b/packages/icons/src/index.js @@ -70,7 +70,6 @@ export { default as currencyPound } from './library/currency-pound'; export { default as customPostType } from './library/custom-post-type'; export { default as desktop } from './library/desktop'; export { default as details } from './library/details'; -export { default as draft } from './library/draft'; export { default as drafts } from './library/drafts'; export { default as dragHandle } from './library/drag-handle'; export { default as drawerLeft } from './library/drawer-left'; diff --git a/packages/icons/src/library/draft.js b/packages/icons/src/library/draft.js deleted file mode 100644 index ce00c68646812a..00000000000000 --- a/packages/icons/src/library/draft.js +++ /dev/null @@ -1,16 +0,0 @@ -/** - * WordPress dependencies - */ -import { SVG, Path } from '@wordpress/primitives'; - -const draft = ( - - - -); - -export default draft; From 5fb0a592e2fceef72511e3e3635e679e3211fd3a Mon Sep 17 00:00:00 2001 From: James Koster Date: Fri, 31 May 2024 15:10:03 +0100 Subject: [PATCH 3/4] Add published, scheduled icons. Update drafts. --- .../sidebar-dataviews/default-views.js | 6 +++--- packages/icons/src/index.js | 2 ++ packages/icons/src/library/drafts.js | 2 +- packages/icons/src/library/published.js | 16 ++++++++++++++++ packages/icons/src/library/scheduled.js | 16 ++++++++++++++++ 5 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 packages/icons/src/library/published.js create mode 100644 packages/icons/src/library/scheduled.js diff --git a/packages/edit-site/src/components/sidebar-dataviews/default-views.js b/packages/edit-site/src/components/sidebar-dataviews/default-views.js index 6ee44a862c9b22..4493df900039a5 100644 --- a/packages/edit-site/src/components/sidebar-dataviews/default-views.js +++ b/packages/edit-site/src/components/sidebar-dataviews/default-views.js @@ -2,7 +2,7 @@ * WordPress dependencies */ import { __ } from '@wordpress/i18n'; -import { trash, pages, drafts, page, calendar } from '@wordpress/icons'; +import { trash, pages, drafts, published, scheduled } from '@wordpress/icons'; /** * Internal dependencies @@ -57,7 +57,7 @@ export const DEFAULT_VIEWS = { { title: __( 'Published' ), slug: 'published', - icon: page, + icon: published, view: { ...DEFAULT_PAGE_BASE, filters: [ @@ -72,7 +72,7 @@ export const DEFAULT_VIEWS = { { title: __( 'Scheduled' ), slug: 'future', - icon: calendar, + icon: scheduled, view: { ...DEFAULT_PAGE_BASE, filters: [ diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js index 5ee2eb6ba50c20..119b101f65ef5d 100644 --- a/packages/icons/src/index.js +++ b/packages/icons/src/index.js @@ -196,6 +196,7 @@ export { default as previous } from './library/previous'; export { default as next } from './library/next'; export { default as offline } from './library/offline'; export { default as preformatted } from './library/preformatted'; +export { default as published } from './library/published'; export { default as pullLeft } from './library/pull-left'; export { default as pullRight } from './library/pull-right'; export { default as pullquote } from './library/pullquote'; @@ -220,6 +221,7 @@ export { default as rss } from './library/rss'; export { default as search } from './library/search'; export { default as seen } from './library/seen'; export { default as unseen } from './library/unseen'; +export { default as scheduled } from './library/scheduled'; export { default as separator } from './library/separator'; export { default as settings } from './library/settings'; export { default as shadow } from './library/shadow'; diff --git a/packages/icons/src/library/drafts.js b/packages/icons/src/library/drafts.js index 8744c35dfd4dbe..14e2c3a9345f1b 100644 --- a/packages/icons/src/library/drafts.js +++ b/packages/icons/src/library/drafts.js @@ -8,7 +8,7 @@ const drafts = ( ); diff --git a/packages/icons/src/library/published.js b/packages/icons/src/library/published.js new file mode 100644 index 00000000000000..c23745caca7459 --- /dev/null +++ b/packages/icons/src/library/published.js @@ -0,0 +1,16 @@ +/** + * WordPress dependencies + */ +import { SVG, Path } from '@wordpress/primitives'; + +const published = ( + + + +); + +export default published; diff --git a/packages/icons/src/library/scheduled.js b/packages/icons/src/library/scheduled.js new file mode 100644 index 00000000000000..84c2f01546e6da --- /dev/null +++ b/packages/icons/src/library/scheduled.js @@ -0,0 +1,16 @@ +/** + * WordPress dependencies + */ +import { SVG, Path } from '@wordpress/primitives'; + +const scheduled = ( + + + +); + +export default scheduled; From 35fb94b2bdcd670f34bafef4ed2d70e8ca94e48f Mon Sep 17 00:00:00 2001 From: James Koster Date: Fri, 31 May 2024 15:57:59 +0100 Subject: [PATCH 4/4] Update icons for private / pending --- .../sidebar-dataviews/default-views.js | 12 ++++++++++-- packages/icons/src/index.js | 2 ++ packages/icons/src/library/not-allowed.js | 16 ++++++++++++++++ packages/icons/src/library/pending.js | 16 ++++++++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 packages/icons/src/library/not-allowed.js create mode 100644 packages/icons/src/library/pending.js diff --git a/packages/edit-site/src/components/sidebar-dataviews/default-views.js b/packages/edit-site/src/components/sidebar-dataviews/default-views.js index 9d54fa8837f875..e7c2471fe44bc7 100644 --- a/packages/edit-site/src/components/sidebar-dataviews/default-views.js +++ b/packages/edit-site/src/components/sidebar-dataviews/default-views.js @@ -2,7 +2,15 @@ * WordPress dependencies */ import { __ } from '@wordpress/i18n'; -import { trash, pages, drafts, published, scheduled, pending, private } from '@wordpress/icons'; +import { + trash, + pages, + drafts, + published, + scheduled, + pending, + notAllowed, +} from '@wordpress/icons'; /** * Internal dependencies @@ -117,7 +125,7 @@ export const DEFAULT_VIEWS = { { title: __( 'Private' ), slug: 'private', - icon: private, + icon: notAllowed, view: { ...DEFAULT_PAGE_BASE, filters: [ diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js index 119b101f65ef5d..c5d5976dd2d5f7 100644 --- a/packages/icons/src/index.js +++ b/packages/icons/src/index.js @@ -160,6 +160,7 @@ export { default as moreHorizontalMobile } from './library/more-horizontal-mobil export { default as moreVertical } from './library/more-vertical'; export { default as moveTo } from './library/move-to'; export { default as navigation } from './library/navigation'; +export { default as notAllowed } from './library/not-allowed'; export { default as notFound } from './library/not-found'; export { default as overlayText } from './library/overlay-text'; export { default as pageBreak } from './library/page-break'; @@ -168,6 +169,7 @@ export { default as page } from './library/page'; export { default as pages } from './library/pages'; export { default as paragraph } from './library/paragraph'; export { default as payment } from './library/payment'; +export { default as pending } from './library/pending'; export { default as percent } from './library/percent'; export { default as positionCenter } from './library/position-center'; export { default as positionLeft } from './library/position-left'; diff --git a/packages/icons/src/library/not-allowed.js b/packages/icons/src/library/not-allowed.js new file mode 100644 index 00000000000000..cafebb60b7c628 --- /dev/null +++ b/packages/icons/src/library/not-allowed.js @@ -0,0 +1,16 @@ +/** + * WordPress dependencies + */ +import { SVG, Path } from '@wordpress/primitives'; + +const notAllowed = ( + + + +); + +export default notAllowed; diff --git a/packages/icons/src/library/pending.js b/packages/icons/src/library/pending.js new file mode 100644 index 00000000000000..c1c7e326ebe3ef --- /dev/null +++ b/packages/icons/src/library/pending.js @@ -0,0 +1,16 @@ +/** + * WordPress dependencies + */ +import { SVG, Path } from '@wordpress/primitives'; + +const pending = ( + + + +); + +export default pending;