Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 0 additions & 27 deletions src/components/material/Avatar.tsx

This file was deleted.

4 changes: 2 additions & 2 deletions src/components/material/Icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import clsx from 'clsx'
// biome-ignore format: the array should not be formatted
export const Icons = [
'add', 'arrow_back', 'camera', 'check', 'chevron_right', 'clear', 'close', 'delete', 'description', 'directions_car', 'download', 'error',
'file_copy', 'info', 'logout', 'menu', 'my_location', 'open_in_new', 'payments', 'person', 'progress_activity', 'satellite_alt', 'search',
'settings', 'sync', 'upload', 'videocam',
'file_copy', 'flag', 'info', 'logout', 'menu', 'my_location', 'open_in_new', 'payments', 'person', 'progress_activity', 'satellite_alt',
'search', 'settings', 'sync', 'upload', 'videocam',
] as const

export type IconName = (typeof Icons)[number]
Expand Down
14 changes: 13 additions & 1 deletion src/pages/dashboard/components/RouteList.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { createEffect, createResource, createSignal, For, Index, onCleanup, onMount, Suspense, type VoidComponent } from 'solid-js'
import { createEffect, createResource, createSignal, For, Index, onCleanup, onMount, Show, Suspense, type VoidComponent } from 'solid-js'
import dayjs from 'dayjs'

import { fetcher } from '~/api'
import { getTimelineStatistics } from '~/api/derived'
import Card, { CardContent, CardHeader } from '~/components/material/Card'
import Icon from '~/components/material/Icon'
import RouteStatistics from '~/components/RouteStatistics'
import { getPlaceName } from '~/map/geocode'
import type { RouteSegments } from '~/types'
Expand All @@ -19,6 +21,7 @@ const RouteCard: VoidComponent<RouteCardProps> = (props) => {
const endPosition = () => [props.route.end_lng || 0, props.route.end_lat || 0] as number[]
const [startPlace] = createResource(startPosition, getPlaceName)
const [endPlace] = createResource(endPosition, getPlaceName)
const [timeline] = createResource(() => props.route, getTimelineStatistics)
const [location] = createResource(
() => [startPlace(), endPlace()],
([startPlace, endPlace]) => {
Expand All @@ -41,6 +44,15 @@ const RouteCard: VoidComponent<RouteCardProps> = (props) => {
</div>
}
subhead={location()}
trailing={
<Suspense>
<Show when={timeline()?.userFlags}>
<div class="flex items-center justify-center rounded-full bg-gradient-to-br from-amber-500 to-amber-900 p-2 ring-1 ring-amber-300 shadow-inner shadow-black/20">
<Icon class="text-yellow-300" size="20" name="flag" filled />
</div>
</Show>
</Suspense>
}
/>

<CardContent>
Expand Down
Loading