diff --git a/app/components/Login.tsx b/app/components/Login.tsx index 69b57d8..f98ffb4 100644 --- a/app/components/Login.tsx +++ b/app/components/Login.tsx @@ -55,7 +55,7 @@ const Login: React.FC = () => { const success = await checkCredentials(accountName, password); if (success) { setIsLoggedIn(true); // Successful login - var data = await getData(accountName, password) + const data = await getData(accountName, password) if (data) { localStorage.setItem("dataFromServer", data) } @@ -86,7 +86,7 @@ const Login: React.FC = () => {
{/* Login or Settings Button */} {/* Conditional rendering of the Login Popup */} @@ -131,7 +131,7 @@ const Login: React.FC = () => { {/* Text for creating an account */}

- Don't have an account yet? Create one{' '} + Don't have an account yet? Create one{' '} { const [radioSelection, setRadioSelection] = useState("") const [activeSelectedAIFunction, setActiveSelectedAIFunction] = useState(''); const [currentSelectedAIFunction, setCurrentSelectedAIFunction] = useState(""); - const [isOpenSourceMode, setIsOpenSourceMode] = useState(localStorage.getItem('openSourceMode') || "false") + const [isOpenSourceMode] = useState(localStorage.getItem('openSourceMode') || "false") useEffect(() => { - var temp = localStorage.getItem("activeSelectedAIFunction") || "" + const temp = localStorage.getItem("activeSelectedAIFunction") || "" setActiveSelectedAIFunction(temp) if (!localStorage.getItem('selectedModelDropdown')) { localStorage.setItem("selectedModelDropdown", "Offline Fast") @@ -215,7 +215,7 @@ const ModelSection: React.FC = () => { }, []); // Dependency array can remain empty if you only want this to run on mount useEffect(() => { - var storedActiveSelectedAIFunction = localStorage.getItem("activeSelectedAIFunction") || ""; + const storedActiveSelectedAIFunction = localStorage.getItem("activeSelectedAIFunction") || ""; if (storedActiveSelectedAIFunction !== currentSelectedAIFunction) { setCurrentSelectedAIFunction(storedActiveSelectedAIFunction); } @@ -225,7 +225,7 @@ const ModelSection: React.FC = () => { const newModel = event.target.value; setSelectedModelDropdown(newModel); localStorage.setItem('selectedModelDropdown', newModel); // Update localStorage directly - var model = localStorage.getItem('activeSelectedAIFunction') || "Code" + const model = localStorage.getItem('activeSelectedAIFunction') || "Code" modelClicked(model) }; @@ -287,7 +287,7 @@ const ModelSection: React.FC = () => { const modelClicked = (model: string) => { localStorage.setItem('activeSelectedAIFunction', model) setActiveSelectedAIFunction(model) - var modelDropdown = localStorage.getItem('selectedModelDropdown') || 'Offline Fast' + const modelDropdown = localStorage.getItem('selectedModelDropdown') || 'Offline Fast' const selectedAIFunction = modelDropdown as keyof typeof modelList; localStorage.setItem("model", modelList[selectedAIFunction][model as keyof typeof modelList[typeof selectedAIFunction]]) localStorage.setItem("type", modelList[selectedAIFunction]['model_type' as keyof typeof modelList[typeof selectedAIFunction]]) diff --git a/app/components/settings/ButtonSettings.tsx b/app/components/settings/ButtonSettings.tsx index 3724a15..c0372d3 100644 --- a/app/components/settings/ButtonSettings.tsx +++ b/app/components/settings/ButtonSettings.tsx @@ -6,12 +6,12 @@ interface ButtonSettingProps { className?: string; // Optional additional classes for styling } -const ButtonSetting: React.FC = ({ label, onClick, className }) => { +const ButtonSetting: React.FC = ({ label, onClick }) => { return (

- diff --git a/app/components/settings/DropDownTheme.tsx b/app/components/settings/DropDownTheme.tsx index c816129..8609d9b 100644 --- a/app/components/settings/DropDownTheme.tsx +++ b/app/components/settings/DropDownTheme.tsx @@ -1,41 +1,40 @@ - // ThemeDropdown.tsx - import React from 'react'; - import { applyTheme, applyCustomTheme } from './theme'; +// ThemeDropdown.tsx +import React from 'react'; - const ThemeDropdown: React.FC<{ - selectedTheme: string; - setSelectedTheme: (theme: string) => void; - }> = ({ selectedTheme, setSelectedTheme }) => { - const themeOptions = [ - { value: 'IOMARKET', label: 'IOMARKET' }, - { value: 'WHITE', label: 'WHITE' }, - { value: 'BLACK', label: 'BLACK' }, - { value: 'BASIC-CUSTOM', label: 'BASIC-CUSTOM' }, - { value: 'CUSTOM', label: 'CUSTOM' }, - ]; +const ThemeDropdown: React.FC<{ + selectedTheme: string; + setSelectedTheme: (theme: string) => void; +}> = ({ selectedTheme, setSelectedTheme }) => { + const themeOptions = [ + { value: 'IOMARKET', label: 'IOMARKET' }, + { value: 'WHITE', label: 'WHITE' }, + { value: 'BLACK', label: 'BLACK' }, + { value: 'BASIC-CUSTOM', label: 'BASIC-CUSTOM' }, + { value: 'CUSTOM', label: 'CUSTOM' }, + ]; - return ( -
-

Select Theme

- -
- ); - }; + return ( +
+

Select Theme

+ +
+ ); +}; - export default ThemeDropdown; +export default ThemeDropdown; diff --git a/app/components/settings/Settings.tsx b/app/components/settings/Settings.tsx index ad1c21e..092bdfb 100644 --- a/app/components/settings/Settings.tsx +++ b/app/components/settings/Settings.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { applyTheme, applyCustomTheme } from './theme'; +import { applyTheme } from './theme'; import { exportSettings, importSettings } from './settingUtils'; // Import utility functions import { getAllLocalStorageItems } from '../../backend/GetLocalStorage'; import ColorSetting from './ColorSettings'; @@ -14,7 +14,6 @@ import { changeData, createAccount, deleteAccount, - getData, } from '../../backend/database'; import ThemeDropdown from './DropDownTheme'; @@ -35,12 +34,6 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( return false; // Default to false if item is null or empty }; - interface SettingsProps { - closeSettings: () => void; - accountName: string; - handleLogout: () => void; // Add this line to accept handleLogout as a prop - } - // Active section const [activeSection, setActiveSection] = useState(() => localStorage.getItem('activeSection') || 'general'); @@ -65,7 +58,6 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( const [newName, setNewName] = useState(() => localStorage.getItem('newName') || ''); const [newEmail, setNewEmail] = useState(() => localStorage.getItem('newEmail') || ''); const [newPassword, setNewPassword] = useState(() => localStorage.getItem('newPassword') || ''); - const [currentPassword, setCurrentPassword] = useState(''); // Measurement setting const [preferredMeasurement, setPreferredMeasurement] = useState(() => localStorage.getItem('preferredMeasurement') || 'Metric'); @@ -91,7 +83,7 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( const [inputBorderColor, setInputBorderColor] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--input-border-color').trim()); const [fontFamily, setFontFamily] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--font-family').trim()); const [fontSize, setFontSize] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--font-size').trim()); - const [burgerMenu, setBurgerMenu] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--burger-menu-background-color').trim()); + const [burgerMenu] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--burger-menu-background-color').trim()); const [burgerMenuBackgroundColor, setBurgerMenuBackgroundColor] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--burger-menu-background-color').trim()); const [faqBackgroundColor, setFaqBackgroundColor] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--faq-background-color').trim()); const [faqHeadingColor, setFaqHeadingColor] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--faq-heading-color').trim()); @@ -122,7 +114,7 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( const [openai, setOpenai] = useState(localStorage.getItem('openai') || ""); const [anthropic, setAnthropic] = useState(localStorage.getItem('anthropic') || ""); const [google, setGoogle] = useState(localStorage.getItem('google') || ""); - const [myBoolean, setMyBoolean] = useState(() => getItemFromLocalStorage('myBoolean')); + const [myBoolean, setMyBoolean] = useState(() => getItemFromLocalStorage('myBoolean')); const settings = { userPreferences: { @@ -344,9 +336,9 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( // Function to handle updating all credentials const handleUpdateCredentials = async () => { - var useName = localStorage.getItem("accountName") - var useEmail = localStorage.getItem("accountEmail") - var usePassword = localStorage.getItem("accountPassword") + let useName = localStorage.getItem("accountName") + let useEmail = localStorage.getItem("accountEmail") + let usePassword = localStorage.getItem("accountPassword") if (useName && useEmail && usePassword) { await deleteAccount(useName, usePassword) @@ -372,8 +364,8 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( // Function to handle account deletion const handleDeleteAccount = async () => { - var useName = localStorage.getItem("accountName") - var usePassword = localStorage.getItem("accountPassword") + const useName = localStorage.getItem("accountName") + const usePassword = localStorage.getItem("accountPassword") if (useName && usePassword) { const success = await deleteAccount(useName, usePassword); if (success) { diff --git a/app/components/settings/settingUtils.ts b/app/components/settings/settingUtils.ts index 435ed0d..6ac1148 100644 --- a/app/components/settings/settingUtils.ts +++ b/app/components/settings/settingUtils.ts @@ -2,14 +2,14 @@ // Method to export localStorage to a JSON object export function exportSettings(): string { - const settings: { [key: string]: any } = {}; + const settings: { [key: string]: string } = {}; // Loop through all keys in localStorage and add them to the settings object for (let i = 0; i < localStorage.length; i++) { const key = localStorage.key(i); if (key) { if (key !== "accountName" && key !== "accountPassword" && key !== "accountEmail") { - settings[key] = localStorage.getItem(key); + settings[key] = localStorage.getItem(key) || ""; } } } diff --git a/app/page.tsx b/app/page.tsx index c7b295c..fd0c0ce 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -41,13 +41,10 @@ const LandingPage: React.FC = () => { } }; - const [selectedTheme, setSelectedTheme] = useState(''); - // Apply theme based on selectedTheme and color settings useEffect(() => { const savedTheme = localStorage.getItem('selectedTheme'); if (savedTheme) { - setSelectedTheme(savedTheme); switch (savedTheme) { case 'IOMARKET': applyIOMarketTheme(); @@ -107,4 +104,3 @@ const LandingPage: React.FC = () => { }; export default LandingPage; - \ No newline at end of file