Merge pull request #131 from CannonLock/fix-routes

Fix routing
UW-Macrostrat · Jan 24, 2024 · 78aec29 · 78aec29
2 parents 715c19f + daea495
commit 78aec29
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/pages/maps/ingestion/+Page.ts b/src/pages/maps/ingestion/+Page.ts
@@ -4,7 +4,7 @@ import hyper from "@macrostrat/hyper";
 
 // Page for a list of maps
 import styles from "./main.module.sass";
-import { tempImageIndex, s3Address } from "../raster-images";
+import { tempImageIndex, s3Address } from "../../maps/raster-images";
 import {
   Icon,
   IconSize,

diff --git a/src/pages/maps/ingestion/@id/+route.ts b/src/pages/maps/ingestion/@id/+route.ts
@@ -1,4 +1,4 @@
-export default "/maps/@id/edit/*";
+export default "/maps/ingestion/@id/*";
 
 import { render, redirect } from "vike/abort";
 

diff --git a/src/pages/maps/ingestion/@id/edit-page.ts b/src/pages/maps/ingestion/@id/edit-page.ts
@@ -62,7 +62,7 @@ export default function EditInterface({
               h(ShowMapButton, { showMap, setShowMap }),
             ]),
           ]),
-          h(Router, { basename: `/maps/${source_id}/edit` }, [
+          h(Router, { basename: `/maps/ingestion/${source_id}` }, [
             h(Routes, [
               h(Route, {
                 path: "",

diff --git a/src/pages/maps/ingestion/@id/map-interface.ts b/src/pages/maps/ingestion/@id/map-interface.ts
@@ -15,7 +15,7 @@ import { LngLatBoundsLike } from "mapbox-gl";
 import { useEffect, useMemo, useState } from "react";
 import { MapNavbar } from "~/components/map-navbar";
 import "~/styles/global.styl";
-import { s3Address, tempImageIndex } from "../raster-images";
+import { s3Address, tempImageIndex } from "~/pages/maps/raster-images";
 import styles from "./main.module.sass";
 
 const h = hyper.styled(styles);