Merge pull request #1 from shawkyebrahim2514/Development

Accepting the new updates in Sanity and frontend implementations

react-frontend/src/APIs/Sanity/about.ts

@@ -0,0 +1,20 @@
+import { SanityAboutPage } from '../../Types';
+import sanityClient from './client';
+
+const getAboutPage = async () => {
+    const query = `*[_type == "portfolio"][0].pages[_type == "aboutPage"][0] {
+        salutation,
+        personImage,
+        seeking,
+        personName,
+        description,
+        resume,
+        position
+    }`;
+    const result: SanityAboutPage = await sanityClient.fetch(query);
+    return result;
+};
+
+export {
+    getAboutPage,
+}

react-frontend/src/APIs/Sanity/client.ts

@@ -3,7 +3,8 @@ import { createClient } from '@sanity/client'
 const sanityClient = createClient({
     projectId: 'h48br789',
     dataset: 'production',
-    useCdn: true
+    useCdn: true,
+    apiVersion: '2022-03-07',
 })
 
 export default sanityClient;

react-frontend/src/APIs/Sanity/contacts.ts

@@ -1,16 +1,19 @@
-import { SanityContact } from '../../Types';
+import { SanityContactsPage } from '../../Types';
 import sanityClient from './client';
 
-const getContacts = async () => {
-    const query = `*[_type == "contacts"]{
-        "imgSrc": icon.asset->url,
-        link,
-        name
+const getContactsPage = async () => {
+    const query = `*[_type == "portfolio"][0].pages[_type == "contactsPage"][0] {
+        title,
+        "contacts": contacts[] -> {
+            "imgSrc": icon.asset->url,
+            link,
+            name
+        }
     }`;
-    const result: SanityContact[] = await sanityClient.fetch(query);
+    const result: SanityContactsPage = await sanityClient.fetch(query);
     return result;
 };
 
 export {
-    getContacts,
+    getContactsPage,
 }

react-frontend/src/APIs/Sanity/education.ts

@@ -0,0 +1,25 @@
+import { SanityEducationPage } from '../../Types';
+import sanityClient from './client';
+
+const getEducationPage = async () => {
+    const query = `*[_type == "portfolio"][0].pages[_type == "educationPage"][0] {
+        title,
+        education {
+            name,
+            description,
+            location,
+            date,
+            courses[] -> {
+                name,
+                description,
+                "technologies": technologies[]->name
+            }
+        }
+    }`;
+    const result: SanityEducationPage = await sanityClient.fetch(query);
+    return result;
+};
+
+export {
+    getEducationPage,
+}

react-frontend/src/APIs/Sanity/experience.ts

@@ -0,0 +1,34 @@
+import { SanityExperiencePage } from '../../Types';
+import sanityClient from './client';
+
+const getExperiencePage = async () => {
+    const query = `*[_type == "portfolio"][0].pages[_type == "experiencePage"][0] {
+        internshipsSection {
+            title,
+            internships[] -> {
+                title,
+                subTitle,
+                date,
+                link,
+                description,
+                "technologies": technologies[]->name
+            }
+        },
+        certificatesSection {
+            title,
+            certificates[] -> {
+                title,
+                subTitle,
+                description,
+                date,
+                link,
+            }
+        }
+    }`;
+    const result: SanityExperiencePage = await sanityClient.fetch(query);
+    return result;
+};
+
+export {
+    getExperiencePage,
+}

react-frontend/src/APIs/Sanity/index.ts

@@ -1,6 +1,7 @@
-export { getContacts } from './contacts';
-export { getCertificates } from './certificates';
-export { getEducationCourses } from './educationCourses';
-export { getInternships } from './internships';
-export { getProjects } from './projects';
-export { getSkills } from './skills';
+export { getContactsPage } from './contacts';
+export { getEducationPage } from './education';
+export { getProjectsPage } from './projects';
+export { getSkillsPage } from './skills';
+export { getAboutPage } from './about';
+export { getExperiencePage } from './experience';
+export { getNavbarData } from './navbar';

react-frontend/src/APIs/Sanity/navbar.ts

@@ -0,0 +1,12 @@
+import { SanityNavbarData } from '../../Types';
+import sanityClient from './client';
+
+const getNavbarData = async () => {
+    const query = `*[_type == "portfolio"][0].navbar`;
+    const result: SanityNavbarData = await sanityClient.fetch(query);
+    return result;
+};
+
+export {
+    getNavbarData,
+}

react-frontend/src/APIs/Sanity/projects.ts

@@ -1,19 +1,21 @@
-import { SanityProject } from '../../Types';
+import { SanityProjectsPage } from '../../Types';
 import sanityClient from './client';
 
-const getProjects = async () => {
-    const query = `*[_type == "projects"]{
-        name,
-        rank,
-        links,
-        description,
-        "imgSrc": image.asset->url,
-        "technologies": technologies[]->name
+const getProjectsPage = async () => {
+    const query = `*[_type == "portfolio"][0].pages[_type == "projectsPage"][0] {
+        title,
+        "projects": projects[] -> {
+            name,
+            links,
+            description,
+            "imgSrc": image.asset->url,
+            "technologies": technologies[]->name
+        }
     }`;
-    const result: SanityProject[] = await sanityClient.fetch(query);
+    const result: SanityProjectsPage = await sanityClient.fetch(query);
     return result;
 };
 
 export {
-    getProjects,
+    getProjectsPage,
 }

react-frontend/src/APIs/Sanity/skills.ts

@@ -1,16 +1,21 @@
-import { SanitySkill } from '../../Types';
+import { SanitySkillsPage } from '../../Types';
 import sanityClient from './client';
 
-const getSkills = async () => {
-    const query = `*[_type == "skills" && rank >= 0]{
-        "categoryName": category->name,
-        "iconURL": icon.asset->url,
-        name, rank
+const getSkillsPage = async () => {
+    const query = `*[_type == "portfolio"][0].pages[_type == "skillsPage"][0] {
+        title,
+        "categories": categories[] {
+            title,
+            skills[] -> {
+                "iconURL": icon.asset->url,
+                name
+            }
+        }
     }`;
-    const result: SanitySkill[] = await sanityClient.fetch(query);
+    const result: SanitySkillsPage = await sanityClient.fetch(query);
     return result;
 };
 
 export {
-    getSkills,
+    getSkillsPage,
 }

react-frontend/src/APIs/index.ts

@@ -1,10 +1,9 @@
-export { getGithubImageURL, getResumeURL } from './ExternalResource';
-
 export {
-    getSkills,
-    getEducationCourses,
-    getInternships,
-    getProjects,
-    getContacts,
-    getCertificates
+    getSkillsPage,
+    getEducationPage,
+    getProjectsPage,
+    getContactsPage,
+    getExperiencePage,
+    getAboutPage,
+    getNavbarData
 } from './Sanity';