Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Move premium tab to the new settings

Browse Source 
[MAILPOET-2681]
This commit is contained in:
Amine Ben hammou
2020-03-29 16:16:48 +02:00
committed by Veljko V
parent d297ff24f5
commit a00cdd626d
7 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
assets/js/src/settings/pages/key_activation.tsx
View File

@@ -1,5 +0,0 @@
import React from 'react';
export default function KeyActivation() {
return <p>Key Activation!</p>;
}

13
assets/js/src/old_settings/premium_tab/premium_tab.jsx → assets/js/src/settings/pages/key_activation/index.tsx
View File

@@ -2,13 +2,10 @@ import PropTypes from 'prop-types';
import React, { useMemo, useState } from 'react'; import React, { useMemo, useState } from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import MailPoet from 'mailpoet'; import MailPoet from 'mailpoet';
import SetFromAddressModal from 'common/set_from_address_modal.tsx'; import KeyMessages from 'settings/pages/key_activation/messages/key_messages.jsx';
import { GlobalContext, useGlobalContextValue } from 'context/index.jsx'; import { MssStatus, MssMessages } from 'settings/pages/key_activation/messages/mss_messages.jsx';
import Notices from 'notices/notices.jsx'; import { PremiumStatus, PremiumMessages } from 'settings/pages/key_activation/messages/premium_messages.jsx';
import KeyMessages from 'old_settings/premium_tab/messages/key_messages.jsx'; import { PremiumInstallationStatus } from 'settings/pages/key_activation/messages/premium_installation_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';
const getSettings = async () => MailPoet.Ajax.post({ const getSettings = async () => MailPoet.Ajax.post({
api_version: window.mailpoet_api_version, api_version: window.mailpoet_api_version,
@@ -236,7 +233,7 @@ const PremiumTab = (props) => {
</tr> </tr>
</tbody> </tbody>
</table> </table>
{ showSetFromAddressModal && ( {showSetFromAddressModal && (
<SetFromAddressModal <SetFromAddressModal
onRequestClose={() => setShowSetFromAddressModal(false)} onRequestClose={() => setShowSetFromAddressModal(false)}
/> />

0
assets/js/src/old_settings/premium_tab/messages/key_messages.jsx → assets/js/src/settings/pages/key_activation/messages/key_messages.jsx
View File

0
assets/js/src/old_settings/premium_tab/messages/mss_messages.jsx → assets/js/src/settings/pages/key_activation/messages/mss_messages.jsx
View File

0
assets/js/src/old_settings/premium_tab/messages/premium_installation_messages.jsx → assets/js/src/settings/pages/key_activation/messages/premium_installation_messages.jsx
View File

2
assets/js/src/old_settings/premium_tab/messages/premium_messages.jsx → assets/js/src/settings/pages/key_activation/messages/premium_messages.jsx
View File

@@ -1,7 +1,7 @@
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
import MailPoet from 'mailpoet'; 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 = { const PremiumStatus = {
KEY_INVALID: 0, KEY_INVALID: 0,

1
assets/js/src/webpack_admin_index.jsx
View File

@@ -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 'old_settings/settings.jsx'; // side effect - renders ReactDOM to document
import 'forms/forms.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/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 'help/help.jsx'; // side effect - renders ReactDOM to document
import 'old_settings/reinstall_from_scratch.js'; // side effect - adds event handler 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 import 'subscribers/importExport/import.jsx'; // side effect - executes on doc ready, adds events