Skip to content

fix: ensure loading spinner displays only when a trip is selected #197

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

Merged
merged 2 commits into from
Mar 21, 2025
Merged

fix: ensure loading spinner displays only when a trip is selected #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36ea380
fix: ensure loading spinner displays only when a trip is selected
iqbalcodes6602 Feb 24, 2025
4c721b5
refactor: remove unused loading state and related imports in schedule…
iqbalcodes6602 Mar 6, 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
2 changes: 1 addition & 1 deletion src/components/stops/StopPane.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<p>Loading...</p>
{:else}
<div>
{#if loading && isLoading}
{#if loading && isLoading && tripSelected}
<LoadingSpinner />
{/if}

Expand Down
88 changes: 39 additions & 49 deletions src/routes/stops/[stopID]/schedule/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script>
import { page } from '$app/stores';
import LoadingSpinner from '$components/LoadingSpinner.svelte';
import RouteScheduleTable from '$components/schedule-for-stop/RouteScheduleTable.svelte';
import StopPageHeader from '$components/stops/StopPageHeader.svelte';
import StandalonePage from '$components/StandalonePage.svelte';
Expand All @@ -9,7 +8,6 @@
import AccordionItem from '$components/containers/AccordionItem.svelte';
import { Datepicker } from 'flowbite-svelte';
import { onMount } from 'svelte';
import { isLoading } from 'svelte-i18n';
import { t } from 'svelte-i18n';

let selectedDate = $state(new Date());
Expand All @@ -19,7 +17,6 @@
let stopName = $state('');
let stopId = $state('');
let stopDirection = $state('');
let loading = $state(true);
let accordionComponent = $state();
let allRoutesExpanded = $state(false);

Expand All @@ -29,16 +26,13 @@

async function fetchScheduleForStop(stopId, date) {
try {
loading = true;
emptySchedules = false;
const response = await fetch(`/api/oba/schedule-for-stop/${stopId}?date=${date}`);
if (!response.ok) throw new Error('Failed to fetch schedule for stop');
const scheduleForStop = await response.json();
handleScheduleForStopResponse(scheduleForStop.data);
} catch (error) {
console.error('Error fetching schedules:', error);
} finally {
loading = false;
}
}

Expand Down Expand Up @@ -140,52 +134,48 @@
</svelte:head>

<StandalonePage>
{#if loading || $isLoading}
<LoadingSpinner />
{:else}
<StopPageHeader {stopName} {stopId} {stopDirection} />

<div class="flex flex-col">
<div class="flex flex-1 flex-col">
<h2 class="mb-4 text-2xl font-bold text-gray-800">
{$t('schedule_for_stop.route_schedules')}
</h2>

<div class="mb-4 flex gap-4">
<div class="z-20 min-w-32 md:w-[30%]">
<Datepicker bind:value={selectedDate} inputClass="w-96" />
</div>

<div class="flex-1 text-right">
<button class="button" onclick={toggleAllRoutes}>
{allRoutesExpanded
? $t('schedule_for_stop.collapse_all_routes')
: $t('schedule_for_stop.show_all_routes')}
</button>
</div>
<StopPageHeader {stopName} {stopId} {stopDirection} />

<div class="flex flex-col">
<div class="flex flex-1 flex-col">
<h2 class="mb-4 text-2xl font-bold text-gray-800">
{$t('schedule_for_stop.route_schedules')}
</h2>

<div class="mb-4 flex gap-4">
<div class="z-20 min-w-32 md:w-[30%]">
<Datepicker bind:value={selectedDate} inputClass="w-96" />
</div>

<div
class="flex-1 rounded-lg border border-gray-200 bg-white p-2 dark:border-gray-700 dark:bg-black"
>
{#if emptySchedules}
<p class="text-center text-gray-700 dark:text-gray-400">
{$t('schedule_for_stop.no_schedules_available')}
</p>
{:else}
<Accordion bind:this={accordionComponent}>
{#each schedules as schedule}
<AccordionItem>
{#snippet header()}
<span>{schedule.tripHeadsign}</span>
{/snippet}
<RouteScheduleTable {schedule} />
</AccordionItem>
{/each}
</Accordion>
{/if}
<div class="flex-1 text-right">
<button class="button" onclick={toggleAllRoutes}>
{allRoutesExpanded
? $t('schedule_for_stop.collapse_all_routes')
: $t('schedule_for_stop.show_all_routes')}
</button>
</div>
</div>

<div
class="flex-1 rounded-lg border border-gray-200 bg-white p-2 dark:border-gray-700 dark:bg-black"
>
{#if emptySchedules}
<p class="text-center text-gray-700 dark:text-gray-400">
{$t('schedule_for_stop.no_schedules_available')}
</p>
{:else}
<Accordion bind:this={accordionComponent}>
{#each schedules as schedule}
<AccordionItem>
{#snippet header()}
<span>{schedule.tripHeadsign}</span>
{/snippet}
<RouteScheduleTable {schedule} />
</AccordionItem>
{/each}
</Accordion>
{/if}
</div>
</div>
{/if}
</div>
</StandalonePage>