Merge branch 'main' into issue881-branch

Author: ksen0

public/reference/data.json

@@ -10,6 +10,7 @@ const openProcessingEndpoint = "https://openprocessing.org/api/";
  * Currently a placeholder (https://openprocessing.org/curation/78544/)
  */
 const curationId = "87649";
+const newCurationId = "89576";
 
 /**
  * API Response from a call to the Curation Sketches endpoint
@@ -18,7 +19,7 @@ const curationId = "87649";
  */
 export type OpenProcessingCurationResponse = Array<{
   /** Sketch ID used for constructing URLs */
-  visualID: string;
+  visualID: number;
   /** Title of sketch */
   title: string;
   /** Description of sketch */
@@ -43,14 +44,38 @@ export const getCurationSketches = memoize(async (
   limit?: number,
 ): Promise<OpenProcessingCurationResponse> => {
   const limitParam = limit ? `limit=${limit}` : "";
-  const response = await fetch(
+  const response1 = await fetch(
     `${openProcessingEndpoint}curation/${curationId}/sketches?${limitParam}`,
   );
-  if(!response.ok){ //log error instead of throwing error to not cache result in memoize
-    console.error('getCurationSketches', response.status, response.statusText)
+  if(!response1.ok){ //log error instead of throwing error to not cache result in memoize
+    console.error('getCurationSketches', response1.status, response1.statusText)
   }
-  const payload = await response.json();
-  return payload as OpenProcessingCurationResponse;
+  const payload1 = await response1.json();
+
+  const response2 = await fetch(
+    `${openProcessingEndpoint}curation/${newCurationId}/sketches?${limitParam}`,
+  );
+  if(!response2.ok){ //log error instead of throwing error to not cache result in memoize
+    console.error('getCurationSketches', response2.status, response2.statusText)
+  }
+  const payload2 = await response2.json();
+
+  // Selected Sketches from the 2025 curation
+  const priorityIds = ['2690038', '2484739', '2688829', '2689119', '2690571', '2690405','2684408' , '2693274', '2693345', '2691712']
+
+  const prioritySketches = payload2.filter(
+    (sketch: OpenProcessingCurationResponse[number]) => priorityIds.includes(String(sketch.visualID)))
+    .sort((a: OpenProcessingCurationResponse[number], b: OpenProcessingCurationResponse[number]) => priorityIds.indexOf(String(a.visualID)) - priorityIds.indexOf(String(b.visualID)));
+
+
+  const finalSketches = [
+    ...prioritySketches.map((sketch: OpenProcessingCurationResponse[number]) => ({ ...sketch, curation: '2025' })),
+    ...payload1.map((sketch: OpenProcessingCurationResponse[number]) => ({ ...sketch, curation: '2024' })),
+  ];
+
+  return [
+    ...finalSketches,
+  ] as OpenProcessingCurationResponse;
 });
 
 /**
@@ -60,7 +85,7 @@ export const getCurationSketches = memoize(async (
  */
 export type OpenProcessingSketchResponse = {
   /** Sketch ID used for constructing URLs */
-  visualID: string;
+  visualID: number;
   /** Title of sketch */
   title: string;
   /** Description of sketch */
@@ -83,7 +108,7 @@ export type OpenProcessingSketchResponse = {
  * @returns
  */
 export const getSketch = memoize(
-  async (id: string): Promise<OpenProcessingSketchResponse> => {
+  async (id: number): Promise<OpenProcessingSketchResponse> => {
     // check for memoized sketch in curation sketches
     const curationSketches = await getCurationSketches();
     const memoizedSketch = curationSketches.find((el) => el.visualID === id);
@@ -109,7 +134,7 @@ export const getSketch = memoize(
  * But only uses the width and height properties from this call
  * Width and height should instead be added to properties for `/api/sketch/:id` or `api/curation/:curationId/sketches` instead
  */
-export const getSketchSize = memoize(async (id: string) => {
+export const getSketchSize = memoize(async (id: number) => {
   const sketch = await getSketch(id)
   if (sketch.mode !== 'p5js') {
     return { width: undefined, height: undefined };
@@ -139,16 +164,16 @@ export const getSketchSize = memoize(async (id: string) => {
   return { width: undefined, height: undefined };
 });
 
-export const makeSketchLinkUrl = (id: string) =>
+export const makeSketchLinkUrl = (id: number) =>
   `https://openprocessing.org/sketch/${id}`;
 
-export const makeSketchEmbedUrl = (id: string) =>
+export const makeSketchEmbedUrl = (id: number) =>
   `https://openprocessing.org/sketch/${id}/embed/?plusEmbedFullscreen=true&plusEmbedInstructions=false`;
 
-export const makeThumbnailUrl = (id: string) =>
+export const makeThumbnailUrl = (id: number) =>
   `https://openprocessing-usercontent.s3.amazonaws.com/thumbnails/visualThumbnail${id}@2x.jpg`;
 
-export const getSketchThumbnailSource = async (id: string) => {
+export const getSketchThumbnailSource = async (id: number) => {
   const manualThumbs = import.meta.glob<ImageMetadata>('./images/*', { import: 'default' })
   const key = `./images/${id}.png`;
   if (manualThumbs[key]) {