diff --git a/src/lib/components/notes/Notes.svelte b/src/lib/components/notes/Notes.svelte index c0d461205f..fa1b6a0253 100644 --- a/src/lib/components/notes/Notes.svelte +++ b/src/lib/components/notes/Notes.svelte @@ -435,36 +435,164 @@ - {#if (items ?? []).length > 0} - {@const notes = groupNotes(items)} + {#if items !== null && total !== null} + {#if (items ?? []).length > 0} + {@const notes = groupNotes(items)} -
-
- {#each Object.keys(notes) as timeRange, idx} -
- {$i18n.t(timeRange)} -
- - {#if displayOption === null} +
+
+ {#each Object.keys(notes) as timeRange, idx}
- {#each notes[timeRange] as note, idx (note.id)} -
- -
-
-
- {note.title} + {$i18n.t(timeRange)} +
+ + {#if displayOption === null} +
+ {#each notes[timeRange] as note, idx (note.id)} +
+ +
+
+
+ {note.title} +
+ +
+
+ {dayjs(note.updated_at / 1000000).fromNow()} +
+ +
+ {$i18n.t('By {{name}}', { + name: capitalizeFirstLetter( + note?.user?.name ?? + note?.user?.email ?? + $i18n.t('Deleted User') + ) + })} +
+ + +
+ { + selectedNote = note; + + downloadHandler(type); + }} + onCopyLink={async () => { + const baseUrl = window.location.origin; + const res = await copyToClipboard( + `${baseUrl}/notes/${note.id}` + ); + + if (res) { + toast.success($i18n.t('Copied link to clipboard')); + } else { + toast.error($i18n.t('Failed to copy link')); + } + }} + onDelete={() => { + selectedNote = note; + showDeleteConfirm = true; + }} + > + + +
+
+
+
+ +
+ {/each} +
+ {:else if displayOption === 'grid'} +
+ {#each notes[timeRange] as note, idx (note.id)} +
+
+ +
+
+
+ {note.title} +
+ +
+ { + selectedNote = note; + + downloadHandler(type); + }} + onCopyLink={async () => { + const baseUrl = window.location.origin; + const res = await copyToClipboard( + `${baseUrl}/notes/${note.id}` + ); + + if (res) { + toast.success($i18n.t('Copied link to clipboard')); + } else { + toast.error($i18n.t('Failed to copy link')); + } + }} + onDelete={() => { + selectedNote = note; + showDeleteConfirm = true; + }} + > + + +
+
+ +
+ {#if note.data?.content?.md} + {note.data?.content?.md} + {:else} + {$i18n.t('No content')} + {/if} +
-
+
{dayjs(note.updated_at / 1000000).fromNow()}
@@ -483,171 +611,55 @@ })}
- -
- { - selectedNote = note; - - downloadHandler(type); - }} - onCopyLink={async () => { - const baseUrl = window.location.origin; - const res = await copyToClipboard( - `${baseUrl}/notes/${note.id}` - ); - - if (res) { - toast.success($i18n.t('Copied link to clipboard')); - } else { - toast.error($i18n.t('Failed to copy link')); - } - }} - onDelete={() => { - selectedNote = note; - showDeleteConfirm = true; - }} - > - - -
-
+
- -
- {/each} -
- {:else if displayOption === 'grid'} -
- {#each notes[timeRange] as note, idx (note.id)} -
-
- -
-
-
{note.title}
- -
- { - selectedNote = note; - - downloadHandler(type); - }} - onCopyLink={async () => { - const baseUrl = window.location.origin; - const res = await copyToClipboard( - `${baseUrl}/notes/${note.id}` - ); - - if (res) { - toast.success($i18n.t('Copied link to clipboard')); - } else { - toast.error($i18n.t('Failed to copy link')); - } - }} - onDelete={() => { - selectedNote = note; - showDeleteConfirm = true; - }} - > - - -
-
- -
- {#if note.data?.content?.md} - {note.data?.content?.md} - {:else} - {$i18n.t('No content')} - {/if} -
-
- -
-
- {dayjs(note.updated_at / 1000000).fromNow()} -
- -
- {$i18n.t('By {{name}}', { - name: capitalizeFirstLetter( - note?.user?.name ?? note?.user?.email ?? $i18n.t('Deleted User') - ) - })} -
- -
-
-
- {/each} -
- {/if} - {/each} + {/each} +
+ {/if} + {/each} - {#if !allItemsLoaded} - { - if (!itemsLoading) { - loadMoreItems(); - } - }} - > -
{ + if (!itemsLoading) { + loadMoreItems(); + } + }} > - -
{$i18n.t('Loading...')}
-
- - {/if} -
-
- {:else} -
-
-
- {$i18n.t('No Notes')} +
+ +
{$i18n.t('Loading...')}
+
+ + {/if}
+
+ {:else} +
+
+
+ {$i18n.t('No Notes')} +
-
- {$i18n.t('Create your first note by clicking on the plus button below.')} +
+ {$i18n.t('Create your first note by clicking on the plus button below.')} +
+ {/if} + {:else} +
+
{/if}
{:else}
- +
{/if}