diff --git a/src/components/Notes/NoteCard.test.ts b/src/components/Notes/NoteCard.test.ts index 87d9012..77e7513 100644 --- a/src/components/Notes/NoteCard.test.ts +++ b/src/components/Notes/NoteCard.test.ts @@ -20,6 +20,14 @@ vi.mock('@nextcloud/vue/components/NcActionButton', () => ({ template: '', }, })) +vi.mock('@nextcloud/vue/components/NcCheckboxRadioSwitch', () => ({ + default: { + name: 'NcCheckboxRadioSwitch', + template: + '', + props: ['modelValue'], + }, +})) vi.mock('@nextcloud/vue/components/NcRichText', () => ({ default: { name: 'NcRichText', diff --git a/src/components/Notes/NoteCard.vue b/src/components/Notes/NoteCard.vue index 2407a15..112b552 100644 --- a/src/components/Notes/NoteCard.vue +++ b/src/components/Notes/NoteCard.vue @@ -1,7 +1,7 @@ + + + +

{{ bulkDeleteBody }}

+ +
@@ -375,6 +447,21 @@ const strings = { padding: 2rem; } +.pantry-selection-bar { + display: flex; + align-items: center; + gap: 0.75rem; + padding: 0.5rem 1rem; + margin: 0 1rem 0.75rem; + background: var(--color-primary-element-light); + border-radius: var(--border-radius-large, 12px); + font-weight: 500; + + span:first-child { + flex: 1; + } +} + .pantry-sort-active { font-weight: 600; } diff --git a/src/views/PhotosView.vue b/src/views/PhotosView.vue index 6260df5..a9f7792 100644 --- a/src/views/PhotosView.vue +++ b/src/views/PhotosView.vue @@ -59,6 +59,20 @@

{{ strings.dropToUpload }}

+ +
+ {{ photoSelectionLabel }} + + + {{ strings.moveToFolder }} + + + + {{ strings.delete }} + + {{ strings.clearSelection }} +
+
@@ -124,12 +138,14 @@ :photo="item.photo" :house-id="houseIdNum" :reorder-enabled="isCustomSort" + :selected="selectedPhotoIds.has(item.photo.id)" @preview="openPreview" @edit="startEditPhoto" @delete="confirmDeletePhoto" @move-to-root="movePhotoToRoot" @drag-start="onPhotoDragStart" @reorder-over="(id, e) => onReorderOver(id, rootPhotos, e)" + @select="togglePhotoSelection" /> @@ -169,12 +185,14 @@ :photo="item.photo" :house-id="houseIdNum" :reorder-enabled="isCustomSort" + :selected="selectedPhotoIds.has(item.photo.id)" @preview="openPreview" @edit="startEditPhoto" @delete="confirmDeletePhoto" @move-to-root="movePhotoToRoot" @drag-start="onPhotoDragStart" @reorder-over="(id, e) => onReorderOver(id, activeFolderPhotos, e)" + @select="togglePhotoSelection" /> @@ -293,13 +311,66 @@ + + + +

{{ bulkDeletePhotosBody }}

+ +
+ + + +
+ + + {{ strings.board }} + + + + {{ f.name }} + + + + {{ strings.newFolder }} + +
+
+ + + @@ -868,6 +1015,28 @@ const strings = { pointer-events: none; } +.pantry-selection-bar { + display: flex; + align-items: center; + gap: 0.75rem; + padding: 0.5rem 1rem; + margin: 0 1rem 0.75rem; + background: var(--color-primary-element-light); + border-radius: var(--border-radius-large, 12px); + font-weight: 500; + + span:first-child { + flex: 1; + } +} + +.pantry-move-folder-list { + display: flex; + flex-direction: column; + gap: 0.25rem; + padding: 0.5rem 0; +} + .pantry-sort-active { font-weight: 600; }