fix map

app/client/src/pages/Map/Map.tsx

@@ -39,14 +39,15 @@ export default function Map() {
             throw new Error(`Failed to fetch well data:, ${res}`);
         }
 
-        const wells = await res.json();
-        setWells(wells.data);
+        const data = await res.json();
+        setWells(data.wells);
     }
 
     async function getRegionTranslations() {
         const translations = await RegionTranslationsFetcher();
         setRegionTranslations(translations);
     }
+
     useEffect(() => {
         async function fetchToken() {
             const token = await AccessToken.get();
@@ -58,9 +59,12 @@ export default function Map() {
         fetchToken();
         getRegionTranslations();
         getInteractiveMap();
-        getPredictionPinData();
     }, []);
 
+    useEffect(() => {
+        getPredictionPinData();
+    },  [token]);
+
     if (!interactiveMap || !wells || !regionTranslations) return (
         <Stack alignItems='center' justifyContent='center'>
             <CircularProgress />

app/client/src/pages/Map/markers.tsx

@@ -63,6 +63,10 @@ export default function Markers({ wells, regionTranslations }: props): JSX.Eleme
         }
     }
 
+    console.log('================================');
+    console.log(wells);
+    console.log(wells.filter);
+
     return (
         <>
             {wells.filter(

app/client/src/utils/AccessToken.ts

@@ -11,7 +11,11 @@ export default class AccessToken {
         if (!accessToken) return null;
 
         const parsedAccessToken = JSON.parse(accessToken);
-        const tokenValidationRes = TokenSchema.safeParse(parsedAccessToken);
+        const tokenValidationRes = TokenSchema.safeParse({
+            ...parsedAccessToken,
+            createdAt: parsedAccessToken.createdAt = new Date(parsedAccessToken.createdAt),
+            expiresAt: parsedAccessToken.expiresAt = new Date(parsedAccessToken.expiresAt),
+        });
 
         if (!tokenValidationRes.success) {
             console.error('Failed to validate access token:', tokenValidationRes.error);

app/client/vite.config.ts

@@ -16,7 +16,7 @@ export default defineConfig({
   },
   resolve: {
     alias: {
-      'shared': './node_modules/shared/dist/index.js',
+      'shared': './node_modules/shared/src/index.ts',
     }
   }
 });

app/server/iArsenic API/environments/localhost.bru

@@ -2,7 +2,7 @@ vars {
   base_url: http://127.0.0.1:5001/iarsenic-staging/us-central1/default
 }
 vars:secret [
-  test_password,
   access_token,
+  test_password,
   well_id
 ]

app/server/iArsenic API/get wells.bru

@@ -0,0 +1,15 @@
+meta {
+  name: get wells
+  type: http
+  seq: 14
+}
+
+get {
+  url: {{base_url}}/api/v1/well/
+  body: none
+  auth: none
+}
+
+headers {
+  authorization: Bearer {{access_token}}
+}

app/server/package.json

@@ -5,7 +5,7 @@
   "main": "index.ts",
   "scripts": {
     "build": "rm -rf dist && tsc && ../client/ run build && cp -r ../client/static/ dist/static/",
-    "build:firebase": "npm --prefix ../shared run build && npm --prefix ../client/ run build && rm -rf dist && tsc && rm -rf ../../firebase-functions/dist && cp -r dist/* ../../firebase-functions"
+    "build:firebase": "npm --prefix ../shared run build && npm --prefix ../client run build && rm -rf dist && tsc && rm -rf ../../firebase-functions/dist && cp -r dist/* ../../firebase-functions && cp -r ../client/static ../../firebase-functions"
   },
   "keywords": [],
   "author": "",

app/server/src/server/routes/v1/index.ts

@@ -3,6 +3,7 @@ import healthcheck from './healthcheck'
 import Router from '@koa/router'
 import self from './self'
 import user from './user'
+import well from './well'
 
 const routes = new Router({ prefix: '/api/v1' })
 
@@ -13,5 +14,6 @@ routes.use(errorHandler)
 routes.use(healthcheck.routes())
 routes.use(user.routes())
 routes.use(self.routes())
+routes.use(well.routes())
 
 export default routes

app/server/src/server/routes/v1/well.ts

@@ -1,6 +1,6 @@
 import Router from '@koa/router'
 import { adminOnly } from '../../middleware'
-import { WellController } from 'src/server/controllers';
+import { WellController } from '../../controllers';
 
 const well = new Router({ prefix: '/well' })