Skip to content

Commit

Permalink
refactor: to use correct illustrations for maintenance pages (#3100)
Browse files Browse the repository at this point in the history
* refactor: to use correct illustrations for maintenance pages

* fix: set maintenance page image height for consistency across images

* fix(vrt): test image width
  • Loading branch information
emmenko authored May 24, 2023
1 parent 5fdd801 commit 8e814ad
Show file tree
Hide file tree
Showing 15 changed files with 122 additions and 152 deletions.
7 changes: 7 additions & 0 deletions .changeset/hot-glasses-beam.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@commercetools-frontend/application-components': patch
'@commercetools-frontend/application-shell': patch
'@commercetools-frontend/assets': patch
---

Update illustrations leftovers and use correct illustrations for maintenance pages
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ReactNode } from 'react';
import { css } from '@emotion/react';
import Constraints from '@commercetools-uikit/constraints';
import { designTokens } from '@commercetools-uikit/design-system';
import Spacings from '@commercetools-uikit/spacings';
import Text from '@commercetools-uikit/text';

Expand Down Expand Up @@ -28,7 +29,11 @@ const MaintenancePageLayout = (props: Props) => (
<Constraints.Horizontal max={10}>
<Spacings.Stack scale="m">
<div>
<img src={props.imageSrc} alt={props.label} />
<img
style={{ height: designTokens.constraint7 }}
src={props.imageSrc}
alt={props.label}
/>
</div>
<Text.Headline as="h2">{props.title}</Text.Headline>
<Text.Body>{props.paragraph1}</Text.Body>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useIntl, FormattedMessage } from 'react-intl';
import PageNotFoundIllustration from '@commercetools-frontend/assets/images/page-application-disabled.svg';
import PageNotFoundSVG from '@commercetools-frontend/assets/images/page-not-found.svg';
import { SUPPORT_PORTAL_URL } from '@commercetools-frontend/constants';
import MaintenancePageLayout from '../maintenance-page-layout';
import messages from './messages';
Expand All @@ -15,7 +15,7 @@ const PageNotFound = () => {

return (
<MaintenancePageLayout
imageSrc={PageNotFoundIllustration}
imageSrc={PageNotFoundSVG}
title={<FormattedMessage {...messages.title} />}
label={intl.formatMessage(messages.title)}
paragraph1={
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useIntl, FormattedMessage } from 'react-intl';
import FailedAuthorizationIllustration from '@commercetools-frontend/assets/images/folder-full-locked.svg';
import FailedAuthorizationSVG from '@commercetools-frontend/assets/images/doors-closed.svg';
import { SUPPORT_PORTAL_URL } from '@commercetools-frontend/constants';
import MaintenancePageLayout from '../maintenance-page-layout';
import messages from './messages';
Expand All @@ -16,7 +16,7 @@ export const PageUnauthorized = () => {

return (
<MaintenancePageLayout
imageSrc={FailedAuthorizationIllustration}
imageSrc={FailedAuthorizationSVG}
title={<FormattedMessage {...messages.title} />}
label={intl.formatMessage(messages.title)}
paragraph1={<FormattedMessage {...messages.paragraph1} />}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
PublicPageLayout,
themesOverrides,
} from '@commercetools-frontend/application-components';
import FailedAuthenticationSVG from '@commercetools-frontend/assets/images/locked-diamond.svg';
import FailedAuthenticationSVG from '@commercetools-frontend/assets/images/doors-closed.svg';
import type { TAsyncLocaleDataProps } from '@commercetools-frontend/i18n';

import { AsyncLocaleData } from '@commercetools-frontend/i18n';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { useIntl, FormattedMessage } from 'react-intl';
import { MaintenancePageLayout } from '@commercetools-frontend/application-components';
import UnexpectedErrorIllustration from '@commercetools-frontend/assets/images/unexpected-error.svg';
import UnexpectedErrorSVG from '@commercetools-frontend/assets/images/unexpected-error.svg';
import messages from './messages';

const ErrorApologizer = () => {
const intl = useIntl();

return (
<MaintenancePageLayout
imageSrc={UnexpectedErrorIllustration}
imageSrc={UnexpectedErrorSVG}
title={<FormattedMessage {...messages.title} />}
label={intl.formatMessage(messages.title)}
paragraph1={<FormattedMessage {...messages.notifiedTeam} />}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useIntl, FormattedMessage } from 'react-intl';
import { MaintenancePageLayout } from '@commercetools-frontend/application-components';
import FailedAuthenticationSVG from '@commercetools-frontend/assets/images/locked-diamond.svg';
import FailedAuthenticationSVG from '@commercetools-frontend/assets/images/doors-closed.svg';
import messages from './messages';

const FailedAuthentication = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useIntl, FormattedMessage } from 'react-intl';
import { MaintenancePageLayout } from '@commercetools-frontend/application-components';
import FailedAuthorizationIllustration from '@commercetools-frontend/assets/images/folder-full-locked.svg';
import ProjectNotFoundSVG from '@commercetools-frontend/assets/images/folder-full-locked.svg';
import ServicePageProjectSwitcher from '../service-page-project-switcher';
import messages from './messages';

Expand All @@ -9,7 +9,7 @@ const ProjectNotFound = () => {

return (
<MaintenancePageLayout
imageSrc={FailedAuthorizationIllustration}
imageSrc={ProjectNotFoundSVG}
title={<FormattedMessage {...messages.title} />}
label={intl.formatMessage(messages.title)}
paragraph1={<FormattedMessage {...messages.paragraph1} />}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useIntl, FormattedMessage } from 'react-intl';
import { MaintenancePageLayout } from '@commercetools-frontend/application-components';
import ProjectNotInitializedIllustration from '@commercetools-frontend/assets/images/hourglass.svg';
import ProjectNotInitializedSVG from '@commercetools-frontend/assets/images/hourglass.svg';
import ServicePageProjectSwitcher from '../service-page-project-switcher';
import messages from './messages';

Expand All @@ -20,7 +20,7 @@ const ProjectNotInitialized = () => {

return (
<MaintenancePageLayout
imageSrc={ProjectNotInitializedIllustration}
imageSrc={ProjectNotInitializedSVG}
title={<FormattedMessage {...messages.title} />}
label={intl.formatMessage(messages.title)}
paragraph1={
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useIntl, FormattedMessage, MessageDescriptor } from 'react-intl';
import { MaintenancePageLayout } from '@commercetools-frontend/application-components';
import ProjectSuspendedSVG from '@commercetools-frontend/assets/images/doors-closed.svg';
import ProjectSuspendedSVG from '@commercetools-frontend/assets/images/locked-diamond.svg';
import ServicePageProjectSwitcher from '../service-page-project-switcher';
import messages from './messages';

Expand Down
66 changes: 26 additions & 40 deletions packages/assets/images/doors-closed.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

1 comment on commit 8e814ad

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deploy preview for merchant-center-application-kit ready!

✅ Preview
https://merchant-center-application-mk962v13o-commercetools.vercel.app

Built with commit 8e814ad.
This pull request is being automatically deployed with vercel-action

Please sign in to comment.