From 7c4505fb1928bfe3f0bed60542e6506de95d7616 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 1 Mar 2024 02:31:24 +0100 Subject: [PATCH 1/3] fix: popover --- src/lib/elements/forms/inputDomain.svelte | 8 ++-- src/lib/elements/forms/inputEmail.svelte | 8 ++-- src/lib/elements/forms/inputFile.svelte | 8 ++-- src/lib/elements/forms/inputPassword.svelte | 8 ++-- src/lib/elements/forms/inputPhone.svelte | 8 ++-- src/lib/elements/forms/inputText.svelte | 8 ++-- .../messaging/providers/popoverContent.svelte | 10 ++--- .../providers/settingsFormList.svelte | 43 +++++++++++-------- 8 files changed, 59 insertions(+), 42 deletions(-) diff --git a/src/lib/elements/forms/inputDomain.svelte b/src/lib/elements/forms/inputDomain.svelte index 007c12e97..db798dea7 100644 --- a/src/lib/elements/forms/inputDomain.svelte +++ b/src/lib/elements/forms/inputDomain.svelte @@ -1,5 +1,5 @@
@@ -10,11 +10,11 @@

{@html line}

{/each} - {#if popoverImage} + {#if image} + darkSrc={image.src.dark} + lightSrc={image.src.light} + alt={image.alt} /> {/if}
diff --git a/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte b/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte index e0c330642..92baa0d30 100644 --- a/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte +++ b/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte @@ -40,21 +40,31 @@ | FCMProviderParams | APNSProviderParams >; + + function getPopoverProps(input: ProviderInput) { + if (!input.popover) { + return {}; + } + return { + lines: input.popover, + image: input.popoverImage + }; + } {#each inputs as input} - {@const popoverImage = input.popoverImage} + {@const popover = input.popover ? PopoverContent : null} + {@const popoverProps = getPopoverProps(input)} {#if input.type === 'text'} - - - {:else if input.type === 'password'} - - - {:else if input.type === 'email'} - - - {:else if input.type === 'domain'} - - - {:else if input.type === 'phone'} - - - {:else if input.type === 'file'} - - - {:else if input.type === 'switch'} From 3fb99772b64bb65ecca4075536fbc7e00668dd26 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 1 Mar 2024 02:33:35 +0100 Subject: [PATCH 2/3] fix: use template const for popover props with email input --- .../messaging/providers/popoverContent.svelte | 5 +---- .../messaging/providers/settingsFormList.svelte | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/routes/console/project-[project]/messaging/providers/popoverContent.svelte b/src/routes/console/project-[project]/messaging/providers/popoverContent.svelte index 378e9424d..7b9a1e723 100644 --- a/src/routes/console/project-[project]/messaging/providers/popoverContent.svelte +++ b/src/routes/console/project-[project]/messaging/providers/popoverContent.svelte @@ -11,10 +11,7 @@ {/each} {#if image} - + {/if} diff --git a/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte b/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte index 92baa0d30..8d167bbdf 100644 --- a/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte +++ b/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte @@ -84,7 +84,7 @@ placeholder={input.placeholder} required={!input.optional} {popover} - popoverProps={getPopoverProps(input)} + {popoverProps} bind:value={params[input.name]}> {:else if input.type === 'domain'} From 8f385564085ef7bc3c2778452733f534a29b2cde Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 1 Mar 2024 13:45:46 +0100 Subject: [PATCH 3/3] fix: popover card radius --- src/lib/elements/forms/inputDomain.svelte | 4 +++- src/lib/elements/forms/inputEmail.svelte | 4 +++- src/lib/elements/forms/inputFile.svelte | 4 +++- src/lib/elements/forms/inputPassword.svelte | 4 +++- src/lib/elements/forms/inputPhone.svelte | 4 +++- src/lib/elements/forms/inputText.svelte | 1 + 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/lib/elements/forms/inputDomain.svelte b/src/lib/elements/forms/inputDomain.svelte index db798dea7..91d0e51b0 100644 --- a/src/lib/elements/forms/inputDomain.svelte +++ b/src/lib/elements/forms/inputDomain.svelte @@ -68,7 +68,9 @@
+ style:--card-border-radius="var(--border-radius-small)" + style:--p-card-padding=".75rem" + style:box-shadow="var(--shadow-large)">
diff --git a/src/lib/elements/forms/inputEmail.svelte b/src/lib/elements/forms/inputEmail.svelte index b925a1b62..2cd761e4a 100644 --- a/src/lib/elements/forms/inputEmail.svelte +++ b/src/lib/elements/forms/inputEmail.svelte @@ -77,7 +77,9 @@
+ style:--card-border-radius="var(--border-radius-small)" + style:--p-card-padding=".75rem" + style:box-shadow="var(--shadow-large)">
diff --git a/src/lib/elements/forms/inputFile.svelte b/src/lib/elements/forms/inputFile.svelte index d3d88c033..2de200818 100644 --- a/src/lib/elements/forms/inputFile.svelte +++ b/src/lib/elements/forms/inputFile.svelte @@ -113,7 +113,9 @@
+ style:--card-border-radius="var(--border-radius-small)" + style:--p-card-padding=".75rem" + style:box-shadow="var(--shadow-large)">
diff --git a/src/lib/elements/forms/inputPassword.svelte b/src/lib/elements/forms/inputPassword.svelte index 7834dad57..423f0db2b 100644 --- a/src/lib/elements/forms/inputPassword.svelte +++ b/src/lib/elements/forms/inputPassword.svelte @@ -68,7 +68,9 @@
+ style:--card-border-radius="var(--border-radius-small)" + style:--p-card-padding=".75rem" + style:box-shadow="var(--shadow-large)">
diff --git a/src/lib/elements/forms/inputPhone.svelte b/src/lib/elements/forms/inputPhone.svelte index 1a39f6400..23e7c1c81 100644 --- a/src/lib/elements/forms/inputPhone.svelte +++ b/src/lib/elements/forms/inputPhone.svelte @@ -67,7 +67,9 @@
+ style:--card-border-radius="var(--border-radius-small)" + style:--p-card-padding=".75rem" + style:box-shadow="var(--shadow-large)">
diff --git a/src/lib/elements/forms/inputText.svelte b/src/lib/elements/forms/inputText.svelte index b7b8de090..ac354e3f2 100644 --- a/src/lib/elements/forms/inputText.svelte +++ b/src/lib/elements/forms/inputText.svelte @@ -95,6 +95,7 @@