feat: move type CodeSnippet

martapanc · Aug 24, 2023 · 7b3a838 · 7b3a838
1 parent f376fe2
commit 7b3a838
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/apollo/apollo-client.ts b/apollo/apollo-client.ts
@@ -1,7 +1,7 @@
 import { ApolloClient, InMemoryCache } from '@apollo/client';
 
 const apolloClient = new ApolloClient({
-  uri: 'https://martacodes-it-strapi.up.railway.app/graphql',
+  uri: process.env.GRAPHQL_URL,
   cache: new InMemoryCache(),
   defaultOptions: {
     watchQuery: {

diff --git a/src/app/(public)/page.tsx b/src/app/(public)/page.tsx
@@ -1,28 +1,33 @@
 import * as React from 'react';
 
+import { flattenToArray } from '@/lib/graphqlUtils';
+
 import Intro from '@/components/organisms/home/Intro';
 import Summary from '@/components/organisms/home/Summary';
 import Seo from '@/components/Seo';
 
-import { codeSnippetsQuery } from '@/queries/codeSnippets';
-import { CodeSnippet } from '@/sanityTypes/CodeSnippet';
+import { codeSnippetsQueryQL } from '@/queries/codeSnippets';
 
-import { sanityClient } from '../../../sanity/lib/client';
+import apolloClient from '../../../apollo/apollo-client';
 
-const getData = async () => {
-  // const homeData: HomeContent[] = await sanityClient.fetch(homeContentQuery);
-  const codeSnippets: CodeSnippet[] = await sanityClient.fetch(
-    codeSnippetsQuery
-  );
+import { CodeSnippet } from '@/types/CodeSnippet';
+
+async function queryCodeSnippets() {
+  const { data } = await apolloClient.query({ query: codeSnippetsQueryQL });
+
+  return flattenToArray<CodeSnippet>(data.codeSnippets);
+}
+
+const queryData = async () => {
+  const codeSnippets: CodeSnippet[] = await queryCodeSnippets();
 
   return {
     codeSnippets,
-    // homeContent: homeData[0],
   };
 };
 
 const HomePage = async () => {
-  const { codeSnippets } = await getData();
+  const { codeSnippets } = await queryData();
 
   return (
     <main className='min-h-main'>

diff --git a/src/components/organisms/home/Code.tsx b/src/components/organisms/home/Code.tsx
@@ -9,7 +9,7 @@ import {
 } from 'react-syntax-highlighter/dist/cjs/styles/hljs';
 import Typed, { TypedOptions } from 'typed.js';
 
-import { CodeSnippet } from '@/sanityTypes/CodeSnippet';
+import { CodeSnippet } from '@/types/CodeSnippet';
 
 export interface CodeSnippetsProps {
   codeSnippets: CodeSnippet[];
@@ -64,7 +64,7 @@ const Code = ({ codeSnippets }: CodeSnippetsProps) => {
           codeSnippets.map((snippet) => (
             <SyntaxHighlighter
               className='text-xs md:text-base'
-              key={snippet._id}
+              key={snippet.id}
               language={snippet.language}
               style={ideStyle}
               wrapLongLines={true}

diff --git a/src/types/CodeSnippet.ts b/src/types/CodeSnippet.ts
@@ -0,0 +1,5 @@
+export interface CodeSnippet {
+  id: string;
+  code: string;
+  language: string;
+}