diff --git a/app/components/settings/Settings.tsx b/app/components/settings/Settings.tsx index afe571d..d1adb30 100644 --- a/app/components/settings/Settings.tsx +++ b/app/components/settings/Settings.tsx @@ -15,8 +15,7 @@ import { changeSettings, createAccount, deleteAccount, - getSettings, - sendToDatabase + getSettings } from '../../backend/database'; import ThemeDropdown from './DropDownTheme'; @@ -300,13 +299,11 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( }; useEffect(() => { - const useName = localStorage.getItem("accountName"); - const usePassword = localStorage.getItem("accountPassword"); - + let useName = localStorage.getItem("accountName") + let usePassword = localStorage.getItem("accountPassword") if (useName && usePassword) { - importDatabase(useName, usePassword); + importDatabase(useName, usePassword) } - const savedTheme = localStorage.getItem('selectedTheme'); if (savedTheme) { setSelectedTheme(savedTheme); @@ -314,27 +311,10 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( } }, []); // Runs only once when the component mounts - const importDatabase = async (useName: string, usePassword: string) => { - const databaseSettings = await getSettings(useName, usePassword); - - // Ensure user settings exist before flattening and storing - if (typeof databaseSettings == 'object' && databaseSettings) { - JSON.stringify(importSettings(databaseSettings), null, 2); // Pass only the current user's settings - } else { - console.error('Database settings are not in the expected format.'); - } + const importDatabase = async (useName : string, usePassword : string) => { + const databaseSettings = await getSettings(useName, usePassword) + importSettings(databaseSettings) } - - const sendToDatabase = async () => { - let useName = localStorage.getItem("accountName") - let usePassword = localStorage.getItem("accountPassword") - if (useName && usePassword) { - if (await changeSettings(useName, usePassword, JSON.parse(exportSettings()))) { - alert('Data has been transferred') - } - } - }; - // Effect hooks to update localStorage whenever any state changes useEffect(() => { // Flatten nested objects @@ -385,7 +365,7 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( } if (await createAccount(useName, useEmail, usePassword)) { - if (await changeSettings(useName, usePassword, settings)) { + if (await changeSettings(useName, usePassword, handleExport)) { localStorage.setItem("currentName", useName) localStorage.setItem("currentPassword", usePassword) localStorage.setItem("currentEmail", useEmail) @@ -794,7 +774,6 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (