Move page components into page folder

trevorgerhardt · trevorgerhardt · commit 8a14e04e0f0e · 2025-08-21T09:27:11.000-04:00
diff --git a/apps/osm-merge/index.html b/apps/osm-merge/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osm merge</title>
+    <title>OSM.ts Merge</title>
     <link rel="stylesheet" href="src/main.css" />
   </head>
   <body>
diff --git a/apps/osm-merge/src/components/nav.tsx b/apps/osm-merge/src/components/nav.tsx
@@ -22,9 +22,9 @@ export default function Nav() {
 					className={({ isActive }) =>
 						cn("text-slate-950 py-4 px-2", isActive && "text-blue-600")
 					}
-					to="view"
+					to="inspect"
 				>
-					View
+					Inspect
 				</NavLink>
 				{process.env.NODE_ENV === "development" && <BrowserCheck />}
 			</div>
diff --git a/apps/osm-merge/src/main.tsx b/apps/osm-merge/src/main.tsx
@@ -2,8 +2,8 @@ import { StrictMode, Suspense } from "react"
 import { createRoot } from "react-dom/client"
 import { BrowserRouter, Route, Routes, Outlet } from "react-router"
 import Nav from "./components/nav"
-import ViewPage from "./components/view-page"
-import MergePage from "./components/merge-page"
+import InspectPage from "./pages/inspect"
+import MergePage from "./pages/merge"
 
 function RootLayout() {
 	return (
@@ -27,9 +27,9 @@ createRoot(rootEl).render(
 					path={process.env.NODE_ENV === "production" ? "/osm.ts" : "/"}
 					element={<RootLayout />}
 				>
-					<Route path="" element={<ViewPage />} />
+					<Route path="" element={<InspectPage />} />
 					<Route path="merge" element={<MergePage />} />
-					<Route path="view" element={<ViewPage />} />
+					<Route path="inspect" element={<InspectPage />} />
 				</Route>
 			</Routes>
 		</BrowserRouter>
diff --git a/apps/osm-merge/src/pages/inspect.tsx b/apps/osm-merge/src/pages/inspect.tsx
@@ -9,13 +9,13 @@ import { MaximizeIcon } from "lucide-react"
 import * as Performance from "osm.ts/performance"
 import { useEffect, useMemo, useState } from "react"
 import { Layer, Source } from "react-map-gl/maplibre"
-import Basemap from "./basemap"
-import DeckGlOverlay from "./deckgl-overlay"
-import EntityDetails from "./entity-details"
-import { Main, MapContent, Sidebar } from "./layout"
-import OsmInfoTable from "./osm-info-table"
-import OsmPbfFileInput from "./osm-pbf-file-input"
-import { Button } from "./ui/button"
+import Basemap from "../components/basemap"
+import DeckGlOverlay from "../components/deckgl-overlay"
+import EntityDetails from "../components/entity-details"
+import { Main, MapContent, Sidebar } from "../components/layout"
+import OsmInfoTable from "../components/osm-info-table"
+import OsmPbfFileInput from "../components/osm-pbf-file-input"
+import { Button } from "../components/ui/button"
 
 export default function ViewPage() {
 	const [file, setFile] = useState<File | null>(null)
diff --git a/apps/osm-merge/src/pages/merge.tsx b/apps/osm-merge/src/pages/merge.tsx
@@ -13,14 +13,14 @@ import {
 	type OsmChanges,
 } from "osm.ts"
 import { useCallback, useEffect, useRef, useState, useTransition } from "react"
-import Basemap from "./basemap"
-import DeckGlOverlay from "./deckgl-overlay"
-import { Details, DetailsContent, DetailsSummary } from "./details"
-import EntityDetails from "./entity-details"
-import { Main, MapContent, Sidebar } from "./layout"
-import OsmInfoTable from "./osm-info-table"
-import OsmPbfFileInput from "./osm-pbf-file-input"
-import { Button } from "./ui/button"
+import Basemap from "../components/basemap"
+import DeckGlOverlay from "../components/deckgl-overlay"
+import { Details, DetailsContent, DetailsSummary } from "../components/details"
+import EntityDetails from "../components/entity-details"
+import { Main, MapContent, Sidebar } from "../components/layout"
+import OsmInfoTable from "../components/osm-info-table"
+import OsmPbfFileInput from "../components/osm-pbf-file-input"
+import { Button } from "../components/ui/button"
 
 export default function Merge() {
 	const [baseFile, setBaseFile] = useState<File | null>(null)

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ export default function Nav() {`
`22`	`22`	`className={({ isActive }) =>`
`23`	`23`	`cn("text-slate-950 py-4 px-2", isActive && "text-blue-600")`
`24`	`24`	`}`
`25`		`- to="view"`
	`25`	`+ to="inspect"`
`26`	`26`	`>`
`27`		`- View`
	`27`	`+ Inspect`
`28`	`28`	`</NavLink>`
`29`	`29`	`{process.env.NODE_ENV === "development" && <BrowserCheck />}`
`30`	`30`	`</div>`