diff --git a/frontend/package.json b/frontend/package.json index 6e8d8e6..af29561 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -14,7 +14,6 @@ }, "lint-staged": { "**/*.{js,jsx,ts,tsx}": [ - "npm run lint-fix", "npm run format" ] }, diff --git a/frontend/src/Navigation.tsx b/frontend/src/Navigation.tsx index a13b37a..e669ea2 100644 --- a/frontend/src/Navigation.tsx +++ b/frontend/src/Navigation.tsx @@ -19,8 +19,8 @@ import SettingGearDark from './assets/settingGear-dark.svg'; import Add from './assets/add.svg'; import UploadIcon from './assets/upload.svg'; import { ActiveState } from './models/misc'; -import Trash from '../src/assets/trash.svg'; import APIKeyModal from './preferences/APIKeyModal'; +import DeleteConvModal from './preferences/DeleteConvModal'; import { selectApiKeyStatus, @@ -31,6 +31,7 @@ import { selectConversations, setConversations, selectConversationId, + selectModalState, } from './preferences/preferenceSlice'; import { setConversation, @@ -43,7 +44,6 @@ import SelectDocsModal from './preferences/SelectDocsModal'; import ConversationTile from './conversation/ConversationTile'; import { useDarkTheme } from './hooks'; import SourceDropdown from './components/SourceDropdown'; -import DeleteConvModal from './preferences/DeleteConvModal'; interface NavigationProps { navOpen: boolean; @@ -69,7 +69,9 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) { const docs = useSelector(selectSourceDocs); const selectedDocs = useSelector(selectSelectedDocs); const conversations = useSelector(selectConversations); + const modalState = useSelector(selectModalState); const conversationId = useSelector(selectConversationId); + const { isMobile } = useMediaQuery(); const [isDarkTheme] = useDarkTheme(); const [isDocsListOpen, setIsDocsListOpen] = useState(false); @@ -98,18 +100,24 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) { fetchConversations(); } }, [conversations, dispatch]); + + useEffect(() => { + console.log(modalState); + }, [modalState]); + async function fetchConversations() { return await getConversations() .then((fetchedConversations) => { dispatch(setConversations(fetchedConversations)); + console.log(conversations); }) .catch((error) => { console.error('Failed to fetch conversations: ', error); }); } - const handleDeleteConversation = (id: string) => { - fetch(`${apiHost}/api/delete_conversation?id=${id}`, { + const handleDeleteAllConversations = () => { + fetch(`${apiHost}/api/delete_all_conversations`, { method: 'POST', }) .then(() => { @@ -118,8 +126,8 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) { .catch((error) => console.error(error)); }; - const handleDeleteAllConversations = () => { - fetch(`${apiHost}/api/delete_all_conversations`, { + const handleDeleteConversation = (id: string) => { + fetch(`${apiHost}/api/delete_conversation?id=${id}`, { method: 'POST', }) .then(() => { @@ -278,17 +286,6 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
Chats
- setDeleteConvState('ACTIVE')} - />+ Delete all conversations +
+ +