From 9faf2cafbe41ba0eb3682431de489893c707fb3b Mon Sep 17 00:00:00 2001 From: Peter Zimon Date: Wed, 7 Jun 2023 09:53:20 +0200 Subject: [PATCH] Got rid of `modal` folders in AdminX refs. https://github.com/TryGhost/Team/issues/3354 --- .../general/{modals => }/InviteUserModal.tsx | 14 +++---- .../general/{modals => }/UserDetailModal.tsx | 38 +++++++++---------- .../src/components/settings/general/Users.tsx | 4 +- .../site/{modals => }/DesignModal.tsx | 10 ++--- .../components/settings/site/SiteSettings.tsx | 2 +- .../designAndBranding/BrandSettings.tsx | 12 +++--- .../designAndBranding/ThemePreivew.tsx | 2 +- .../designAndBranding/ThemeSettings.tsx | 0 8 files changed, 41 insertions(+), 41 deletions(-) rename ghost/admin-x-settings/src/components/settings/general/{modals => }/InviteUserModal.tsx (91%) rename ghost/admin-x-settings/src/components/settings/general/{modals => }/UserDetailModal.tsx (95%) rename ghost/admin-x-settings/src/components/settings/site/{modals => }/DesignModal.tsx (82%) rename ghost/admin-x-settings/src/components/settings/site/{modals => }/designAndBranding/BrandSettings.tsx (83%) rename ghost/admin-x-settings/src/components/settings/site/{modals => }/designAndBranding/ThemePreivew.tsx (82%) rename ghost/admin-x-settings/src/components/settings/site/{modals => }/designAndBranding/ThemeSettings.tsx (100%) diff --git a/ghost/admin-x-settings/src/components/settings/general/modals/InviteUserModal.tsx b/ghost/admin-x-settings/src/components/settings/general/InviteUserModal.tsx similarity index 91% rename from ghost/admin-x-settings/src/components/settings/general/modals/InviteUserModal.tsx rename to ghost/admin-x-settings/src/components/settings/general/InviteUserModal.tsx index abadd31120..e877702a87 100644 --- a/ghost/admin-x-settings/src/components/settings/general/modals/InviteUserModal.tsx +++ b/ghost/admin-x-settings/src/components/settings/general/InviteUserModal.tsx @@ -1,12 +1,12 @@ -import Modal from '../../../../admin-x-ds/global/Modal'; +import Modal from '../../../admin-x-ds/global/Modal'; import NiceModal from '@ebay/nice-modal-react'; -import Radio from '../../../../admin-x-ds/global/Radio'; -import TextField from '../../../../admin-x-ds/global/TextField'; -import useRoles from '../../../../hooks/useRoles'; -import useStaffUsers from '../../../../hooks/useStaffUsers'; +import Radio from '../../../admin-x-ds/global/Radio'; +import TextField from '../../../admin-x-ds/global/TextField'; +import useRoles from '../../../hooks/useRoles'; +import useStaffUsers from '../../../hooks/useStaffUsers'; import validator from 'validator'; -import {ServicesContext} from '../../../providers/ServiceProvider'; -import {showToast} from '../../../../admin-x-ds/global/Toast'; +import {ServicesContext} from '../../providers/ServiceProvider'; +import {showToast} from '../../../admin-x-ds/global/Toast'; import {useContext, useEffect, useRef, useState} from 'react'; type RoleType = 'administrator' | 'editor' | 'author' | 'contributor'; diff --git a/ghost/admin-x-settings/src/components/settings/general/modals/UserDetailModal.tsx b/ghost/admin-x-settings/src/components/settings/general/UserDetailModal.tsx similarity index 95% rename from ghost/admin-x-settings/src/components/settings/general/modals/UserDetailModal.tsx rename to ghost/admin-x-settings/src/components/settings/general/UserDetailModal.tsx index 01d8a7e97b..87d8c096e6 100644 --- a/ghost/admin-x-settings/src/components/settings/general/modals/UserDetailModal.tsx +++ b/ghost/admin-x-settings/src/components/settings/general/UserDetailModal.tsx @@ -1,25 +1,25 @@ -import Button from '../../../../admin-x-ds/global/Button'; -import ConfirmationModal from '../../../../admin-x-ds/global/ConfirmationModal'; -import Heading from '../../../../admin-x-ds/global/Heading'; -import Icon from '../../../../admin-x-ds/global/Icon'; -import ImageUpload from '../../../../admin-x-ds/global/ImageUpload'; -import Menu from '../../../../admin-x-ds/global/Menu'; -import Modal from '../../../../admin-x-ds/global/Modal'; +import Button from '../../../admin-x-ds/global/Button'; +import ConfirmationModal from '../../../admin-x-ds/global/ConfirmationModal'; +import Heading from '../../../admin-x-ds/global/Heading'; +import Icon from '../../../admin-x-ds/global/Icon'; +import ImageUpload from '../../../admin-x-ds/global/ImageUpload'; +import Menu from '../../../admin-x-ds/global/Menu'; +import Modal from '../../../admin-x-ds/global/Modal'; import NiceModal, {useModal} from '@ebay/nice-modal-react'; -import Radio from '../../../../admin-x-ds/global/Radio'; +import Radio from '../../../admin-x-ds/global/Radio'; import React, {useContext, useEffect, useRef, useState} from 'react'; -import SettingGroup from '../../../../admin-x-ds/settings/SettingGroup'; -import SettingGroupContent from '../../../../admin-x-ds/settings/SettingGroupContent'; -import TextField from '../../../../admin-x-ds/global/TextField'; -import Toggle from '../../../../admin-x-ds/global/Toggle'; -import useRoles from '../../../../hooks/useRoles'; -import useStaffUsers from '../../../../hooks/useStaffUsers'; +import SettingGroup from '../../../admin-x-ds/settings/SettingGroup'; +import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupContent'; +import TextField from '../../../admin-x-ds/global/TextField'; +import Toggle from '../../../admin-x-ds/global/Toggle'; +import useRoles from '../../../hooks/useRoles'; +import useStaffUsers from '../../../hooks/useStaffUsers'; import validator from 'validator'; -import {FileService, ServicesContext} from '../../../providers/ServiceProvider'; -import {MenuItem} from '../../../../admin-x-ds/global/Menu'; -import {User} from '../../../../types/api'; -import {isAdminUser, isOwnerUser} from '../../../../utils/helpers'; -import {showToast} from '../../../../admin-x-ds/global/Toast'; +import {FileService, ServicesContext} from '../../providers/ServiceProvider'; +import {MenuItem} from '../../../admin-x-ds/global/Menu'; +import {User} from '../../../types/api'; +import {isAdminUser, isOwnerUser} from '../../../utils/helpers'; +import {showToast} from '../../../admin-x-ds/global/Toast'; interface CustomHeadingProps { children?: React.ReactNode; diff --git a/ghost/admin-x-settings/src/components/settings/general/Users.tsx b/ghost/admin-x-settings/src/components/settings/general/Users.tsx index 1bd7c1dcb9..86c717b214 100644 --- a/ghost/admin-x-settings/src/components/settings/general/Users.tsx +++ b/ghost/admin-x-settings/src/components/settings/general/Users.tsx @@ -1,6 +1,6 @@ import Avatar from '../../../admin-x-ds/global/Avatar'; import Button from '../../../admin-x-ds/global/Button'; -import InviteUserModal from './modals/InviteUserModal'; +import InviteUserModal from './InviteUserModal'; import List from '../../../admin-x-ds/global/List'; import ListItem from '../../../admin-x-ds/global/ListItem'; import NiceModal from '@ebay/nice-modal-react'; @@ -8,7 +8,7 @@ import NoValueLabel from '../../../admin-x-ds/global/NoValueLabel'; import React, {useContext, useState} from 'react'; import SettingGroup from '../../../admin-x-ds/settings/SettingGroup'; import TabView from '../../../admin-x-ds/global/TabView'; -import UserDetailModal from './modals/UserDetailModal'; +import UserDetailModal from './UserDetailModal'; import useStaffUsers from '../../../hooks/useStaffUsers'; import {ServicesContext} from '../../providers/ServiceProvider'; import {User} from '../../../types/api'; diff --git a/ghost/admin-x-settings/src/components/settings/site/modals/DesignModal.tsx b/ghost/admin-x-settings/src/components/settings/site/DesignModal.tsx similarity index 82% rename from ghost/admin-x-settings/src/components/settings/site/modals/DesignModal.tsx rename to ghost/admin-x-settings/src/components/settings/site/DesignModal.tsx index 1d0de32cb5..9721073eec 100644 --- a/ghost/admin-x-settings/src/components/settings/site/modals/DesignModal.tsx +++ b/ghost/admin-x-settings/src/components/settings/site/DesignModal.tsx @@ -1,13 +1,13 @@ import BrandSettings from './designAndBranding/BrandSettings'; -import Button from '../../../../admin-x-ds/global/Button'; +import Button from '../../../admin-x-ds/global/Button'; import NiceModal from '@ebay/nice-modal-react'; -import PreviewModal from '../../../../admin-x-ds/global/PreviewModal'; +import PreviewModal from '../../../admin-x-ds/global/PreviewModal'; import React from 'react'; -import SettingGroup from '../../../../admin-x-ds/settings/SettingGroup'; -import TabView from '../../../../admin-x-ds/global/TabView'; +import SettingGroup from '../../../admin-x-ds/settings/SettingGroup'; +import TabView from '../../../admin-x-ds/global/TabView'; import ThemePreview from './designAndBranding/ThemePreivew'; import ThemeSettings from './designAndBranding/ThemeSettings'; -import {Tab} from '../../../../admin-x-ds/global/TabView'; +import {Tab} from '../../../admin-x-ds/global/TabView'; const Sidebar: React.FC = () => { const tabs: Tab[] = [ diff --git a/ghost/admin-x-settings/src/components/settings/site/SiteSettings.tsx b/ghost/admin-x-settings/src/components/settings/site/SiteSettings.tsx index da55ca97a9..750cae2f8b 100644 --- a/ghost/admin-x-settings/src/components/settings/site/SiteSettings.tsx +++ b/ghost/admin-x-settings/src/components/settings/site/SiteSettings.tsx @@ -1,4 +1,4 @@ -import DesignModal from './modals/DesignModal'; +import DesignModal from './DesignModal'; import React from 'react'; import SettingSection from '../../../admin-x-ds/settings/SettingSection'; diff --git a/ghost/admin-x-settings/src/components/settings/site/modals/designAndBranding/BrandSettings.tsx b/ghost/admin-x-settings/src/components/settings/site/designAndBranding/BrandSettings.tsx similarity index 83% rename from ghost/admin-x-settings/src/components/settings/site/modals/designAndBranding/BrandSettings.tsx rename to ghost/admin-x-settings/src/components/settings/site/designAndBranding/BrandSettings.tsx index 981d801347..567fbbce26 100644 --- a/ghost/admin-x-settings/src/components/settings/site/modals/designAndBranding/BrandSettings.tsx +++ b/ghost/admin-x-settings/src/components/settings/site/designAndBranding/BrandSettings.tsx @@ -1,10 +1,10 @@ -import Button from '../../../../../admin-x-ds/global/Button'; -import Heading from '../../../../../admin-x-ds/global/Heading'; -import Hint from '../../../../../admin-x-ds/global/Hint'; +import Button from '../../../../admin-x-ds/global/Button'; +import Heading from '../../../../admin-x-ds/global/Heading'; +import Hint from '../../../../admin-x-ds/global/Hint'; import React from 'react'; -import SettingGroupContent from '../../../../../admin-x-ds/settings/SettingGroupContent'; -import TextField from '../../../../../admin-x-ds/global/TextField'; -import useSettingGroup from '../../../../../hooks/useSettingGroup'; +import SettingGroupContent from '../../../../admin-x-ds/settings/SettingGroupContent'; +import TextField from '../../../../admin-x-ds/global/TextField'; +import useSettingGroup from '../../../../hooks/useSettingGroup'; const BrandSettings: React.FC = () => { const { diff --git a/ghost/admin-x-settings/src/components/settings/site/modals/designAndBranding/ThemePreivew.tsx b/ghost/admin-x-settings/src/components/settings/site/designAndBranding/ThemePreivew.tsx similarity index 82% rename from ghost/admin-x-settings/src/components/settings/site/modals/designAndBranding/ThemePreivew.tsx rename to ghost/admin-x-settings/src/components/settings/site/designAndBranding/ThemePreivew.tsx index 0cf42af730..18c2f6dad3 100644 --- a/ghost/admin-x-settings/src/components/settings/site/modals/designAndBranding/ThemePreivew.tsx +++ b/ghost/admin-x-settings/src/components/settings/site/designAndBranding/ThemePreivew.tsx @@ -1,4 +1,4 @@ -import DesktopChrome from '../../../../../admin-x-ds/global/DesktopChrome'; +import DesktopChrome from '../../../../admin-x-ds/global/DesktopChrome'; import React from 'react'; const ThemePreview: React.FC = () => { diff --git a/ghost/admin-x-settings/src/components/settings/site/modals/designAndBranding/ThemeSettings.tsx b/ghost/admin-x-settings/src/components/settings/site/designAndBranding/ThemeSettings.tsx similarity index 100% rename from ghost/admin-x-settings/src/components/settings/site/modals/designAndBranding/ThemeSettings.tsx rename to ghost/admin-x-settings/src/components/settings/site/designAndBranding/ThemeSettings.tsx