From b01f9e8ec343fdc85b0252b0448f90d1e82547c5 Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Tue, 15 Oct 2024 00:35:14 -0700 Subject: [PATCH] refac: folder --- src/lib/components/common/Collapsible.svelte | 5 ++ src/lib/components/common/Folder.svelte | 56 ++++++++++++ src/lib/components/layout/Sidebar.svelte | 90 ++++++++----------- .../components/layout/Sidebar/ChatItem.svelte | 9 +- .../layout/Sidebar/SearchInput.svelte | 4 - 5 files changed, 101 insertions(+), 63 deletions(-) create mode 100644 src/lib/components/common/Folder.svelte diff --git a/src/lib/components/common/Collapsible.svelte b/src/lib/components/common/Collapsible.svelte index fea21151f..6a9d1ff19 100644 --- a/src/lib/components/common/Collapsible.svelte +++ b/src/lib/components/common/Collapsible.svelte @@ -1,4 +1,9 @@ + +
+ { + dispatch('change', e.detail); + }} + > + +
{ + e.stopPropagation(); + }} + on:drop={(e) => { + console.log('Dropped on the Button'); + }} + on:dragleave={(e) => {}} + > + +
+ +
+ +
+
+
diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte index cfe5b9976..8372d77b1 100644 --- a/src/lib/components/layout/Sidebar.svelte +++ b/src/lib/components/layout/Sidebar.svelte @@ -53,6 +53,7 @@ import ChevronUp from '../icons/ChevronUp.svelte'; import ChevronRight from '../icons/ChevronRight.svelte'; import Collapsible from '../common/Collapsible.svelte'; + import Folder from '../common/Folder.svelte'; const BREAKPOINT = 768; @@ -517,61 +518,42 @@ {#if !search && $pinnedChats.length > 0}
-
- -
- -
- -
-
- {#each $pinnedChats as chat, idx} - { - selectedChatId = chat.id; - }} - on:unselect={() => { - selectedChatId = null; - }} - on:delete={(e) => { - if ((e?.detail ?? '') === 'shift') { - deleteChatHandler(chat.id); - } else { - deleteChat = chat; - showDeleteConfirm = true; - } - }} - on:tag={(e) => { - const { type, name } = e.detail; - tagEventHandler(type, name, chat.id); - }} - /> - {/each} -
-
-
-
+ on:unselect={() => { + selectedChatId = null; + }} + on:delete={(e) => { + if ((e?.detail ?? '') === 'shift') { + deleteChatHandler(chat.id); + } else { + deleteChat = chat; + showDeleteConfirm = true; + } + }} + on:tag={(e) => { + const { type, name } = e.detail; + tagEventHandler(type, name, chat.id); + }} + /> + {/each} +
+ {/if} diff --git a/src/lib/components/layout/Sidebar/ChatItem.svelte b/src/lib/components/layout/Sidebar/ChatItem.svelte index bebc63785..7682dd3c5 100644 --- a/src/lib/components/layout/Sidebar/ChatItem.svelte +++ b/src/lib/components/layout/Sidebar/ChatItem.svelte @@ -98,10 +98,10 @@ let y = 0; const dragImage = new Image(); - dragImage.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs='; + dragImage.src = + 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII='; const onDragStart = (event) => { - console.log('Dragging started:', event.target); event.dataTransfer.setDragImage(dragImage, 0, 0); drag = true; @@ -114,7 +114,6 @@ }; const onDragEnd = (event) => { - console.log('Dragging ended:', event.target); drag = false; itemElement.style.opacity = '1'; // Reset visual cue after drag }; @@ -143,9 +142,9 @@ {#if drag && x && y} -
+
-
+
{chat.title}
diff --git a/src/lib/components/layout/Sidebar/SearchInput.svelte b/src/lib/components/layout/Sidebar/SearchInput.svelte index 04af4109d..5e8213308 100644 --- a/src/lib/components/layout/Sidebar/SearchInput.svelte +++ b/src/lib/components/layout/Sidebar/SearchInput.svelte @@ -51,10 +51,6 @@ const chatSearch = document.getElementById('chat-search'); if (!searchContainer.contains(e.target) && !chatSearch.contains(e.target)) { - console.log( - e.target.id, - e.target.id.startsWith('search-tag-') || e.target.id.startsWith('search-option-') - ); if (e.target.id.startsWith('search-tag-') || e.target.id.startsWith('search-option-')) { return; }