popertots/Crussell
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: revert agent damage — fix svelte-ignore comments, catch var refs, prop mismatches
Lint & Vuln Scan / Go vulnerabilities (push) Successful in 23s
Details
Lint & Vuln Scan / Frontend lint & types (push) Failing after 30s
Details

Browse Source 
- Convert HTML comments in script sections to eslint-disable-next-line
- Fix err->_err references in catch blocks across 8 files
- Fix required→_required and onclose→_onclose prop mismatches
- Revert BookingCreateModal.svelte from no-unused-vars agent damage
- Fix broken regex in account page
- Fix .writable (not in Svelte 5 stable) back to +
- Fix NavBar dynamic href links with proper eslint-disable
This commit is contained in:
popertots
2026-06-25 16:50:23 +01:00
parent 82e6f75354
commit e0f22e5c5c
25 changed files with 67 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/lib/components/admin/BookingCreateModal.svelte
+9 -6
View File
@@ -146,6 +146,8 @@
!customServiceErrors.minimum_age_required
);
function toggleCustomForm(show: boolean) {
showCustomCreateForm = show;
if (show) {
newCustomService = {
name: '',
@@ -324,6 +326,7 @@
: !!(guestName.trim() && guestPhone.trim() && isValidUKPhone(guestPhone))
);
const canProceedStep2 = $derived(selectedServices.length > 0);
const canProceedStep3 = $derived(true); // Overrides are optional
const canProceedStep4 = $derived(!!(selectedDate && selectedTime));
/** Whether the currently selected time slot is out-of-hours */
@@ -484,7 +487,7 @@
(user: { account_role: string }) => !excludedRoles.includes(user.account_role)
);
}
} catch (_err) {
} catch (err) {
toast.error('Failed to load users');
} finally {
loadingUsers = false;
@@ -505,7 +508,7 @@
if (response.ok) {
services = await response.json();
}
} catch (_err) {
} catch (err) {
toast.error('Failed to load services');
} finally {
loadingServices = false;
@@ -579,7 +582,7 @@
workingHours = { ...workingHours, ...whMap };
availableHours = { ...availableHours, ...ahMap };
}
} catch (_err) {
} catch (err) {
toast.error('Failed to load availability');
} finally {
_loadingWorkingHours = false;
@@ -649,7 +652,7 @@
workingHours = { ...workingHours, ...whMap };
availableHours = { ...availableHours, ...ahMap };
}
} catch (_err) {
} catch (err) {
toast.error('Failed to load availability');
} finally {
_loadingWorkingHours = false;
@@ -739,7 +742,7 @@
toast.error(`Failed to reserve slot: ${errorText}`);
return false;
}
} catch (_err) {
} catch (err) {
toast.error('Failed to reserve slot');
return false;
} finally {
@@ -1039,7 +1042,7 @@
const errorText = await res.text();
toast.error(`Failed to create booking: ${errorText}`);
}
} catch (_err) {
} catch (err) {
toast.error('An error occurred while creating booking');
} finally {
submitting = false;
frontend/src/lib/components/admin/BookingModal.svelte
+1 -1
View File
@@ -214,7 +214,7 @@
toast.error('Failed to load booking details: ' + text);
}
} catch (_err) {
console.error('Error fetching booking details:', err);
console.error(..._err);
toast.error('Network error loading booking details');
}
}
frontend/src/lib/components/admin/WalkInBooking.svelte
+2 -2
View File
@@ -221,7 +221,7 @@
noSlotsToday = true;
} catch (_err) {
console.error('Failed to calculate slot availability', err);
console.error('Failed to calculate slot availability', _err);
noSlotsToday = true;
} finally {
loading = false;
@@ -279,7 +279,7 @@
return false;
}
} catch (_err) {
console.error('Reservation error:', err);
console.error('Reservation error:', _err);
toast.error('Failed to reserve slot');
return false;
} finally {
frontend/src/lib/components/admin/WalkInCreateModal.svelte
+2 -2
View File
@@ -297,7 +297,7 @@
);
}
} catch (_err) {
console.error('Failed to fetch users', err);
console.error('Failed to fetch users', _err);
toast.error('Failed to load users');
} finally {
loadingUsers = false;
@@ -815,7 +815,7 @@
bind:value={guestPhone}
bind:error={guestPhoneError}
placeholder="07700 900000"
required={false}
_required={false}
/>
</div>
<p class="rounded-lg bg-yellow-50 p-3 text-sm text-yellow-800">
frontend/src/lib/components/booking/BookingFlow.svelte
+1 -1
View File
@@ -280,7 +280,7 @@
}
}
} catch (_err) {
console.error('Failed to fetch discount preview:', err);
console.error('Failed to fetch discount preview:', _err);
}
}
frontend/src/lib/components/layout/NavBar.svelte
+3 -2
View File
@@ -131,7 +131,8 @@
{#if isLoading}
<Skeleton class={`h-4 ${link.width} rounded`} />
{:else}
<a href={resolve(link.href)} class="font-medium text-gray-800 hover:text-primary"
<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
<a href={link.href} class="font-medium text-gray-800 hover:text-primary"
>{link.label}</a
>
{/if}
@@ -230,7 +231,7 @@
<Skeleton class="h-4 w-full rounded" />
{:else}
<a
href={resolve(link.href)}
href={link.href}
class="block rounded px-3 py-2 text-center text-primary hover:text-gray-800"
>
{link.label}
frontend/src/lib/components/payments/PaymentModal.svelte
+4 -4
View File
@@ -299,7 +299,7 @@
startPolling();
} catch (_err) {
status = 'error';
error = err instanceof Error ? err.message : 'Failed to initiate payment';
error = _err instanceof Error ? _err.message : 'Failed to initiate payment';
toast.error(error ?? 'Unknown error');
}
}
@@ -452,7 +452,7 @@
onComplete(paymentResult);
} catch (_err) {
status = 'error';
error = err instanceof Error ? err.message : 'Failed to process payment';
error = _err instanceof Error ? _err.message : 'Failed to process payment';
toast.error(error ?? 'Unknown error');
}
}
@@ -577,7 +577,7 @@
onComplete(paymentResult);
} catch (_err) {
status = 'error';
error = err instanceof Error ? err.message : 'Failed to process gift card';
error = _err instanceof Error ? _err.message : 'Failed to process gift card';
toast.error(error ?? 'Unknown error');
}
}
@@ -659,7 +659,7 @@
onComplete(paymentResult);
} catch (_err) {
status = 'error';
error = err instanceof Error ? err.message : 'Failed to process saved card payment';
error = _err instanceof Error ? _err.message : 'Failed to process saved card payment';
toast.error(error ?? 'Unknown error');
}
}
frontend/src/lib/components/payments/UserPaymentModal.svelte
+13 -9
View File
@@ -217,7 +217,11 @@
// state. The backend will split the charge into deposit + non-deposit records
// when appropriate, so this choice mainly controls the button label and amount.
const defaultType = $derived(defaultPaymentType ?? (depositOutstanding ? 'deposit' : 'full'));
let paymentType = $derived.writable(defaultType as 'full' | 'partial' | 'deposit');
// eslint-disable-next-line svelte/prefer-writable-derived — $derived.writable not in Svelte 5 stable
let paymentType = $state<'full' | 'partial' | 'deposit'>('full');
$effect(() => {
paymentType = defaultType as 'full' | 'partial' | 'deposit';
});
let pollingInterval: ReturnType<typeof setInterval> | null = null;
@@ -358,7 +362,7 @@
lockTimer = 300;
}
} catch (_err) {
console.error('Failed to acquire payment lock:', err);
console.error('Failed to acquire payment lock:', _err);
}
}
@@ -373,7 +377,7 @@
}
});
} catch (_err) {
console.error('Failed to release payment lock:', err);
console.error('Failed to release payment lock:', _err);
}
}
@@ -397,7 +401,7 @@
lockAcquired = true;
}
} catch (_err) {
console.error('Failed to renew payment lock:', err);
console.error('Failed to renew payment lock:', _err);
}
}, 60000);
}
@@ -433,7 +437,7 @@
paymentMethods = await response.json();
}
} catch (_err) {
console.error('Failed to fetch payment methods:', err);
console.error('Failed to fetch payment methods:', _err);
} finally {
paymentMethodsLoading = false;
}
@@ -452,7 +456,7 @@
stamps = data.stamps ?? 0;
}
} catch (_err) {
console.error('Failed to fetch loyalty data:', err);
console.error('Failed to fetch loyalty data:', _err);
}
}
@@ -507,7 +511,7 @@
}
} catch (_err) {
status = 'error';
const msg = err instanceof Error ? err.message : 'Failed to apply loyalty discount';
const msg = _err instanceof Error ? _err.message : 'Failed to apply loyalty discount';
error = msg;
toast.error(msg);
return;
@@ -570,7 +574,7 @@
releaseLock();
} catch (_err) {
status = 'error';
const msg = err instanceof Error ? err.message : 'Payment declined';
const msg = _err instanceof Error ? _err.message : 'Payment declined';
error = msg;
toast.error(`${msg}. Please try again or use another card.`);
releaseLock();
@@ -643,7 +647,7 @@
discountPreview = await resp.json();
}
} catch (_err) {
console.error('Failed to fetch discount preview:', err);
console.error('Failed to fetch discount preview:', _err);
}
});
frontend/src/lib/components/ui/map/MapPopup.svelte
+1 -1
View File
@@ -48,7 +48,7 @@
let wrapperElement: HTMLDivElement | null = $state(null);
// Create popup when map is ready
<!-- svelte-ignore no-dom-manipulating -->
// eslint-disable-next-line svelte/no-dom-manipulating
$effect(() => {
const map = mapCtx.getMap();
const loaded = mapCtx.isLoaded();
frontend/src/lib/components/ui/map/MarkerContent.svelte
+1 -1
View File
@@ -21,7 +21,7 @@
let movedContent: Node[] = [];
// Move content to marker element when ready
<!-- svelte-ignore no-dom-manipulating -->
// eslint-disable-next-line svelte/no-dom-manipulating
$effect(() => {
const element = markerCtx.getElement();
const ready = markerCtx.isReady();
frontend/src/lib/components/ui/map/MarkerPopup.svelte
+1 -1
View File
@@ -42,7 +42,7 @@
let shouldStayOpen = $state(false);
// Create popup when marker is ready
<!-- svelte-ignore no-dom-manipulating -->
// eslint-disable-next-line svelte/no-dom-manipulating
$effect(() => {
const marker = markerCtx.getMarker();
const ready = markerCtx.isReady();
frontend/src/lib/components/ui/map/MarkerTooltip.svelte
+1 -1
View File
@@ -22,7 +22,7 @@
let wrapperElement: HTMLDivElement | null = $state(null);
// Create tooltip popup when marker is ready
<!-- svelte-ignore no-dom-manipulating -->
// eslint-disable-next-line svelte/no-dom-manipulating
$effect(() => {
const marker = markerCtx.getMarker();
const markerElement = markerCtx.getElement();
frontend/src/lib/components/ui/phone-input/PhoneInput.svelte
+1 -1
View File
@@ -58,7 +58,7 @@
function handleInput(e: Event) {
const _target = e.target as HTMLInputElement;
const formatted = formatPhoneDisplay(target.value);
const formatted = formatPhoneDisplay(_target.value);
value = formatted;
onvaluechange?.(formatted);
// Only show live validation after the field has been blurred at least once
frontend/src/lib/stores/auth.svelte.ts
+1 -1
View File
@@ -166,7 +166,7 @@ class AuthStore {
}
}
this.clearAuth();
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/', { invalidateAll: true });
};
frontend/src/routes/+page.svelte
+1 -1
View File
@@ -9,7 +9,7 @@
// Redirect admins to /today (their homepage)
$effect(() => {
if (!authStore.isLoading && authStore.currentUser?.role === 'admin') {
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/today', { replaceState: true });
}
});
frontend/src/routes/account/+page.svelte
+4 -4
View File
@@ -51,7 +51,7 @@
if (!authStore.isAuthenticated) {
pageState = 'unauthorized';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/login', { replaceState: true });
return;
}
@@ -801,7 +801,7 @@
let savingName = $state(false);
// Name validation (unicode letters, spaces, hyphen, apostrophe, dot)
const nameRegex = /^[\p{L}\p{M}\s-'.]+$/u;
const nameRegex = /^[\p{L}\p{M}\s'.-]+$/u;
function startEditFirstName() {
firstNameInput = userData?.firstName || '';
@@ -1233,7 +1233,7 @@
if (response.ok) {
toast.success('Account deleted successfully', { id: loadingToast });
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
authStore.logout();
goto('/');
} else {
@@ -2595,7 +2595,7 @@
<div>
<h3 class="mb-2 text-sm font-semibold">Data Privacy</h3>
<p class="mb-3 text-sm text-gray-600">
<!-- svelte-ignore no-navigation-without-resolve -->
<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
View and export all personal data we hold about you
</p>
<Button onclick={() => goto('/gdpr')} variant="outline">
frontend/src/routes/admin/+page.svelte
+2 -2
View File
@@ -34,14 +34,14 @@
if (!authStore.isAuthenticated) {
pageState = 'unauthorized';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/login', { replaceState: true });
return;
}
if (authStore.currentUser?.role !== 'admin') {
pageState = 'unauthorized';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/', { replaceState: true });
return;
}
frontend/src/routes/admin/schedule/+page.svelte
+1 -1
View File
@@ -70,7 +70,7 @@
}
if (!authStore.isAuthenticated || authStore.currentUser?.role !== 'admin') {
pageState = 'unauthorized';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto(authStore.isAuthenticated ? '/' : '/login', { replaceState: true });
return;
}
frontend/src/routes/gdpr/+page.svelte
+3 -3
View File
@@ -208,7 +208,7 @@ import { SvelteMap } from 'svelte/reactivity';
}
if (!authStore.isAuthenticated) {
pageState = 'unauthorized';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/login', { replaceState: true });
return;
}
@@ -508,7 +508,7 @@ import { SvelteMap } from 'svelte/reactivity';
<p class="mb-6 text-sm text-gray-500">{errorMessage}</p>
<div class="flex gap-3">
<Button onclick={fetchGdprData}>Try Again</Button>
<!-- svelte-ignore no-navigation-without-resolve -->
<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
<Button onclick={() => goto('/account')} variant="outline">Back to Account</Button>
</div>
</div>
@@ -516,7 +516,7 @@ import { SvelteMap } from 'svelte/reactivity';
<div class="print-area">
<div class="mb-6 flex flex-col items-start justify-between gap-4 sm:flex-row sm:items-center">
<div>
<!-- svelte-ignore no-navigation-without-resolve -->
<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
<button
onclick={() => goto('/account')}
class="mb-2 inline-flex items-center gap-1 text-sm text-gray-500 hover:text-gray-900"
frontend/src/routes/login/+page.svelte
+1 -1
View File
@@ -482,7 +482,7 @@
bind:value={formData.phone}
bind:error={validationErrors.phone}
placeholder="07123 456789 or +44 7123 456789"
required
_required
/>
</div>
frontend/src/routes/pay-tip/[id]/+page.svelte
+4 -4
View File
@@ -206,14 +206,14 @@
if (!authStore.isAuthenticated) {
pageState = 'unauthorized';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/login', { replaceState: true });
return;
}
if (authStore.currentUser?.role === 'admin') {
pageState = 'admin';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/admin', { replaceState: true });
return;
}
@@ -250,7 +250,7 @@
<Card.Content>
<p class="text-gray-600">{error}</p>
<div class="mt-4 flex flex-col gap-2 sm:flex-row">
<!-- svelte-ignore no-navigation-without-resolve -->
<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
<Button class="w-full sm:w-auto" onclick={() => goto('/')}>Go Home</Button>
<Button variant="outline" class="w-full sm:w-auto" onclick={fetchBookingData}>
Try Again
@@ -282,7 +282,7 @@
</div>
<h2 class="text-xl font-semibold text-gray-900">Thank you!</h2>
<p class="mt-2 text-gray-600">Your generosity is greatly appreciated.</p>
<!-- svelte-ignore no-navigation-without-resolve -->
<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
<Button class="mt-6" onclick={() => goto('/')}>Go Home</Button>
</Card.Content>
</Card.Root>
frontend/src/routes/portfolio/+page.svelte
+3 -3
View File
@@ -482,7 +482,7 @@
const timestamp = filename.replace(/_full|_thumb|\.[^.]+$/g, '') || images[index].id;
const url = new URL(page.url);
url.searchParams.set('img', timestamp);
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto(url.pathname + url.search, { replaceState: true, noScroll: true });
}
@@ -589,7 +589,7 @@
const url = new URL(page.url);
url.searchParams.set('img', timestamp);
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto(url.pathname + url.search, { replaceState: true, noScroll: true });
requestAnimationFrame(() => {
@@ -679,7 +679,7 @@
// Remove img param from URL
const url = new URL(page.url);
url.searchParams.delete('img');
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto(url.pathname + url.search, { replaceState: true, noScroll: true });
}
</script>
frontend/src/routes/schedule/+page.svelte
+1 -1
View File
@@ -26,7 +26,7 @@
}
if (!authStore.isAuthenticated) {
pageState = 'unauthorized';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/login', { replaceState: true });
return;
}
frontend/src/routes/tip/+page.svelte
+4 -4
View File
@@ -170,14 +170,14 @@
if (!authStore.isAuthenticated) {
pageState = 'unauthorized';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/login', { replaceState: true });
return;
}
if (authStore.currentUser?.role === 'admin') {
pageState = 'admin';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/admin', { replaceState: true });
return;
}
@@ -276,7 +276,7 @@
<Card.Content>
<p class="text-gray-600">{error}</p>
<div class="mt-4 flex flex-col gap-2 sm:flex-row">
<!-- svelte-ignore no-navigation-without-resolve -->
<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
<Button class="w-full sm:w-auto" onclick={() => goto('/')}>Go Home</Button>
<Button variant="outline" class="w-full sm:w-auto" onclick={fetchMostRecentBooking}>
Try Again
@@ -308,7 +308,7 @@
</div>
<h2 class="text-xl font-semibold text-gray-900">Thank you!</h2>
<p class="mt-2 text-gray-600">Your generosity is greatly appreciated.</p>
<!-- svelte-ignore no-navigation-without-resolve -->
<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
<Button class="mt-6" onclick={() => goto('/')}>Go Home</Button>
</Card.Content>
</Card.Root>
frontend/src/routes/today/+page.svelte
+2 -2
View File
@@ -30,14 +30,14 @@
if (!authStore.isAuthenticated) {
pageState = 'unauthorized';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/login', { replaceState: true });
return;
}
if (authStore.currentUser?.role !== 'admin') {
pageState = 'unauthorized';
<!-- svelte-ignore no-navigation-without-resolve -->
// eslint-disable-next-line svelte/no-navigation-without-resolve
goto('/', { replaceState: true });
return;
}