From aa780ec2787a6dba87d8c7c16f7153297822a4b6 Mon Sep 17 00:00:00 2001 From: Morgan Date: Tue, 13 Feb 2024 11:33:18 +0900 Subject: [PATCH] Fix --- src/lib/Sidebar.svelte | 45 +++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/src/lib/Sidebar.svelte b/src/lib/Sidebar.svelte index 761909a..bd993c7 100644 --- a/src/lib/Sidebar.svelte +++ b/src/lib/Sidebar.svelte @@ -3,14 +3,15 @@ import ChatMenuItem from './ChatMenuItem.svelte' import { chatsStorage, pinMainMenu, checkStateChange, getChatSortOption, setChatSortOption } from './Storage.svelte' import Fa from 'svelte-fa/src/fa.svelte' - import { faSquarePlus, faKey, faDownload, faUpload } from '@fortawesome/free-solid-svg-icons/index' + import { faSquarePlus, faKey, faDownload, faRotate, faUpload } from '@fortawesome/free-solid-svg-icons/index' import ChatOptionMenu from './ChatOptionMenu.svelte' import logo from '../assets/logo.svg' import { clickOutside } from 'svelte-use-click-outside' import { startNewChatWithWarning } from './Util.svelte' import { chatSortOptions } from './Settings.svelte' import { hasActiveModels } from './Models.svelte' - + import { onMount } from 'svelte'; + $: sortedChats = $chatsStorage.sort(getChatSortOption().sortFn) $: activeChatId = $params && $params.chatId ? parseInt($params.chatId) : undefined @@ -36,7 +37,7 @@ storageObject[key] = localStorage.getItem(key); } } - const response = await fetch('https://api.morgan.kr/localstore', { + const response = await fetch('https://api.morgan.kr/localstore/19492', { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -50,7 +51,7 @@ const data = await response.json(); console.log(data) - alert("Uploaded LocalStorage: " + data.id); + alert("Uploaded savedata."); return data.id; } catch (error) { @@ -59,19 +60,9 @@ } } - async function fetchLocalStorage(id){ + async function fetchLocalStorage(){ try { - const id = prompt("RemoteStorage ID?"); - - if(id === null || id.trim() === "") { - alert("No ID provided. Fetching aborted."); - return; - } - - let currentStorageId = await uploadLocalStorage(); - alert('Backuped LocalStorage: ' + currentStorageId); - - const response = await fetch(`https://api.morgan.kr/localstore/${id}`, { + const response = await fetch('https://api.morgan.kr/localstore/19492', { method: 'GET', }); if (!response.ok) { @@ -84,15 +75,24 @@ Object.entries(newData).forEach(([key, value]) => { localStorage.setItem(key, value); }); - alert('Fetched RemoteStorage'); + alert('Fetched savedata'); window.reload(); } catch (error) { - console.error('Error fetching new localStorage:', error); + console.error('Error fetching localStorage:', error); } } + async function syncLocalStorage(){ + uploadLocalStorage(); + } + + onMount(() => { + console.log('Downloading from server.'); + fetchLocalStorage(); + }); +