fix: move the layout to an actual remix layout

This allows me to have a data loader for the layout itself, which can have a different caching strategy than the root loader.
eligundry · Jul 12, 2024 · d3323e2 · d3323e2
1 parent fe93b1b
commit d3323e2
Show file tree

Hide file tree

Showing 32 changed files with 591 additions and 954 deletions.
diff --git a/app/components/Base/HomeSection.tsx b/app/components/Base/HomeSection.tsx
@@ -1,4 +1,4 @@
-import clsx from 'clsx'
+import { cn } from '~/lib/util'
 
 import { Heading, Typography } from '~/components/Base'
 
@@ -15,12 +15,12 @@ const HomeSection: React.FC<React.PropsWithChildren<Props>> = ({
   className,
 }) => {
   return (
-    <section className={clsx(className)}>
-      <Heading level="h3" className={clsx('mb-0')}>
+    <section className={cn(className)}>
+      <Heading level="h3" className={cn('mb-0')}>
         {title}
       </Heading>
       {typeof subtitle === 'string' ? (
-        <Typography variant="hint" className={clsx('mb-2')}>
+        <Typography variant="hint" className={cn('mb-2')}>
           {subtitle}
         </Typography>
       ) : (

diff --git a/app/components/Base/Layout.tsx b/app/components/Base/Layout.tsx
diff --git a/app/components/Base/LayoutV2.tsx b/app/components/Base/LayoutV2.tsx
diff --git a/app/components/Base/index.tsx b/app/components/Base/index.tsx
@@ -5,7 +5,6 @@ import React from 'react'
 
 import { cn } from '~/lib/util'
 
-export { default as Layout } from './LayoutV2'
 export { default as EmojiText } from './EmojiText'
 
 const headingVariants = cva('', {

diff --git a/app/components/ErrorBoundary.tsx b/app/components/ErrorBoundary.tsx
@@ -6,7 +6,6 @@ import {
   Container,
   EmojiText,
   Heading,
-  Layout,
   Typography,
 } from '~/components/Base'
 import Document from '~/components/Base/Document'
@@ -33,26 +32,23 @@ export const PageErrorBoundary: React.FC = () => {
 
   return (
     <Document>
-      <Layout>
-        <Container>
-          <div className={clsx('prose')}>
-            <Heading level="h2">⛔️ Whoops!</Heading>
-            <Typography>
-              We seem to have run into an error. We are working on fixing it
-              now.
-            </Typography>
-            <details className={clsx('mb-6')}>
-              <summary>Detailed error message</summary>
-              <pre className={clsx('whitespace-pre-line')}>{body}</pre>
-            </details>
-            <ButtonLink to="/">
-              <EmojiText emoji="🏚" label="broken home">
-                Head Home
-              </EmojiText>
-            </ButtonLink>
-          </div>
-        </Container>
-      </Layout>
+      <Container>
+        <div className={clsx('prose')}>
+          <Heading level="h2">⛔️ Whoops!</Heading>
+          <Typography>
+            We seem to have run into an error. We are working on fixing it now.
+          </Typography>
+          <details className={clsx('mb-6')}>
+            <summary>Detailed error message</summary>
+            <pre className={clsx('whitespace-pre-line')}>{body}</pre>
+          </details>
+          <ButtonLink to="/">
+            <EmojiText emoji="🏚" label="broken home">
+              Head Home
+            </EmojiText>
+          </ButtonLink>
+        </div>
+      </Container>
     </Document>
   )
 }