Skip to content

Commit

Permalink
refactor: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
dejmedus committed Oct 2, 2022
1 parent f216e20 commit 38d2d1e
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 0 deletions.
20 changes: 20 additions & 0 deletions pages/404/404.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.main {
text-align: center;
display: flex;
min-height: 100vh;
flex-wrap: wrap;
}
.left {
flex: 1;
display: flex;
justify-content: center;
align-items: center;
min-width: 300px;
}
.right {
flex: 1;
display: grid;
align-content: center;
justify-content: center;
padding: 30px 4vw;
}
40 changes: 40 additions & 0 deletions pages/404/404.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import Head from "next/head";
import type { NextPage } from "next";
import styles from "./404.module.scss";
import { Error } from "assets/png";
import Image from "next/image";
import { Box, Typography } from "@mui/material";

export const Error404: NextPage = () => {
return (
<>
<Head>
<title> 404 | Page Not Found </title>
<meta
name="description"
content="Uh oh! 404 Not Found. looks like you got lost"
/>
<meta
name="keywords"
content="404, not, found, walking, pal, buddy, walk"
/>
</Head>

<main className={styles.main}>
<div className={styles.left}>
<Image src={Error} alt="" />
</div>
<Box bgcolor="primary.main" color="#ffffffcc" className={styles.right}>
<Typography variant="h1" pb={3}>
Ouppps! <br /> 404
</Typography>
<Typography variant="h5">
Looks like this page is missing or unavailable. If you think this is
a mistake, don’t worry though, our best man is on the case! <br />
<br /> Meanwhile, please headback.
</Typography>
</Box>
</main>
</>
);
};

0 comments on commit 38d2d1e

Please sign in to comment.