diff --git a/assets/js/src/settings/pages/key_activation.tsx b/assets/js/src/settings/pages/key_activation.tsx deleted file mode 100644 index dd21803691..0000000000 --- a/assets/js/src/settings/pages/key_activation.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import React from 'react'; - -export default function KeyActivation() { - return

Key Activation!

; -} diff --git a/assets/js/src/old_settings/premium_tab/premium_tab.jsx b/assets/js/src/settings/pages/key_activation/index.tsx similarity index 94% rename from assets/js/src/old_settings/premium_tab/premium_tab.jsx rename to assets/js/src/settings/pages/key_activation/index.tsx index 0303c9474a..71aefe80b5 100644 --- a/assets/js/src/old_settings/premium_tab/premium_tab.jsx +++ b/assets/js/src/settings/pages/key_activation/index.tsx @@ -2,13 +2,10 @@ import PropTypes from 'prop-types'; import React, { useMemo, useState } from 'react'; import ReactDOM from 'react-dom'; import MailPoet from 'mailpoet'; -import SetFromAddressModal from 'common/set_from_address_modal.tsx'; -import { GlobalContext, useGlobalContextValue } from 'context/index.jsx'; -import Notices from 'notices/notices.jsx'; -import KeyMessages from 'old_settings/premium_tab/messages/key_messages.jsx'; -import { MssStatus, MssMessages } from 'old_settings/premium_tab/messages/mss_messages.jsx'; -import { PremiumStatus, PremiumMessages } from 'old_settings/premium_tab/messages/premium_messages.jsx'; -import { PremiumInstallationStatus } from 'old_settings/premium_tab/messages/premium_installation_messages.jsx'; +import KeyMessages from 'settings/pages/key_activation/messages/key_messages.jsx'; +import { MssStatus, MssMessages } from 'settings/pages/key_activation/messages/mss_messages.jsx'; +import { PremiumStatus, PremiumMessages } from 'settings/pages/key_activation/messages/premium_messages.jsx'; +import { PremiumInstallationStatus } from 'settings/pages/key_activation/messages/premium_installation_messages.jsx'; const getSettings = async () => MailPoet.Ajax.post({ api_version: window.mailpoet_api_version, @@ -236,7 +233,7 @@ const PremiumTab = (props) => { - { showSetFromAddressModal && ( + {showSetFromAddressModal && ( setShowSetFromAddressModal(false)} /> diff --git a/assets/js/src/old_settings/premium_tab/messages/key_messages.jsx b/assets/js/src/settings/pages/key_activation/messages/key_messages.jsx similarity index 100% rename from assets/js/src/old_settings/premium_tab/messages/key_messages.jsx rename to assets/js/src/settings/pages/key_activation/messages/key_messages.jsx diff --git a/assets/js/src/old_settings/premium_tab/messages/mss_messages.jsx b/assets/js/src/settings/pages/key_activation/messages/mss_messages.jsx similarity index 100% rename from assets/js/src/old_settings/premium_tab/messages/mss_messages.jsx rename to assets/js/src/settings/pages/key_activation/messages/mss_messages.jsx diff --git a/assets/js/src/old_settings/premium_tab/messages/premium_installation_messages.jsx b/assets/js/src/settings/pages/key_activation/messages/premium_installation_messages.jsx similarity index 100% rename from assets/js/src/old_settings/premium_tab/messages/premium_installation_messages.jsx rename to assets/js/src/settings/pages/key_activation/messages/premium_installation_messages.jsx diff --git a/assets/js/src/old_settings/premium_tab/messages/premium_messages.jsx b/assets/js/src/settings/pages/key_activation/messages/premium_messages.jsx similarity index 96% rename from assets/js/src/old_settings/premium_tab/messages/premium_messages.jsx rename to assets/js/src/settings/pages/key_activation/messages/premium_messages.jsx index 1ddc606612..09686edfe9 100644 --- a/assets/js/src/old_settings/premium_tab/messages/premium_messages.jsx +++ b/assets/js/src/settings/pages/key_activation/messages/premium_messages.jsx @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import MailPoet from 'mailpoet'; -import { PremiumInstallationMessages } from 'old_settings/premium_tab/messages/premium_installation_messages.jsx'; +import { PremiumInstallationMessages } from 'settings/pages/key_activation/messages/premium_installation_messages.jsx'; const PremiumStatus = { KEY_INVALID: 0, diff --git a/assets/js/src/webpack_admin_index.jsx b/assets/js/src/webpack_admin_index.jsx index ef3fc475ee..00b4931462 100644 --- a/assets/js/src/webpack_admin_index.jsx +++ b/assets/js/src/webpack_admin_index.jsx @@ -12,7 +12,6 @@ import 'dynamic_segments/dynamic_segments.jsx'; // side effect - renders ReactDO import 'old_settings/settings.jsx'; // side effect - renders ReactDOM to document import 'forms/forms.jsx'; // side effect - renders ReactDOM to document import 'old_settings/tabs.js'; // side effect - assigns to MailPoet.Router, executes code on doc ready -import 'old_settings/premium_tab/premium_tab.jsx'; // side effect - renders ReactDOM to document import 'help/help.jsx'; // side effect - renders ReactDOM to document import 'old_settings/reinstall_from_scratch.js'; // side effect - adds event handler to document import 'subscribers/importExport/import.jsx'; // side effect - executes on doc ready, adds events