Skip to content

Commit

Permalink
add: deactivated account component, routes, translations and image
Browse files Browse the repository at this point in the history
  • Loading branch information
vincit-matu committed Nov 18, 2024
1 parent dde4364 commit f794281
Show file tree
Hide file tree
Showing 10 changed files with 187 additions and 0 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions apps/admin-ui/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import NotificationsRouter from "./spa/notifications/router";
import Error404 from "./common/Error404";
import { UserPermissionChoice } from "@gql/gql-types";
import { UnitsRouter } from "./spa/unit/router";
import DeactivatedAccount from "common/src/components/DeactivatedAccount";

const Units = dynamic(() => import("./spa/unit"));

Expand Down Expand Up @@ -151,6 +152,15 @@ function ClientApp({
UserPermissionChoice.CanManageNotifications
)}
/>
<Route
path="/deactivated-account"
element={
<DeactivatedAccount
feedbackUrl={`${feedbackUrl}foo`}
imgSrc={`${PUBLIC_URL}/images/deactivated-account.png`}
/>
}
/>
</Routes>
</PageWrapper>
</BrowserRouter>
Expand Down
10 changes: 10 additions & 0 deletions apps/admin-ui/src/i18n/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,14 @@ i18n.addResourceBundle("fi", "forms", {
invalidEmail: "Sähköpostin tulee olla oikeassa muodossa (sisältäen @-merkin)",
});

i18n.addResourceBundle("fi", "errors", {
deactivatedAccount: {
heading: "Käyttäjätunnuksesi ei ole voimassa.",
subHeadingA: "Ota yhteyttä asiakaspalveluun sähköpostitse",
subHeadingB: "tai Ota yhteyttä-lomakkeella.",
email: "[email protected]",
button: "Ota yhteyttä",
},
});

export default i18n;
3 changes: 3 additions & 0 deletions apps/ui/components/common/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ const Wrapper = styled.div`
width: 100%;
margin: 0 auto;
max-width: var(--container-width-xl);
@media (min-width: ${breakpoints.xl}) {
padding-inline: 0;
}
}
[class*="module_headerNavigationMenuContainer__"] li {
Expand Down
27 changes: 27 additions & 0 deletions apps/ui/pages/deactivated-account.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from "react";
import { getCommonServerSideProps } from "@/modules/serverUtils";
import { GetServerSidePropsContext } from "next";
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
import DeactivatedAccount from "common/src/components/DeactivatedAccount";

export async function getServerSideProps({
locale,
}: GetServerSidePropsContext) {
return {
props: {
...getCommonServerSideProps(),
...(await serverSideTranslations(locale ?? "fi")),
},
};
}

const DeactivatedAccountPage = ({ feedbackUrl }: { feedbackUrl: string }) => {
return (
<DeactivatedAccount
feedbackUrl={feedbackUrl}
imgSrc="/images/deactivated-account.png"
/>
);
};

export default DeactivatedAccountPage;
Binary file added apps/ui/public/images/deactivated-account.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions apps/ui/public/locales/en/errors.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
"500": {
"body": "Something unexpected happened"
},
"deactivatedAccount": {
"heading": "Your User ID is not valid.",
"subHeadingA": "Please contact support via email at",
"subHeadingB": "or via the Contact us form.",
"email": "[email protected]",
"button": "Contact us"
},
"applicationMutation": {
"Validation error": "Error in the API call",
"Form validation error": "Form validation error",
Expand Down
7 changes: 7 additions & 0 deletions apps/ui/public/locales/fi/errors.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
"500": {
"body": "Jotain meni pieleen"
},
"deactivatedAccount": {
"heading": "Käyttäjätunnuksesi ei ole voimassa.",
"subHeadingA": "Ota yhteyttä asiakaspalveluun sähköpostitse",
"subHeadingB": "tai Ota yhteyttä-lomakkeella.",
"email": "[email protected]",
"button": "Ota yhteyttä"
},
"applicationMutation": {
"Validation error": "Virheellinen rajapintakutsu",
"Form validation error": "Virheellinen lomake",
Expand Down
7 changes: 7 additions & 0 deletions apps/ui/public/locales/sv/errors.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
"500": {
"body": "Något oväntat hände"
},
"deactivatedAccount": {
"heading": "Ditt användar-ID är inte giltigt.",
"subHeadingA": "Var god och kontakta vår kundtjänst via email på",
"subHeadingB": "eller via Ta kontakt-formuläret.",
"email": "[email protected]",
"button": "Ta kontakt"
},
"applicationMutation": {
"Validation error": "Ett fel uppstod i API-anropet",
"Form validation error": "Formuläret innehåller fel",
Expand Down
116 changes: 116 additions & 0 deletions packages/common/src/components/DeactivatedAccount.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
import React from "react";
import { useTranslation } from "next-i18next";
import styled from "styled-components";
import IconButton from "./IconButton";
import { IconArrowRight } from "hds-react";
import { fontBold, fontRegular } from "../common/typography";

const ErrorContainer = styled.div`
display: flex;
flex-direction: column;
max-width: var(--container-width-xl);
margin: 0 auto;
gap: 42px;
padding-block: 42px;
padding-inline: var(--spacing-s);
--spacing-hz: var(--spacing-s);
img {
width: 185px;
height: auto;
margin: 0 auto;
}
@media (min-width: 768px) {
flex-direction: row;
padding-inline: var(--spacing-m);
--spacing-hz: var(--spacing-m);
img {
display: flex;
margin: 0;
margin-inline: auto;
width: auto;
max-height: 418px;
max-width: 350px;
flex-grow: 1;
}
}
`;

const TextContent = styled.div`
display: flex;
flex-direction: column;
gap: 42px;
justify-content: center;
@media (min-width: 768px) {
order: -1;
}
`;

const Heading = styled.h1`
margin: 0;
line-height: 1;
font-size: 40px;
${fontRegular}
`;

const Body = styled.p`
margin: 0;
`;

const Email = styled.a`
margin: 8px 0 0;
${fontBold}
`;

// NOTE: This is a copy of the Footer component from the common package
const constructFeedbackUrl = (
feedbackUrl: string,
i18n: { language: string }
) => {
try {
const url = new URL(feedbackUrl);
url.searchParams.set("lang", i18n.language);
return url.toString();
} catch (e) {
return null;
}
};

const DeactivatedAccount = ({
feedbackUrl,
imgSrc,
}: {
feedbackUrl: string;
imgSrc: string;
}) => {
console.log(feedbackUrl);

Check failure on line 85 in packages/common/src/components/DeactivatedAccount.tsx

View workflow job for this annotation

GitHub Actions / Lint admin ui

Unexpected console statement

Check failure on line 85 in packages/common/src/components/DeactivatedAccount.tsx

View workflow job for this annotation

GitHub Actions / Lint ui

Unexpected console statement
const { t, i18n } = useTranslation();
return (
<ErrorContainer>
<img
src={imgSrc}
alt={t("errors:deactivatedAccount.heading")}
width="350"
height="418"
aria-hidden="true"
/>
<TextContent>
<Heading>{t("errors:deactivatedAccount.heading")}</Heading>
<Body>
{`${t("errors:deactivatedAccount.subHeadingA")} `}
<Email href={`mailto:${t("errors:deactivatedAccount.email")}`}>
{t("errors:deactivatedAccount.email")}
</Email>
{` ${t("errors:deactivatedAccount.subHeadingB")}`}
</Body>
<IconButton
label={t("errors:deactivatedAccount.button")}
icon={<IconArrowRight aria-hidden="true" />}
href={constructFeedbackUrl(feedbackUrl, i18n) ?? feedbackUrl}
rel="noopener noreferrer"
/>
</TextContent>
</ErrorContainer>
);
};

export default DeactivatedAccount;

0 comments on commit f794281

Please sign in to comment.