feat: move types to Sanity folder

apollo/apollo-client.ts

@@ -5,11 +5,11 @@ const apolloClient = new ApolloClient({
   cache: new InMemoryCache(),
   defaultOptions: {
     watchQuery: {
-      fetchPolicy: 'network-only',
+      fetchPolicy: 'no-cache',
       errorPolicy: 'ignore',
     },
     query: {
-      fetchPolicy: 'network-only',
+      fetchPolicy: 'no-cache',
       errorPolicy: 'all',
     },
   },

src/app/(public)/about/free-time/page.tsx

@@ -19,15 +19,14 @@ import {
 } from '@/queries/random-facts';
 import { tvSeriesQuery } from '@/queries/tv-series';
 import { videoGamesQuery } from '@/queries/video-games';
+import { Book } from '@/sanityTypes/Book';
+import { Podcast } from '@/sanityTypes/Podcast';
+import { RandomFact } from '@/sanityTypes/RandomFact';
+import { TvShow } from '@/sanityTypes/TvSeries';
+import { VideoGame } from '@/sanityTypes/VideoGame';
 
 import { sanityClient } from '../../../../../sanity/lib/client';
 
-import { Book } from '@/types/Book';
-import { Podcast } from '@/types/Podcast';
-import { RandomFact } from '@/types/RandomFact';
-import { TvShow } from '@/types/TvSeries';
-import { VideoGame } from '@/types/VideoGame';
-
 export const metadata = {
   title: 'About my Free Time | MartaCodes.it',
   description: 'About page',

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

@@ -15,18 +15,17 @@ import { publicationQuery } from '@/queries/publications';
 import { schoolsQuery } from '@/queries/schools';
 import { shortTextQuery } from '@/queries/short-texts';
 import { skillQuery } from '@/queries/skills';
+import { Icon } from '@/SanityTypes/Icon';
+import { Language } from '@/SanityTypes/Language';
+import { Publication } from '@/SanityTypes/Publication';
+import { School } from '@/SanityTypes/School';
+import { ShortText } from '@/SanityTypes/ShortText';
+import { Skill } from '@/SanityTypes/Skill';
 
 import apolloClient from '../../../../../apollo/apollo-client';
 import { sanityClient } from '../../../../../sanity/lib/client';
 
-import { Icon } from '@/types/Icon';
 import { Job } from '@/types/Job';
-import { Job2 } from '@/types/Job2';
-import { Language } from '@/types/Language';
-import { Publication } from '@/types/Publication';
-import { School } from '@/types/School';
-import { ShortText } from '@/types/ShortText';
-import { Skill } from '@/types/Skill';
 
 export const metadata = {
   title: 'About my Work | MartaCodes.it',
@@ -63,7 +62,7 @@ const queryData = async () => {
     query: jobsQueryQL,
   });
 
-  const jobs: Job2[] = flattenToArray<Job2>(data.jobs);
+  const jobs: Job[] = flattenToArray<Job>(data.jobs);
   return {
     jobs: jobs,
   };

src/app/(public)/page.tsx

@@ -5,11 +5,10 @@ import Summary from '@/components/organisms/home/Summary';
 import Seo from '@/components/Seo';
 
 import { codeSnippetsQuery } from '@/queries/codeSnippets';
+import { CodeSnippet } from '@/sanityTypes/CodeSnippet';
 
 import { sanityClient } from '../../../sanity/lib/client';
 
-import { CodeSnippet } from '@/types/CodeSnippet';
-
 const getData = async () => {
   // const homeData: HomeContent[] = await sanityClient.fetch(homeContentQuery);
   const codeSnippets: CodeSnippet[] = await sanityClient.fetch(

src/components/molecules/RandomFacts/GeneralView.tsx

@@ -6,7 +6,7 @@ import { useState } from 'react';
 
 import Button from '@/components/buttons/Button';
 
-import { RandomFact } from '@/types/RandomFact';
+import { RandomFact } from '@/sanityTypes/RandomFact';
 
 export interface GeneralViewProps {
   randomFacts: RandomFact[];

src/components/molecules/RandomFacts/Quiz.tsx

@@ -13,7 +13,7 @@ import { saveToLocalStorage } from '@/lib/helper';
 import Button from '@/components/buttons/Button';
 import { localStorageKey } from '@/components/organisms/about-free-time/RandomFacts';
 
-import { RandomFact } from '@/types/RandomFact';
+import { RandomFact } from '@/sanityTypes/RandomFact';
 
 export interface QuizOption {
   headline: string;

src/components/molecules/RandomFacts/__stories__/GeneralView.stories.tsx

@@ -8,11 +8,10 @@ import GeneralView, {
 } from '@/components/molecules/RandomFacts/GeneralView';
 
 import { trueRandomFactsQuery } from '@/queries/random-facts';
+import { RandomFact } from '@/sanityTypes/RandomFact';
 
 import { sanityClient } from '../../../../../sanity/lib/client';
 
-import { RandomFact } from '@/types/RandomFact';
-
 const meta: Meta<typeof GeneralView> = {
   title: 'Components/Random Facts/General View',
   component: GeneralView,

src/components/organisms/about-free-time/Books.tsx

@@ -3,7 +3,7 @@
 import Image from 'next/image';
 import * as React from 'react';
 
-import { Book } from '@/types/Book';
+import { Book } from '@/sanityTypes/Book';
 
 export interface BookProps {
   books: Book[];

src/components/organisms/about-free-time/Podcasts.tsx

@@ -3,7 +3,7 @@
 import Image from 'next/image';
 import * as React from 'react';
 
-import { Podcast } from '@/types/Podcast';
+import { Podcast } from '@/sanityTypes/Podcast';
 
 export interface PodcastProps {
   podcasts: Podcast[];

src/components/organisms/about-free-time/TvSeries.tsx

@@ -3,7 +3,7 @@
 import Image from 'next/image';
 import * as React from 'react';
 
-import { TvShow } from '@/types/TvSeries';
+import { TvShow } from '@/sanityTypes/TvSeries';
 
 export interface TvSeriesProps {
   tvSeries: TvShow[];

src/components/organisms/about-free-time/VideoGames.tsx

@@ -3,7 +3,7 @@
 import Image from 'next/image';
 import * as React from 'react';
 
-import { VideoGame } from '@/types/VideoGame';
+import { VideoGame } from '@/sanityTypes/VideoGame';
 
 export interface VideoGameProps {
   videoGames: VideoGame[];

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

@@ -4,7 +4,7 @@ import { PortableText } from '@portabletext/react';
 import Image from 'next/image';
 import * as React from 'react';
 
-import { School } from '@/types/School';
+import { School } from '@/sanityTypes/School';
 
 export interface EducationProps {
   schools: School[];

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 '@/types/Publication';
+import { Publication } from '@/sanityTypes/Publication';
 
 export interface PublicationProps {
   publications: Publication[];

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

@@ -5,10 +5,10 @@ import { useTheme } from 'next-themes';
 import * as React from 'react';
 import ReactMarkdown from 'react-markdown';
 
-import { Job2 } from '@/types/Job2';
+import { Job } from '@/types/Job';
 
 export interface WorkExperienceProps {
-  jobs: Job2[];
+  jobs: Job[];
 }
 
 const WorkExperience = ({ jobs }: WorkExperienceProps) => {

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 '@/types/CodeSnippet';
+import { CodeSnippet } from '@/sanityTypes/CodeSnippet';
 
 export interface CodeSnippetsProps {
   codeSnippets: CodeSnippet[];

src/pages/api/code-snippets.ts

@@ -1,11 +1,10 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
 import { codeSnippetsQuery } from '@/queries/codeSnippets';
+import { CodeSnippet } from '@/sanityTypes/CodeSnippet';
 
 import { sanityClient } from '../../../sanity/lib/client';
 
-import { CodeSnippet } from '@/types/CodeSnippet';
-
 const codeSnippetsApi = async (req: NextApiRequest, res: NextApiResponse) => {
   const codeSnippets: CodeSnippet[] = await sanityClient.fetch(
     codeSnippetsQuery

src/pages/api/hobbies.ts

@@ -4,14 +4,13 @@ import { booksQuery } from '@/queries/books';
 import { podcastsQuery } from '@/queries/podcasts';
 import { tvSeriesQuery } from '@/queries/tv-series';
 import { videoGamesQuery } from '@/queries/video-games';
+import { Book } from '@/sanityTypes/Book';
+import { Podcast } from '@/sanityTypes/Podcast';
+import { TvShow } from '@/sanityTypes/TvSeries';
+import { VideoGame } from '@/sanityTypes/VideoGame';
 
 import { sanityClient } from '../../../sanity/lib/client';
 
-import { Book } from '@/types/Book';
-import { Podcast } from '@/types/Podcast';
-import { TvShow } from '@/types/TvSeries';
-import { VideoGame } from '@/types/VideoGame';
-
 const hobbiesApi = async (req: NextApiRequest, res: NextApiResponse) => {
   const books: Book[] = await sanityClient.fetch(booksQuery);
 

src/pages/api/home.ts

@@ -1,11 +1,10 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
 import { homeContentQuery } from '@/queries/homeContent';
+import { HomeContent } from '@/sanityTypes/HomeContent';
 
 import { sanityClient } from '../../../sanity/lib/client';
 
-import { HomeContent } from '@/types/HomeContent';
-
 const homeApi = async (req: NextApiRequest, res: NextApiResponse) => {
   const homeContent: HomeContent = await sanityClient.fetch(homeContentQuery);
 

src/pages/api/jobs.ts

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

src/pages/api/publications.ts

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

src/pages/api/random-facts.ts

@@ -6,11 +6,10 @@ import {
   falseRandomFactsQuery,
   selectedTrueRandomFactsQuery,
 } from '@/queries/random-facts';
+import { RandomFact } from '@/sanityTypes/RandomFact';
 
 import { sanityClient } from '../../../sanity/lib/client';
 
-import { RandomFact } from '@/types/RandomFact';
-
 const randomFactsApi = async (req: NextApiRequest, res: NextApiResponse) => {
   const trueFacts: RandomFact[] = await sanityClient.fetch(
     selectedTrueRandomFactsQuery

src/pages/api/schools.ts

@@ -1,11 +1,10 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
 import { schoolsQuery } from '@/queries/schools';
+import { School } from '@/sanityTypes/School';
 
 import { sanityClient } from '../../../sanity/lib/client';
 
-import { School } from '@/types/School';
-
 const schoolsApi = async (req: NextApiRequest, res: NextApiResponse) => {
   const schools: School[] = await sanityClient.fetch(schoolsQuery);
 

src/pages/api/short-texts.ts

@@ -1,11 +1,10 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
 import { shortTextQuery } from '@/queries/short-texts';
+import { ShortText } from '@/sanityTypes/ShortText';
 
 import { sanityClient } from '../../../sanity/lib/client';
 
-import { ShortText } from '@/types/ShortText';
-
 const shortTextsApi = async (req: NextApiRequest, res: NextApiResponse) => {
   const shortTexts: ShortText[] = await sanityClient.fetch(shortTextQuery);
 

src/pages/api/skills.ts

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

src/pages/api/true-random-facts.ts

@@ -1,11 +1,10 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 
 import { selectedTrueRandomFactsQuery } from '@/queries/random-facts';
+import { RandomFact } from '@/sanityTypes/RandomFact';
 
 import { sanityClient } from '../../../sanity/lib/client';
 
-import { RandomFact } from '@/types/RandomFact';
-
 const trueFactsApi = async (req: NextApiRequest, res: NextApiResponse) => {
   const trueFacts: RandomFact[] = await sanityClient.fetch(
     selectedTrueRandomFactsQuery

src/queries/languages.ts

@@ -1,3 +1,4 @@
+import { gql } from '@apollo/client';
 import { groq } from 'next-sanity';
 
 export const languageQuery = groq`
@@ -7,3 +8,24 @@ export const languageQuery = groq`
   level,
   "flagUrl": flag.asset->url
 }`;
+
+export const languagesQueryQL = gql`
+  query {
+    languages(locale: "en") {
+      data {
+        attributes {
+          name
+          level
+          flag {
+            data {
+              attributes {
+                url
+                alternativeText
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;

src/sanityTypes/Icon.ts

@@ -0,0 +1,5 @@
+export interface Icon {
+  _id: string;
+  title: string;
+  url: string;
+}

src/sanityTypes/Job.ts

@@ -0,0 +1,17 @@
+import { TypedObject } from '@portabletext/types';
+
+export interface Job {
+  _id: string;
+  name: string;
+  company: string;
+  iconUrl: string;
+  location: string;
+  jobTitle: string;
+  startDate: string;
+  endDate: string;
+  isCurrentJob: boolean;
+  description: TypedObject;
+  mainColor: string;
+  darkColor: string;
+  technologies: string[];
+}

src/sanityTypes/Language.ts

@@ -0,0 +1,6 @@
+export interface Language {
+  id: number;
+  name: string;
+  level: string;
+  flagUrl: string;
+}

src/types/Skill.ts → src/sanityTypes/Skill.ts

@@ -1,6 +1,6 @@
 import { TypedObject } from '@portabletext/types';
 
-import { Icon } from '@/types/Icon';
+import { Icon } from '@/sanityTypes/Icon';
 
 export interface Skill {
   name: string;