diff --git a/ghost/portal/src/components/pages/FeedbackPage.js b/ghost/portal/src/components/pages/FeedbackPage.js index 1e9e088089..bbe95ccbd2 100644 --- a/ghost/portal/src/components/pages/FeedbackPage.js +++ b/ghost/portal/src/components/pages/FeedbackPage.js @@ -7,6 +7,7 @@ import LoadingPage from './LoadingPage'; import {HumanReadableError} from '../../utils/errors'; import {ReactComponent as ThumbUpIcon} from '../../images/icons/thumbs-up.svg'; import {ReactComponent as ThumbDownIcon} from '../../images/icons/thumbs-down.svg'; +import {ReactComponent as WarningIcon} from '../../images/icons/warning-fill.svg'; const React = require('react'); @@ -19,6 +20,12 @@ export const FeedbackPageStyles = ` padding: 10px 0; text-align: center; color: var(--brandcolor); + width: 48px; + margin: 0 auto; + } + + .gh-portal-feedback .gh-feedback-icon.gh-feedback-icon-error { + color: #f50b23; } .gh-portal-feedback .gh-portal-text-center { @@ -26,38 +33,30 @@ export const FeedbackPageStyles = ` } `; -function SiteLogo() { - const {site} = useContext(AppContext); - const siteLogo = site.icon; - - if (siteLogo) { - return ( - {site.title} - ); - } - return (null); -} - -function AccountHeader() { - const {site} = useContext(AppContext); - const siteTitle = site.title || ''; - return ( -
- -

{siteTitle}

-
- ); -} - function ErrorPage({error}) { + const {onAction} = useContext(AppContext); + return (
- -

Saving failed.

+
+ +
+

It's not you, it's us

{error}

+ onAction('closePopup')} + disabled={false} + brandColor='#000000' + label={'Close'} + isRunning={false} + tabindex='3' + classes={'sticky bottom'} + />
); } @@ -76,7 +75,7 @@ export default function FeedbackPage() { // Clear query params once finished setLoading(false); })().catch((e) => { - const text = HumanReadableError.getMessageFromError(e, 'There was a problem submitting your feedback'); + const text = HumanReadableError.getMessageFromError(e, 'There was a problem submitting your feedback. Please try again or contact the site owner.'); setError(text); }); }, [uuid, postId, score, site.url]); diff --git a/ghost/portal/src/components/pages/UnsubscribePage.js b/ghost/portal/src/components/pages/UnsubscribePage.js index 11bf664770..4945be65a9 100644 --- a/ghost/portal/src/components/pages/UnsubscribePage.js +++ b/ghost/portal/src/components/pages/UnsubscribePage.js @@ -1,10 +1,11 @@ import AppContext from '../../AppContext'; - +import ActionButton from '../common/ActionButton'; import {useContext, useEffect, useState} from 'react'; import {getSiteNewsletters} from '../../utils/helpers'; import setupGhostApi from '../../utils/api'; import NewsletterManagement from '../common/NewsletterManagement'; import CloseButton from '../common/CloseButton'; +import {ReactComponent as WarningIcon} from '../../images/icons/warning-fill.svg'; const React = require('react'); @@ -95,13 +96,26 @@ export default function UnsubscribePage() { // Case: Email not found if (member === null) { return ( -
+
- -

Unsubscribe failed

-
-

Email address not found.

+
+
+

That didn't go to plan

+
+

We couldn't unsubscribe you as the email address was not found. Please contact the site owner.

+
+ onAction('closePopup')} + disabled={false} + brandColor='#000000' + label={'Close'} + isRunning={false} + tabindex='3' + classes={'sticky bottom'} + />
); }