feat: saving wallet connection with a Layout and prisma update

Markkos89 · Markkos89 · commit 0be96a2a19e5 · 2023-07-14T03:04:58.000-03:00
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "@emotion/styled": "^11.11.0",
     "@fontsource/inter": "^5.0.3",
     "@next-auth/prisma-adapter": "^1.0.7",
-    "@prisma/client": "^4.16.1",
+    "@prisma/client": "^5.0.0",
     "@tanstack/react-query": "^4.29.19",
     "@trpc/client": "^10.33.0",
     "@trpc/next": "^10.33.0",
@@ -61,7 +61,7 @@
     "postcss": "^8.4.24",
     "prettier": "^2.8.8",
     "prettier-plugin-tailwindcss": "^0.3.0",
-    "prisma": "^4.16.1",
+    "prisma": "^5.0.0",
     "react-syntax-highlighter": "^15.5.0",
     "remark-frontmatter": "^4.0.1",
     "tailwindcss": "^3.3.2",
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -1,6 +1,5 @@
 generator client {
-  provider        = "prisma-client-js"
-  previewFeatures = ["jsonProtocol"]
+  provider = "prisma-client-js"
 }
 
 datasource db {
diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
@@ -0,0 +1,22 @@
+import { Box } from "@chakra-ui/react";
+import Topbar from "./Topbar";
+
+interface Props {
+  children: React.ReactNode;
+}
+
+export default function Layout({ children }: Props) {
+  return (
+    <>
+      <Topbar />
+      <Box
+        as="main"
+        p="1.25em"
+        px="5%"
+        mx={{ base: "2rem", md: "6rem", lg: "10rem" }}
+      >
+        {children}
+      </Box>
+    </>
+  );
+}
diff --git a/src/components/Topbar.tsx b/src/components/Topbar.tsx
@@ -39,7 +39,7 @@ import {
 import { InjectedConnector } from "wagmi/connectors/injected";
 import { useEffect, useState } from "react";
 
-export default function WithSubnavigation() {
+export default function Topbar() {
   const { isOpen, onToggle } = useDisclosure();
   const router = useRouter();
 
@@ -109,7 +109,12 @@ export default function WithSubnavigation() {
   }, []);
 
   return (
-    <Box>
+    <Box
+      as="header"
+      p="1.25em"
+      px="5%"
+      mx={{ base: "2rem", md: "6rem", lg: "10rem" }}
+    >
       <Flex
         // bg={useColorModeValue('white', 'gray.800')}
         color={useColorModeValue("gray.600", "white")}
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -63,16 +63,16 @@ const MyApp: AppType<{ session: Session | null }> = ({
     <ChakraProvider theme={theme}>
       <WagmiConfig config={config}>
         <SessionProvider session={session} refetchInterval={0}>
-          <Box
+          {/* <Box
             p="1.25em"
             px="5%"
             mx={{ base: "2rem", md: "6rem", lg: "10rem" }}
-          >
-            <Topbar />
-            <MDXProvider components={Components}>
-              <Component {...pageProps} />{" "}
-            </MDXProvider>
-          </Box>
+          > */}
+          {/* <Topbar /> */}
+          <MDXProvider components={Components}>
+            <Component {...pageProps} />
+          </MDXProvider>
+          {/* </Box> */}
         </SessionProvider>
       </WagmiConfig>
     </ChakraProvider>
diff --git a/src/pages/getting-started.tsx b/src/pages/getting-started.tsx
@@ -22,6 +22,7 @@ import path from "path";
 import matter from "gray-matter";
 import { CONTENT_PATH } from "@/lib/constants";
 import { useEffect, useState } from "react";
+import Layout from "@/components/Layout";
 
 interface Lesson {
   frontMatter: any;
@@ -52,9 +53,9 @@ const GettingStarted: React.FC<LessonProps> = ({ lessons }) => {
   }, [lessons]);
 
   return (
-    <>
+    <Layout>
       <Flex
-        as="main"
+        // as="main"
         py={5}
         px={[4, 10, 16]}
         direction="column"
@@ -234,7 +235,7 @@ const GettingStarted: React.FC<LessonProps> = ({ lessons }) => {
           </Box>
         </Stack>
       </Flex>
-    </>
+    </Layout>
   );
 };
 
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -1,14 +1,12 @@
-import { Box } from "@chakra-ui/react";
 import type { NextPage } from "next";
 import Hero from "@/components/Hero";
+import Layout from "@/components/Layout";
 
 const Home: NextPage = () => {
   return (
-    <main>
-      <Box as="main">
-        <Hero />
-      </Box>
-    </main>
+    <Layout>
+      <Hero />
+    </Layout>
   );
 };
 
diff --git a/src/pages/lessons/index.tsx b/src/pages/lessons/index.tsx
@@ -4,6 +4,7 @@ import path from "path";
 import matter from "gray-matter";
 import { ContentBanner } from "@/components/ContentBanner";
 import { CONTENT_PATH } from "@/lib/constants";
+import Layout from "@/components/Layout";
 
 interface Lesson {
   path: string;
@@ -31,8 +32,8 @@ const Lessons: React.FC<LessonProps> = ({ lessons }: { lessons: Lesson[] }) => {
   }, {});
 
   return (
-    <>
-      <Flex as="main" py={5} px={[4, 10, 16]} direction="column" minH="90vh">
+    <Layout>
+      <Flex py={5} px={[4, 10, 16]} direction="column" minH="90vh">
         <Stack spacing={5} direction="column">
           <>
             {Object.entries(result).map((track, idx: number) => {
@@ -56,7 +57,7 @@ const Lessons: React.FC<LessonProps> = ({ lessons }: { lessons: Lesson[] }) => {
           </>
         </Stack>
       </Flex>
-    </>
+    </Layout>
   );
 };
 
diff --git a/yarn.lock b/yarn.lock
@@ -1602,22 +1602,22 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
   integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
-"@prisma/client@^4.16.1":
-  version "4.16.1"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.16.1.tgz#030bf59ee51f223bae2a8e7c49827528756cf03a"
-  integrity sha512-CoDHu7Bt+NuDo40ijoeHP79EHtECsPBTy3yte5Yo3op8TqXt/kV0OT5OrsWewKvQGKFMHhYQ+ePed3zzjYdGAw==
+"@prisma/client@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.0.0.tgz#9f0cd4164f4ffddb28bb1811c27eb7fa1e01a087"
+  integrity sha512-XlO5ELNAQ7rV4cXIDJUNBEgdLwX3pjtt9Q/RHqDpGf43szpNJx2hJnggfFs7TKNx0cOFsl6KJCSfqr5duEU/bQ==
   dependencies:
-    "@prisma/engines-version" "4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c"
+    "@prisma/engines-version" "4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584"
 
-"@prisma/engines-version@4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c":
-  version "4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c.tgz#54fd17f9a9080e13e2f75613fd35afb7875e3715"
-  integrity sha512-tMWAF/qF00fbUH1HB4Yjmz6bjh7fzkb7Y3NRoUfMlHu6V+O45MGvqwYxqwBjn1BIUXkl3r04W351D4qdJjrgvA==
+"@prisma/engines-version@4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584":
+  version "4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584.tgz#b36eda5620872d3fac810c302a7e46cf41daa033"
+  integrity sha512-HHiUF6NixsldsP3JROq07TYBLEjXFKr6PdH8H4gK/XAoTmIplOJBCgrIUMrsRAnEuGyRoRLXKXWUb943+PFoKQ==
 
-"@prisma/engines@4.16.1":
-  version "4.16.1"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.16.1.tgz#ee487620dc5135fd175ac7494b1c60c9f12c1e4b"
-  integrity sha512-gpZG0kGGxfemgvK/LghHdBIz+crHkZjzszja94xp4oytpsXrgt/Ice82MvPsWMleVIniKuARrowtsIsim0PFJQ==
+"@prisma/engines@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.0.0.tgz#5249650eabe77c458c90f2be97d8210353c2e22e"
+  integrity sha512-kyT/8fd0OpWmhAU5YnY7eP31brW1q1YrTGoblWrhQJDiN/1K+Z8S1kylcmtjqx5wsUGcP1HBWutayA/jtyt+sg==
 
 "@rushstack/eslint-patch@^1.1.3":
   version "1.3.2"
@@ -6568,12 +6568,12 @@ pretty-format@^3.8.0:
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-3.8.0.tgz#bfbed56d5e9a776645f4b1ff7aa1a3ac4fa3c385"
   integrity sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==
 
-prisma@^4.16.1:
-  version "4.16.1"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.16.1.tgz#c6d723a4326138a72489098a6c39a698a670fbbf"
-  integrity sha512-C2Xm7yxHxjFjjscBEW4tmoraPHH/Vyu/A0XABdbaFtoiOZARsxvOM7rwc2iZ0qVxbh0bGBGBWZUSXO/52/nHBQ==
+prisma@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.0.0.tgz#f6571c46dc2478172cb7bc1bb62d74026a2c2630"
+  integrity sha512-KYWk83Fhi1FH59jSpavAYTt2eoMVW9YKgu8ci0kuUnt6Dup5Qy47pcB4/TLmiPAbhGrxxSz7gsSnJcCmkyPANA==
   dependencies:
-    "@prisma/engines" "4.16.1"
+    "@prisma/engines" "5.0.0"
 
 prismjs@^1.27.0:
   version "1.29.0"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`generator client {`
`2`		`- provider = "prisma-client-js"`
`3`		`- previewFeatures = ["jsonProtocol"]`
	`2`	`+ provider = "prisma-client-js"`
`4`	`3`	`}`
`5`	`4`
`6`	`5`	`datasource db {`