Compare commits

..

No commits in common. "ac58b57645ffe60d21263ad94ad9dc3ef1024e39" and "015e9a1064170661392a5b8875042085b0abeba9" have entirely different histories.

2 changed files with 38 additions and 51 deletions

View file

@ -47,13 +47,10 @@ const Login: React.FC = () => {
const savedAccountPassword = localStorage.getItem('accountPassword');
const savedAccountName = localStorage.getItem('accountName');
if (
(email === savedAccountEmail || accountName === savedAccountName) &&
password === savedAccountPassword
) {
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)
// Save credentials to localStorage
localStorage.setItem('accountName', savedAccountName || accountName);
localStorage.setItem('accountEmail', savedAccountEmail || email);
localStorage.setItem('accountPassword', savedAccountPassword || password);
@ -78,7 +75,7 @@ const Login: React.FC = () => {
<div>
{/* Login or Settings Button */}
<button className='header-login-button' onClick={isLoggedIn ? toggleSettingsPopup : toggleLoginPopup}>
{isLoggedIn ? <img src="" alt="Settings" /> : 'Log In'}
{isLoggedIn ? 'Settings' : 'Log In'}
</button>
{/* Conditional rendering of the Login Popup */}
@ -97,12 +94,8 @@ const Login: React.FC = () => {
<input
type="text"
placeholder="Name or Email"
value={email || accountName} // Display whichever is set
onChange={(e) => {
const input = e.target.value;
setEmail(input); // Update both email and accountName states
setAccountName(input);
}}
value={email}
onChange={(e) => setEmail(e.target.value)}
/>
</div>

View file

@ -35,7 +35,7 @@ const Models: React.FC = () => {
const handleStorageChange = () => {
setRadioSelection(localStorage.getItem('radioSelection') || '');
};
handleStorageChange();
handleStorageChange()
// Update dropdown immediately when localStorage changes internally or externally
window.addEventListener('storage', handleStorageChange);
@ -54,22 +54,16 @@ const Models: React.FC = () => {
// Determine the filtered models based on current radioSelection
const filteredModels = (() => {
let models = [];
switch (radioSelection) {
case 'Offline':
models = modelDropdown.offlineModels; // Show only offline models
break;
return modelDropdown.offlineModels; // Show only offline models
case 'AI Online':
models = modelDropdown.onlineModels; // Show only online models
break;
return modelDropdown.onlineModels; // Show only online models
case 'FOSS':
models = modelDropdown.fossModels; // Show only FOSS models
break;
return modelDropdown.fossModels; // Show only FOSS models
default:
models = [...modelDropdown.offlineModels, ...modelDropdown.onlineModels, ...modelDropdown.fossModels]; // Show all models if nothing matches
break;
return [...modelDropdown.offlineModels, ...modelDropdown.onlineModels, ...modelDropdown.fossModels]; // Show all models if nothing matches
}
return Array.from(new Set(models)); // Remove duplicates using Set
})();
const isOfflineModel = (model: string) => modelDropdown.offlineModels.includes(model);