feat: remove Sanity from Job, Publication, Skill and Intro types

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

@@ -2,66 +2,28 @@ import Image from 'next/image';
 import * as React from 'react';
 import ReactMarkdown from 'react-markdown';
 
-import { flattenToArray, flattenToObject } from '@/lib/graphqlUtils';
-
 import Heading from '@/components/atoms/Heading';
 import Education from '@/components/organisms/about-work/Education';
 import Intro from '@/components/organisms/about-work/Intro';
 import Languages from '@/components/organisms/about-work/Languages';
 import Publications from '@/components/organisms/about-work/Publications';
 import WorkExperience from '@/components/organisms/about-work/WorkExperience';
 
-import { jobsQueryQL } from '@/queries/jobs';
-import { languagesQueryQL } from '@/queries/languages';
-import { publicationQueryQL } from '@/queries/publications';
+import { queryJobs } from '@/queries/jobs';
+import { queryLanguages } from '@/queries/languages';
+import { queryPublications } from '@/queries/publications';
 import { querySchools } from '@/queries/schools';
-import { softwareDevIntroQuery } from '@/queries/short-texts';
-import { skillQueryQL } from '@/queries/skills';
-
-import apolloClient from '../../../../../apollo/apollo-client';
+import { queryIntro } from '@/queries/short-texts';
+import { querySkills } from '@/queries/skills';
 
 import { Icon } from '@/types/Icon';
-import { Job } from '@/types/Job';
-import { Language } from '@/types/Language';
-import { Publication } from '@/types/Publication';
-import { SoftwareDevIntro } from '@/types/ShortText';
 import { Skill } from '@/types/Skill';
 
 export const metadata = {
   title: 'About my Work | MartaCodes.it',
   description: 'About page',
 };
 
-async function queryIntro() {
-  const { data } = await apolloClient.query({ query: softwareDevIntroQuery });
-
-  return flattenToObject<SoftwareDevIntro>(data.softwareDevelopmentIntro);
-}
-
-async function queryJobs() {
-  const { data } = await apolloClient.query({ query: jobsQueryQL });
-
-  return flattenToArray<Job>(data.jobs);
-}
-
-async function queryPublications() {
-  const { data } = await apolloClient.query({ query: publicationQueryQL });
-
-  return flattenToArray<Publication>(data.publications);
-}
-
-async function querySkills() {
-  const { data } = await apolloClient.query({ query: skillQueryQL });
-
-  return flattenToArray<Skill>(data.skills);
-}
-
-async function queryLanguages() {
-  const { data } = await apolloClient.query({ query: languagesQueryQL });
-
-  return flattenToArray<Language>(data.languages);
-}
-
 const queryData = async () => {
   const intro = await queryIntro();
 

src/pages/api/jobs.ts

@@ -1,12 +1,10 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
-import { jobsQuery } from '@/queries/jobs';
+import { queryJobs } from '@/queries/jobs';
 import { Job } from '@/sanityTypes/Job';
 
-import { sanityClient } from '../../../sanity/lib/client';
-
 const jobsApi = async (req: NextApiRequest, res: NextApiResponse) => {
-  const jobs: Job[] = await sanityClient.fetch(jobsQuery);
+  const jobs: Job[] = await queryJobs();
 
   res.status(200).json(jobs);
 };

src/pages/api/publications.ts

@@ -1,14 +1,10 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
-import { publicationQuery } from '@/queries/publications';
+import { queryPublications } from '@/queries/publications';
 import { Publication } from '@/sanityTypes/Publication';
 
-import { sanityClient } from '../../../sanity/lib/client';
-
 const publicationsApi = async (req: NextApiRequest, res: NextApiResponse) => {
-  const publications: Publication[] = await sanityClient.fetch(
-    publicationQuery
-  );
+  const publications: Publication[] = await queryPublications();
 
   res.status(200).json(publications);
 };

src/pages/api/skills.ts

@@ -1,12 +1,10 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
-import { skillQuery } from '@/queries/skills';
+import { querySkills } from '@/queries/skills';
 import { Skill } from '@/sanityTypes/Skill';
 
-import { sanityClient } from '../../../sanity/lib/client';
-
 const skillsApi = async (req: NextApiRequest, res: NextApiResponse) => {
-  const skills: Skill[] = await sanityClient.fetch(skillQuery);
+  const skills: Skill[] = await querySkills();
 
   res.status(200).json(skills);
 };

src/queries/jobs.ts

@@ -1,21 +1,16 @@
 import { gql } from '@apollo/client';
-import { groq } from 'next-sanity';
 
-export const jobsQuery = groq`
-*[_type == "job"] | order(endDate desc) {
-  _id,
-  company,
-  "iconUrl": icon.asset->url,
-  location,
-  jobTitle,
-  startDate,
-  endDate,
-  isCurrentJob,
-  description,
-  technologies,
-  mainColor,
-  darkColor,
-}`;
+import { flattenToArray } from '@/lib/graphqlUtils';
+
+import apolloClient from '../../apollo/apollo-client';
+
+import { Job } from '@/types/Job';
+
+export async function queryJobs() {
+  const { data } = await apolloClient.query({ query: jobsQueryQL });
+
+  return flattenToArray<Job>(data.jobs);
+}
 
 export const jobsQueryQL = gql`
   query {

src/queries/languages.ts

@@ -1,13 +1,16 @@
 import { gql } from '@apollo/client';
-import { groq } from 'next-sanity';
 
-export const languageQuery = groq`
-*[_type == "language"] | order(id asc) {
-  _id,
-  name,
-  level,
-  "flagUrl": flag.asset->url
-}`;
+import { flattenToArray } from '@/lib/graphqlUtils';
+
+import apolloClient from '../../apollo/apollo-client';
+
+import { Language } from '@/types/Language';
+
+export async function queryLanguages() {
+  const { data } = await apolloClient.query({ query: languagesQueryQL });
+
+  return flattenToArray<Language>(data.languages);
+}
 
 export const languagesQueryQL = gql`
   query {

src/queries/publications.ts

@@ -1,16 +1,16 @@
 import { gql } from '@apollo/client';
-import { groq } from 'next-sanity';
 
-export const publicationQuery = groq`
-*[_type == "publication"] | order(sortId asc) {
-  _id,
-  name,
-  title,
-  description,
-  publisher,
-  year,
-  "link": file.asset->url
-}`;
+import { flattenToArray } from '@/lib/graphqlUtils';
+
+import apolloClient from '../../apollo/apollo-client';
+
+import { Publication } from '@/types/Publication';
+
+export async function queryPublications() {
+  const { data } = await apolloClient.query({ query: publicationQueryQL });
+
+  return flattenToArray<Publication>(data.publications);
+}
 
 export const publicationQueryQL = gql`
   query {

src/queries/short-texts.ts

@@ -1,14 +1,16 @@
 import { gql } from '@apollo/client';
-import { groq } from 'next-sanity';
 
-export const shortTextQuery = groq`
-*[_type == "shortText"] {
-  _id,
-  name,
-  title,
-  content,
-  "iconUrl": icon.asset->url
-}`;
+import { flattenToObject } from '@/lib/graphqlUtils';
+
+import apolloClient from '../../apollo/apollo-client';
+
+import { SoftwareDevIntro } from '@/types/ShortText';
+
+export async function queryIntro() {
+  const { data } = await apolloClient.query({ query: softwareDevIntroQuery });
+
+  return flattenToObject<SoftwareDevIntro>(data.softwareDevelopmentIntro);
+}
 
 export const softwareDevIntroQuery = gql`
   query {

src/queries/skills.ts

@@ -1,17 +1,16 @@
 import { gql } from '@apollo/client';
-import { groq } from 'next-sanity';
 
-export const skillQuery = groq`
-*[_type == "skill"] {
-  name,
-  title,
-  description,
-  'icons': icons[]-> {
-    _id,
-    title,
-    "url": icon.asset->url
-  }
-}`;
+import { flattenToArray } from '@/lib/graphqlUtils';
+
+import apolloClient from '../../apollo/apollo-client';
+
+import { Skill } from '@/types/Skill';
+
+export async function querySkills() {
+  const { data } = await apolloClient.query({ query: skillQueryQL });
+
+  return flattenToArray<Skill>(data.skills);
+}
 
 export const skillQueryQL = gql`
   query {