diff --git a/index.html b/index.html index 9ec0778a..48fc0c3b 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ Utopia Game - + diff --git a/src/api/itemsApi.ts b/src/api/itemsApi.ts index 9110acef..c14b5092 100644 --- a/src/api/itemsApi.ts +++ b/src/api/itemsApi.ts @@ -9,9 +9,13 @@ export class itemsApi implements ItemsApi{ collectionName: string; filter: any; - constructor(collectionName: string, filter?: any) { + constructor(collectionName: string, layerId?: string | undefined, filter?: any, ) { this.collectionName = collectionName; - this.filter = filter; + if(filter) this.filter = filter; + else this.filter = {}; + if(layerId) this.filter = {... filter, ... { "layer" : { "id": { "_eq": layerId }}}} + console.log(this.filter); + } async getItems() { diff --git a/src/pages/MapContainer.tsx b/src/pages/MapContainer.tsx index a469a7c1..23dac036 100644 --- a/src/pages/MapContainer.tsx +++ b/src/pages/MapContainer.tsx @@ -4,12 +4,14 @@ import { permissionsApi } from '../api/permissionsApi'; import { Place, Event, Tag } from '../api/directus'; import { useEffect, useState } from 'react'; import {CalendarDaysIcon, MapPinIcon, UserIcon} from '@heroicons/react/20/solid' +// import { refiBcnApi } from '../api/refiBcnApi'; function MapContainer() { const [placesApi, setPlacesApi] = useState>(); const [eventsApi, setEventsApi] = useState>(); + // const [refiApi, setRefiApi] = useState(); const [tagsApi, setTagsApi] = useState>(); const [permissionsApiInstance, setPermissionsApiInstance] = useState(); const [updatesApiInstance, setUpdatesApiInstance] = useState>(); @@ -19,15 +21,13 @@ function MapContainer() { useEffect(() => { - setPlacesApi(new itemsApi('places')); - setEventsApi(new itemsApi('events')); + setPlacesApi(new itemsApi('places',"e31de961-6709-4413-a27d-00e59ccfe472")); + setEventsApi(new itemsApi('events', "1837e83e-07f1-44c0-88c0-8e9ea8e597db")); + setUpdatesApiInstance(new itemsApi('updates',"b4dd8b6b-80e8-4173-9682-4a5755e7b9cb",{"latest":{"_eq": true}})); setTagsApi(new itemsApi('tags')); + // setRefiApi(new refiBcnApi('refi')); setPermissionsApiInstance(new permissionsApi()); - setUpdatesApiInstance(new itemsApi('updates', { - "latest": { - "_eq": true - } - })); + }, []); const icon = CalendarDaysIcon; @@ -93,7 +93,8 @@ function MapContainer() { - + {/** + */}