Fix linter warnings

This commit is contained in:
2026-02-06 23:54:50 +00:00
parent 46c897efcf
commit 6c10cb628e
8 changed files with 447 additions and 381 deletions

View File

@@ -1,20 +1,20 @@
import { type HandleFetch } from "@sveltejs/kit";
import { type HandleFetch } from '@sveltejs/kit';
export const handleFetch: HandleFetch = async ({ request, fetch }) => {
if (request.url.startsWith('https://maps.owlboard.info')) {
const newUrl = request.url.replace('https://maps.owlboard.info', 'http://localhost:3000');
const headers = new Headers(request.headers);
headers.set('host', 'maps.owlboard.info');
if (request.url.startsWith('https://maps.owlboard.info')) {
const newUrl = request.url.replace('https://maps.owlboard.info', 'http://localhost:3000');
request = new Request(newUrl, {
method: request.method,
headers: headers,
body: request.body,
// @ts-ignore - 'duplex' is needed for node fetch with bodies
duplex: 'half'
});
}
const headers = new Headers(request.headers);
headers.set('host', 'maps.owlboard.info');
return fetch(request);
}
request = new Request(newUrl, {
method: request.method,
headers: headers,
body: request.body,
// @ts-expect-error - 'duplex' is needed for node fetch with bodies
duplex: 'half'
});
}
return fetch(request);
};

View File

@@ -4,7 +4,15 @@
export let feature: {
position: 'over' | 'under';
category: 'rail' |'stream'| 'foot' | 'aroad' | 'minorRoad' | 'motorway' | 'waterway' | 'pipeline';
category:
| 'rail'
| 'stream'
| 'foot'
| 'aroad'
| 'minorRoad'
| 'motorway'
| 'waterway'
| 'pipeline';
roadName?: string;
};
export let activeElec: ElecType;
@@ -98,11 +106,10 @@
{#if isOver}
<BaseTrack {activeElec} height={64} />
<!-- White edge, to provide separation between abutment line and bridge content -->
<rect x="0" y={32 - s.width / 2 - 4} width="64" height={s.width + 8} fill="white" />
<!-- White edge, to provide separation between abutment line and bridge content -->
<rect x=0 y={32 - (s.width / 2) - 4} width="64" height="{s.width + 8}" fill="white" />
<rect x="6" y={32 - (s.width / 2)} width="52" height={s.width} fill={s.bg} />
<rect x="6" y={32 - s.width / 2} width="52" height={s.width} fill={s.bg} />
{#if s.type === 'road'}
<line
@@ -120,15 +127,17 @@
<line x1={xLeft} y1="36" x2={xRight} y2="36" stroke="#cbd5e1" stroke-width="1.5" />
{/if}
<g fill="none" stroke={s.stroke} stroke-width="2.5" stroke-linecap="square">
<path d={`M 20 ${32 - s.width / 2 - 6} L 20 ${32 - s.width / 2 - 4} L 44 ${32 - s.width / 2 - 4} L 44 ${32 - s.width / 2 - 6}`} />
<path d={`M 20 ${32 + s.width / 2 + 6} L 20 ${32 + s.width / 2 + 4} L 44 ${32 + s.width / 2 + 4} L 44 ${32 + s.width / 2 + 6}`} />
</g>
<g fill="none" stroke={s.stroke} stroke-width="2.5" stroke-linecap="square">
<path
d={`M 20 ${32 - s.width / 2 - 6} L 20 ${32 - s.width / 2 - 4} L 44 ${32 - s.width / 2 - 4} L 44 ${32 - s.width / 2 - 6}`}
/>
<path
d={`M 20 ${32 + s.width / 2 + 6} L 20 ${32 + s.width / 2 + 4} L 44 ${32 + s.width / 2 + 4} L 44 ${32 + s.width / 2 + 6}`}
/>
</g>
{:else}
<rect x="6" y={32 - (s.width / 2)} width="52" height={s.width} fill={s.bg} />
<rect x="6" y={32 - s.width / 2} width="52" height={s.width} fill={s.bg} />
{#if s.type === 'road'}
<line
@@ -148,9 +157,13 @@
<rect x="26" y={yTop} width="12" height="64" fill="white" />
<g stroke={s.stroke} stroke-width="2.5" fill="none" stroke-linecap="square">
<path d={`M 24 ${(32 - (s.width / 2)) - 5} L 25 ${(32 - (s.width / 2)) - 5} L 25 ${(32 - (s.width / 2)) + s.width + 5} L 24 ${(32 - (s.width / 2)) + s.width + 5}`} />
<path
d={`M 24 ${32 - s.width / 2 - 5} L 25 ${32 - s.width / 2 - 5} L 25 ${32 - s.width / 2 + s.width + 5} L 24 ${32 - s.width / 2 + s.width + 5}`}
/>
<path d={`M 40 ${(32 - (s.width / 2)) - 5} L 39 ${(32 - (s.width / 2)) - 5} L 39 ${(32 - (s.width / 2)) + s.width + 5} L 40 ${(32 - (s.width / 2)) + s.width + 5}`} />
<path
d={`M 40 ${32 - s.width / 2 - 5} L 39 ${32 - s.width / 2 - 5} L 39 ${32 - s.width / 2 + s.width + 5} L 40 ${32 - s.width / 2 + s.width + 5}`}
/>
</g>
<BaseTrack {activeElec} height={64} />

View File

@@ -18,7 +18,7 @@
};
const getPath = (side: 'left' | 'right') => {
const yStart = visualUp ? 64 : 0;
const yStart = visualUp ? 64 : 8;
const yEnd = visualUp ? 8 : 56;
const xEnd = side === 'right' ? 56 : 8;
return `M 32 ${yStart} Q 32 32 ${xEnd} ${yEnd}`;
@@ -34,7 +34,7 @@
</script>
<svg viewBox="0 0 64 64" width="64" height="64" class="junction">
{#each paths as d}
{#each paths as d (d)}
<path {d} fill="none" stroke={branchColour} stroke-width="5" stroke-linecap="round" />
{/each}
<BaseTrack {activeElec} height={64} />

View File

@@ -1,283 +1,332 @@
<script lang="ts">
import type { PageData } from './$types';
export let data: PageData;
import type { PageData } from './$types';
import { base } from '$app/paths';
export let data: PageData;
let searchTerm = '';
let searchTerm = '';
const formatDate = (dateVal: string | null) => {
if (!dateVal) return '---';
const d = new Date(dateVal);
return d.toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: '2-digit' });
};
const formatDate = (dateVal: string | null) => {
if (!dateVal) return '---';
const d = new Date(dateVal);
return d.toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: '2-digit' });
};
$: filteredMaps = data.maps.filter(m =>
m.routeId.toString().includes(searchTerm) ||
m.routeStart.toLowerCase().includes(searchTerm.toLowerCase()) ||
m.routeEnd.toLowerCase().includes(searchTerm.toLowerCase())
);
$: filteredMaps = data.maps.filter(
(m) =>
m.routeId.toString().includes(searchTerm) ||
m.routeStart.toLowerCase().includes(searchTerm.toLowerCase()) ||
m.routeEnd.toLowerCase().includes(searchTerm.toLowerCase())
);
const isVerifiedRecently = (dateVal: string | null) => {
if (!dateVal) return 'draft';
const checkedDate = new Date(dateVal).getTime();
const oneYearAgo = Date.now() - (365 * 24 * 60 * 60 * 1000);
return checkedDate > oneYearAgo ? 'verified' : 'stale';
};
const isVerifiedRecently = (dateVal: string | null) => {
if (!dateVal) return 'draft';
const checkedDate = new Date(dateVal).getTime();
const oneYearAgo = Date.now() - 365 * 24 * 60 * 60 * 1000;
return checkedDate > oneYearAgo ? 'verified' : 'stale';
};
</script>
<div class="page-wrapper">
<header class="main-header">
<div class="brand-container">
<img src="https://owlboard.info/images/logo/wide_logo.svg" alt="OwlBoard Logo" class="main-logo" />
<div class="brand-text">
<h1>Routes</h1>
<p class="sub-brand">by OwlBoard</p>
</div>
<div class="search-container">
<input
type="text"
bind:value={searchTerm}
placeholder="Search index..."
class="search-input"
/>
</div>
</header>
<header class="main-header">
<div class="brand-container">
<img
src="https://owlboard.info/images/logo/wide_logo.svg"
alt="OwlBoard Logo"
class="main-logo"
/>
<div class="brand-text">
<h1>Routes</h1>
</div>
<div class="search-container">
<input
type="text"
bind:value={searchTerm}
placeholder="Search index..."
class="search-input"
/>
</div>
</div>
</header>
<div class="list-container">
{#each filteredMaps as map}
<a href="/map/{map.routeId.toString().padStart(4, '0')}" class="card">
<div class="card-top">
<span class="route-id">{map.routeId.toString().padStart(4, '0')}</span>
<span class="status-badge {isVerifiedRecently(map.checked)}">
{#if isVerifiedRecently(map.checked) === 'verified'}
Reviewed
{:else if isVerifiedRecently(map.checked) === 'stale'}
Needs review
{:else}
Draft
{/if}
</span>
</div>
<div class="card-body">
<div class="location origin">{map.routeStart}</div>
<div class="path-arrow"></div>
<div class="location destination">{map.routeEnd}</div>
</div>
<div class="list-container">
<a
href="https://owlboard.info"
class="card external-card"
target="_blank"
rel="noopener noreferrer"
>
<div class="card-top">
<span class="route-id system-tag">OWL</span>
<span class="status-badge external">External Tool</span>
</div>
<div class="card-body">
<div class="location">OwlBoard</div>
<p class="description">Live Departure Boards and PIS Codes</p>
</div>
<div class="card-footer">
<span>Visit owlboard.info ↗</span>
</div>
</a>
{#each filteredMaps as map (map.routeId)}
<a href="{base}/map/{map.routeId.toString().padStart(4, '0')}" class="card">
<div class="card-top">
<span class="route-id">{map.routeId.toString().padStart(4, '0')}</span>
<span class="status-badge {isVerifiedRecently(map.checked)}">
{#if isVerifiedRecently(map.checked) === 'verified'}
Reviewed
{:else if isVerifiedRecently(map.checked) === 'stale'}
Needs review
{:else}
Draft
{/if}
</span>
</div>
<div class="card-footer">
<span>Created: {formatDate(map.created)}</span>
{#if map.checked}
<span>• Checked: {formatDate(map.checked)}</span>
{/if}
</div>
</a>
{:else}
<div class="empty-state">No maps found.</div>
{/each}
</div>
<div class="card-body">
<div class="location origin">{map.routeStart}</div>
<div class="path-arrow">to</div>
<div class="location destination">{map.routeEnd}</div>
</div>
<div class="card-footer">
<span>Created: {formatDate(map.created)}</span>
{#if map.checked}
<span>• Checked: {formatDate(map.checked)}</span>
{/if}
</div>
</a>
{:else}
<div class="empty-state">No maps found.</div>
{/each}
</div>
</div>
<style>
/* Mobile-First Base Styles */
:global(body) {
margin: 0;
background-color: #f8fafc;
color: #0f172a;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
}
/* Mobile-First Base Styles */
:global(body) {
margin: 0;
background-color: #f8fafc;
color: #0f172a;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
}
.page-wrapper {
padding: 1rem;
max-width: 800px;
margin: 0 auto;
}
.page-wrapper {
padding: 1rem;
max-width: 800px;
margin: 0 auto;
}
.main-header {
margin-bottom: 1.5rem;
}
.main-header {
margin-bottom: 1.5rem;
}
.brand-container {
display: flex;
align-items: center;
gap: 1rem;
margin-bottom: 1.5rem;
}
.brand-container {
display: flex;
align-items: center;
gap: 1rem;
margin-bottom: 1.5rem;
}
.main-logo {
/* Adjust height to fit your logo's aspect ratio */
height: 48px;
width: auto;
display: block;
}
.main-logo {
/* Adjust height to fit your logo's aspect ratio */
height: 48px;
width: auto;
display: block;
}
.brand-text h1 {
font-size: 1.5rem;
font-weight: 900;
margin: 0;
line-height: 1;
letter-spacing: -0.05em;
font-style: italic;
}
.brand-text h1 {
font-size: 1.5rem;
font-weight: 900;
margin: 0;
line-height: 1;
letter-spacing: -0.05em;
font-style: italic;
}
.sub-brand {
font-size: 0.65rem;
font-weight: 800;
color: #94a3b8;
text-transform: uppercase;
letter-spacing: 0.1em;
margin: 0.2rem 0 0 0;
}
.sub-brand {
font-size: 0.65rem;
font-weight: 800;
color: #94a3b8;
text-transform: uppercase;
letter-spacing: 0.1em;
margin: 0.2rem 0 0 0;
}
/* Desktop layout adjustment */
@media (min-width: 640px) {
.main-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 3rem;
}
/* Desktop layout adjustment */
@media (min-width: 640px) {
.main-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 3rem;
}
.brand-container {
margin-bottom: 0;
}
.brand-container {
margin-bottom: 0;
}
.main-logo {
height: 56px;
}
}
.main-logo {
height: 56px;
}
}
.search-input {
width: 100%;
padding: 0.8rem 1rem;
border: 2px solid #e2e8f0;
border-radius: 12px;
font-size: 1rem;
box-sizing: border-box; /* Ensures padding doesn't break width */
outline: none;
}
.search-input {
width: 100%;
padding: 0.8rem 1rem;
border: 2px solid #e2e8f0;
border-radius: 12px;
font-size: 1rem;
box-sizing: border-box; /* Ensures padding doesn't break width */
outline: none;
}
.search-input:focus {
border-color: #3b82f6;
}
.search-input:focus {
border-color: #3b82f6;
}
/* Card Layout (Mobile) */
.list-container {
display: flex;
flex-direction: column;
gap: 1rem;
}
/* Card Layout (Mobile) */
.list-container {
display: flex;
flex-direction: column;
gap: 1rem;
}
.card {
display: block;
background: white;
padding: 1.25rem;
border-radius: 16px;
text-decoration: none;
color: inherit;
border: 1px solid #e2e8f0;
box-shadow: 0 1px 3px rgba(0,0,0,0.05);
transition: transform 0.1s ease;
}
.card {
display: block;
background: white;
padding: 1.25rem;
border-radius: 16px;
text-decoration: none;
color: inherit;
border: 1px solid #e2e8f0;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
transition: transform 0.1s ease;
cursor: pointer;
}
.card:active {
transform: scale(0.98); /* Tactile feedback for mobile */
}
.card:active {
transform: scale(0.98); /* Tactile feedback for mobile */
}
.card-top {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 0.75rem;
}
.card-top {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 0.75rem;
}
.route-id {
font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
font-weight: 800;
color: #3b82f6;
background: #eff6ff;
padding: 0.2rem 0.5rem;
border-radius: 6px;
}
.route-id {
font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
font-weight: 800;
color: #3b82f6;
background: #eff6ff;
padding: 0.2rem 0.5rem;
border-radius: 6px;
}
.card-body {
margin-bottom: 1rem;
}
.card-body {
margin-bottom: 1rem;
}
.location {
font-size: 1.125rem;
font-weight: 700;
letter-spacing: -0.02em;
}
.location {
font-size: 1.125rem;
font-weight: 700;
letter-spacing: -0.02em;
}
.path-arrow {
color: #cbd5e1;
font-size: 0.9rem;
margin: 0.2rem 0;
}
.path-arrow {
color: #acc7e8;
font-size: 0.9rem;
margin: 0.2rem 0;
}
.card-footer {
font-size: 0.7rem;
color: #64748b;
text-transform: uppercase;
font-weight: 600;
letter-spacing: 0.05em;
border-top: 1px solid #f1f5f9;
padding-top: 0.75rem;
}
.card-footer {
font-size: 0.7rem;
color: #64748b;
text-transform: uppercase;
font-weight: 600;
letter-spacing: 0.05em;
border-top: 1px solid #f1f5f9;
padding-top: 0.75rem;
}
/* Update your existing badge styles */
.status-badge {
font-size: 0.65rem;
font-weight: 800;
text-transform: uppercase;
padding: 0.3rem 0.6rem;
border-radius: 999px;
white-space: nowrap; /* Prevents label snapping on small screens */
}
.status-badge {
font-size: 0.65rem;
font-weight: 800;
text-transform: uppercase;
padding: 0.3rem 0.6rem;
border-radius: 999px;
white-space: nowrap;
}
.verified {
background: #dcfce7;
color: #166534;
}
.verified {
background: #dcfce7;
color: #166534;
}
.stale {
background: #fef3c7; /* Amber/Yellow background */
color: #92400e; /* Dark brown/gold text */
border: 1px solid #fcd34d;
}
.stale {
background: #fef3c7;
color: #92400e;
border: 1px solid #fcd34d;
}
.draft {
background: #f1f5f9;
color: #475569;
}
.draft {
background: #f1f5f9;
color: #475569;
}
/* Desktop Adjustments */
@media (min-width: 640px) {
.page-wrapper {
padding: 3rem 1.5rem;
}
@media (min-width: 640px) {
.page-wrapper {
padding: 3rem 1.5rem;
}
.main-header {
display: flex;
justify-content: space-between;
align-items: center;
}
.main-header {
display: flex;
justify-content: space-between;
align-items: center;
}
.search-input {
width: 300px;
}
.search-input {
width: 300px;
}
.path-arrow {
display: inline-block;
margin: 0 0.5rem;
transform: rotate(-90deg); /* Turn down arrow into right arrow */
}
.path-arrow {
display: inline-block;
margin: 0 0.5rem;
}
.card-body {
display: flex;
align-items: center;
}
}
</style>
.card-body {
display: flex;
align-items: center;
}
}
.external-card {
border-left: 4px solid #6366f1;
background: linear-gradient(to right, #ffffff, #f5f3ff);
}
.system-tag {
background: #eef2ff !important;
color: #4338ca !important;
}
.status-badge.external {
background: #6366f1;
color: white;
}
.description {
margin: 0.25rem 0 0 0;
font-size: 0.9rem;
color: #64748b;
font-weight: 500;
}
.external-card:hover {
border-color: #4338ca;
background: #f5f3ff;
}
</style>

View File

@@ -1,17 +1,17 @@
import type { PageLoad } from "./$types";
import type { PageLoad } from './$types';
export const load: PageLoad = async ({ fetch }) => {
const response = await fetch('map-index.json');
const response = await fetch('map-index.json');
if (!response.ok) {
return { maps: [] };
}
if (!response.ok) {
return { maps: [] };
}
const maps = await response.json();
const maps = await response.json();
return {
maps: maps.sort((a: any, b: any) => {
return Number(a.routeId) - Number(b.routeId);
})
};
};
return {
maps: maps.sort((a: any, b: any) => {
return Number(a.routeId) - Number(b.routeId);
})
};
};

View File

@@ -2,6 +2,7 @@
import RouteRow from '$lib/components/RouteRow.svelte';
import RouteEndLink from '$lib/components/mapIcons/RouteEndLink.svelte';
import { slide } from 'svelte/transition';
import { base } from '$app/paths';
// data.route contains: routeStart, routeEnd, routeId, elecStart, elecEnd, routeDetail[]
export let data;
@@ -58,31 +59,31 @@
</script>
<div class="map-layout">
<header class="top-nav">
<div class="nav-cluster">
<a href="/" class="home-link" title="Back to Index">
<span class="home-icon"></span>
</a>
<div class="route-stack">
{#if data?.route}
<h1 class="primary-station">
{reversed ? data.route.routeEnd : data.route.routeStart}
</h1>
<span class="secondary-station">
to {reversed ? data.route.routeStart : data.route.routeEnd}
</span>
{/if}
</div>
</div>
<header class="top-nav">
<div class="nav-cluster">
<a href="{base}/" class="home-link" title="Back to Index">
<span class="home-icon"></span>
</a>
<div class="quick-actions">
<button class="icon-btn" on:click={() => (reversed = !reversed)}>
{reversed ? 'UP' : 'DN'}
</button>
<button class="icon-btn" on:click={() => (showFilters = !showFilters)}> Settings </button>
</div>
</header>
<div class="route-stack">
{#if data?.route}
<h1 class="primary-station">
{reversed ? data.route.routeEnd : data.route.routeStart}
</h1>
<span class="secondary-station">
to {reversed ? data.route.routeStart : data.route.routeEnd}
</span>
{/if}
</div>
</div>
<div class="quick-actions">
<button class="icon-btn" on:click={() => (reversed = !reversed)}>
{reversed ? 'UP' : 'DN'}
</button>
<button class="icon-btn" on:click={() => (showFilters = !showFilters)}> Settings </button>
</div>
</header>
{#if showFilters}
<div class="backdrop" on:click={() => (showFilters = false)}></div>
@@ -106,7 +107,7 @@
<div class="drawer-content">
<div class="filter-flex">
{#each Object.keys(visibleTypes) as type}
{#each Object.keys(visibleTypes) as type (type)}
<button
class="filter-chip"
class:active={visibleTypes[type]}
@@ -143,82 +144,82 @@
padding-top: 0;
}
.top-nav {
display: flex;
align-items: center;
justify-content: space-between;
padding: 0.5rem 1rem;
background: #0f172a;
color: white;
gap: 1rem;
}
.top-nav {
display: flex;
align-items: center;
justify-content: space-between;
padding: 0.5rem 1rem;
background: #0f172a;
color: white;
gap: 1rem;
}
.nav-cluster {
display: flex;
align-items: center;
gap: 1rem;
min-width: 0; /* Prevents flex children from overflowing */
}
.nav-cluster {
display: flex;
align-items: center;
gap: 1rem;
min-width: 0; /* Prevents flex children from overflowing */
}
.home-link {
display: flex;
align-items: center;
justify-content: center;
width: 36px;
height: 36px;
background: #1e293b;
border: 1px solid #334155;
border-radius: 8px;
color: #94a3b8;
text-decoration: none;
font-size: 1.2rem;
flex-shrink: 0; /* Keeps button from squishing on mobile */
}
.home-link {
display: flex;
align-items: center;
justify-content: center;
width: 36px;
height: 36px;
background: #1e293b;
border: 1px solid #334155;
border-radius: 8px;
color: #94a3b8;
text-decoration: none;
font-size: 1.2rem;
flex-shrink: 0; /* Keeps button from squishing on mobile */
}
.home-link:hover {
background: #334155;
color: white;
border-color: #475569;
}
.home-link:hover {
background: #334155;
color: white;
border-color: #475569;
}
.route-stack {
display: flex;
flex-direction: column;
min-width: 0;
}
.route-stack {
display: flex;
flex-direction: column;
min-width: 0;
}
.primary-station {
font-size: 1rem;
font-weight: 800;
margin: 0;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.primary-station {
font-size: 1rem;
font-weight: 800;
margin: 0;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.secondary-station {
font-size: 0.7rem;
color: #94a3b8;
text-transform: uppercase;
font-weight: 600;
}
.secondary-station {
font-size: 0.7rem;
color: #94a3b8;
text-transform: uppercase;
font-weight: 600;
}
.quick-actions {
display: flex;
gap: 0.5rem;
}
.quick-actions {
display: flex;
gap: 0.5rem;
}
.icon-btn {
background: #1e293b;
border: 1px solid #334155;
color: white;
padding: 0.4rem 0.6rem;
border-radius: 6px;
font-size: 0.75rem;
font-weight: bold;
cursor: pointer;
white-space: nowrap;
}
.icon-btn {
background: #1e293b;
border: 1px solid #334155;
color: white;
padding: 0.4rem 0.6rem;
border-radius: 6px;
font-size: 0.75rem;
font-weight: bold;
cursor: pointer;
white-space: nowrap;
}
.map-spine {
padding-top: 72px;