Merge branch 'main' into main
This commit is contained in:
commit
d657525f79
9 changed files with 383 additions and 78 deletions
|
|
@ -1,8 +1,11 @@
|
|||
import React, { useState, useEffect } from 'react';
|
||||
import {
|
||||
createAccount,
|
||||
checkCredentials,
|
||||
} from '../backend/database';
|
||||
import Settings from './Settings'; // Import the Settings component
|
||||
|
||||
const Login: React.FC = () => {
|
||||
|
||||
// State to handle popup visibility
|
||||
const [showLoginPopup, setShowLoginPopup] = useState(false);
|
||||
const [showSignUpPopup, setShowSignUpPopup] = useState(false);
|
||||
|
|
@ -28,7 +31,11 @@ const Login: React.FC = () => {
|
|||
setAccountName(savedAccountName);
|
||||
setEmail(savedAccountEmail);
|
||||
setPassword(savedAccountPassword);
|
||||
setIsLoggedIn(true); // Automatically log in
|
||||
const check = async () => {
|
||||
const success = await checkCredentials(savedAccountName, savedAccountPassword);
|
||||
setIsLoggedIn(success); // Automatically log in
|
||||
};
|
||||
check();
|
||||
}
|
||||
}, []);
|
||||
|
||||
|
|
@ -42,33 +49,40 @@ const Login: React.FC = () => {
|
|||
};
|
||||
|
||||
// Function to handle login
|
||||
const handleLogin = () => {
|
||||
const handleLogin = async () => {
|
||||
const savedAccountEmail = localStorage.getItem('accountEmail');
|
||||
const savedAccountPassword = localStorage.getItem('accountPassword');
|
||||
const savedAccountName = localStorage.getItem('accountName');
|
||||
|
||||
if (
|
||||
(email === savedAccountEmail || accountName === savedAccountName) &&
|
||||
password === savedAccountPassword
|
||||
) {
|
||||
setIsLoggedIn(true); // Successful login
|
||||
setShowLoginPopup(false); // Close the login popup
|
||||
// Save credentials to localStorage (optional in case of changes)
|
||||
localStorage.setItem('accountName', savedAccountName || accountName);
|
||||
localStorage.setItem('accountEmail', savedAccountEmail || email);
|
||||
localStorage.setItem('accountPassword', savedAccountPassword || password);
|
||||
// Check if savedAccountName or savedAccountEmail is not null before passing to checkCredentials
|
||||
const accountIdentifier = savedAccountName || savedAccountEmail;
|
||||
|
||||
if (accountIdentifier && password === savedAccountPassword) {
|
||||
const success = await checkCredentials(accountIdentifier, password);
|
||||
if (success) {
|
||||
setIsLoggedIn(true); // Successful login
|
||||
setShowLoginPopup(false); // Close the login popup
|
||||
// Save credentials to localStorage (optional in case of changes)
|
||||
localStorage.setItem('accountName', savedAccountName || accountName);
|
||||
localStorage.setItem('accountEmail', savedAccountEmail || email);
|
||||
localStorage.setItem('accountPassword', savedAccountPassword || password);
|
||||
} else {
|
||||
alert('Incorrect credentials');
|
||||
}
|
||||
} else {
|
||||
alert('Incorrect credentials');
|
||||
}
|
||||
};
|
||||
|
||||
// Function to handle account creation
|
||||
const handleCreateAccount = () => {
|
||||
localStorage.setItem('accountName', newAccountName);
|
||||
localStorage.setItem('accountEmail', newAccountEmail);
|
||||
localStorage.setItem('accountPassword', newAccountPassword);
|
||||
alert('Account created successfully! You can now log in.');
|
||||
toggleSignUpPopup(); // Close sign-up popup
|
||||
const handleCreateAccount = async () => {
|
||||
const success = await createAccount(newAccountName, newAccountEmail, newAccountPassword);
|
||||
if (success) {
|
||||
alert('Account created successfully! You can now log in.');
|
||||
toggleSignUpPopup(); // Close sign-up popup
|
||||
} else {
|
||||
alert('Account creation failed. Please try again.');
|
||||
}
|
||||
};
|
||||
|
||||
// Function to toggle the settings popup
|
||||
|
|
|
|||
|
|
@ -1,7 +1,143 @@
|
|||
"use client";
|
||||
import React, { useState, useEffect } from 'react';
|
||||
|
||||
// Define the available model options
|
||||
// Define all models that should be available.
|
||||
const modelList = {
|
||||
'Offline Fast': {
|
||||
'model_type': 'local',
|
||||
'Math': 'qwen2-math:1.5b',
|
||||
'Code': 'starcoder2',
|
||||
'Language': 'llama3.2',
|
||||
'Character': 'dolphin-phi',
|
||||
'Finance': 'qwen2-math:1.5b',
|
||||
'Weather': 'llama3.2',
|
||||
'Time': 'llama3.2',
|
||||
'Image': 'llava-phi3'
|
||||
},
|
||||
'Offline Slow': {
|
||||
'model_type': 'local',
|
||||
'Math': 'wizard-math',
|
||||
'Code': 'starcoder2:7b',
|
||||
'Language': 'llama3.1',
|
||||
'Character': 'dolphin-llama3',
|
||||
'Finance': 'wizard-math',
|
||||
'Weather': 'llama3.1',
|
||||
'Time': 'llama3.1',
|
||||
'Image': 'llava'
|
||||
},
|
||||
'Offline Fast (FOSS)': {
|
||||
'model_type': 'local',
|
||||
'Math': 'qwen2-math:1.5b',
|
||||
'Code': 'qwen2.5-coder:1.5b',
|
||||
'Language': 'phi3.5',
|
||||
'Character': 'dolphin-mistral',
|
||||
'Finance': 'qwen2-math:1.5b',
|
||||
'Weather': 'phi3.5',
|
||||
'Time': 'phi3.5',
|
||||
'Image': 'llava'
|
||||
},
|
||||
'Offline Slow (FOSS)': {
|
||||
'model_type': 'local',
|
||||
'Math': 'mathstral',
|
||||
'Code': 'qwen2.5-coder',
|
||||
'Language': 'qwen2.5',
|
||||
'Character': 'dolphin-mistral',
|
||||
'Finance': 'mathstral',
|
||||
'Weather': 'qwen2.5',
|
||||
'Time': 'qwen2.5',
|
||||
'Image': 'llava'
|
||||
},
|
||||
'Online Cheap (OpenAI)': {
|
||||
'model_type': 'openai',
|
||||
'Math': 'gpt-4o-mini',
|
||||
'Code': 'gpt-4o-mini',
|
||||
'Language': 'gpt-4o-mini',
|
||||
'Character': 'gpt-4o-mini',
|
||||
'Finance': 'gpt-4o-mini',
|
||||
'Weather': 'gpt-4o-mini',
|
||||
'Time': 'gpt-4o-mini',
|
||||
'Image': 'gpt-4o-mini'
|
||||
},
|
||||
'Online Expensive (OpenAI)': {
|
||||
'model_type': 'openai',
|
||||
'Math': 'gpt-4o',
|
||||
'Code': 'gpt-4o',
|
||||
'Language': 'gpt-4o',
|
||||
'Character': 'gpt-4o',
|
||||
'Finance': 'gpt-4o',
|
||||
'Weather': 'gpt-4o',
|
||||
'Time': 'gpt-4o',
|
||||
'Image': 'gpt-4o'
|
||||
},
|
||||
'Online Cheap (Anthropic)': {
|
||||
'model_type': 'anthropic',
|
||||
'Math': 'claude-3-haiku',
|
||||
'Code': 'claude-3-haiku',
|
||||
'Language': 'claude-3-haiku',
|
||||
'Character': 'claude-3-haiku',
|
||||
'Finance': 'claude-3-haiku',
|
||||
'Weather': 'claude-3-haiku',
|
||||
'Time': 'claude-3-haiku',
|
||||
'Image': 'claude-3-haiku'
|
||||
},
|
||||
'Online Expensive (Anthropic)': {
|
||||
'model_type': 'anthropic',
|
||||
'Math': 'claude-3-5-sonnet',
|
||||
'Code': 'claude-3-5-sonnet',
|
||||
'Language': 'claude-3-5-sonnet',
|
||||
'Character': 'claude-3-5-sonnet',
|
||||
'Finance': 'claude-3-5-sonnet',
|
||||
'Weather': 'claude-3-5-sonnet',
|
||||
'Time': 'claude-3-5-sonnet',
|
||||
'Image': 'claude-3-5-sonnet'
|
||||
},
|
||||
'Online Cheap (Google)': {
|
||||
'model_type': 'google',
|
||||
'Math': 'gemini-1.5-flash-latest',
|
||||
'Code': 'gemini-1.5-flash-latest',
|
||||
'Language': 'gemini-1.5-flash-latest',
|
||||
'Character': 'gemini-1.5-flash-latest',
|
||||
'Finance': 'gemini-1.5-flash-latest',
|
||||
'Weather': 'gemini-1.5-flash-latest',
|
||||
'Time': 'gemini-1.5-flash-latest',
|
||||
'Image': 'gemini-1.5-flash-latest'
|
||||
},
|
||||
'Online Expensive (Google)': {
|
||||
'model_type': 'google',
|
||||
'Math': 'gemini-1.5-pro-latest',
|
||||
'Code': 'gemini-1.5-pro-latest',
|
||||
'Language': 'gemini-1.5-pro-latest',
|
||||
'Character': 'gemini-1.5-pro-latest',
|
||||
'Finance': 'gemini-1.5-pro-latest',
|
||||
'Weather': 'gemini-1.5-pro-latest',
|
||||
'Time': 'gemini-1.5-pro-latest',
|
||||
'Image': 'gemini-1.5-pro-latest'
|
||||
},
|
||||
'Online (La Plateforme)': {
|
||||
'model_type': 'mistral',
|
||||
'Math': 'open-mistral-nemo',
|
||||
'Code': 'codestral-latest',
|
||||
'Language': 'mistral-small-latest',
|
||||
'Character': 'mistral-large-latest',
|
||||
'Finance': 'open-mistral-nemo',
|
||||
'Weather': 'mistral-small-latest',
|
||||
'Time': 'mistral-small-latest',
|
||||
'Image': 'pixtral-12b-2409'
|
||||
},
|
||||
'Online (FOSS) (La Plateforme)': {
|
||||
'model_type': 'mistral',
|
||||
'Math': 'open-mistral-nemo',
|
||||
'Code': 'open-codestral-mamba',
|
||||
'Language': 'open-mistral-nemo',
|
||||
'Character': 'open-mixtral-8x22b',
|
||||
'Finance': 'open-mixtral-8x22b',
|
||||
'Weather': 'open-mistral-nemo',
|
||||
'Time': 'open-mistral-nemo',
|
||||
'Image': 'pixtral-12b-2409'
|
||||
}
|
||||
}
|
||||
|
||||
// Define the available category options
|
||||
const modelDropdown = {
|
||||
offlineWithoutFoss: ['Offline Fast', 'Offline Slow'],
|
||||
offlineFoss: ['Offline Fast (FOSS)', 'Offline Slow (FOSS)'],
|
||||
|
|
@ -12,6 +148,7 @@ const modelDropdown = {
|
|||
'Online Expensive (Anthropic)',
|
||||
'Online Cheap (Google)',
|
||||
'Online Expensive (Google)',
|
||||
'Online (La Plateforme)'
|
||||
],
|
||||
onlineFoss: ['Online (FOSS) (La Plateforme)'],
|
||||
};
|
||||
|
|
@ -20,7 +157,7 @@ const Models: React.FC = () => {
|
|||
// Initialize state with value from localStorage or default to ''
|
||||
const [selectedModel, setSelectedModel] = useState('');
|
||||
const [radioSelection, setRadioSelection] = useState<string | null>("")
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
setRadioSelection(localStorage.getItem('radioSelection'))
|
||||
const handleStorageChange = () => {
|
||||
|
|
@ -98,6 +235,13 @@ const Models: React.FC = () => {
|
|||
const isOfflineModel = (model: string) =>
|
||||
modelDropdown.offlineWithoutFoss.includes(model) || modelDropdown.offlineFoss.includes(model);
|
||||
|
||||
const modelClicked = (model: string) => {
|
||||
const category = selectedModel as keyof typeof modelList;
|
||||
console.log(model)
|
||||
console.log(category)
|
||||
console.log(modelList[category][model as keyof typeof modelList[typeof category]]);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="model-background">
|
||||
<div className="models">
|
||||
|
|
@ -122,7 +266,7 @@ const Models: React.FC = () => {
|
|||
<div className="grid">
|
||||
{['Code', 'Math', 'Language', 'Character', 'Finance', 'Weather', 'Time', 'Image', 'Custom1', 'Custom2'].map(
|
||||
(category) => (
|
||||
<button key={category} className={`${category.toLowerCase()}-model model-box`}>
|
||||
<button key={category} className={`${category.toLowerCase()}-model model-box`} onClick={() => modelClicked(category)}>
|
||||
<div className="overlay">
|
||||
<h3>{category}</h3>
|
||||
{isOfflineModel(selectedModel) && <img src="/img/nowifi.svg" alt="No Wi-Fi" />}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,15 @@ import React, { useState, useEffect } from 'react';
|
|||
import { applyIOMarketTheme, applyWhiteTheme, applyBlackTheme } from './theme';
|
||||
import { exportSettings, importSettings } from './settingUtils'; // Import utility functions
|
||||
import { getAllLocalStorageItems } from '../backend/GetLocalStorage';
|
||||
import {
|
||||
sendToDatabase,
|
||||
createAccount,
|
||||
changePassword,
|
||||
getData,
|
||||
changeData,
|
||||
checkCredentials,
|
||||
deleteAccount,
|
||||
} from '../backend/database';
|
||||
|
||||
const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ({ closeSettings, accountName }) => {
|
||||
|
||||
|
|
@ -50,6 +59,7 @@ 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');
|
||||
|
|
@ -80,8 +90,8 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
|
|||
const [selectedTheme, setSelectedTheme] = useState(() => localStorage.getItem('selectedTheme') || 'default');
|
||||
|
||||
// API Keys
|
||||
const [laPlateforme, setLaPlateforme] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--online-la-plateforme').trim());
|
||||
const [openAI, setOpenAI] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--online-cheap-openai').trim());
|
||||
const [mistral, setmistral] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--online-la-plateforme').trim());
|
||||
const [openai, setopenai] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--online-cheap-openai').trim());
|
||||
const [anthropic, setAnthropic] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--online-cheap-anthropic').trim());
|
||||
const [google, setGoogle] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--online-cheap-google').trim());
|
||||
|
||||
|
|
@ -132,8 +142,8 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
|
|||
fontSize,
|
||||
burgerMenu,
|
||||
selectedTheme,
|
||||
laPlateforme,
|
||||
openAI,
|
||||
mistral,
|
||||
openai,
|
||||
anthropic,
|
||||
google,
|
||||
};
|
||||
|
|
@ -182,8 +192,8 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
|
|||
fontSize,
|
||||
burgerMenu,
|
||||
selectedTheme,
|
||||
laPlateforme,
|
||||
openAI,
|
||||
mistral,
|
||||
openai,
|
||||
anthropic,
|
||||
google,
|
||||
]);
|
||||
|
|
@ -306,7 +316,41 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
|
|||
}
|
||||
};
|
||||
|
||||
// Function to handle updating all credentials
|
||||
const handleUpdateCredentials = async () => {
|
||||
// Update account information
|
||||
const newData = {
|
||||
name: newName || accountName, // Keep old name if new name is not provided
|
||||
email: newEmail || '', // Optionally use empty string if not provided
|
||||
};
|
||||
|
||||
// First change the data
|
||||
const dataSuccess = await changeData(accountName, currentPassword, newData);
|
||||
|
||||
// Then change the password if a new password is provided
|
||||
const passwordSuccess = newPassword ?
|
||||
await changePassword(accountName, currentPassword, newPassword) :
|
||||
true; // If no new password, treat as success
|
||||
|
||||
if (dataSuccess && passwordSuccess) {
|
||||
alert('Credentials updated successfully!');
|
||||
closeSettings(); // Close settings after updating
|
||||
} else {
|
||||
alert('Failed to update credentials. Please check your current password.');
|
||||
}
|
||||
};
|
||||
|
||||
// Function to handle account deletion
|
||||
const handleDeleteAccount = async () => {
|
||||
const success = await deleteAccount(accountName, currentPassword);
|
||||
if (success) {
|
||||
alert('Account deleted successfully!');
|
||||
closeSettings(); // Close settings after deletion
|
||||
// Optionally, redirect or reset state here
|
||||
} else {
|
||||
alert('Account deletion failed. Please check your password.');
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// Render settings content based on the active section
|
||||
|
|
@ -832,9 +876,9 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
|
|||
);
|
||||
|
||||
|
||||
case 'account':
|
||||
return (
|
||||
<div className="settings-section">
|
||||
case 'account':
|
||||
return (
|
||||
<div className="settings-section">
|
||||
<h2>Account Settings</h2>
|
||||
<div className="settings-option">
|
||||
<label>New Name</label>
|
||||
|
|
@ -860,15 +904,28 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
|
|||
onChange={(e) => setNewPassword(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="settings-option">
|
||||
<label>Current Password</label>
|
||||
<input
|
||||
type="password"
|
||||
value={currentPassword}
|
||||
onChange={(e) => setCurrentPassword(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="settings-option">
|
||||
<button
|
||||
onClick={() => {
|
||||
handleLogout();
|
||||
closeSettings(); // Optionally close settings after logout
|
||||
}}
|
||||
className="logout-button"
|
||||
onClick={handleUpdateCredentials} // Update all credentials
|
||||
className="update-credentials-button"
|
||||
>
|
||||
Logout
|
||||
Update Credentials
|
||||
</button>
|
||||
</div>
|
||||
<div className="settings-option">
|
||||
<button
|
||||
onClick={handleDeleteAccount} // Delete account
|
||||
className="delete-account-button"
|
||||
>
|
||||
Delete Account
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -881,16 +938,16 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
|
|||
<label>La Plateforme</label>
|
||||
<input
|
||||
type="text"
|
||||
value={laPlateforme}
|
||||
onChange={(e) => setLaPlateforme(e.target.value)}
|
||||
value={mistral}
|
||||
onChange={(e) => setmistral(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="settings-option">
|
||||
<label>OpenAI</label>
|
||||
<input
|
||||
type="text"
|
||||
value={openAI}
|
||||
onChange={(e) => setOpenAI(e.target.value)}
|
||||
value={openai}
|
||||
onChange={(e) => setopenai(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="settings-option">
|
||||
|
|
@ -973,8 +1030,8 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
|
|||
openSourceMode,
|
||||
|
||||
// API Keys
|
||||
laPlateforme,
|
||||
openAI,
|
||||
mistral,
|
||||
openai,
|
||||
anthropic,
|
||||
google
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue