diff --git a/CLAUDE.md b/CLAUDE.md
index 3a71dc9..2109593 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -41,9 +41,7 @@ apps/
planner/ — Planner app (React Router 7)
journal/ — Journal app (React Router 7 + Fedify)
packages/
- types/ — Shared TypeScript interfaces (Route, Activity, Waypoint)
- ui/ — Shared React components (Tailwind)
- map/ — React/Leaflet components (MapView, RouteLayer); re-exports map-core
+ types/ — Shared wire types both apps exchange (Waypoint)
map-core/ — Framework-free map constants (colors, tiles, POI, z-index, snap); safe to import server-side
gpx/ — GPX parsing, generation, validation
fit/ — FIT file generation (Wahoo route push)
@@ -125,8 +123,8 @@ local config symmetric.
- **Route registration**: Both apps use explicit `routes.ts` (not file-based routing). When adding a new route file, you **must** add it to `apps/*/app/routes.ts` or it won't be compiled into the build.
- All user-facing strings must use i18n (`useTranslation()` hook, never hardcode strings)
-- Use `@trails-cool/types` for shared interfaces — don't duplicate type definitions
-- Map components go in `@trails-cool/map`, not in individual apps
+- Database row types are derived from the Drizzle schema (`@trails-cool/db`); API wire shapes are the Zod contracts in `@trails-cool/api`; only types both apps exchange (e.g. Waypoint) live in `@trails-cool/types`
+- Map constants (colors, tiles, POI categories, z-indexes) go in `@trails-cool/map-core`; React/Leaflet map components live in the app that uses them
- GPX parsing/generation goes in `@trails-cool/gpx`
- Database schemas: `planner.*` for Planner data, `journal.*` for Journal data
- Route geometry must be stored as PostGIS LineString (extracted from GPX on save)
diff --git a/apps/journal/Dockerfile b/apps/journal/Dockerfile
index caada24..8121fa3 100644
--- a/apps/journal/Dockerfile
+++ b/apps/journal/Dockerfile
@@ -9,8 +9,6 @@ FROM base AS deps
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
COPY apps/journal/package.json apps/journal/
COPY packages/types/package.json packages/types/
-COPY packages/ui/package.json packages/ui/
-COPY packages/map/package.json packages/map/
COPY packages/gpx/package.json packages/gpx/
COPY packages/i18n/package.json packages/i18n/
COPY packages/sentry-config/package.json packages/sentry-config/
diff --git a/apps/journal/app/root.tsx b/apps/journal/app/root.tsx
index 31e6782..dd74a92 100644
--- a/apps/journal/app/root.tsx
+++ b/apps/journal/app/root.tsx
@@ -15,7 +15,7 @@ import { AccountDropdown } from "~/components/AccountDropdown";
import { MobileNavMenu } from "~/components/MobileNavMenu";
import { initSentryClient, stopSentryClient } from "~/lib/sentry.client";
import { TERMS_VERSION } from "~/lib/legal";
-import stylesheet from "@trails-cool/ui/styles.css?url";
+import stylesheet from "./styles.css?url";
// Paths that must stay reachable even when the user has a stale
// terms_version, so they can read the Terms, accept them, or log out.
diff --git a/packages/ui/src/styles.css b/apps/journal/app/styles.css
similarity index 100%
rename from packages/ui/src/styles.css
rename to apps/journal/app/styles.css
diff --git a/apps/journal/package.json b/apps/journal/package.json
index b5eb55a..d044972 100644
--- a/apps/journal/package.json
+++ b/apps/journal/package.json
@@ -27,10 +27,8 @@
"@trails-cool/gpx": "workspace:*",
"@trails-cool/i18n": "workspace:*",
"@trails-cool/jobs": "workspace:*",
- "@trails-cool/map": "workspace:*",
"@trails-cool/sentry-config": "workspace:*",
"@trails-cool/types": "workspace:*",
- "@trails-cool/ui": "workspace:*",
"drizzle-orm": "catalog:",
"isbot": "^5.1.41",
"jose": "^6.2.3",
diff --git a/apps/planner/Dockerfile b/apps/planner/Dockerfile
index 2130008..6f4e05f 100644
--- a/apps/planner/Dockerfile
+++ b/apps/planner/Dockerfile
@@ -9,8 +9,6 @@ FROM base AS deps
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
COPY apps/planner/package.json apps/planner/
COPY packages/types/package.json packages/types/
-COPY packages/ui/package.json packages/ui/
-COPY packages/map/package.json packages/map/
COPY packages/gpx/package.json packages/gpx/
COPY packages/i18n/package.json packages/i18n/
COPY packages/sentry-config/package.json packages/sentry-config/
diff --git a/apps/planner/app/components/MapHelpers.tsx b/apps/planner/app/components/MapHelpers.tsx
index 2e4b184..4443cc6 100644
--- a/apps/planner/app/components/MapHelpers.tsx
+++ b/apps/planner/app/components/MapHelpers.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState, useRef } from "react";
import { useMap, useMapEvents, Marker } from "react-leaflet";
import L from "leaflet";
import type { YjsState } from "~/lib/use-yjs";
-import { overlayLayers } from "@trails-cool/map";
+import { overlayLayers } from "@trails-cool/map-core";
import { usePois } from "~/lib/use-pois";
import { Z_CURSOR } from "@trails-cool/map-core";
import { getBaseLayer, getOverlays, setBaseLayer, setOverlays } from "~/lib/route-data";
diff --git a/apps/planner/app/components/PlannerMap.tsx b/apps/planner/app/components/PlannerMap.tsx
index 0a135d3..e3a1284 100644
--- a/apps/planner/app/components/PlannerMap.tsx
+++ b/apps/planner/app/components/PlannerMap.tsx
@@ -4,7 +4,7 @@ import L from "leaflet";
import { useTranslation } from "react-i18next";
import type { DayStage } from "@trails-cool/gpx";
import type { YjsState } from "~/lib/use-yjs";
-import { baseLayers, overlayLayers } from "@trails-cool/map";
+import { baseLayers, overlayLayers } from "@trails-cool/map-core";
import { setOvernight } from "~/lib/overnight";
import { usePois } from "~/lib/use-pois";
import { useProfileDefaults } from "~/lib/use-profile-defaults";
diff --git a/apps/planner/app/root.tsx b/apps/planner/app/root.tsx
index b86db49..b116079 100644
--- a/apps/planner/app/root.tsx
+++ b/apps/planner/app/root.tsx
@@ -3,7 +3,7 @@ import type { LinksFunction } from "react-router";
import type { Route } from "./+types/root";
import * as Sentry from "@sentry/react";
import { useTranslation } from "react-i18next";
-import stylesheet from "@trails-cool/ui/styles.css?url";
+import stylesheet from "./styles.css?url";
export const links: LinksFunction = () => [{ rel: "stylesheet", href: stylesheet }];
diff --git a/apps/planner/app/styles.css b/apps/planner/app/styles.css
new file mode 100644
index 0000000..2fa790e
--- /dev/null
+++ b/apps/planner/app/styles.css
@@ -0,0 +1,6 @@
+@import "tailwindcss";
+
+@keyframes slide {
+ 0% { transform: translateX(-100%); }
+ 100% { transform: translateX(400%); }
+}
diff --git a/apps/planner/package.json b/apps/planner/package.json
index 15da606..5bffc1f 100644
--- a/apps/planner/package.json
+++ b/apps/planner/package.json
@@ -27,11 +27,9 @@
"@trails-cool/gpx": "workspace:*",
"@trails-cool/i18n": "workspace:*",
"@trails-cool/jobs": "workspace:*",
- "@trails-cool/map": "workspace:*",
"@trails-cool/map-core": "workspace:*",
"@trails-cool/sentry-config": "workspace:*",
"@trails-cool/types": "workspace:*",
- "@trails-cool/ui": "workspace:*",
"codemirror": "^6.0.2",
"drizzle-orm": "catalog:",
"isbot": "^5.1.41",
diff --git a/packages/map/package.json b/packages/map/package.json
deleted file mode 100644
index e0575ea..0000000
--- a/packages/map/package.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "name": "@trails-cool/map",
- "version": "0.0.1",
- "type": "module",
- "exports": {
- ".": "./src/index.ts"
- },
- "main": "./src/index.ts",
- "types": "./src/index.ts",
- "scripts": {
- "test": "vitest run",
- "lint": "eslint .",
- "typecheck": "tsc"
- },
- "dependencies": {
- "@trails-cool/map-core": "workspace:*"
- },
- "peerDependencies": {
- "react": ">=18",
- "react-dom": ">=18",
- "leaflet": ">=1.9",
- "react-leaflet": ">=5"
- }
-}
diff --git a/packages/map/src/MapView.tsx b/packages/map/src/MapView.tsx
deleted file mode 100644
index 4508793..0000000
--- a/packages/map/src/MapView.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { MapContainer, TileLayer, LayersControl } from "react-leaflet";
-import { baseLayers } from "./layers.ts";
-import "leaflet/dist/leaflet.css";
-
-export interface MapViewProps {
- center?: [number, number];
- zoom?: number;
- className?: string;
- children?: React.ReactNode;
-}
-
-export function MapView({
- center = [50.1, 10.0],
- zoom = 6,
- className = "h-full w-full",
- children,
-}: MapViewProps) {
- return (
-
-
- {baseLayers.map((layer, i) => (
-
-
-
- ))}
-
- {children}
-
- );
-}
diff --git a/packages/map/src/RouteLayer.tsx b/packages/map/src/RouteLayer.tsx
deleted file mode 100644
index 7c16389..0000000
--- a/packages/map/src/RouteLayer.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { GeoJSON } from "react-leaflet";
-import type { GeoJsonObject } from "geojson";
-
-export interface RouteLayerProps {
- data: GeoJsonObject;
- color?: string;
- weight?: number;
-}
-
-export function RouteLayer({ data, color = "#2563eb", weight = 4 }: RouteLayerProps) {
- return (
-
- );
-}
diff --git a/packages/map/src/index.test.ts b/packages/map/src/index.test.ts
deleted file mode 100644
index 3014fe4..0000000
--- a/packages/map/src/index.test.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import { describe, it, expect } from "vitest";
-import { baseLayers, overlayLayers } from "./index.ts";
-
-describe("map package exports", () => {
- it("re-exports baseLayers from map-core", () => {
- expect(baseLayers).toBeDefined();
- expect(baseLayers.length).toBeGreaterThan(0);
- expect(baseLayers[0]!.name).toBe("OpenStreetMap");
- });
-
- it("re-exports overlayLayers from map-core", () => {
- expect(overlayLayers).toBeDefined();
- expect(overlayLayers.length).toBeGreaterThan(0);
- expect(overlayLayers.every((l) => l.id)).toBe(true);
- });
-});
diff --git a/packages/map/src/index.ts b/packages/map/src/index.ts
deleted file mode 100644
index 7190941..0000000
--- a/packages/map/src/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { MapView } from "./MapView.tsx";
-export type { MapViewProps } from "./MapView.tsx";
-export { RouteLayer } from "./RouteLayer.tsx";
-export type { RouteLayerProps } from "./RouteLayer.tsx";
-export { baseLayers, overlayLayers } from "@trails-cool/map-core";
-export type { TileLayerConfig, OverlayLayerConfig } from "@trails-cool/map-core";
diff --git a/packages/map/src/layers.ts b/packages/map/src/layers.ts
deleted file mode 100644
index c627c48..0000000
--- a/packages/map/src/layers.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export type { TileLayerConfig, OverlayLayerConfig } from "@trails-cool/map-core";
-export { baseLayers, overlayLayers } from "@trails-cool/map-core";
diff --git a/packages/map/tsconfig.json b/packages/map/tsconfig.json
deleted file mode 100644
index 5a24989..0000000
--- a/packages/map/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "outDir": "dist",
- "rootDir": "src"
- },
- "include": ["src"]
-}
diff --git a/packages/map/vitest.config.ts b/packages/map/vitest.config.ts
deleted file mode 100644
index 8a07b14..0000000
--- a/packages/map/vitest.config.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../../vitest.shared.ts";
diff --git a/packages/ui/package.json b/packages/ui/package.json
deleted file mode 100644
index df5f7fb..0000000
--- a/packages/ui/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "name": "@trails-cool/ui",
- "version": "0.0.1",
- "type": "module",
- "exports": {
- ".": "./src/index.ts",
- "./styles.css": "./src/styles.css"
- },
- "main": "./src/index.ts",
- "types": "./src/index.ts",
- "scripts": {
- "test": "vitest run",
- "lint": "eslint .",
- "typecheck": "tsc"
- }
-}
diff --git a/packages/ui/src/Button.tsx b/packages/ui/src/Button.tsx
deleted file mode 100644
index 0a436b7..0000000
--- a/packages/ui/src/Button.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { ButtonHTMLAttributes } from "react";
-
-export interface ButtonProps extends ButtonHTMLAttributes {
- variant?: "primary" | "secondary" | "ghost";
- size?: "sm" | "md" | "lg";
-}
-
-const variantStyles = {
- primary: "bg-blue-600 text-white hover:bg-blue-700 active:bg-blue-800",
- secondary: "bg-gray-100 text-gray-900 hover:bg-gray-200 active:bg-gray-300",
- ghost: "text-gray-700 hover:bg-gray-100 active:bg-gray-200",
-};
-
-const sizeStyles = {
- sm: "px-2.5 py-1.5 text-sm",
- md: "px-4 py-2 text-sm",
- lg: "px-6 py-3 text-base",
-};
-
-export function Button({
- variant = "primary",
- size = "md",
- className = "",
- ...props
-}: ButtonProps) {
- return (
-
- );
-}
diff --git a/packages/ui/src/Card.tsx b/packages/ui/src/Card.tsx
deleted file mode 100644
index 41934c9..0000000
--- a/packages/ui/src/Card.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-export interface CardProps {
- className?: string;
- children: React.ReactNode;
-}
-
-export function Card({ className = "", children }: CardProps) {
- return (
-
- {children}
-
- );
-}
diff --git a/packages/ui/src/Input.tsx b/packages/ui/src/Input.tsx
deleted file mode 100644
index ae07294..0000000
--- a/packages/ui/src/Input.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { InputHTMLAttributes } from "react";
-
-export interface InputProps extends InputHTMLAttributes {
- label?: string;
- error?: string;
-}
-
-export function Input({ label, error, className = "", id, ...props }: InputProps) {
- const inputId = id ?? label?.toLowerCase().replace(/\s+/g, "-");
- return (
-
- {label && (
-
- )}
-
- {error &&
{error}
}
-