+ {schools.map((school) => (
+
+ {/* Start School Header */}
+
+
- {/*
*/}
- {/* {jobs.map((job) => (*/}
- {/*
*/}
- {/* /!* Start Job Header *!/*/}
- {/*
*/}
- {/*
*/}
+
+
+
+
- {/*
*/}
- {/*
*/}
- {/*
*/}
- {/* {job.company} ~ {job.location}*/}
- {/*
*/}
- {/* {job.jobTitle}
*/}
- {/* */}
+
+
- {/*
*/}
- {/*
*/}
- {/* {job.startYear} – {job.isCurrentJob ? ` present` : job.endYear}*/}
- {/*
*/}
- {/* */}
- {/*
*/}
- {/*
*/}
- {/* /!* End Job Header *!/*/}
+
{school.degreeName}
+
- {/* /!* Start Job Content *!/*/}
- {/*
*/}
- {/*
*/}
+
+
+
+ {school.grade}
+
+
- {/*
*/}
- {/* {job.technologies.map((tech) => (*/}
- {/*
*/}
- {/* {tech}*/}
- {/* */}
- {/* ))}*/}
- {/*
*/}
- {/*
*/}
- {/* /!* End Job Content *!/*/}
- {/*
*/}
- {/* ))}*/}
- {/*
*/}
+
+
+ {school.startYear} — {school.endYear}
+
+
+
+
+
+ {/* End School Header */}
+
+ {/* Start School Content */}
+
+ {/* End School Content */}
+
- {job.company} ~ {job.location}
+ {job.company} {job.location && `~`} {job.location}
{job.jobTitle}
-
- {job.startYear} –{' '}
- {job.isCurrentJob ? ` present` : job.endYear}
-
+
+ <>
+ {format(job.startDate)}
+ —
+ {job.isCurrentJob ? `present` : format(job.endDate)}
+
+
@@ -83,4 +86,12 @@ const WorkExperience = ({ jobs }: WorkExperienceProps) => {
);
};
+function format(inputDate: string): string {
+ const date = new Date(inputDate);
+ return Intl.DateTimeFormat('en', {
+ year: 'numeric',
+ month: 'short',
+ }).format(date);
+}
+
export default WorkExperience;
diff --git a/src/pages/api/schools.ts b/src/pages/api/schools.ts
new file mode 100644
index 0000000..dd02be7
--- /dev/null
+++ b/src/pages/api/schools.ts
@@ -0,0 +1,15 @@
+import { NextApiRequest, NextApiResponse } from 'next';
+
+import { schoolsQuery } from '@/queries/schools';
+
+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);
+
+ res.status(200).json(schools);
+};
+
+export default schoolsApi;
diff --git a/src/queries/jobs.ts b/src/queries/jobs.ts
index cc77a7c..3bd91cb 100644
--- a/src/queries/jobs.ts
+++ b/src/queries/jobs.ts
@@ -1,14 +1,14 @@
import { groq } from 'next-sanity';
export const jobsQuery = groq`
-*[_type == "job"] | order(endYear desc) {
+*[_type == "job"] | order(endDate desc) {
_id,
company,
"iconUrl": icon.asset->url,
location,
jobTitle,
- startYear,
- endYear,
+ startDate,
+ endDate,
isCurrentJob,
description,
technologies,
diff --git a/src/queries/schools.ts b/src/queries/schools.ts
new file mode 100644
index 0000000..38ebc16
--- /dev/null
+++ b/src/queries/schools.ts
@@ -0,0 +1,16 @@
+import { groq } from 'next-sanity';
+
+export const schoolsQuery = groq`
+*[_type == "school"] | order(endYear desc) {
+ _id,
+ name,
+ schoolName,
+ "schoolIcon": schoolIcon.asset->url,
+ "flagUrl": countryFlag.asset->url,
+ degreeName,
+ degreeUrl,
+ grade,
+ startYear,
+ endYear,
+ description,
+}`;
diff --git a/src/schemas/job.ts b/src/schemas/job.ts
index 450e38d..b55ee9a 100644
--- a/src/schemas/job.ts
+++ b/src/schemas/job.ts
@@ -31,16 +31,22 @@ export default defineType({
type: 'string',
}),
defineField({
- name: 'startYear',
- title: 'Start Year',
- type: 'number',
- initialValue: new Date().getFullYear() - 3,
+ name: 'startDate',
+ title: 'Start Date',
+ type: 'date',
+ options: {
+ dateFormat: 'MMM YYYY',
+ },
+ initialValue: 'Mar 2020',
}),
defineField({
- name: 'endYear',
+ name: 'endDate',
title: 'End Year',
- type: 'number',
- initialValue: new Date().getFullYear() - 1,
+ type: 'date',
+ options: {
+ dateFormat: 'MMM YYYY',
+ },
+ initialValue: 'Mar 2022',
}),
defineField({
name: 'isCurrentJob',
@@ -81,7 +87,7 @@ export default defineType({
{
title: 'Most Recent',
name: 'jobDateDesc',
- by: [{ field: 'endYear', direction: 'desc' }],
+ by: [{ field: 'startDate', direction: 'desc' }],
},
],
});
diff --git a/src/schemas/school.ts b/src/schemas/school.ts
new file mode 100644
index 0000000..977747c
--- /dev/null
+++ b/src/schemas/school.ts
@@ -0,0 +1,69 @@
+import { defineField, defineType } from 'sanity';
+
+export default defineType({
+ name: 'school',
+ title: 'School',
+ type: 'document',
+ fields: [
+ defineField({
+ name: 'name',
+ title: 'Name',
+ type: 'string',
+ }),
+ defineField({
+ name: 'schoolName',
+ title: 'School Name',
+ type: 'string',
+ }),
+ defineField({
+ name: 'schoolIcon',
+ title: 'School Icon',
+ type: 'image',
+ }),
+ defineField({
+ name: 'countryFlag',
+ title: 'Country Flag',
+ type: 'image',
+ }),
+ defineField({
+ name: 'degreeName',
+ title: 'Degree Name',
+ type: 'string',
+ }),
+ defineField({
+ name: 'degreeUrl',
+ title: 'Degree Url',
+ type: 'string',
+ }),
+ defineField({
+ name: 'grade',
+ title: 'Grade',
+ type: 'string',
+ }),
+ defineField({
+ name: 'startYear',
+ title: 'Start Year',
+ type: 'number',
+ initialValue: new Date().getFullYear() - 5,
+ }),
+ defineField({
+ name: 'endYear',
+ title: 'End Year',
+ type: 'number',
+ initialValue: new Date().getFullYear() - 3,
+ }),
+ defineField({
+ name: 'description',
+ title: 'Description',
+ type: 'array',
+ of: [{ type: 'block' }],
+ }),
+ ],
+ orderings: [
+ {
+ title: 'Most Recent',
+ name: 'schoolDateDesc',
+ by: [{ field: 'endYear', direction: 'desc' }],
+ },
+ ],
+});
diff --git a/src/types/Job.ts b/src/types/Job.ts
index 79a48d0..b37d680 100644
--- a/src/types/Job.ts
+++ b/src/types/Job.ts
@@ -7,8 +7,8 @@ export interface Job {
iconUrl: string;
location: string;
jobTitle: string;
- startYear: number;
- endYear: number;
+ startDate: string;
+ endDate: string;
isCurrentJob: boolean;
description: TypedObject;
mainColor: string;
diff --git a/src/types/School.ts b/src/types/School.ts
new file mode 100644
index 0000000..178719b
--- /dev/null
+++ b/src/types/School.ts
@@ -0,0 +1,15 @@
+import { TypedObject } from '@portabletext/types';
+
+export interface School {
+ _id: string;
+ name: string;
+ schoolName: string;
+ schoolIcon: string;
+ flagUrl: string;
+ degreeName: string;
+ degreeUrl: string;
+ grade: string;
+ startYear: number;
+ endYear: number;
+ description: TypedObject;
+}