From d62ba6f7b15f1f46a20d4ea19ac813b5bdd9c209 Mon Sep 17 00:00:00 2001 From: Eric Rolf Date: Mon, 29 Jan 2024 22:59:52 -0500 Subject: [PATCH 1/6] Added support for blank placeholder spaces. --- src/lib/Main/Content.svelte | 3 + src/lib/Main/Placeholder.svelte | 123 +++++++++++++++++++++++++ src/lib/Modal/MainItemConfig.svelte | 12 +++ src/lib/Modal/PlaceholderConfig.svelte | 29 ++++++ src/lib/Types.ts | 4 + 5 files changed, 171 insertions(+) create mode 100644 src/lib/Main/Placeholder.svelte create mode 100644 src/lib/Modal/PlaceholderConfig.svelte diff --git a/src/lib/Main/Content.svelte b/src/lib/Main/Content.svelte index 9d71a647..e89882d0 100644 --- a/src/lib/Main/Content.svelte +++ b/src/lib/Main/Content.svelte @@ -4,6 +4,7 @@ import Media from '$lib/Main/Media.svelte'; import Camera from '$lib/Main/Camera.svelte'; import Configure from '$lib/Main/Configure.svelte'; + import Placeholder from '$lib/Main/Placeholder.svelte'; export let item: any; export let sectionName: string | undefined = undefined; @@ -21,6 +22,8 @@ {:else if item?.type === 'camera'} +{:else if item?.type === 'placeholder'} + {/if} diff --git a/src/lib/Modal/MainItemConfig.svelte b/src/lib/Modal/MainItemConfig.svelte index 97e90c20..eb363f03 100644 --- a/src/lib/Modal/MainItemConfig.svelte +++ b/src/lib/Modal/MainItemConfig.svelte @@ -11,6 +11,7 @@ import Button from '$lib/Main/Button.svelte'; import Camera from '$lib/Main/Camera.svelte'; + import Placeholder from '$lib/Main/Placeholder.svelte'; import ConfigButtons from '$lib/Modal/ConfigButtons.svelte'; import Ripple from 'svelte-ripple'; @@ -64,6 +65,14 @@ demo: $demo.camera, sel } + }, + { + id: 'placeholder', + type: $lang('placeholder'), + component: Placeholder, + props: { + sel + } } // { // id: 'media', @@ -98,6 +107,9 @@ sel }); break; + case 'placeholder': + openModal(() => import('$lib/Modal/PlaceholderConfig.svelte'), { sel }); + break; default: openModal(() => import('$lib/Modal/MainItemConfig.svelte'), { sel }); } diff --git a/src/lib/Modal/PlaceholderConfig.svelte b/src/lib/Modal/PlaceholderConfig.svelte new file mode 100644 index 00000000..6cb43c21 --- /dev/null +++ b/src/lib/Modal/PlaceholderConfig.svelte @@ -0,0 +1,29 @@ + + +{#if isOpen} + +

{$lang('placeholder')}

+

{$lang('preview')}

+ +
+ +
+ + +
+{/if} + + diff --git a/src/lib/Types.ts b/src/lib/Types.ts index b181aa20..eb604a5e 100644 --- a/src/lib/Types.ts +++ b/src/lib/Types.ts @@ -57,6 +57,10 @@ export interface ViewItem { sections?: any[]; } +export interface PlaceholderItem { + id?: number; +} + export interface ButtonItem { type?: string; id?: number; From 8893c56808271b3fb06cac59b36ff121751bd981 Mon Sep 17 00:00:00 2001 From: Eric Rolf Date: Mon, 29 Jan 2024 23:02:50 -0500 Subject: [PATCH 2/6] Fixed hardcoded string value. --- src/lib/Main/Placeholder.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Main/Placeholder.svelte b/src/lib/Main/Placeholder.svelte index 87adf4fd..43c6e6a3 100644 --- a/src/lib/Main/Placeholder.svelte +++ b/src/lib/Main/Placeholder.svelte @@ -1,5 +1,5 @@ {#if isOpen} -

{$lang('placeholder')}

+

{$lang('empty')}

{$lang('preview')}

- +
diff --git a/src/lib/Modal/MainItemConfig.svelte b/src/lib/Modal/MainItemConfig.svelte index eb363f03..43891cf6 100644 --- a/src/lib/Modal/MainItemConfig.svelte +++ b/src/lib/Modal/MainItemConfig.svelte @@ -11,7 +11,7 @@ import Button from '$lib/Main/Button.svelte'; import Camera from '$lib/Main/Camera.svelte'; - import Placeholder from '$lib/Main/Placeholder.svelte'; + import Empty from '$lib/Main/Empty.svelte'; import ConfigButtons from '$lib/Modal/ConfigButtons.svelte'; import Ripple from 'svelte-ripple'; @@ -67,9 +67,9 @@ } }, { - id: 'placeholder', - type: $lang('placeholder'), - component: Placeholder, + id: 'empty', + type: $lang('empty'), + component: Empty, props: { sel } @@ -107,8 +107,8 @@ sel }); break; - case 'placeholder': - openModal(() => import('$lib/Modal/PlaceholderConfig.svelte'), { sel }); + case 'empty': + openModal(() => import('$lib/Modal/EmptyConfig.svelte'), { sel }); break; default: openModal(() => import('$lib/Modal/MainItemConfig.svelte'), { sel }); diff --git a/src/lib/Types.ts b/src/lib/Types.ts index eb604a5e..fc4c369c 100644 --- a/src/lib/Types.ts +++ b/src/lib/Types.ts @@ -57,7 +57,7 @@ export interface ViewItem { sections?: any[]; } -export interface PlaceholderItem { +export interface EmptyItem { id?: number; } From 04819c8462c921aa267093b9de329bff7f472b92 Mon Sep 17 00:00:00 2001 From: Eric Rolf Date: Thu, 1 Feb 2024 04:08:11 -0500 Subject: [PATCH 5/6] Update src/lib/Modal/EmptyConfig.svelte Co-authored-by: Mattias Persson <36163594+matt8707@users.noreply.github.com> --- src/lib/Modal/EmptyConfig.svelte | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/Modal/EmptyConfig.svelte b/src/lib/Modal/EmptyConfig.svelte index 3c248403..55dba7b2 100644 --- a/src/lib/Modal/EmptyConfig.svelte +++ b/src/lib/Modal/EmptyConfig.svelte @@ -1,6 +1,5 @@ {#if isOpen} @@ -17,7 +14,7 @@

{$lang('empty')}

{$lang('preview')}

-
+
@@ -26,4 +23,8 @@ {/if} + From 4e2094f92472cc1fb9c61ff3b2d7e17b68ec1885 Mon Sep 17 00:00:00 2001 From: Eric Rolf Date: Thu, 1 Feb 2024 04:08:26 -0500 Subject: [PATCH 6/6] Update src/lib/Main/Empty.svelte Co-authored-by: Mattias Persson <36163594+matt8707@users.noreply.github.com> --- src/lib/Main/Empty.svelte | 87 +++++++-------------------------------- 1 file changed, 15 insertions(+), 72 deletions(-) diff --git a/src/lib/Main/Empty.svelte b/src/lib/Main/Empty.svelte index ee97ecf1..57abc285 100644 --- a/src/lib/Main/Empty.svelte +++ b/src/lib/Main/Empty.svelte @@ -1,93 +1,35 @@ -{#if $editMode} - - -
-{:else} -
-{/if} + + +
+