From 5a285a4c7eb0db1bbe5d2b618d61e55262e6fded Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 25 Feb 2022 13:50:59 -0800
Subject: [PATCH] Improve design for the error pages

---
 .../web/components/templates/ErrorLayout.tsx  | 107 ++++--------------
 packages/web/pages/404.tsx                    |  15 +--
 packages/web/pages/500.tsx                    |  14 +--
 packages/web/pages/[username]/index.tsx       |   4 -
 4 files changed, 38 insertions(+), 102 deletions(-)
 delete mode 100644 packages/web/pages/[username]/index.tsx

diff --git a/packages/web/components/templates/ErrorLayout.tsx b/packages/web/components/templates/ErrorLayout.tsx
index ca2ed69c8..4c8881d5c 100644
--- a/packages/web/components/templates/ErrorLayout.tsx
+++ b/packages/web/components/templates/ErrorLayout.tsx
@@ -1,103 +1,42 @@
 import {
-  Box,
-  MediumBreakpointBox,
   VStack,
   HStack,
+  SpanBox,
 } from '../elements/LayoutPrimitives'
-import Image from 'next/image'
-import { OmnivoreNameLogo } from '../elements/images/OmnivoreNameLogo'
 import { StyledText } from '../elements/StyledText'
 import Link from 'next/link'
-import { theme } from '../tokens/stitches.config'
+import { Button } from '../elements/Button'
+import { useGetViewerQuery } from '../../lib/networking/queries/useGetViewerQuery'
 
 type ErrorPageStatusCode = 404 | 500
 
 type ErrorLayoutProps = {
+  message?: string
   statusCode: ErrorPageStatusCode
 }
 
 export function ErrorLayout(props: ErrorLayoutProps): JSX.Element {
-  return (
-    <Box css={{ height: '100%' }}>
-      <MediumBreakpointBox
-        smallerLayoutNode={<MobileErrorLayout {...props} />}
-        largerLayoutNode={<MediumErrorLayout {...props} />}
-      />
-    </Box>
-  )
-}
+  const { viewerData } = useGetViewerQuery()
+  console.log(viewerData?.me)
 
-function MobileErrorLayout(props: ErrorLayoutProps) {
   return (
-    <VStack css={{ overflow: 'scroll' }}>
-      <HStack
-        distribution="center"
-        css={{
-          maxHeight: '180px',
-          width: '100%',
-        }}
-      >
-        <OmnivoreIllustration />
+    <VStack alignment="center" distribution="start" css={{ height: '100%' }}>
+      <HStack alignment="center" css={{ mt: '64px', verticalAlign: 'middle' }}>
+        <StyledText style="headline" css={{
+          marginRight: '25px',
+          padding: '32px',
+          borderRight: '1px solid $grayText',
+        }}>
+          {props.statusCode}
+        </StyledText>
+        <StyledText style="body">
+          {props.message ? props.message : 'An error occurred.'}
+        </StyledText>
       </HStack>
-      <VStack
-        alignment="center"
-        distribution="center"
-        css={{
-          bg: '$yellow5',
-          width: '100%',
-          flexGrow: 1,
-        }}
-      >
-        <StyledText>{props.statusCode}</StyledText>
-      </VStack>
+      <SpanBox css={{ height: '64px' }} />
+      <Link passHref href={viewerData?.me ? "/home" : "/login"}>
+        <Button style="ctaDarkYellow">{viewerData?.me ? "Go Home" : "Login"}</Button>
+      </Link>
     </VStack>
   )
-}
-
-function MediumErrorLayout(props: ErrorLayoutProps) {
-  return (
-    <Box
-      css={{
-        display: 'grid',
-        gridTemplateColumns: '1fr 3fr',
-        bg: '$omnivoreYellow',
-        height: '100%',
-      }}
-    >
-      <VStack
-        alignment="start"
-        distribution="start"
-        css={{ height: '100%', m: '$2', '@md': { m: '$3' } }}
-      >
-        <Box>
-          <Link passHref href="/">
-            <a style={{ textDecoration: 'none' }}>
-            <OmnivoreNameLogo color={theme.colors.omnivoreGray.toString()} />
-            </a>
-          </Link>
-        </Box>
-        <StyledText>{props.statusCode}</StyledText>
-      </VStack>
-      <VStack alignment="center" distribution="center">
-        <OmnivoreIllustration isLargeLayout={true} />
-      </VStack>
-    </Box>
-  )
-}
-
-type OmnivoreIllustrationProps = {
-  isLargeLayout?: boolean
-}
-
-function OmnivoreIllustration({ isLargeLayout }: OmnivoreIllustrationProps) {
-  return (
-    <Image
-      src={`/static/images/landing-illustration${
-        isLargeLayout ? '.png' : '-mobile.svg'
-      }`}
-      alt="Illustration of Woman Reading"
-      width={isLargeLayout ? 1280 : 375}
-      height={isLargeLayout ? 1164 : 230}
-    />
-  )
-}
+}
\ No newline at end of file
diff --git a/packages/web/pages/404.tsx b/packages/web/pages/404.tsx
index 8d6e484c3..c6a04dfa0 100644
--- a/packages/web/pages/404.tsx
+++ b/packages/web/pages/404.tsx
@@ -1,16 +1,17 @@
-import { ErrorLayout } from '../components/templates/ErrorLayout'
-import { Box } from '../components/elements/LayoutPrimitives'
 import Head from 'next/head'
+import { useRouter } from 'next/router'
+import { ErrorLayout } from '../components/templates/ErrorLayout'
+import { SettingsLayout } from '../components/templates/SettingsLayout'
 
 export default function Custom404(): JSX.Element {
   return (
-    <Box
-      css={{ bg: '$omnivoreYellow', height: '100vh', overflow: 'hidden', m: 0, p: 0 }}
-    >
+    <>
       <Head>
         <title>Page Not Found</title>
       </Head>
-      <ErrorLayout statusCode={404} />;
-    </Box>
+      <SettingsLayout>
+       <ErrorLayout statusCode={404} message="This page could not be found." />
+      </SettingsLayout>
+    </>
   )
 }
diff --git a/packages/web/pages/500.tsx b/packages/web/pages/500.tsx
index 23f6a0111..0f0fafdd8 100644
--- a/packages/web/pages/500.tsx
+++ b/packages/web/pages/500.tsx
@@ -1,16 +1,16 @@
 import { ErrorLayout } from '../components/templates/ErrorLayout'
-import { Box } from '../components/elements/LayoutPrimitives'
 import Head from 'next/head'
+import { SettingsLayout } from '../components/templates/SettingsLayout'
 
 export default function Custom500(): JSX.Element {
   return (
-    <Box
-      css={{ bg: '$omnivoreYellow', height: '100vh', overflow: 'hidden', m: 0, p: 0 }}
-    >
+    <>
       <Head>
-        <title>Page Not Found</title>
+        <title>An unknown error occurred.</title>
       </Head>
-      <ErrorLayout statusCode={500} />;
-    </Box>
+      <SettingsLayout>
+       <ErrorLayout statusCode={404} message="An unknown error occurred." />
+      </SettingsLayout>
+    </>
   )
 }
diff --git a/packages/web/pages/[username]/index.tsx b/packages/web/pages/[username]/index.tsx
deleted file mode 100644
index 2d4f6d952..000000000
--- a/packages/web/pages/[username]/index.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-// TODO: implement page
-export default function UserIndexPage(): JSX.Element {
-  return <p>unimplemented</p>
-}