DRY up usages of <Layout>

setsun · Jun 30, 2023 · 112a1c2 · 112a1c2 · vercel · Jun 30, 2023
1 parent bf87b43
commit 112a1c2
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 39 deletions.
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -4,6 +4,7 @@ import { Analytics } from '@vercel/analytics/react';
 import { AppProps } from 'next/app';
 import { ThemeProvider, DefaultTheme } from 'styled-components'
 import GlobalStyle from '../components/GlobalStyle';
+import Layout from '../components/Layout';
 
 const theme: DefaultTheme = {
   colors: {
@@ -15,7 +16,11 @@ const App = ({ Component, pageProps }: AppProps) => {
   return (
     <ThemeProvider theme={theme}>
       <GlobalStyle />
-      <Component {...pageProps} />
+
+      <Layout>
+        <Component {...pageProps} />
+      </Layout>
+
       <Analytics />
     </ThemeProvider>
   );

diff --git a/pages/games/index.tsx b/pages/games/index.tsx
@@ -1,14 +1,10 @@
-import Layout from "../../components/Layout"
-
 interface Props { }
 
 const Games: React.FC<Props> = (props) => {
   return (
-    <Layout>
       <div className="h-screen text-3xl flex justify-center items-center">
         🚧 🚧 🚧
       </div>
-    </Layout>
   );
 }
 

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -26,16 +26,14 @@ interface Props {}
 
 const Index: React.FC<Props> = (props) => {
   return (
-    <Layout>
-      <Canvas
-        className="w-full aspect-video"
-        camera={{
-          position: [0, 0, -30]
-        }}
-      >
-        <WireframePlanet />
-      </Canvas>
-    </Layout>
+    <Canvas
+      className="w-full aspect-video"
+      camera={{
+        position: [0, 0, -30]
+      }}
+    >
+      <WireframePlanet />
+    </Canvas>
   )
 }
 

diff --git a/pages/now-playing/index.tsx b/pages/now-playing/index.tsx
@@ -1,11 +1,9 @@
-import Layout from "../../components/Layout"
 import SpotifyIframePlaylist from "../../components/SpotifyIframePlaylist";
 
 interface Props { }
 
 const NowPlaying: React.FC<Props> = (props) => {
   return (
-    <Layout>
       <div className="grid grid-cols-3 gap-4">
         <SpotifyIframePlaylist src="https://open.spotify.com/embed/playlist/1bUUPhe0zP9FgrsqYjxbTp?theme=0" />
         <SpotifyIframePlaylist src="https://open.spotify.com/embed/playlist/1cUbQxIOFcxeL5oUheu85i?theme=0" />
@@ -14,7 +12,6 @@ const NowPlaying: React.FC<Props> = (props) => {
         <SpotifyIframePlaylist src="https://open.spotify.com/embed/playlist/1aQK4Hz4Xmz3Y4NEhz9ReT?theme=0" />
         <SpotifyIframePlaylist src="https://open.spotify.com/embed/playlist/26ItkYptyl56YEIYQDQs7r?theme=0" />
       </div>
-    </Layout>
   );
 }
 

diff --git a/pages/photos/index.tsx b/pages/photos/index.tsx
@@ -1,14 +1,10 @@
-import Layout from "../../components/Layout"
-
 interface Props { }
 
 const Photos: React.FC<Props> = (props) => {
   return (
-    <Layout>
-      <div className="h-screen text-3xl flex justify-center items-center">
-        🚧 🚧 🚧
-      </div>
-    </Layout>
+    <div className="h-screen text-3xl flex justify-center items-center">
+      🚧 🚧 🚧
+    </div>
   );
 }
 

diff --git a/pages/visualizers/index.tsx b/pages/visualizers/index.tsx
@@ -1,14 +1,10 @@
-import Layout from "../../components/Layout"
-
 interface Props { }
 
 const Visualizers: React.FC<Props> = (props) => {
   return (
-    <Layout>
-      <div className="h-screen text-3xl flex justify-center items-center">
-        🚧 🚧 🚧
-      </div>
-    </Layout>
+    <div className="h-screen text-3xl flex justify-center items-center">
+      🚧 🚧 🚧
+    </div>
   );
 }
 

diff --git a/pages/writing/[id].tsx b/pages/writing/[id].tsx
@@ -1,7 +1,6 @@
 import React from "react"
 import { GetServerSideProps } from "next"
 import ReactMarkdown from "react-markdown"
-import Layout from "../../components/Layout"
 import { PostProps } from "../../components/Post"
 import prisma from "../../lib/prisma";
 
@@ -29,7 +28,7 @@ const Post: React.FC<PostProps> = (props) => {
   }
 
   return (
-    <Layout>
+    <>
       <div>
         <h2>{title}</h2>
         <p>By {props?.author?.name || "Unknown author"}</p>
@@ -58,8 +57,8 @@ const Post: React.FC<PostProps> = (props) => {
           margin-left: 1rem;
         }
       `}</style>
-    </Layout>
+    </>
   )
 }
 
-export default Post
+export default Post;
diff --git a/pages/writing/index.tsx b/pages/writing/index.tsx
@@ -1,6 +1,5 @@
 import React from "react"
 import { GetStaticProps } from "next"
-import Layout from "../../components/Layout"
 import Post, { PostProps } from "../../components/Post"
 import prisma from "../../lib/prisma";
 
@@ -26,12 +25,12 @@ type Props = {
 
 const Blog: React.FC<Props> = (props) => {
   return (
-    <Layout>
+    <div>
       <h2 className="underline mb-2">Recent Posts</h2>
       {props.feed.map((post, i) => (
         <Post key={i} post={post} />
       ))}
-    </Layout>
+    </div>
   );
 }