Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Updated default states in AdminX

Browse source 
refs. https://github.com/TryGhost/Team/issues/3151
This commit is contained in:
Peter Zimon 2023-05-25 14:59:30 +02:00
parent 5d1b752d89
commit 486876e3ac
5 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ghost/admin-x-settings/src/assets/icons/check-circle.svg Normal file
View file

@ -0,0 +1 @@
<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" stroke-width="1.5"><path d="M6,13.223,8.45,16.7a1.049,1.049,0,0,0,1.707.051L18,6.828" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path><path d="M0.750 11.999 A11.250 11.250 0 1 0 23.250 11.999 A11.250 11.250 0 1 0 0.750 11.999 Z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path></svg>
Side by side

After

Width:  |  Height:  |  Size: 423 B

1
ghost/admin-x-settings/src/assets/icons/lock-locked.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" stroke-width="1.5px"><defs></defs><title>lock-1</title><rect x="3.75" y="9.75" width="16.5" height="13.5" rx="1.5" ry="1.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></rect><path d="M6.75,9.75V6a5.25,5.25,0,0,1,10.5,0V9.75" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path><line x1="12" y1="15" x2="12" y2="18" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></line></svg>
Side by side

After

Width:  |  Height:  |  Size: 543 B

1
ghost/admin-x-settings/src/assets/icons/lock-unlocked.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" stroke-width="1.5px"><defs></defs><title>lock-unlock</title><path d="M.75,9.75V6a5.25,5.25,0,0,1,10.5,0V9.75" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path><rect x="6.75" y="9.75" width="16.5" height="13.5" rx="1.5" ry="1.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></rect><line x1="15" y1="15" x2="15" y2="18" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></line></svg>
Side by side

After

Width:  |  Height:  |  Size: 547 B

10
ghost/admin-x-settings/src/components/settings/email/Mailgun.tsx
View file

@ -5,6 +5,7 @@ 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 useSettingGroup from '../../../hooks/useSettingGroup';
import {ReactComponent as CheckIcon} from '../../../assets/icons/check-circle.svg';
const MAILGUN_REGIONS = [
{label: '🇺🇸 US', value: 'https://api.mailgun.net/v3'},
@ -25,13 +26,16 @@ const MailGun: React.FC = () => {
'mailgun_base_url', 'mailgun_domain', 'mailgun_api_key'
]) as string[];
const isMailgunSetup = mailgunRegion && mailgunDomain && mailgunApiKey;
const isMailgunSetup = mailgunDomain && mailgunApiKey;
const data = isMailgunSetup ? [
{
heading: 'Status',
key: 'status',
value: 'Mailgun is set up ✅'
value: (
<div className='flex items-center'>
<CheckIcon className='mr-2 h-4 w-4 text-green' /> Mailgun is set up
</div>
)
}
] : [
{

14
ghost/admin-x-settings/src/components/settings/general/LockSite.tsx
View file

@ -5,6 +5,8 @@ import SettingGroupContent from '../../../admin-x-ds/settings/SettingGroupConten
import TextField from '../../../admin-x-ds/global/TextField';
import Toggle from '../../../admin-x-ds/global/Toggle';
import useSettingGroup from '../../../hooks/useSettingGroup';
import {ReactComponent as LockedIcon} from '../../../assets/icons/lock-locked.svg';
import {ReactComponent as UnLockedIcon} from '../../../assets/icons/lock-unlocked.svg';
const LockSite: React.FC = () => {
const {
@ -31,7 +33,17 @@ const LockSite: React.FC = () => {
values={[
{
key: 'private',
value: !passwordEnabled ? 'Your site is not password protected' : 'Your site is password protected'
value: passwordEnabled ? (
<div className='flex items-center '>
<LockedIcon className='mr-2 h-4 w-4 text-yellow' />
<span>Your site is password protected</span>
</div>
) : (
<div className='flex items-center text-grey-900 '>
<UnLockedIcon className='mr-2 h-4 w-4' />
<span>Your site is not password protected</span>
</div>
)
}
]}
/>