Skip to content

Commit 3c5baeb

Browse files
committed
fix: replace default object with derived
1 parent 721aa09 commit 3c5baeb

File tree

4 files changed

+37
-25
lines changed

4 files changed

+37
-25
lines changed

src/lib/ForgotPassword.svelte

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66
let {
77
children,
88
title = 'Forgot your password?',
9-
site = {
10-
name: 'Flowbite',
11-
img: '/images/flowbite-svelte-icon-logo.svg',
12-
link: '/',
13-
imgAlt: 'FlowBite Logo'
14-
},
9+
site,
1510
btnTitle = 'Reset password',
1611
pageDescription = "Don't fret! Just type in your email and we will send you a code to reset your password!",
1712
mainClass = 'bg-gray-50 dark:bg-gray-900',
@@ -22,17 +17,25 @@
2217
...restProps
2318
}: ForgotPasswordProps = $props();
2419
20+
const siteDefault = {
21+
name: 'Flowbite',
22+
img: '/images/flowbite-svelte-icon-logo.svg',
23+
link: '/',
24+
imgAlt: 'FlowBite Logo'
25+
};
26+
const actualSite = $derived(site ?? siteDefault);
27+
2528
const mainDivCls = twMerge('flex flex-col items-center justify-center px-6 pt-8 mx-auto md:h-screen pt:mt-0 dark:bg-gray-900', mainDivClass);
2629
const siteLinkCls = twMerge('flex items-center justify-center mb-8 text-2xl font-semibold lg:mb-10 dark:text-white', siteLinkClass);
2730
const cardH1Cls = twMerge('mb-3 text-2xl font-bold text-gray-900 dark:text-white', cardH1Class);
2831
</script>
2932

3033
<main class={mainClass}>
3134
<div class={mainDivCls}>
32-
{#if site}
33-
<a href={site.link} class={siteLinkCls}>
34-
<img src={site.img} class={siteImgClass} alt={site.imgAlt} />
35-
<span>{site.name}</span>
35+
{#if actualSite}
36+
<a href={actualSite.link} class={siteLinkCls}>
37+
<img src={actualSite.img} class={siteImgClass} alt={actualSite.imgAlt} />
38+
<span>{actualSite.name}</span>
3639
</a>
3740
{/if}
3841
<!-- Card -->

src/lib/Maintenance.svelte

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
let {
88
title = 'Under Maintenance',
99
description = 'Sorry for the inconvenience but we’re performing some maintenance at the moment. If you need to you can always <a href="/" class="text-primary-700 hover:underline dark:text-primary-500">contact us</a>, otherwise we’ll be back online shortly!.',
10-
image = {
11-
src: imagesPath('illustrations/maintenance.svg'),
12-
alt: 'maintenance'
13-
},
10+
image,
1411
btnTitle = 'Go back home',
1512
btnHref = '/',
1613
mainClass = 'bg-gray-50 dark:bg-gray-900',
@@ -20,14 +17,20 @@
2017
div2Class = 'text-center xl:max-w-4xl'
2118
}: MaintenanceProps = $props();
2219
20+
const imageDefault = {
21+
src: imagesPath('illustrations/maintenance.svg'),
22+
alt: 'maintenance'
23+
}
24+
const actualImage = $derived( image ?? imageDefault);
25+
2326
const mainDivCls = twMerge('flex flex-col justify-center items-center px-6 mx-auto h-screen xl:px-0 dark:bg-gray-900', mainDivClass);
2427
const h1Cls = twMerge('mb-3 text-2xl font-bold leading-tight text-gray-900 sm:text-4xl lg:text-5xl dark:text-white', h1Class);
2528
</script>
2629

2730
<main class={mainClass}>
2831
<div class={mainDivCls}>
2932
<div class={imgDiv}>
30-
<img src={image.src} alt={image.alt} />
33+
<img src={actualImage.src} alt={actualImage.alt} />
3134
</div>
3235
<div class={div2Class}>
3336
<h1 class={h1Cls}>{title}</h1>

src/lib/NotFound.svelte

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
let {
88
title = 'Page not found',
99
description = 'Oops! Looks like you followed a bad link. If you think this is a problem with us, please tell us.',
10-
image = {
11-
src: imagesPath('404.svg', 'illustrations'),
12-
alt: 'astronaut'
13-
},
10+
image,
1411
btnTitle = 'Go back home',
1512
btnHref = '/',
1613
mainClass = 'bg-gray-50 dark:bg-gray-900',
@@ -20,14 +17,20 @@
2017
div2Class = 'text-center xl:max-w-4xl'
2118
}: NotFoundProps = $props();
2219
20+
const imageDefault = {
21+
src: imagesPath('404.svg', 'illustrations'),
22+
alt: 'astronaut'
23+
}
24+
const actualImage = $derived( image ?? imageDefault);
25+
2326
const mainDivCls = twMerge('flex flex-col items-center justify-center px-6 pt-8 mx-auto md:h-screen pt:mt-0 dark:bg-gray-900', mainDivClass);
2427
const h1Cls = twMerge('mb-3 text-2xl font-bold leading-tight text-gray-900 sm:text-4xl lg:text-5xl dark:text-white', h1Class);
2528
</script>
2629

2730
<main class={mainClass}>
2831
<div class={mainDivCls}>
2932
<div class={imgDiv}>
30-
<img src={image.src} alt={image.alt} />
33+
<img src={actualImage.src} alt={actualImage.alt} />
3134
</div>
3235
<div class={div2Class}>
3336
<h1 class={h1Cls}>

src/lib/ServerError.svelte

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
let {
88
title = 'Something has gone seriously wrong',
99
description = "It's always time for a coffee break. We should be back by the time you finish your coffee.",
10-
image = {
11-
src: imagesPath('illustrations/500.svg'),
12-
alt: 'astronaut'
13-
},
10+
image,
1411
btnTitle = 'Go back home',
1512
btnHref = '/',
1613
mainClass = 'bg-gray-50 dark:bg-gray-900',
@@ -20,14 +17,20 @@
2017
div2Class = 'text-center xl:max-w-4xl'
2118
}: ServerErrorProps = $props();
2219
20+
const imageDefault = {
21+
src: imagesPath('illustrations/500.svg'),
22+
alt: 'astronaut'
23+
}
24+
const actualImage = $derived( image ?? imageDefault);
25+
2326
const mainDivCls = twMerge('flex flex-col justify-center items-center px-6 mx-auto h-screen xl:px-0 dark:bg-gray-900', mainDivClass);
2427
const h1Cls = twMerge('mb-3 text-2xl font-bold leading-tight text-gray-900 sm:text-4xl lg:text-5xl dark:text-white', h1Class);
2528
</script>
2629

2730
<main class={mainClass}>
2831
<div class={mainDivCls}>
2932
<div class={imgDiv}>
30-
<img src={image.src} alt={image.alt} />
33+
<img src={actualImage.src} alt={actualImage.alt} />
3134
</div>
3235
<div class={div2Class}>
3336
<h1 class={h1Cls}>

0 commit comments

Comments
 (0)