From 4b2c57388a5b3db1174a493ceca91a05819ce42e Mon Sep 17 00:00:00 2001 From: Eric Rolf Date: Sat, 27 Jan 2024 09:32:17 -0500 Subject: [PATCH 1/2] Update date sidebar to support vertical and horizontal layouts. --- src/lib/Modal/DateConfig.svelte | 37 ++++++++++++++++++++++++++++++--- src/lib/Sidebar/Date.svelte | 18 +++++++++++----- src/lib/Sidebar/Index.svelte | 1 + src/lib/Types.ts | 1 + 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/src/lib/Modal/DateConfig.svelte b/src/lib/Modal/DateConfig.svelte index d8344cd6..12c5520d 100644 --- a/src/lib/Modal/DateConfig.svelte +++ b/src/lib/Modal/DateConfig.svelte @@ -26,7 +26,12 @@

{$lang('preview')}

- +
@@ -79,19 +84,45 @@ + {#if sel?.hide === 'none'} + +

{$lang('Layout')}

+
+ + +
+ {/if} diff --git a/src/lib/Sidebar/Date.svelte b/src/lib/Sidebar/Date.svelte index fe2582fe..b9573aa7 100644 --- a/src/lib/Sidebar/Date.svelte +++ b/src/lib/Sidebar/Date.svelte @@ -4,6 +4,7 @@ export let short_day: boolean | undefined = undefined; export let short_month: boolean | undefined = undefined; export let hide: string | undefined = undefined; + export let layout: string | undefined = undefined; $: weekDay = $timer.toLocaleDateString($selectedLanguage, { weekday: short_day ? 'short' : 'long' @@ -13,15 +14,22 @@ day: 'numeric', month: short_month ? 'short' : 'long' }); + + $: orientation = layout || 'vertical';
- {#if hide !== 'day'} - {weekDay}
- {/if} + {#if orientation === 'vertical'} + {#if hide !== 'day'} + {weekDay}
+ {/if} - {#if hide !== 'month'} - {shortDate}
+ {#if hide !== 'month'} + {shortDate}
+ {/if} + {/if} + {#if orientation === 'horizontal'} + {weekDay}, {shortDate} {/if}
diff --git a/src/lib/Sidebar/Index.svelte b/src/lib/Sidebar/Index.svelte index 1ed91e7c..45ac6eba 100644 --- a/src/lib/Sidebar/Index.svelte +++ b/src/lib/Sidebar/Index.svelte @@ -218,6 +218,7 @@ short_day={item?.short_day} short_month={item?.short_month} hide={item?.hide} + layout={item?.layout} /> diff --git a/src/lib/Types.ts b/src/lib/Types.ts index 6af8cc61..b181aa20 100644 --- a/src/lib/Types.ts +++ b/src/lib/Types.ts @@ -108,6 +108,7 @@ export interface DateItem { short_day?: boolean; short_month?: boolean; hide?: string; + layout?: string; } export interface GraphItem { From 774143f1a61ce9a2fde191f2de572d7b40b7c097 Mon Sep 17 00:00:00 2001 From: Eric Rolf Date: Sat, 27 Jan 2024 18:00:46 -0500 Subject: [PATCH 2/2] Fix bug where layout was not visible on the inital add to sidebar.: --- src/lib/Modal/DateConfig.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/Modal/DateConfig.svelte b/src/lib/Modal/DateConfig.svelte index 12c5520d..1d591cf6 100644 --- a/src/lib/Modal/DateConfig.svelte +++ b/src/lib/Modal/DateConfig.svelte @@ -103,7 +103,7 @@ {$lang('month')} - {#if sel?.hide === 'none'} + {#if !sel?.hide || sel?.hide === 'none'}

{$lang('Layout')}