feat: move type Publication

src/app/(public)/about/work/page.tsx

@@ -11,12 +11,11 @@ import WorkExperience from '@/components/organisms/about-work/WorkExperience';
 
 import { jobsQueryQL } from '@/queries/jobs';
 import { languagesQueryQL } from '@/queries/languages';
-import { publicationQuery } from '@/queries/publications';
-import { schoolsQuery, schoolsQueryQL } from '@/queries/schools';
+import { publicationQueryQL } from '@/queries/publications';
+import { schoolsQueryQL } from '@/queries/schools';
 import { shortTextQuery } from '@/queries/short-texts';
 import { skillQuery } from '@/queries/skills';
 import { Icon } from '@/sanityTypes/Icon';
-import { Publication } from '@/sanityTypes/Publication';
 import { ShortText } from '@/sanityTypes/ShortText';
 import { Skill } from '@/sanityTypes/Skill';
 
@@ -25,6 +24,7 @@ import { sanityClient } from '../../../../../sanity/lib/client';
 
 import { Job } from '@/types/Job';
 import { Language } from '@/types/Language';
+import { Publication } from '@/types/Publication';
 import { School } from '@/types/School';
 
 export const metadata = {
@@ -33,19 +33,11 @@ export const metadata = {
 };
 
 const getData = async () => {
-  const publications: Publication[] = await sanityClient.fetch(
-    publicationQuery
-  );
-
-  const schools: School[] = await sanityClient.fetch(schoolsQuery);
-
   const skills: Skill[] = await sanityClient.fetch(skillQuery);
 
   const shortTexts: ShortText[] = await sanityClient.fetch(shortTextQuery);
 
   return {
-    publications,
-    schools,
     shortTexts,
     skills,
   };
@@ -59,6 +51,14 @@ async function queryJobs() {
   return flattenToArray<Job>(data.jobs);
 }
 
+async function queryPublications() {
+  const { data } = await apolloClient.query({
+    query: publicationQueryQL,
+  });
+
+  return flattenToArray<Publication>(data.publications);
+}
+
 async function querySchools() {
   const { data } = await apolloClient.query({
     query: schoolsQueryQL,
@@ -78,19 +78,21 @@ async function queryLanguages() {
 const queryData = async () => {
   const jobs = await queryJobs();
   const languages = await queryLanguages();
+  const publications = await queryPublications();
   const schools = await querySchools();
 
   return {
     jobs,
     languages,
+    publications,
     schools,
   };
 };
 
 const AboutPage = async () => {
-  const { publications, shortTexts, skills } = await getData();
+  const { shortTexts, skills } = await getData();
 
-  const { jobs, languages, schools } = await queryData();
+  const { jobs, languages, publications, schools } = await queryData();
 
   const softwareDevelopment: ShortText | undefined = shortTexts.find(
     (item) => item.name === 'software-development'

src/components/organisms/about-work/Publications.tsx

@@ -5,7 +5,7 @@ import { AiOutlineFilePdf } from 'react-icons/ai';
 
 import UnstyledLink from '@/components/links/UnstyledLink';
 
-import { Publication } from '@/sanityTypes/Publication';
+import { Publication } from '@/types/Publication';
 
 export interface PublicationProps {
   publications: Publication[];
@@ -36,9 +36,9 @@ const Publications = ({ publications }: PublicationProps) => {
 
               <div className='flex flex-col self-end'>
                 <UnstyledLink
-                  key={publication._id}
+                  key={publication.id}
                   className='focus-visible:ring-primary-300 inline-flex items-center justify-center rounded-sm focus:outline-none focus-visible:ring'
-                  href={publication.link}
+                  href={publication.file.url}
                 >
                   <AiOutlineFilePdf className='hover:text-primary-500 dark:hover:text-primary-300 my-auto h-6 w-6 align-middle text-blue-900 transition-colors dark:text-gray-300' />
                 </UnstyledLink>

src/queries/publications.ts

@@ -1,3 +1,4 @@
+import { gql } from '@apollo/client';
 import { groq } from 'next-sanity';
 
 export const publicationQuery = groq`
@@ -10,3 +11,29 @@ export const publicationQuery = groq`
   year,
   "link": file.asset->url
 }`;
+
+export const publicationQueryQL = gql`
+  query {
+    publications(locale: "en", sort: "rank") {
+      data {
+        id
+        attributes {
+          title
+          description
+          publisher
+          year
+          file {
+            data {
+              id
+              attributes {
+                name
+                url
+                alternativeText
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;

src/types/Icon.ts

@@ -4,3 +4,10 @@ export interface Icon {
   url: string;
   alternativeText?: string;
 }
+
+export interface File {
+  id: string;
+  name: string;
+  url: string;
+  alternativeText?: string;
+}

src/types/Publication.ts

@@ -0,0 +1,11 @@
+import { File } from '@/types/Icon';
+
+export interface Publication {
+  id: string;
+  name: string;
+  title: string;
+  description: string;
+  publisher: string;
+  year: string;
+  file: File;
+}