From 98f80f33b594cc6ef7a827ac8296e08c10611562 Mon Sep 17 00:00:00 2001 From: okmttdhr Date: Tue, 17 Dec 2024 14:47:12 +0900 Subject: [PATCH] Lift up A4A's layout-related components --- .../components/page-placeholder/index.tsx | 6 +++--- .../primary/agency-tier-overview/index.tsx | 8 ++++---- .../tier-permission-error/index.tsx | 10 +++++----- .../sections/client/client-landing.tsx | 10 +++++----- .../primary/subscriptions-list/index.tsx | 10 +++++----- .../marketplace/assign-license/index.tsx | 14 ++++++------- .../sections/marketplace/checkout/index.tsx | 10 +++++----- .../marketplace/hosting-overview-v3/index.tsx | 12 +++++------ .../marketplace/hosting-overview/index.tsx | 12 +++++------ .../marketplace/pressable-overview/index.tsx | 12 +++++------ .../primary/download-products/index.tsx | 8 ++++---- .../marketplace/products-overview/index.tsx | 12 +++++------ .../product-navigation/index.tsx | 4 ++-- .../marketplace/wpcom-overview/index.tsx | 12 +++++------ .../primary/migrations-commissions/index.tsx | 12 +++++------ .../primary/migrations-overview-v2/index.tsx | 8 ++++---- .../primary/migrations-overview/index.tsx | 12 +++++------ .../primary/self-migration-tool/index.tsx | 12 +++++------ .../sections/overview/overview.tsx | 10 +++++----- .../partner-directory/partner-directory.tsx | 12 +++++------ .../sections/plugins/controller.tsx | 8 ++++---- .../purchases/billing/billing-dashboard.tsx | 10 +++++----- .../invoices/invoices-overview/index.tsx | 8 ++++---- .../licenses/license-state-filter/index.tsx | 4 +--- .../licenses/licenses-overview/index.tsx | 12 +++++------ .../payment-method-add/index.tsx | 14 ++++++------- .../payment-method-overview/index.tsx | 14 ++++++------- .../referrals/primary/bank-details/index.tsx | 12 +++++------ .../primary/commission-overview/index.tsx | 10 +++++----- .../primary/referrals-overview/index.tsx | 14 ++++++------- .../sections/settings/settings.tsx | 12 +++++------ .../sites/add-sites/add-sites-from-wpcom.tsx | 12 +++++------ .../sites/needs-setup-sites/index.tsx | 14 ++++++------- .../sections/sites/sites-dashboard/index.tsx | 20 +++++++++---------- .../team/primary/get-started/index.tsx | 12 +++++------ .../team/primary/team-accept-invite/index.tsx | 10 +++++----- .../team/primary/team-invite/index.tsx | 10 +++++----- .../sections/team/primary/team-list/index.tsx | 16 +++++++-------- .../index.tsx | 4 ++-- .../multi-site-dashboard}/column.tsx | 0 .../multi-site-dashboard}/header.tsx | 0 .../multi-site-dashboard}/index.tsx | 0 .../multi-site-dashboard}/nav.tsx | 0 .../multi-site-dashboard}/style.scss | 0 .../multi-site-dashboard}/top.tsx | 2 +- .../components/domain-dashboard-layout.tsx | 4 ++-- client/sites/components/sites-dashboard.tsx | 14 ++++++------- 47 files changed, 219 insertions(+), 223 deletions(-) rename client/{a8c-for-agencies/components/layout => layout/multi-site-dashboard}/column.tsx (100%) rename client/{a8c-for-agencies/components/layout => layout/multi-site-dashboard}/header.tsx (100%) rename client/{a8c-for-agencies/components/layout => layout/multi-site-dashboard}/index.tsx (100%) rename client/{a8c-for-agencies/components/layout => layout/multi-site-dashboard}/nav.tsx (100%) rename client/{a8c-for-agencies/components/layout => layout/multi-site-dashboard}/style.scss (100%) rename client/{a8c-for-agencies/components/layout => layout/multi-site-dashboard}/top.tsx (85%) diff --git a/client/a8c-for-agencies/components/page-placeholder/index.tsx b/client/a8c-for-agencies/components/page-placeholder/index.tsx index f6ed62ddd3e63e..b61c0926467f26 100644 --- a/client/a8c-for-agencies/components/page-placeholder/index.tsx +++ b/client/a8c-for-agencies/components/page-placeholder/index.tsx @@ -1,10 +1,10 @@ import clsx from 'clsx'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; +import Layout from 'calypso/layout/multi-site-dashboard'; import LayoutHeader, { LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import './style.scss'; diff --git a/client/a8c-for-agencies/sections/agency-tier/primary/agency-tier-overview/index.tsx b/client/a8c-for-agencies/sections/agency-tier/primary/agency-tier-overview/index.tsx index e78bcbc64ef540..5ac2b9c37af0be 100644 --- a/client/a8c-for-agencies/sections/agency-tier/primary/agency-tier-overview/index.tsx +++ b/client/a8c-for-agencies/sections/agency-tier/primary/agency-tier-overview/index.tsx @@ -2,14 +2,14 @@ import { Card, Badge } from '@automattic/components'; import { Icon, check } from '@wordpress/icons'; import { clsx } from 'clsx'; import { useTranslate } from 'i18n-calypso'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; +import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +import Layout from 'calypso/layout/multi-site-dashboard'; import LayoutHeader, { LayoutHeaderTitle as Title, LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; -import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useSelector, useDispatch } from 'calypso/state'; import { getActiveAgency } from 'calypso/state/a8c-for-agencies/agency/selectors'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; diff --git a/client/a8c-for-agencies/sections/agency-tier/tier-permission-error/index.tsx b/client/a8c-for-agencies/sections/agency-tier/tier-permission-error/index.tsx index c2fa9e803c82ae..24ab3632f36ae5 100644 --- a/client/a8c-for-agencies/sections/agency-tier/tier-permission-error/index.tsx +++ b/client/a8c-for-agencies/sections/agency-tier/tier-permission-error/index.tsx @@ -1,15 +1,15 @@ import { Button } from '@wordpress/components'; import { useTranslate } from 'i18n-calypso'; import { useEffect } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; +import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +import AgencyTierLevels from 'calypso/assets/images/a8c-for-agencies/agency-tier/agency-tier-levels.svg'; +import Layout from 'calypso/layout/multi-site-dashboard'; import LayoutHeader, { LayoutHeaderTitle as Title, LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; -import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; -import AgencyTierLevels from 'calypso/assets/images/a8c-for-agencies/agency-tier/agency-tier-levels.svg'; +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import getTierPermissionData from '../lib/get-tier-permission-data'; diff --git a/client/a8c-for-agencies/sections/client/client-landing.tsx b/client/a8c-for-agencies/sections/client/client-landing.tsx index 8b137575b3177b..900111dd18a09b 100644 --- a/client/a8c-for-agencies/sections/client/client-landing.tsx +++ b/client/a8c-for-agencies/sections/client/client-landing.tsx @@ -2,16 +2,16 @@ import page from '@automattic/calypso-router'; import { addQueryArgs, getQueryArg, getQueryArgs } from '@wordpress/url'; import { useTranslate } from 'i18n-calypso'; import { useEffect } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import { A4A_CLIENT_SUBSCRIPTIONS_LINK, A4A_OVERVIEW_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderTitle as Title, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useSelector } from 'calypso/state'; import { hasAgency, hasFetchedAgency } from 'calypso/state/a8c-for-agencies/agency/selectors'; diff --git a/client/a8c-for-agencies/sections/client/primary/subscriptions-list/index.tsx b/client/a8c-for-agencies/sections/client/primary/subscriptions-list/index.tsx index 60d8d9ef71accf..d1b36badb79ff4 100644 --- a/client/a8c-for-agencies/sections/client/primary/subscriptions-list/index.tsx +++ b/client/a8c-for-agencies/sections/client/primary/subscriptions-list/index.tsx @@ -5,14 +5,14 @@ import { useTranslate } from 'i18n-calypso'; import { useMemo, ReactNode, useState, useCallback } from 'react'; import { initialDataViewsState } from 'calypso/a8c-for-agencies/components/items-dashboard/constants'; import ItemsDataViews from 'calypso/a8c-for-agencies/components/items-dashboard/items-dataviews'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import useFetchClientProducts from 'calypso/a8c-for-agencies/data/client/use-fetch-client-products'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderTitle as Title, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import useFetchClientSubscriptions from '../../hooks/use-fetch-client-subscriptions'; import { SubscriptionAction, diff --git a/client/a8c-for-agencies/sections/marketplace/assign-license/index.tsx b/client/a8c-for-agencies/sections/marketplace/assign-license/index.tsx index 2cf0e1feefb1b0..66bd5ae1ac27ec 100644 --- a/client/a8c-for-agencies/sections/marketplace/assign-license/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/assign-license/index.tsx @@ -4,14 +4,7 @@ import { getQueryArg } from '@wordpress/url'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useEffect, useMemo, useState } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderActions as Actions, - LayoutHeaderSubtitle as Subtitle, - LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_DOWNLOAD_PRODUCTS_LINK, @@ -24,6 +17,13 @@ import SearchCard from 'calypso/components/search-card'; import useFetchDashboardSites from 'calypso/data/agency-dashboard/use-fetch-dashboard-sites'; import areLicenseKeysAssignableToMultisite from 'calypso/jetpack-cloud/sections/partner-portal/lib/are-license-keys-assignable-to-multisite'; import isWooCommerceProduct from 'calypso/jetpack-cloud/sections/partner-portal/lib/is-woocommerce-product'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderActions as Actions, + LayoutHeaderSubtitle as Subtitle, + LayoutHeaderTitle as Title, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { addQueryArgs } from 'calypso/lib/url'; import { useDispatch, useSelector } from 'calypso/state'; import { getActiveAgencyId } from 'calypso/state/a8c-for-agencies/agency/selectors'; diff --git a/client/a8c-for-agencies/sections/marketplace/checkout/index.tsx b/client/a8c-for-agencies/sections/marketplace/checkout/index.tsx index 300fadae0afc75..ed9a7a96925c58 100644 --- a/client/a8c-for-agencies/sections/marketplace/checkout/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/checkout/index.tsx @@ -4,17 +4,17 @@ import { getQueryArg } from '@wordpress/url'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useMemo, useContext, useEffect, useRef, useState } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderBreadcrumb as Breadcrumb, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_LINK, A4A_SITES_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderBreadcrumb as Breadcrumb, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch, useSelector } from 'calypso/state'; import { getActiveAgency } from 'calypso/state/a8c-for-agencies/agency/selectors'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; diff --git a/client/a8c-for-agencies/sections/marketplace/hosting-overview-v3/index.tsx b/client/a8c-for-agencies/sections/marketplace/hosting-overview-v3/index.tsx index 380f31c5733a09..e2ce34d587abc9 100644 --- a/client/a8c-for-agencies/sections/marketplace/hosting-overview-v3/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/hosting-overview-v3/index.tsx @@ -2,13 +2,7 @@ import page from '@automattic/calypso-router'; import { useBreakpoint } from '@automattic/viewport-react'; import { useTranslate } from 'i18n-calypso'; import { useCallback } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderActions as Actions, - LayoutHeaderBreadcrumb as Breadcrumb, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import PressableUsageLimitNotice from 'calypso/a8c-for-agencies/components/pressable-usage-limit-notice'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { @@ -17,6 +11,12 @@ import { A4A_MARKETPLACE_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import QueryProductsList from 'calypso/components/data/query-products-list'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderActions as Actions, + LayoutHeaderBreadcrumb as Breadcrumb, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import { APIProductFamilyProduct } from 'calypso/state/partner-portal/types'; diff --git a/client/a8c-for-agencies/sections/marketplace/hosting-overview/index.tsx b/client/a8c-for-agencies/sections/marketplace/hosting-overview/index.tsx index 717fb30ebc35c2..d5170df50fbdef 100644 --- a/client/a8c-for-agencies/sections/marketplace/hosting-overview/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/hosting-overview/index.tsx @@ -4,13 +4,7 @@ import { useBreakpoint } from '@automattic/viewport-react'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useCallback } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderActions as Actions, - LayoutHeaderBreadcrumb as Breadcrumb, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import PressableUsageLimitNotice from 'calypso/a8c-for-agencies/components/pressable-usage-limit-notice'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { @@ -18,6 +12,12 @@ import { A4A_MARKETPLACE_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import QueryProductsList from 'calypso/components/data/query-products-list'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderActions as Actions, + LayoutHeaderBreadcrumb as Breadcrumb, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import ReferralToggle from '../common/referral-toggle'; diff --git a/client/a8c-for-agencies/sections/marketplace/pressable-overview/index.tsx b/client/a8c-for-agencies/sections/marketplace/pressable-overview/index.tsx index ff65e9cb2a2ed9..5234da131798ac 100644 --- a/client/a8c-for-agencies/sections/marketplace/pressable-overview/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/pressable-overview/index.tsx @@ -3,19 +3,19 @@ import { Button } from '@automattic/components'; import { Icon, external } from '@wordpress/icons'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useContext, useEffect } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderBreadcrumb as Breadcrumb, - LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_CHECKOUT_LINK, A4A_MARKETPLACE_HOSTING_LINK, A4A_MARKETPLACE_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderBreadcrumb as Breadcrumb, + LayoutHeaderActions as Actions, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import { APIProductFamilyProduct } from 'calypso/state/partner-portal/types'; diff --git a/client/a8c-for-agencies/sections/marketplace/primary/download-products/index.tsx b/client/a8c-for-agencies/sections/marketplace/primary/download-products/index.tsx index 62b223afd2a8dd..51737598607bda 100644 --- a/client/a8c-for-agencies/sections/marketplace/primary/download-products/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/primary/download-products/index.tsx @@ -1,12 +1,12 @@ import { getQueryArg } from '@wordpress/url'; import { useTranslate } from 'i18n-calypso'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; +import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +import Layout from 'calypso/layout/multi-site-dashboard'; import LayoutHeader, { LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; -import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import AssignLicenseStepProgress from '../../assign-license-step-progress'; import DownloadProductsForm from '../../download-products-form'; diff --git a/client/a8c-for-agencies/sections/marketplace/products-overview/index.tsx b/client/a8c-for-agencies/sections/marketplace/products-overview/index.tsx index 276ff247dbc3d3..bbf7d429697651 100644 --- a/client/a8c-for-agencies/sections/marketplace/products-overview/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/products-overview/index.tsx @@ -3,19 +3,19 @@ import { useBreakpoint } from '@automattic/viewport-react'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useEffect, useState } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderActions as Actions, - LayoutHeaderBreadcrumb as Breadcrumb, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_CHECKOUT_LINK, A4A_MARKETPLACE_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import useProductsQuery from 'calypso/a8c-for-agencies/data/marketplace/use-products-query'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderActions as Actions, + LayoutHeaderBreadcrumb as Breadcrumb, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useSelector } from 'calypso/state'; import getSites from 'calypso/state/selectors/get-sites'; import ReferralToggle from '../common/referral-toggle'; diff --git a/client/a8c-for-agencies/sections/marketplace/products-overview/product-navigation/index.tsx b/client/a8c-for-agencies/sections/marketplace/products-overview/product-navigation/index.tsx index 9c454781681ad3..cb420ac028fbeb 100644 --- a/client/a8c-for-agencies/sections/marketplace/products-overview/product-navigation/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/products-overview/product-navigation/index.tsx @@ -1,12 +1,12 @@ import { JetpackLogo, WooLogo } from '@automattic/components'; import { useTranslate } from 'i18n-calypso'; import { useMemo } from 'react'; +import { A4A_MARKETPLACE_PRODUCTS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import LayoutNavigation, { LayoutNavigationItemProps, LayoutNavigationTabs, buildNavItems, -} from 'calypso/a8c-for-agencies/components/layout/nav'; -import { A4A_MARKETPLACE_PRODUCTS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; +} from 'calypso/layout/multi-site-dashboard/nav'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import { diff --git a/client/a8c-for-agencies/sections/marketplace/wpcom-overview/index.tsx b/client/a8c-for-agencies/sections/marketplace/wpcom-overview/index.tsx index 1c7234d9b0dfb2..826439e9ae4968 100644 --- a/client/a8c-for-agencies/sections/marketplace/wpcom-overview/index.tsx +++ b/client/a8c-for-agencies/sections/marketplace/wpcom-overview/index.tsx @@ -14,13 +14,7 @@ import { } from '@wordpress/icons'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useContext, useState } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderBreadcrumb as Breadcrumb, - LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_CHECKOUT_LINK, @@ -28,6 +22,12 @@ import { A4A_MARKETPLACE_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import useWPCOMOwnedSites from 'calypso/a8c-for-agencies/hooks/use-wpcom-owned-sites'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderBreadcrumb as Breadcrumb, + LayoutHeaderActions as Actions, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import { APIProductFamilyProduct } from 'calypso/state/partner-portal/types'; diff --git a/client/a8c-for-agencies/sections/migrations/primary/migrations-commissions/index.tsx b/client/a8c-for-agencies/sections/migrations/primary/migrations-commissions/index.tsx index 05fcef49c9d2e6..5c1de0ae96a9dd 100644 --- a/client/a8c-for-agencies/sections/migrations/primary/migrations-commissions/index.tsx +++ b/client/a8c-for-agencies/sections/migrations/primary/migrations-commissions/index.tsx @@ -3,17 +3,17 @@ import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useMemo, useState } from 'react'; import A4APaymentDelayedNotice from 'calypso/a8c-for-agencies/components/a4a-payment-delayed-notice'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderBreadcrumb as Breadcrumb, - LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MIGRATIONS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import TextPlaceholder from 'calypso/a8c-for-agencies/components/text-placeholder'; import useGetTipaltiPayee from 'calypso/a8c-for-agencies/sections/referrals/hooks/use-get-tipalti-payee'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderBreadcrumb as Breadcrumb, + LayoutHeaderActions as Actions, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import MigrationsCommissionsList from '../../commissions-list'; diff --git a/client/a8c-for-agencies/sections/migrations/primary/migrations-overview-v2/index.tsx b/client/a8c-for-agencies/sections/migrations/primary/migrations-overview-v2/index.tsx index 771e7024861da7..f40aa7a2b197a2 100644 --- a/client/a8c-for-agencies/sections/migrations/primary/migrations-overview-v2/index.tsx +++ b/client/a8c-for-agencies/sections/migrations/primary/migrations-overview-v2/index.tsx @@ -2,14 +2,14 @@ import { Button } from '@wordpress/components'; import { useTranslate } from 'i18n-calypso'; import { useCallback } from 'react'; import { CONTACT_URL_FOR_MIGRATION_OFFER_HASH_FRAGMENT } from 'calypso/a8c-for-agencies/components/a4a-contact-support-widget'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; +import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +import Layout from 'calypso/layout/multi-site-dashboard'; import LayoutHeader, { LayoutHeaderTitle as Title, LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; -import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import MigrateSiteButton from './migrate-site-button'; diff --git a/client/a8c-for-agencies/sections/migrations/primary/migrations-overview/index.tsx b/client/a8c-for-agencies/sections/migrations/primary/migrations-overview/index.tsx index e9ae6de6bb7736..ad46cd6c10f4ab 100644 --- a/client/a8c-for-agencies/sections/migrations/primary/migrations-overview/index.tsx +++ b/client/a8c-for-agencies/sections/migrations/primary/migrations-overview/index.tsx @@ -3,13 +3,7 @@ import { Button, Card, WordPressLogo } from '@automattic/components'; import { Icon, external } from '@wordpress/icons'; import { useTranslate } from 'i18n-calypso'; import { useCallback } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderTitle as Title, - LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_REFERRALS_BANK_DETAILS_LINK, @@ -20,6 +14,12 @@ import useGetTipaltiPayee from 'calypso/a8c-for-agencies/sections/referrals/hook import { getAccountStatus } from 'calypso/a8c-for-agencies/sections/referrals/lib/get-account-status'; import tipaltiLogo from 'calypso/a8c-for-agencies/sections/referrals/lib/tipalti-logo'; import pressableIcon from 'calypso/assets/images/pressable/pressable-icon.svg'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderTitle as Title, + LayoutHeaderActions as Actions, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { preventWidows } from 'calypso/lib/formatting'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; diff --git a/client/a8c-for-agencies/sections/migrations/primary/self-migration-tool/index.tsx b/client/a8c-for-agencies/sections/migrations/primary/self-migration-tool/index.tsx index b4ca2841b3f703..52bb30082619c5 100644 --- a/client/a8c-for-agencies/sections/migrations/primary/self-migration-tool/index.tsx +++ b/client/a8c-for-agencies/sections/migrations/primary/self-migration-tool/index.tsx @@ -1,15 +1,15 @@ import { useTranslate } from 'i18n-calypso'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderBreadcrumb as Breadcrumb, - LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MIGRATIONS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import { TaskSteps } from 'calypso/a8c-for-agencies/components/task-steps'; import useGetTipaltiPayee from 'calypso/a8c-for-agencies/sections/referrals/hooks/use-get-tipalti-payee'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderBreadcrumb as Breadcrumb, + LayoutHeaderActions as Actions, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { getMigrationInfo } from './migration-info'; import './style.scss'; diff --git a/client/a8c-for-agencies/sections/overview/overview.tsx b/client/a8c-for-agencies/sections/overview/overview.tsx index c41da8b208ca2c..5784315feb9979 100644 --- a/client/a8c-for-agencies/sections/overview/overview.tsx +++ b/client/a8c-for-agencies/sections/overview/overview.tsx @@ -1,14 +1,14 @@ import { useTranslate } from 'i18n-calypso'; import ContentSidebar from 'calypso/a8c-for-agencies/components/content-sidebar'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; +import PressableUsageLimitNotice from 'calypso/a8c-for-agencies/components/pressable-usage-limit-notice'; +import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +import Layout from 'calypso/layout/multi-site-dashboard'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; -import PressableUsageLimitNotice from 'calypso/a8c-for-agencies/components/pressable-usage-limit-notice'; -import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import OverviewBody from './body'; import OverviewHeaderActions from './header-actions'; import PartnerDirectoryOnboardingCard from './partner-directory-onboarding-card'; diff --git a/client/a8c-for-agencies/sections/partner-directory/partner-directory.tsx b/client/a8c-for-agencies/sections/partner-directory/partner-directory.tsx index 65a21ac99559dd..374f58eb49615b 100644 --- a/client/a8c-for-agencies/sections/partner-directory/partner-directory.tsx +++ b/client/a8c-for-agencies/sections/partner-directory/partner-directory.tsx @@ -3,19 +3,19 @@ import page from '@automattic/calypso-router'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { ReactNode, useMemo } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderBreadcrumb as Breadcrumb, - LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_OVERVIEW_LINK, A4A_PARTNER_DIRECTORY_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import { Item as BreadcrumbItem } from 'calypso/components/breadcrumb'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderBreadcrumb as Breadcrumb, + LayoutHeaderTitle as Title, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useSelector } from 'calypso/state'; import { getActiveAgency, diff --git a/client/a8c-for-agencies/sections/plugins/controller.tsx b/client/a8c-for-agencies/sections/plugins/controller.tsx index a34ae255f52c19..f46e8ced9969a9 100644 --- a/client/a8c-for-agencies/sections/plugins/controller.tsx +++ b/client/a8c-for-agencies/sections/plugins/controller.tsx @@ -1,12 +1,12 @@ import { type Callback } from '@automattic/calypso-router'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; +import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +import Layout from 'calypso/layout/multi-site-dashboard'; import LayoutHeader, { LayoutHeaderSubtitle as Subtitle, LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; -import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import MainSidebar from '../../components/sidebar-menu/main'; export const pluginsContext: Callback = ( context, next ) => { diff --git a/client/a8c-for-agencies/sections/purchases/billing/billing-dashboard.tsx b/client/a8c-for-agencies/sections/purchases/billing/billing-dashboard.tsx index 3e0853bd5f0e34..86833ebe64affa 100644 --- a/client/a8c-for-agencies/sections/purchases/billing/billing-dashboard.tsx +++ b/client/a8c-for-agencies/sections/purchases/billing/billing-dashboard.tsx @@ -1,14 +1,14 @@ import { Button } from '@automattic/components'; import { useTranslate } from 'i18n-calypso'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; +import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +import { A4A_MARKETPLACE_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; +import Layout from 'calypso/layout/multi-site-dashboard'; import LayoutHeader, { LayoutHeaderActions as Actions, LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; -import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; -import { A4A_MARKETPLACE_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import BillingDetails from './billing-details'; diff --git a/client/a8c-for-agencies/sections/purchases/invoices/invoices-overview/index.tsx b/client/a8c-for-agencies/sections/purchases/invoices/invoices-overview/index.tsx index 9369d99c7853b1..a6a2b98f68c320 100644 --- a/client/a8c-for-agencies/sections/purchases/invoices/invoices-overview/index.tsx +++ b/client/a8c-for-agencies/sections/purchases/invoices/invoices-overview/index.tsx @@ -1,11 +1,11 @@ import { useTranslate } from 'i18n-calypso'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; +import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +import Layout from 'calypso/layout/multi-site-dashboard'; import LayoutHeader, { LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; -import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import InvoicesList from '../invoices-list'; import './style.scss'; diff --git a/client/a8c-for-agencies/sections/purchases/licenses/license-state-filter/index.tsx b/client/a8c-for-agencies/sections/purchases/licenses/license-state-filter/index.tsx index ba51728d81ad7b..8249ed07b4f91b 100644 --- a/client/a8c-for-agencies/sections/purchases/licenses/license-state-filter/index.tsx +++ b/client/a8c-for-agencies/sections/purchases/licenses/license-state-filter/index.tsx @@ -1,11 +1,9 @@ import { useTranslate } from 'i18n-calypso'; import { useContext } from 'react'; -import LayoutNavigation, { - LayoutNavigationTabs, -} from 'calypso/a8c-for-agencies/components/layout/nav'; import { A4A_LICENSES_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import { internalToPublicLicenseFilter } from 'calypso/jetpack-cloud/sections/partner-portal/lib/license-filters'; import { LicenseFilter } from 'calypso/jetpack-cloud/sections/partner-portal/types'; +import LayoutNavigation, { LayoutNavigationTabs } from 'calypso/layout/multi-site-dashboard/nav'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import LicenseListContext from '../licenses-overview/context'; diff --git a/client/a8c-for-agencies/sections/purchases/licenses/licenses-overview/index.tsx b/client/a8c-for-agencies/sections/purchases/licenses/licenses-overview/index.tsx index 68a9357e137254..571420ae440f9a 100644 --- a/client/a8c-for-agencies/sections/purchases/licenses/licenses-overview/index.tsx +++ b/client/a8c-for-agencies/sections/purchases/licenses/licenses-overview/index.tsx @@ -1,12 +1,6 @@ import { Button } from '@automattic/components'; import { useTranslate } from 'i18n-calypso'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderActions as Actions, - LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import PressableUsageLimitNotice from 'calypso/a8c-for-agencies/components/pressable-usage-limit-notice'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; @@ -16,6 +10,12 @@ import { LicenseSortDirection, LicenseSortField, } from 'calypso/jetpack-cloud/sections/partner-portal/types'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderActions as Actions, + LayoutHeaderTitle as Title, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import LicenseList from '../license-list'; diff --git a/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-add/index.tsx b/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-add/index.tsx index 04d45ea6c4dc43..0b5a7cfb1af811 100644 --- a/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-add/index.tsx +++ b/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-add/index.tsx @@ -1,15 +1,8 @@ import { Card } from '@automattic/components'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderTitle as Title, - LayoutHeaderSubtitle as Subtitle, - LayoutHeaderBreadcrumb as Breadcrumb, -} from 'calypso/a8c-for-agencies/components/layout/header'; import LayoutStepper from 'calypso/a8c-for-agencies/components/layout/stepper'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_PAYMENT_METHODS_LINK, @@ -17,6 +10,13 @@ import { } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import PaymentMethodStripeInfo from 'calypso/jetpack-cloud/sections/partner-portal/payment-method-stripe-info'; import { usePaymentMethodStepper } from 'calypso/jetpack-cloud/sections/partner-portal/primary/payment-method-add-v2/hooks/use-payment-method-stepper'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderTitle as Title, + LayoutHeaderSubtitle as Subtitle, + LayoutHeaderBreadcrumb as Breadcrumb, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { isClientView } from '../lib/is-client-view'; import PaymentMethodForm from './payment-method-form'; diff --git a/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-overview/index.tsx b/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-overview/index.tsx index 555aa9b20da15f..7a1073d200dc75 100644 --- a/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-overview/index.tsx +++ b/client/a8c-for-agencies/sections/purchases/payment-methods/payment-method-overview/index.tsx @@ -2,14 +2,7 @@ import { Button } from '@automattic/components'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useMemo, useState } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderActions as Actions, - LayoutHeaderTitle as Title, - LayoutHeaderSubtitle as Subtitle, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_PAYMENT_METHODS_ADD_LINK, @@ -17,6 +10,13 @@ import { } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import Pagination from 'calypso/components/pagination'; import { PaymentMethod } from 'calypso/jetpack-cloud/sections/partner-portal/payment-methods'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderActions as Actions, + LayoutHeaderTitle as Title, + LayoutHeaderSubtitle as Subtitle, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import { PaymentMethodOverviewContext } from '../context'; diff --git a/client/a8c-for-agencies/sections/referrals/primary/bank-details/index.tsx b/client/a8c-for-agencies/sections/referrals/primary/bank-details/index.tsx index 3d5d938b74118a..397b38d2cc950e 100644 --- a/client/a8c-for-agencies/sections/referrals/primary/bank-details/index.tsx +++ b/client/a8c-for-agencies/sections/referrals/primary/bank-details/index.tsx @@ -2,13 +2,7 @@ import { useDesktopBreakpoint } from '@automattic/viewport-react'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useLayoutEffect, useState } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderBreadcrumb as Breadcrumb, - LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_REFERRALS_LINK, @@ -16,6 +10,12 @@ import { } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import StatusBadge from 'calypso/a8c-for-agencies/components/step-section-item/status-badge'; import TextPlaceholder from 'calypso/a8c-for-agencies/components/text-placeholder'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderBreadcrumb as Breadcrumb, + LayoutHeaderActions as Actions, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import useGetTipaltiIFrameURL from '../../hooks/use-get-tipalti-iframe-url'; import useGetTipaltiPayee from '../../hooks/use-get-tipalti-payee'; import { getAccountStatus } from '../../lib/get-account-status'; diff --git a/client/a8c-for-agencies/sections/referrals/primary/commission-overview/index.tsx b/client/a8c-for-agencies/sections/referrals/primary/commission-overview/index.tsx index 000ad05dd7e41d..90411bbdbae37c 100644 --- a/client/a8c-for-agencies/sections/referrals/primary/commission-overview/index.tsx +++ b/client/a8c-for-agencies/sections/referrals/primary/commission-overview/index.tsx @@ -2,12 +2,7 @@ import { FoldableCard } from '@automattic/components'; import { useDesktopBreakpoint } from '@automattic/viewport-react'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderBreadcrumb as Breadcrumb, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_REFERRALS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import StepSection from 'calypso/a8c-for-agencies/components/step-section'; @@ -15,6 +10,11 @@ import pressableIcon from 'calypso/assets/images/pressable/pressable-icon.svg'; import JetpackLogo from 'calypso/components/jetpack-logo'; import WooCommerceLogo from 'calypso/components/woocommerce-logo'; import WordPressLogo from 'calypso/components/wordpress-logo'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderBreadcrumb as Breadcrumb, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import ReferralsFooter from '../footer'; import './style.scss'; diff --git a/client/a8c-for-agencies/sections/referrals/primary/referrals-overview/index.tsx b/client/a8c-for-agencies/sections/referrals/primary/referrals-overview/index.tsx index 946754d983262b..b8c00a491ba9df 100644 --- a/client/a8c-for-agencies/sections/referrals/primary/referrals-overview/index.tsx +++ b/client/a8c-for-agencies/sections/referrals/primary/referrals-overview/index.tsx @@ -13,14 +13,7 @@ import { initialDataViewsState, } from 'calypso/a8c-for-agencies/components/items-dashboard/constants'; import { DataViewsState } from 'calypso/a8c-for-agencies/components/items-dashboard/items-dataviews/interfaces'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutColumn from 'calypso/a8c-for-agencies/components/layout/column'; -import LayoutHeader, { - LayoutHeaderTitle as Title, - LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_MARKETPLACE_PRODUCTS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import { REFERRAL_EMAIL_QUERY_PARAM_KEY } from 'calypso/a8c-for-agencies/constants'; @@ -29,6 +22,13 @@ import { MARKETPLACE_TYPE_SESSION_STORAGE_KEY, MARKETPLACE_TYPE_REFERRAL, } from 'calypso/a8c-for-agencies/sections/marketplace/hoc/with-marketplace-type'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutColumn from 'calypso/layout/multi-site-dashboard/column'; +import LayoutHeader, { + LayoutHeaderTitle as Title, + LayoutHeaderActions as Actions, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import MissingPaymentSettingsNotice from '../../common/missing-payment-settings-notice'; diff --git a/client/a8c-for-agencies/sections/settings/settings.tsx b/client/a8c-for-agencies/sections/settings/settings.tsx index bc1de018424c42..26d8f2e7908c8c 100644 --- a/client/a8c-for-agencies/sections/settings/settings.tsx +++ b/client/a8c-for-agencies/sections/settings/settings.tsx @@ -1,17 +1,17 @@ import { useTranslate } from 'i18n-calypso'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; +import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; +import { A4A_SETTINGS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; +import Layout from 'calypso/layout/multi-site-dashboard'; import LayoutHeader, { LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; +} from 'calypso/layout/multi-site-dashboard/header'; import LayoutNavigation, { buildNavItems, LayoutNavigationItemProps, LayoutNavigationTabs, -} from 'calypso/a8c-for-agencies/components/layout/nav'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; -import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; -import { A4A_SETTINGS_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; +} from 'calypso/layout/multi-site-dashboard/nav'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import AgencyProfile from './agency-profile'; diff --git a/client/a8c-for-agencies/sections/sites/add-sites/add-sites-from-wpcom.tsx b/client/a8c-for-agencies/sections/sites/add-sites/add-sites-from-wpcom.tsx index e8ac0514188e77..291d067fc09170 100644 --- a/client/a8c-for-agencies/sections/sites/add-sites/add-sites-from-wpcom.tsx +++ b/client/a8c-for-agencies/sections/sites/add-sites/add-sites-from-wpcom.tsx @@ -2,12 +2,6 @@ import page from '@automattic/calypso-router'; import { addQueryArgs } from '@wordpress/url'; import { useTranslate } from 'i18n-calypso'; import { useCallback } from 'react'; -import LayoutColumn from 'calypso/a8c-for-agencies/components/layout/column'; -import LayoutHeader, { - LayoutHeaderTitle, - LayoutHeaderActions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_SITES_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import useFetchPendingSites from 'calypso/a8c-for-agencies/data/sites/use-fetch-pending-sites'; @@ -15,6 +9,12 @@ import useImportWPCOMSitesMutation from 'calypso/a8c-for-agencies/data/sites/use import useFetchDashboardSites, { FetchDashboardSitesArgsInterface, } from 'calypso/data/agency-dashboard/use-fetch-dashboard-sites'; +import LayoutColumn from 'calypso/layout/multi-site-dashboard/column'; +import LayoutHeader, { + LayoutHeaderTitle, + LayoutHeaderActions, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import AtomicSitesSelector from './atomic-sites-selector'; import './styles.scss'; diff --git a/client/a8c-for-agencies/sections/sites/needs-setup-sites/index.tsx b/client/a8c-for-agencies/sections/sites/needs-setup-sites/index.tsx index b2381ce3dd2942..036dc0682c4faf 100644 --- a/client/a8c-for-agencies/sections/sites/needs-setup-sites/index.tsx +++ b/client/a8c-for-agencies/sections/sites/needs-setup-sites/index.tsx @@ -4,13 +4,6 @@ import page from '@automattic/calypso-router'; import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import { useCallback, useState } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; -import LayoutColumn from 'calypso/a8c-for-agencies/components/layout/column'; -import LayoutHeader, { - LayoutHeaderTitle as Title, - LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_SITES_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import SiteConfigurationsModal from 'calypso/a8c-for-agencies/components/site-configurations-modal'; @@ -19,6 +12,13 @@ import useCreateWPCOMSiteMutation from 'calypso/a8c-for-agencies/data/sites/use- import useFetchPendingSites from 'calypso/a8c-for-agencies/data/sites/use-fetch-pending-sites'; import useSiteCreatedCallback from 'calypso/a8c-for-agencies/hooks/use-site-created-callback'; import useTrackProvisioningSites from 'calypso/a8c-for-agencies/hooks/use-track-provisioning-sites'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutColumn from 'calypso/layout/multi-site-dashboard/column'; +import LayoutHeader, { + LayoutHeaderTitle as Title, + LayoutHeaderActions as Actions, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import SitesHeaderActions from '../sites-header-actions'; import ClientSite from './client-site'; import { AvailablePlans } from './plan-field'; diff --git a/client/a8c-for-agencies/sections/sites/sites-dashboard/index.tsx b/client/a8c-for-agencies/sections/sites/sites-dashboard/index.tsx index 2cabf75b4490aa..18153b7a0a5009 100644 --- a/client/a8c-for-agencies/sections/sites/sites-dashboard/index.tsx +++ b/client/a8c-for-agencies/sections/sites/sites-dashboard/index.tsx @@ -9,16 +9,6 @@ import { DATAVIEWS_TABLE, } from 'calypso/a8c-for-agencies/components/items-dashboard/constants'; import { DataViewsState } from 'calypso/a8c-for-agencies/components/items-dashboard/items-dataviews/interfaces'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; -import LayoutColumn from 'calypso/a8c-for-agencies/components/layout/column'; -import LayoutHeader, { - LayoutHeaderTitle as Title, - LayoutHeaderActions as Actions, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutNavigation, { - LayoutNavigationTabs as NavigationTabs, -} from 'calypso/a8c-for-agencies/components/layout/nav'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import JetpackSitesDataViews from 'calypso/a8c-for-agencies/sections/sites/features/jetpack/jetpack-sites-dataviews'; import QueryReaderTeams from 'calypso/components/data/query-reader-teams'; @@ -29,6 +19,16 @@ import { AgencyDashboardFilter, Site, } from 'calypso/jetpack-cloud/sections/agency-dashboard/sites-overview/types'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutColumn from 'calypso/layout/multi-site-dashboard/column'; +import LayoutHeader, { + LayoutHeaderTitle as Title, + LayoutHeaderActions as Actions, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutNavigation, { + LayoutNavigationTabs as NavigationTabs, +} from 'calypso/layout/multi-site-dashboard/nav'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch, useSelector } from 'calypso/state'; import { getActiveAgencyId } from 'calypso/state/a8c-for-agencies/agency/selectors'; import { checkIfJetpackSiteGotDisconnected } from 'calypso/state/jetpack-agency-dashboard/selectors'; diff --git a/client/a8c-for-agencies/sections/team/primary/get-started/index.tsx b/client/a8c-for-agencies/sections/team/primary/get-started/index.tsx index adb56d513bb606..250fabb76817c8 100644 --- a/client/a8c-for-agencies/sections/team/primary/get-started/index.tsx +++ b/client/a8c-for-agencies/sections/team/primary/get-started/index.tsx @@ -1,16 +1,16 @@ import { Button } from '@wordpress/components'; import { Icon, external } from '@wordpress/icons'; import { useTranslate } from 'i18n-calypso'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderActions as Actions, - LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import { A4A_TEAM_INVITE_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import StepSection from 'calypso/a8c-for-agencies/components/step-section'; import StepSectionItem from 'calypso/a8c-for-agencies/components/step-section-item'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderActions as Actions, + LayoutHeaderTitle as Title, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; diff --git a/client/a8c-for-agencies/sections/team/primary/team-accept-invite/index.tsx b/client/a8c-for-agencies/sections/team/primary/team-accept-invite/index.tsx index 7c5cf4a4083758..2d36c15812a643 100644 --- a/client/a8c-for-agencies/sections/team/primary/team-accept-invite/index.tsx +++ b/client/a8c-for-agencies/sections/team/primary/team-accept-invite/index.tsx @@ -1,18 +1,18 @@ import page from '@automattic/calypso-router'; import { useTranslate } from 'i18n-calypso'; import { useEffect, useMemo, useState } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import PagePlaceholder from 'calypso/a8c-for-agencies/components/page-placeholder'; import { A4A_OVERVIEW_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import useActivateMemberMutation, { APIError, } from 'calypso/a8c-for-agencies/data/team/use-activate-member'; import AgencyLogo from 'calypso/assets/images/a8c-for-agencies/agency-logo.svg'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderTitle as Title, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch, useSelector } from 'calypso/state'; import { fetchAgencies } from 'calypso/state/a8c-for-agencies/agency/actions'; import { getActiveAgency } from 'calypso/state/a8c-for-agencies/agency/selectors'; diff --git a/client/a8c-for-agencies/sections/team/primary/team-invite/index.tsx b/client/a8c-for-agencies/sections/team/primary/team-invite/index.tsx index 88111dac019c23..b08b8b4bba3cbd 100644 --- a/client/a8c-for-agencies/sections/team/primary/team-invite/index.tsx +++ b/client/a8c-for-agencies/sections/team/primary/team-invite/index.tsx @@ -9,14 +9,14 @@ import useShowFeedback from 'calypso/a8c-for-agencies/components/a4a-feedback/ho import Form from 'calypso/a8c-for-agencies/components/form'; import FormField from 'calypso/a8c-for-agencies/components/form/field'; import FormSection from 'calypso/a8c-for-agencies/components/form/section'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderBreadcrumb as Breadcrumb, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import { A4A_TEAM_LINK } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; import useSendTeamMemberInvite from 'calypso/a8c-for-agencies/data/team/use-send-team-member-invite'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderBreadcrumb as Breadcrumb, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import { errorNotice, successNotice } from 'calypso/state/notices/actions'; diff --git a/client/a8c-for-agencies/sections/team/primary/team-list/index.tsx b/client/a8c-for-agencies/sections/team/primary/team-list/index.tsx index 7faa2478361b26..d3ec6b42e91d8c 100644 --- a/client/a8c-for-agencies/sections/team/primary/team-list/index.tsx +++ b/client/a8c-for-agencies/sections/team/primary/team-list/index.tsx @@ -3,22 +3,20 @@ import { useDesktopBreakpoint } from '@automattic/viewport-react'; import { Button } from '@wordpress/components'; import { useTranslate } from 'i18n-calypso'; import { ReactNode, useMemo } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; import LayoutBody from 'calypso/a8c-for-agencies/components/layout/body'; -import LayoutHeader, { - LayoutHeaderActions as Actions, - LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutNavigation, { - LayoutNavigationTabs, -} from 'calypso/a8c-for-agencies/components/layout/nav'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import PagePlaceholder from 'calypso/a8c-for-agencies/components/page-placeholder'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import { A4A_TEAM_INVITE_LINK, A4A_TEAM_LINK, } from 'calypso/a8c-for-agencies/components/sidebar-menu/lib/constants'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutHeader, { + LayoutHeaderActions as Actions, + LayoutHeaderTitle as Title, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutNavigation, { LayoutNavigationTabs } from 'calypso/layout/multi-site-dashboard/nav'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { useDispatch } from 'calypso/state'; import { recordTracksEvent } from 'calypso/state/analytics/actions'; import { TAB_ACTIVE_MEMBERS, TAB_INVITED_MEMBERS } from '../../constants'; diff --git a/client/blocks/plugins-scheduled-updates-multisite/index.tsx b/client/blocks/plugins-scheduled-updates-multisite/index.tsx index bd934d3f9e3891..71e27c916d5dca 100644 --- a/client/blocks/plugins-scheduled-updates-multisite/index.tsx +++ b/client/blocks/plugins-scheduled-updates-multisite/index.tsx @@ -1,9 +1,9 @@ import { useBreakpoint } from '@automattic/viewport-react'; import { useTranslate } from 'i18n-calypso'; import { useEffect } from 'react'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; -import LayoutColumn from 'calypso/a8c-for-agencies/components/layout/column'; import { useLoadScheduleFromId } from 'calypso/blocks/plugins-scheduled-updates-multisite/hooks/use-load-schedule-from-id'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutColumn from 'calypso/layout/multi-site-dashboard/column'; import { recordTracksEvent } from 'calypso/lib/analytics/tracks'; import { MultisitePluginUpdateManagerContextProvider } from './context'; import { ScheduleCreate } from './schedule-create'; diff --git a/client/a8c-for-agencies/components/layout/column.tsx b/client/layout/multi-site-dashboard/column.tsx similarity index 100% rename from client/a8c-for-agencies/components/layout/column.tsx rename to client/layout/multi-site-dashboard/column.tsx diff --git a/client/a8c-for-agencies/components/layout/header.tsx b/client/layout/multi-site-dashboard/header.tsx similarity index 100% rename from client/a8c-for-agencies/components/layout/header.tsx rename to client/layout/multi-site-dashboard/header.tsx diff --git a/client/a8c-for-agencies/components/layout/index.tsx b/client/layout/multi-site-dashboard/index.tsx similarity index 100% rename from client/a8c-for-agencies/components/layout/index.tsx rename to client/layout/multi-site-dashboard/index.tsx diff --git a/client/a8c-for-agencies/components/layout/nav.tsx b/client/layout/multi-site-dashboard/nav.tsx similarity index 100% rename from client/a8c-for-agencies/components/layout/nav.tsx rename to client/layout/multi-site-dashboard/nav.tsx diff --git a/client/a8c-for-agencies/components/layout/style.scss b/client/layout/multi-site-dashboard/style.scss similarity index 100% rename from client/a8c-for-agencies/components/layout/style.scss rename to client/layout/multi-site-dashboard/style.scss diff --git a/client/a8c-for-agencies/components/layout/top.tsx b/client/layout/multi-site-dashboard/top.tsx similarity index 85% rename from client/a8c-for-agencies/components/layout/top.tsx rename to client/layout/multi-site-dashboard/top.tsx index 5212ea50816cde..eab35754157763 100644 --- a/client/a8c-for-agencies/components/layout/top.tsx +++ b/client/layout/multi-site-dashboard/top.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; import { Children, ReactNode } from 'react'; -import PendingPaymentNotification from '../pending-payment-notification'; +import PendingPaymentNotification from '../../a8c-for-agencies/components/pending-payment-notification'; import LayoutNavigation from './nav'; type Props = { diff --git a/client/my-sites/domains/domain-management/components/domain-dashboard-layout.tsx b/client/my-sites/domains/domain-management/components/domain-dashboard-layout.tsx index 32564bff1b9cd9..a58efb3f683016 100644 --- a/client/my-sites/domains/domain-management/components/domain-dashboard-layout.tsx +++ b/client/my-sites/domains/domain-management/components/domain-dashboard-layout.tsx @@ -1,5 +1,5 @@ -import Layout from 'calypso/a8c-for-agencies/components/layout'; -import LayoutColumn from 'calypso/a8c-for-agencies/components/layout/column'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutColumn from 'calypso/layout/multi-site-dashboard/column'; import DomainManagement from 'calypso/my-sites/domains/domain-management'; import { domainManagementRoot } from 'calypso/my-sites/domains/paths'; diff --git a/client/sites/components/sites-dashboard.tsx b/client/sites/components/sites-dashboard.tsx index 74a64433cc7772..2d16aed315d642 100644 --- a/client/sites/components/sites-dashboard.tsx +++ b/client/sites/components/sites-dashboard.tsx @@ -15,16 +15,16 @@ import clsx from 'clsx'; import { translate } from 'i18n-calypso'; import React, { useEffect, useMemo, useState } from 'react'; import GuidedTour from 'calypso/a8c-for-agencies/components/guided-tour'; -import Layout from 'calypso/a8c-for-agencies/components/layout'; -import LayoutColumn from 'calypso/a8c-for-agencies/components/layout/column'; -import LayoutHeader, { - LayoutHeaderActions as Actions, - LayoutHeaderTitle as Title, -} from 'calypso/a8c-for-agencies/components/layout/header'; -import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import { GuidedTourContextProvider } from 'calypso/a8c-for-agencies/data/guided-tours/guided-tour-context'; import DocumentHead from 'calypso/components/data/document-head'; import { useSiteExcerptsQuery } from 'calypso/data/sites/use-site-excerpts-query'; +import Layout from 'calypso/layout/multi-site-dashboard'; +import LayoutColumn from 'calypso/layout/multi-site-dashboard/column'; +import LayoutHeader, { + LayoutHeaderActions as Actions, + LayoutHeaderTitle as Title, +} from 'calypso/layout/multi-site-dashboard/header'; +import LayoutTop from 'calypso/layout/multi-site-dashboard/top'; import { recordTracksEvent } from 'calypso/lib/analytics/tracks'; import { isP2Theme } from 'calypso/lib/site/utils'; import {