Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(Mobile) UI improvements #705

Merged
merged 9 commits into from
Jan 19, 2025
Merged

(Mobile) UI improvements #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
be8b0f5
ui: move components to lib
traines-source Jan 16, 2025
9ea7b2c
ui: make components more responsive
traines-source Jan 16, 2025
8551887
ui: more compact layout
traines-source Jan 17, 2025
9665724
ui: i18n fixes
traines-source Jan 17, 2025
522a080
ui: make toggle button state more visible
traines-source Jan 17, 2025
e82df54
ui: error handling, avoid repeated effect triggering
traines-source Jan 17, 2025
a97cd0c
ui: more small screen adjustments
traines-source Jan 17, 2025
636154f
ui: url state handling
traines-source Jan 18, 2025
eaa2053
ui: show backend error msgs, compact transfer display
traines-source Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 11 additions & 35 deletions ui/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@hey-api/openapi-ts": "^0.53.11",
"@playwright/test": "^1.28.1",
"@sveltejs/adapter-static": "^3.0.5",
"@sveltejs/kit": "^2.7.2",
"@sveltejs/kit": "^2.12.0",
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.6",
"@types/eslint": "^8.56.0",
"@types/polyline": "^0.1.32",
Expand Down
8 changes: 8 additions & 0 deletions ui/src/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,11 @@
.maplibregl-popup-content {
background-color: hsl(var(--background)) !important;
}

.maplibregl-control-container .maplibregl-ctrl-top-left {
max-width: 100%;
bottom: 1rem;
display: flex;
flex-direction: column;
z-index: 3;
}
10 changes: 9 additions & 1 deletion ui/src/app.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
// See https://kit.svelte.dev/docs/types#app

import type { Itinerary } from '$lib/openapi';

// for information about these interfaces
declare global {
namespace App {
// interface Error {}
// interface Locals {}
// interface PageData {}
// interface PageState {}
interface PageState {
selectedItinerary?: Itinerary;
selectedStop?: { name: string; stopId: string; time: Date };
stopArriveBy?: boolean;
tripId?: string;
}
// interface Platform {}
}
}
Expand Down
59 changes: 38 additions & 21 deletions ui/src/routes/ConnectionDetail.svelte → ui/src/lib/ConnectionDetail.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import ArrowRight from 'lucide-svelte/icons/arrow-right';
import type { Itinerary, Leg } from '$lib/openapi';
import Time from '../lib/Time.svelte';
import Time from '$lib/Time.svelte';
import { routeBorderColor, routeColor } from '$lib/modeStyle';
import { formatDurationSec, formatDistanceMeters } from '$lib/formatDuration';
import { Button } from '$lib/components/ui/button';
Expand Down Expand Up @@ -31,15 +31,21 @@
)}
<Time
variant="schedule"
class="font-semibold mr-2"
class="font-semibold w-16"
{isRealtime}
{timestamp}
{scheduledTimestamp}
/>
<Time
variant="realtime"
class="font-semibold w-16"
{isRealtime}
{timestamp}
{scheduledTimestamp}
/>
<Time variant="realtime" class="font-semibold" {isRealtime} {timestamp} {scheduledTimestamp} />
{#if stopId}
<Button
class="col-span-5 mr-6 text-lg justify-normal text-wrap text-left"
class="text-[length:inherit] leading-none justify-normal text-wrap text-left"
variant="link"
onclick={() => {
onClickStop(name, stopId, new Date(timestamp));
Expand All @@ -48,7 +54,7 @@
{name}
</Button>
{:else}
<span class="col-span-5 mr-6">{name}</span>
<span>{name}</span>
{/if}
{/snippet}

Expand Down Expand Up @@ -83,8 +89,8 @@
<div class="w-full flex justify-between items-center space-x-1">
<Route {onClickTrip} {l} />
{#if pred && (pred.from.track || pred.duration !== 0)}
<div class="border-t w-full h-0"></div>
<div class="text-sm text-muted-foreground text-nowrap px-2">
<div class="border-t h-0 grow shrink"></div>
<div class="text-sm text-muted-foreground leading-none px-2">
{#if pred.from.track}
{t.arrivalOnTrack} {pred.from.track}{pred.duration ? ',' : ''}
{/if}
Expand All @@ -96,7 +102,7 @@
{/if}
</div>
{/if}
<div class="border-t w-full h-0"></div>
<div class="border-t h-0 grow shrink"></div>
{#if l.from.track}
<div class="text-nowrap border rounded-xl px-2">
{t.track}
Expand All @@ -106,7 +112,7 @@
</div>

<div class="pt-4 pl-6 border-l-4 left-4 relative" style={routeBorderColor(l)}>
<div class="grid gap-y-6 grid-cols-7 items-center">
<div class="grid gap-y-6 grid-cols-[max-content_max-content_auto] items-center text-lg">
{@render stopTimes(
l.startTime,
l.scheduledStartTime,
Expand All @@ -115,17 +121,17 @@
l.from.stopId
)}
</div>
<div class="mt-2 flex items-center text-muted-foreground">
<div class="mt-2 flex items-center text-muted-foreground leading-none">
<ArrowRight class="stroke-muted-foreground h-4 w-4" />
<span class="ml-1">{l.headsign}</span>
</div>
{#if l.intermediateStops?.length === 0}
<div class="py-12 pl-8 flex items-center text-muted-foreground">
<div class="py-3 pl-8 flex items-center text-muted-foreground text-sm">
{t.tripIntermediateStops(0)}
</div>
{:else}
<details class="[&_svg]:open:-rotate-180">
<summary class="py-12 pl-8 flex items-center text-muted-foreground">
<details class="[&_svg]:open:-rotate-180 my-2">
<summary class="py-3 pl-8 flex items-center text-muted-foreground">
<svg
class="rotate-0 transform transition-all duration-300"
fill="none"
Expand All @@ -139,12 +145,14 @@
>
<polyline points="6 9 12 15 18 9"></polyline>
</svg>
<span class="ml-2 cursor-pointer">
<span class="ml-2 cursor-pointer text-sm">
{t.tripIntermediateStops(l.intermediateStops?.length ?? 0)}
({formatDurationSec(l.duration)})
</span>
</summary>
<div class="mb-6 grid gap-y-6 grid-cols-7 items-center">
<div
class="mb-1 grid gap-y-1 grid-cols-[max-content_max-content_auto] items-center text-sm"
>
{#each l.intermediateStops! as s}
{@render stopTimes(s.arrival!, s.scheduledArrival!, l.realTime, s.name!, s.stopId)}
{/each}
Expand All @@ -153,7 +161,9 @@
{/if}

{#if !isLast && !(isLastPred && next!.duration === 0)}
<div class="grid gap-y-6 grid-cols-7 items-center pb-3">
<div
class="grid gap-y-6 grid-cols-[max-content_max-content_auto] items-center pb-3 text-lg"
>
{@render stopTimes(
l.endTime!,
l.scheduledEndTime!,
Expand All @@ -172,7 +182,7 @@
{:else if !(isLast && l.duration === 0) && ((i == 0 && l.duration !== 0) || !next || !next.routeShortName || l.mode != 'WALK' || (pred && (pred.mode == 'BIKE' || pred.mode == 'RENTAL')))}
<Route {onClickTrip} {l} />
<div class="pt-4 pl-6 border-l-4 left-4 relative" style={routeBorderColor(l)}>
<div class="grid gap-y-6 grid-cols-7 items-center">
<div class="grid gap-y-6 grid-cols-[max-content_max-content_auto] items-center text-lg">
{@render stopTimes(
l.startTime,
l.scheduledStartTime,
Expand All @@ -183,16 +193,23 @@
</div>
{@render streetLeg(l)}
{#if !isLast}
<div class="grid gap-y-6 grid-cols-7 items-center pb-4">
<div
class="grid gap-y-6 grid-cols-[max-content_max-content_auto] items-center pb-4 text-lg"
>
{@render stopTimes(l.endTime, l.scheduledEndTime, l.realTime, l.to.name, l.to.stopId)}
</div>
{/if}
</div>
{/if}
{/each}
<div class="flex">
<div class="relative left-[13px] w-3 h-3 rounded-full" style={routeColor(lastLeg!)}></div>
<div class="relative left-3 bottom-[7px] pl-6 grid gap-y-6 grid-cols-7 items-center">
<div class="relative pl-6 left-4">
<div
class="absolute left-[-6px] top-[0px] w-[15px] h-[15px] rounded-full"
style={routeColor(lastLeg!)}
></div>
<div
class="relative left-[4px] bottom-[7px] grid gap-y-6 grid-cols-[max-content_max-content_auto] items-center text-lg"
>
{@render stopTimes(
lastLeg!.endTime,
lastLeg!.scheduledEndTime,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/lib/DateInput.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<input
type="datetime-local"
class={cn(
'flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50',
'flex h-9 rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50',
className
)}
bind:this={el}
Expand Down
0 ui/src/routes/Debug.svelte → ui/src/lib/Debug.svelte
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions ui/src/lib/ErrorMessage.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<script lang="ts">
let {
e
}: {
e: unknown;
} = $props();
</script>

<div class="m-4 text-red-600"><div class="min-w-0">{e}</div></div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<div class="m-4 text-red-600"><div class="min-w-0">{e}</div></div>
<div class="m-4 text-destructive"><div class="min-w-0">{e}</div></div>

or maybe introduce a error theme dependent error color?

0 ui/src/routes/ItineraryGeoJSON.svelte → ui/src/lib/ItineraryGeoJSON.svelte
View file
Open in desktop
File renamed without changes.
Loading
Loading