Merge pull request #240 from Markkos89/staging

Markkos89 · web-flow · commit a4bd206675c6 · 2023-09-20T12:54:56.000-03:00
[STAGING] Feat: UI and api calls improvements
diff --git a/src/contexts/AppContextProvider.tsx b/src/contexts/AppContextProvider.tsx
@@ -12,6 +12,7 @@ import {
 } from "@/interfaces";
 import { useSession } from "next-auth/react";
 import { api } from "@/utils/api";
+import { useAccount } from "wagmi";
 
 interface IProps {
   children: ReactNode;
@@ -24,6 +25,7 @@ export function AppContextProvider({ children }: IProps) {
   const [sessionDataUser, setSessionDataUser] = useState<any>(null);
 
   const { data: sessionData } = useSession();
+  const { address } = useAccount();
 
   useEffect(() => {
     if (sessionData?.user && sessionData.user !== sessionDataUser) {
@@ -42,7 +44,7 @@ export function AppContextProvider({ children }: IProps) {
     undefined, // no input
     {
       // Disable request if no session data
-      enabled: !!sessionDataUser,
+      enabled: !!sessionDataUser && !!address,
       refetchOnWindowFocus: false,
     },
   );
@@ -78,7 +80,6 @@ export function AppContextProvider({ children }: IProps) {
   useEffect(() => {
     void fetchFromDirs();
   }, []);
-  0;
 
   // - Get All lessons to get the Id's
   const { data: allLessonsData } = api.lessons.getAll.useQuery();
diff --git a/src/pages/docs/index.mdx b/src/pages/docs/index.mdx
@@ -1,3 +1,10 @@
+import Layout from "../../components/Layout";
+
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
+
 # Contributor Docs
 
 Our Academy website and all lesson content are in GitHub.
@@ -11,3 +18,5 @@ to get started.
 - [How do I find and manage day-to-day project tasks?](/docs/day-to-day)
 - [How do I author content? What is the review process?](/docs/content)
 - [How do I sponsor content?](/docs/sponsor)
+
+</Layout>
diff --git a/src/pages/lessons/fundamentals/cli_lesson.mdx b/src/pages/lessons/fundamentals/cli_lesson.mdx
@@ -8,7 +8,12 @@ authors: ["piablo", "georgemac510"]
 ---
 
 import { LessonHeader } from "../../../components/mdx/LessonHeader";
+import Layout from "../../../components/Layout";
 
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
 <LessonHeader title="Navigating in a CLI for beginners" />
 
 A CLI is an invaluable tool for development. It's actually quite straightforward
@@ -483,3 +488,5 @@ Some basic commands for CLI:
 And a more extensive list of <a style={{textDecoration: 'underline'}}
 href="https://support.apple.com/guide/terminal/keyboard-shortcuts-trmlshtcts/mac"
 target="\_blank"> CLI commands</a>
+
+</Layout>
diff --git a/src/pages/lessons/fundamentals/code-editors.mdx b/src/pages/lessons/fundamentals/code-editors.mdx
@@ -7,7 +7,12 @@ author: "georgemac510"
 ---
 
 import { LessonHeader } from "../../../components/mdx/LessonHeader";
+import Layout from "../../../components/Layout";
 
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
 <LessonHeader title="Code Editors (IDEs)" />
 
 ## What is an IDE?
@@ -87,3 +92,5 @@ To help you make an informed decision, check for the following features:
 
 There are several other cool, free IDEs on the market such as NetBeans,
 TextMate, Bluefish and many others to choose from. Happy coding!! 👍 😀
+
+</Layout>
diff --git a/src/pages/lessons/fundamentals/connect-with-rpc.mdx b/src/pages/lessons/fundamentals/connect-with-rpc.mdx
@@ -6,7 +6,12 @@ author: "georgemac510"
 ---
 
 import { LessonHeader } from "../../../components/mdx/LessonHeader";
+import Layout from "../../../components/Layout";
 
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
 <LessonHeader title="Connecting to a Network via RPC" />
 
 **Remote Procedure Call (RPC)** could be classified as a type of API
@@ -65,3 +70,5 @@ below:
 ON AND THE POP-UP MESSAGE IN METAMASK WHEN CONNECTING YOUR WALLET. IF YOU ARE ON
 THE WRONG WEBSITE AND YOU ALLOW ACCESS TO YOUR METAMASK WALLET, YOU MAY BE
 ALLOWING HACKERS ACCESS TO YOUR WALLET. BE SAFE!! ALWAYS DOUBLE-CHECK!!**
+
+</Layout>
diff --git a/src/pages/lessons/fundamentals/decentralized-storage.mdx b/src/pages/lessons/fundamentals/decentralized-storage.mdx
@@ -6,7 +6,12 @@ author: ["georgemac510", "pbillingsby"]
 ---
 
 import { LessonHeader } from "../../../components/mdx/LessonHeader";
+import Layout from "../../../components/Layout";
 
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
 <LessonHeader title="Decentralized Storage with Arweave and IPFS/Filecoin" />
 
 Among the many use cases for these great technologies, the most common are for
@@ -117,3 +122,5 @@ we are “trusting” to stay online and continue to render service.
 **Decentralized web networks such as IPFS/Filecoin and Arweave solve this
 centralization** **problem by distributing the data to nodes and eliminate a
 central point of failure.**
+
+</Layout>
diff --git a/src/pages/lessons/fundamentals/install-npm.mdx b/src/pages/lessons/fundamentals/install-npm.mdx
@@ -6,7 +6,12 @@ author: "georgemac510"
 ---
 
 import { LessonHeader } from "../../../components/mdx/LessonHeader";
+import Layout from "../../../components/Layout";
 
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
 <LessonHeader title="How to install node.js and npm" />
 
 ![NPM Overload Joke](/assets/lessons/install_npm/npm-jokes-1.png)
@@ -224,3 +229,5 @@ few easy steps, you will be up and running! 🏃🏾‍♀️
 
 You made it to the end of our nodejs and npm installation with nvm tutorial!  
 Congratulations!! 🎉💥🥇
+
+</Layout>
diff --git a/src/pages/lessons/fundamentals/nft-hosting.mdx b/src/pages/lessons/fundamentals/nft-hosting.mdx
@@ -7,7 +7,12 @@ author: "georgemac510"
 ---
 
 import { LessonHeader } from "../../../components/mdx/LessonHeader";
+import Layout from "../../../components/Layout";
 
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
 <LessonHeader title="NFT hosting through OpenSea and Rarible" />
 
 ## What are NFTs?
@@ -103,3 +108,5 @@ vote on DAO self-governance proposals.
 
 Both of these platforms are continually being improved with additional
 functionality, stronger security and a better user experience.💥
+
+</Layout>
diff --git a/src/pages/lessons/fundamentals/open_zeppelin.mdx b/src/pages/lessons/fundamentals/open_zeppelin.mdx
@@ -6,7 +6,12 @@ author: ["piablo", "7i7o"]
 ---
 
 import { LessonHeader } from "../../../components/mdx/LessonHeader";
+import Layout from "../../../components/Layout";
 
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
 <LessonHeader title="Open Zeppelin Smart Contract Concepts" />
 
 We are going to stand on the shoulder of giants and leverage the power of open
@@ -53,3 +58,5 @@ our own, like inheriting those good qualities of our favourite relatives!
 It’s very rare in the Ethereum smart contract development sphere to see a smart
 contract that doesn’t include at least one line of code stating
 `import 'OpenZeppelin_something_or_other.sol';`!
+
+</Layout>
diff --git a/src/pages/lessons/fundamentals/testnets.mdx b/src/pages/lessons/fundamentals/testnets.mdx
@@ -6,7 +6,12 @@ author: "piablo"
 ---
 
 import { LessonHeader } from "../../../components/mdx/LessonHeader";
+import Layout from "../../../components/Layout";
 
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
 <LessonHeader title="Test, test, test, testnets" />
 
 **TL'DR**
@@ -71,3 +76,5 @@ for testnets, we would never have known if _The Merge_ of Ethereum was possible.
 If we want to ensure global adoption of web3, every single one of us has the
 responsibility of making it secure. A testnet is the gateway to our collective
 success. Let’s BUIDL safely for our seven billion friends.
+
+</Layout>
diff --git a/src/pages/lessons/fundamentals/token-standards.mdx b/src/pages/lessons/fundamentals/token-standards.mdx
@@ -8,7 +8,12 @@ author: "piablo"
 **LEGO and our digital Web3 realm…..**
 
 import { LessonHeader } from "../../../components/mdx/LessonHeader";
+import Layout from "../../../components/Layout";
 
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
 <LessonHeader title="What are token standards and why do we need them?" />
 
 There is an analogy used in the Web3 world that a blockchain such as Ethereum,
@@ -88,3 +93,4 @@ Now, you have a few NFTs to create, so we’ll let you get back to that. Have fu
 <center>
   Developers building composable components for distributed networks
 </center>
+</Layout>
diff --git a/src/pages/lessons/fundamentals/wallets.mdx b/src/pages/lessons/fundamentals/wallets.mdx
@@ -7,7 +7,12 @@ author: ["piablo", "Meowy"]
 ---
 
 import { LessonHeader } from "../../../components/mdx/LessonHeader";
+import Layout from "../../../components/Layout";
 
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
 <LessonHeader title="Web3 wallets, and public and private keys..." />
 
 ### What do we have in store?
@@ -156,3 +161,5 @@ the _faucet_ for Goerli Testnet. And check out _Connect with RPC_ for when you
 need to start deploying your work to the distributed networks that make up Web3.
 
 Don't lose those keys and happy coding!!!
+
+</Layout>
diff --git a/src/pages/lessons/projects/1.mdx b/src/pages/lessons/projects/1.mdx
@@ -5,7 +5,12 @@ icons: ["solidity", "remix"]
 ---
 
 import { LessonHeader } from "../../../components/mdx/LessonHeader";
+import Layout from "../../../components/Layout";
 
+<Layout
+    title="Dapp Page" 
+    description="A page for your dapp." 
+>
 <LessonHeader title="Lesson 1: Intro to Smart Contract Development" />
 
 ## About this lesson
@@ -795,3 +800,4 @@ import { ContributorFooter } from "../../../components/mdx/ContributorFooter";
   reviewers={["georgemac510", "wolovim"]}
   contributors={["mveve"]}
 />
+</Layout>
diff --git a/src/pages/lessons/projects/2.mdx b/src/pages/lessons/projects/2.mdx
diff --git a/src/pages/lessons/projects/3.mdx b/src/pages/lessons/projects/3.mdx
diff --git a/src/pages/lessons/projects/4.mdx b/src/pages/lessons/projects/4.mdx
diff --git a/src/pages/lessons/projects/5.mdx b/src/pages/lessons/projects/5.mdx
diff --git a/src/server/api/routers/lessons.ts b/src/server/api/routers/lessons.ts
diff --git a/src/utils/questions/lesson-2/4-nft-id/Q5.json b/src/utils/questions/lesson-2/4-nft-id/Q5.json
