Skip to content

feat: introduced not found / error layout #6247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ovflowd merged 11 commits into from
Jan 17, 2024
Merged

feat: introduced not found / error layout #6247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cbc3489
feat: not found layout
canerakdas Jan 14, 2024
e894957
refactor: markdown content
canerakdas Jan 16, 2024
553a591
refactor: source moved outside of the component
canerakdas Jan 16, 2024
010b259
refactor: review updates
canerakdas Jan 16, 2024
a6ee4a8
refactor: review updates
canerakdas Jan 16, 2024
280e68b
refactor: layout struct
canerakdas Jan 16, 2024
340eacf
refactor: mdx to i18n
canerakdas Jan 16, 2024
20554dd
refactor: unused layouts removed into the layouts
canerakdas Jan 16, 2024
cb9b87e
refactor: unused 404.md removed
canerakdas Jan 16, 2024
e462778
feat: global-error and error page
canerakdas Jan 16, 2024
26409ad
refactor: error page i18n support
canerakdas Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions app/[locale]/error.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
'use client';

import { captureException } from '@sentry/nextjs';
import { useTranslations } from 'next-intl';
import type { FC } from 'react';
import { useMemo } from 'react';

const ErrorPage: FC<{ error: Error }> = ({ error }) => {
import Button from '@/components/Common/Button';
import CenteredLayout from '@/layouts/New/Centered';
import { ENABLE_WEBSITE_REDESIGN } from '@/next.constants.mjs';

/** @deprecated remove legacy component when website redesign is done */
const LegacyErrorPage: FC<{ error: Error }> = ({ error }) => {
useMemo(() => captureException(error), [error]);

return (
Expand All @@ -15,4 +21,26 @@ const ErrorPage: FC<{ error: Error }> = ({ error }) => {
);
};

export default ErrorPage;
const ErrorPage: FC<{ error: Error }> = ({ error }) => {
captureException(error);
const t = useTranslations();

return (
<CenteredLayout>
<div className="glowingBackdrop" />

<main>
500
<h1 className="special -mt-4">
{t('layouts.error.internalServerError.title')}
</h1>
<p className="-mt-4 max-w-sm text-center text-lg">
{t('layouts.error.internalServerError.description')}
</p>
<Button href="/">{t('layouts.error.backToHome')}</Button>
</main>
</CenteredLayout>
);
};

export default ENABLE_WEBSITE_REDESIGN ? ErrorPage : LegacyErrorPage;
28 changes: 26 additions & 2 deletions app/[locale]/not-found.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
import { useTranslations } from 'next-intl';
import type { FC } from 'react';

const LocalizedNotFound: FC = () => {
import Button from '@/components/Common/Button';
import CenteredLayout from '@/layouts/New/Centered';
import { ENABLE_WEBSITE_REDESIGN } from '@/next.constants.mjs';

/** @deprecated remove legacy component when website redesign is done */
const LegacyNotFoundPage: FC = () => {
const t = useTranslations();

return (
Expand All @@ -14,4 +19,23 @@ const LocalizedNotFound: FC = () => {
);
};

export default LocalizedNotFound;
const NotFoundPage: FC = () => {
const t = useTranslations();

return (
<CenteredLayout>
<div className="glowingBackdrop" />

<main>
404
<h1 className="special -mt-4">{t('layouts.error.notFound.title')}</h1>
<p className="-mt-4 max-w-sm text-center text-lg">
{t('layouts.error.notFound.description')}
</p>
<Button href="/">{t('layouts.error.backToHome')}</Button>
</main>
</CenteredLayout>
);
};

export default ENABLE_WEBSITE_REDESIGN ? NotFoundPage : LegacyNotFoundPage;
37 changes: 35 additions & 2 deletions app/global-error.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ import ErrorComponent from 'next/error';
import type { FC } from 'react';
import { useMemo } from 'react';

const GlobalErrorPage: FC<{ error: Error }> = ({ error }) => {
import Button from '@/components/Common/Button';
import BaseLayout from '@/layouts/BaseLayout';
import CenteredLayout from '@/layouts/New/Centered';
import { ENABLE_WEBSITE_REDESIGN } from '@/next.constants.mjs';

/** @deprecated remove legacy component when website redesign is done */
const LegacyGlobalErrorPage: FC<{ error: Error }> = ({ error }) => {
useMemo(() => captureException(error), [error]);

return (
Expand All @@ -17,4 +23,31 @@ const GlobalErrorPage: FC<{ error: Error }> = ({ error }) => {
);
};

export default GlobalErrorPage;
const GlobalErrorPage: FC<{ error: Error }> = ({ error }) => {
captureException(error);

return (
<html>
<body>
<BaseLayout>
<CenteredLayout>
<div className="glowingBackdrop" />

<main>
500
<h1 className="special -mt-4">Internal Server Error</h1>
<p className="-mt-4 max-w-sm text-center text-lg">
This page has thrown a non-recoverable error.
</p>
<Button href="/">Back to Home</Button>
</main>
</CenteredLayout>
</BaseLayout>
</body>
</html>
);
};

export default ENABLE_WEBSITE_REDESIGN
? GlobalErrorPage
: LegacyGlobalErrorPage;
11 changes: 11 additions & 0 deletions i18n/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,17 @@
"weekly-updates": "Weekly Updates",
"wg": "Working Groups"
}
},
"error": {
"notFound": {
"title": "Page could not be found",
"description": "Sorry, we couldn’t find the page you’re after! Try starting again from the homepage."
},
"internalServerError": {
"title": "Internal Server Error",
"description": "This page has thrown a non-recoverable error."
},
"backToHome": "Back to Home"
}
},
"pages": {
Expand Down
18 changes: 18 additions & 0 deletions layouts/New/Centered.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import type { FC, PropsWithChildren } from 'react';

import WithFooter from '@/components/withFooter';
import WithNavBar from '@/components/withNavBar';

import styles from './layouts.module.css';

const CenteredLayout: FC<PropsWithChildren> = ({ children }) => (
<>
<WithNavBar />

<div className={styles.centeredLayout}>{children}</div>

<WithFooter />
</>
);

export default CenteredLayout;
17 changes: 5 additions & 12 deletions layouts/New/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
import type { FC, PropsWithChildren } from 'react';

import WithFooter from '@/components/withFooter';
import WithNavBar from '@/components/withNavBar';
import CenteredLayout from '@/layouts/New/Centered';

import styles from './layouts.module.css';

const HomeLayout: FC<PropsWithChildren> = ({ children }) => (
<>
<WithNavBar />
<CenteredLayout>
<div className="glowingBackdrop" />

<div className={styles.homeLayout}>
<div className="glowingBackdrop" />

<main>{children}</main>
</div>

<WithFooter />
</>
<main className={styles.homeLayout}>{children}</main>
</CenteredLayout>
);

export default HomeLayout;
123 changes: 63 additions & 60 deletions layouts/New/layouts.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}
}

.homeLayout {
.centeredLayout {
@apply flex
w-full
items-center
Expand All @@ -70,77 +70,80 @@

main {
@apply items-center
justify-center
gap-8
md:flex-row
md:gap-14
xl:gap-28
2xl:gap-32;

section {
&:nth-of-type(1) {
@apply flex
max-w-[500px]
flex-[1_0]
flex-col
gap-8;

> div {
@apply flex
max-w-[400px]
flex-col
gap-4;

p {
@apply text-base
md:text-lg;
}
justify-center;
}
}

small {
@apply text-center
text-sm
text-neutral-800
xs:text-xs
dark:text-neutral-400;
}
}
}
.homeLayout {
@apply gap-8
md:flex-row
md:gap-14
xl:gap-28
2xl:gap-32;

section {
&:nth-of-type(1) {
@apply flex
max-w-[500px]
flex-[1_0]
flex-col
gap-8;

&:nth-of-type(2) {
> div {
@apply flex
max-w-md
flex-[1_1]
max-w-[400px]
flex-col
items-center
gap-4
md:max-w-2xl
lg:max-w-3xl;

> div {
@apply w-fit;

div[data-state='active'] a {
@apply border-none
bg-neutral-900
px-3
py-1.5
text-sm
font-medium;

&:hover {
@apply bg-neutral-800;
}
}
gap-4;

p {
@apply text-base
md:text-lg;
}

> p {
small {
@apply text-center
text-sm
text-neutral-800
dark:text-neutral-200;
xs:text-xs
dark:text-neutral-400;
}
}
}

&:nth-of-type(2) {
@apply flex
max-w-md
flex-[1_1]
flex-col
items-center
gap-4
md:max-w-2xl
lg:max-w-3xl;

> div {
@apply w-fit;

div[data-state='active'] a {
@apply border-none
bg-neutral-900
px-3
py-1.5
text-sm
font-medium;

&:hover {
@apply bg-neutral-800;
}
}
}

> p {
@apply text-center
text-sm
text-neutral-800
dark:text-neutral-200;
}
}
}
}

Expand Down
2 changes: 0 additions & 2 deletions next.dynamic.constants.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import { defaultLocale } from './next.locales.mjs';
* @type {((route: import('./types').RouteSegment) => boolean)[]} A list of Ignored Routes by Regular Expressions
*/
export const IGNORED_ROUTES = [
// This is used to ignore the 404 route for the static generation (/404)
({ pathname }) => pathname === '404',
// This is used to ignore all blog routes except for the English language
({ locale, pathname }) =>
locale !== defaultLocale.code && /^blog\//.test(pathname),
Expand Down
9 changes: 0 additions & 9 deletions pages/en/404.md
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions styles/new/markdown.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ main {
dark:text-green-300;
}

&[role='button'] {
@apply xs:no-underline;
}

&:has(code) {
@apply xs:decoration-neutral-800
dark:xs:decoration-neutral-200;
Expand Down
1 change: 1 addition & 0 deletions tailwind.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default {
'./layouts/**/*.tsx',
'./.storybook/preview.tsx',
'./.storybook/main.ts',
'./app/**/*.tsx',
],
theme: {
colors: {
Expand Down