diff --git a/ghost/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.tsx b/ghost/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.tsx index 79f5502f4f..eddc8375b8 100644 --- a/ghost/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.tsx +++ b/ghost/admin-x-settings/src/admin-x-ds/settings/SettingGroupHeader.tsx @@ -13,7 +13,7 @@ const SettingGroupHeader: React.FC = ({title, description, children}) => {(title || description) &&
{title} - {description &&

{description}

} + {description &&

{description}

}
} {children} diff --git a/ghost/admin-x-settings/src/components/settings/email/DefaultRecipients.tsx b/ghost/admin-x-settings/src/components/settings/email/DefaultRecipients.tsx index ca6891e3e3..d5d4b4488d 100644 --- a/ghost/admin-x-settings/src/components/settings/email/DefaultRecipients.tsx +++ b/ghost/admin-x-settings/src/components/settings/email/DefaultRecipients.tsx @@ -1,5 +1,7 @@ import React, {useState} from 'react'; import SettingGroup from '../../../admin-x-ds/settings/SettingGroup'; +import SettingGroupInputs from '../../../admin-x-ds/settings/SettingGroupInputs'; +import SettingGroupValues from '../../../admin-x-ds/settings/SettingGroupValues'; import {TSettingGroupStates} from '../../../admin-x-ds/settings/SettingGroup'; const DefaultRecipients: React.FC = () => { @@ -9,14 +11,32 @@ const DefaultRecipients: React.FC = () => { setCurrentState(newState); }; + const values = ( + + ); + + const inputs = ( + + + + ); + return ( - Values and inputs + {currentState === 'view' ? values : inputs} ); }; diff --git a/ghost/admin-x-settings/src/components/settings/email/Mailgun.tsx b/ghost/admin-x-settings/src/components/settings/email/Mailgun.tsx index 2a6ca0dd14..ef0526d340 100644 --- a/ghost/admin-x-settings/src/components/settings/email/Mailgun.tsx +++ b/ghost/admin-x-settings/src/components/settings/email/Mailgun.tsx @@ -1,6 +1,8 @@ import Link from '../../../admin-x-ds/global/Link'; import React, {useState} from 'react'; import SettingGroup from '../../../admin-x-ds/settings/SettingGroup'; +import SettingGroupInputs from '../../../admin-x-ds/settings/SettingGroupInputs'; +import SettingGroupValues from '../../../admin-x-ds/settings/SettingGroupValues'; import {TSettingGroupStates} from '../../../admin-x-ds/settings/SettingGroup'; const MailGun: React.FC = () => { @@ -10,14 +12,33 @@ const MailGun: React.FC = () => { setCurrentState(newState); }; + const values = ( + + ); + + const inputs = ( + + + + ); + return ( The Mailgun API is used for bulk email newsletter delivery. Why is this required?} state={currentState} - title='Make site private' + title='Mailgun' onStateChange={handleStateChange} > - Values and inputs + {currentState === 'view' ? values : inputs} ); }; diff --git a/ghost/admin-x-settings/src/components/settings/general/SocialAccounts.tsx b/ghost/admin-x-settings/src/components/settings/general/SocialAccounts.tsx index 9a4b79d8aa..57983b8432 100644 --- a/ghost/admin-x-settings/src/components/settings/general/SocialAccounts.tsx +++ b/ghost/admin-x-settings/src/components/settings/general/SocialAccounts.tsx @@ -39,7 +39,7 @@ const SocialAccounts: React.FC = () => { /> {}} /> diff --git a/ghost/admin-x-settings/src/components/settings/membership/Access.tsx b/ghost/admin-x-settings/src/components/settings/membership/Access.tsx index 1210f34bcc..6dbe6413f0 100644 --- a/ghost/admin-x-settings/src/components/settings/membership/Access.tsx +++ b/ghost/admin-x-settings/src/components/settings/membership/Access.tsx @@ -1,5 +1,7 @@ import React, {useState} from 'react'; import SettingGroup from '../../../admin-x-ds/settings/SettingGroup'; +import SettingGroupInputs from '../../../admin-x-ds/settings/SettingGroupInputs'; +import SettingGroupValues from '../../../admin-x-ds/settings/SettingGroupValues'; import {TSettingGroupStates} from '../../../admin-x-ds/settings/SettingGroup'; const Access: React.FC = () => { @@ -9,6 +11,34 @@ const Access: React.FC = () => { setCurrentState(newState); }; + const values = ( + + ); + + const inputs = ( + + + + ); + return ( { title='Access' onStateChange={handleStateChange} > - Values and inputs + {currentState === 'view' ? values : inputs} ); }; diff --git a/ghost/admin-x-settings/src/components/settings/membership/Analytics.tsx b/ghost/admin-x-settings/src/components/settings/membership/Analytics.tsx index f784ceb065..c4fd234464 100644 --- a/ghost/admin-x-settings/src/components/settings/membership/Analytics.tsx +++ b/ghost/admin-x-settings/src/components/settings/membership/Analytics.tsx @@ -1,5 +1,7 @@ import React, {useState} from 'react'; import SettingGroup from '../../../admin-x-ds/settings/SettingGroup'; +import SettingGroupInputs from '../../../admin-x-ds/settings/SettingGroupInputs'; +import SettingGroupValues from '../../../admin-x-ds/settings/SettingGroupValues'; import {TSettingGroupStates} from '../../../admin-x-ds/settings/SettingGroup'; const Analytics: React.FC = () => { @@ -9,6 +11,40 @@ const Analytics: React.FC = () => { setCurrentState(newState); }; + const values = ( + + ); + + const inputs = ( + + + + ); + return ( { title='Analytics' onStateChange={handleStateChange} > - Values and inputs + {currentState === 'view' ? values : inputs} ); };