From db1c4e638175f5efbf65f2d58ee1aefec284b107 Mon Sep 17 00:00:00 2001
From: Peter Zimon <peter.zimon@gmail.com>
Date: Tue, 13 Jun 2023 12:20:29 +0200
Subject: [PATCH] Restructured components for theme mngmt in AdminX

refs. https://github.com/TryGhost/Team/issues/3432
---
 .../src/components/settings/site/Theme.tsx           |  2 +-
 .../ChangeThemeModal.tsx => ThemeModal.tsx}          | 12 ++++++------
 .../AdvancedThemeSettings.tsx                        |  0
 .../{designAndBranding => theme}/OfficialThemes.tsx  |  0
 .../NewThemePreview.tsx => theme/ThemePreview.tsx}   |  0
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename ghost/admin-x-settings/src/components/settings/site/{designAndBranding/ChangeThemeModal.tsx => ThemeModal.tsx} (91%)
 rename ghost/admin-x-settings/src/components/settings/site/{designAndBranding => theme}/AdvancedThemeSettings.tsx (100%)
 rename ghost/admin-x-settings/src/components/settings/site/{designAndBranding => theme}/OfficialThemes.tsx (100%)
 rename ghost/admin-x-settings/src/components/settings/site/{designAndBranding/NewThemePreview.tsx => theme/ThemePreview.tsx} (100%)

diff --git a/ghost/admin-x-settings/src/components/settings/site/Theme.tsx b/ghost/admin-x-settings/src/components/settings/site/Theme.tsx
index 4c0a4ea28f..f87bb9b329 100644
--- a/ghost/admin-x-settings/src/components/settings/site/Theme.tsx
+++ b/ghost/admin-x-settings/src/components/settings/site/Theme.tsx
@@ -1,5 +1,5 @@
 import Button from '../../../admin-x-ds/global/Button';
-import ChangeThemeModal from './designAndBranding/ChangeThemeModal';
+import ChangeThemeModal from './ThemeModal';
 import NiceModal from '@ebay/nice-modal-react';
 import React from 'react';
 import SettingGroup from '../../../admin-x-ds/settings/SettingGroup';
diff --git a/ghost/admin-x-settings/src/components/settings/site/designAndBranding/ChangeThemeModal.tsx b/ghost/admin-x-settings/src/components/settings/site/ThemeModal.tsx
similarity index 91%
rename from ghost/admin-x-settings/src/components/settings/site/designAndBranding/ChangeThemeModal.tsx
rename to ghost/admin-x-settings/src/components/settings/site/ThemeModal.tsx
index 114d982b21..26be9e2bcf 100644
--- a/ghost/admin-x-settings/src/components/settings/site/designAndBranding/ChangeThemeModal.tsx
+++ b/ghost/admin-x-settings/src/components/settings/site/ThemeModal.tsx
@@ -1,10 +1,10 @@
-import AdvancedThemeSettings from './AdvancedThemeSettings';
-import Button from '../../../../admin-x-ds/global/Button';
-import ButtonGroup from '../../../../admin-x-ds/global/ButtonGroup';
-import Modal from '../../../../admin-x-ds/global/Modal';
-import NewThemePreview from './NewThemePreview';
+import AdvancedThemeSettings from './theme/AdvancedThemeSettings';
+import Button from '../../../admin-x-ds/global/Button';
+import ButtonGroup from '../../../admin-x-ds/global/ButtonGroup';
+import Modal from '../../../admin-x-ds/global/Modal';
+import NewThemePreview from './theme/ThemePreview';
 import NiceModal, {useModal} from '@ebay/nice-modal-react';
-import OfficialThemes from './OfficialThemes';
+import OfficialThemes from './theme/OfficialThemes';
 import {useState} from 'react';
 
 const ChangeThemeModal = NiceModal.create(() => {
diff --git a/ghost/admin-x-settings/src/components/settings/site/designAndBranding/AdvancedThemeSettings.tsx b/ghost/admin-x-settings/src/components/settings/site/theme/AdvancedThemeSettings.tsx
similarity index 100%
rename from ghost/admin-x-settings/src/components/settings/site/designAndBranding/AdvancedThemeSettings.tsx
rename to ghost/admin-x-settings/src/components/settings/site/theme/AdvancedThemeSettings.tsx
diff --git a/ghost/admin-x-settings/src/components/settings/site/designAndBranding/OfficialThemes.tsx b/ghost/admin-x-settings/src/components/settings/site/theme/OfficialThemes.tsx
similarity index 100%
rename from ghost/admin-x-settings/src/components/settings/site/designAndBranding/OfficialThemes.tsx
rename to ghost/admin-x-settings/src/components/settings/site/theme/OfficialThemes.tsx
diff --git a/ghost/admin-x-settings/src/components/settings/site/designAndBranding/NewThemePreview.tsx b/ghost/admin-x-settings/src/components/settings/site/theme/ThemePreview.tsx
similarity index 100%
rename from ghost/admin-x-settings/src/components/settings/site/designAndBranding/NewThemePreview.tsx
rename to ghost/admin-x-settings/src/components/settings/site/theme/ThemePreview.tsx