React-Group/interstellar_ai
1
1
Fork 2
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: React-Group:9100b0c0f408030acf0f365fca7ad0bf3f94aeb7
Branches Tags
React-Group:main
..
compare: React-Group:29fd6d0a05538f3356c6a9f4b19b82b4641d4822
Branches Tags
React-Group:main

No commits in common. "9100b0c0f408030acf0f365fca7ad0bf3f94aeb7" and "29fd6d0a05538f3356c6a9f4b19b82b4641d4822" have entirely different histories.
9100b0c0f4 ... 29fd6d0a05

1 changed files with 16 additions and 8 deletions
Show stats Expand all files Collapse all files

24
app/components/settings/Settings.tsx
View file

@ -159,14 +159,18 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
fontFamily, fontFamily,
fontSize, fontSize,
selectedTheme, selectedTheme,
faqBackgroundColor, faqSettings: {
faqHeadingColor, faqBackgroundColor,
faqItemBackgroundColor, faqHeadingColor,
faqItemHeadingColor, faqItemBackgroundColor,
faqItemTextColor, faqItemHeadingColor,
faqItemHoverBackgroundColor, faqItemTextColor,
popupBackgroundColor, faqItemHoverBackgroundColor,
overlayTextColor, },
popupSettings: {
popupBackgroundColor,
overlayTextColor,
},
primaryColor, primaryColor,
secondaryColor, secondaryColor,
accentColor, accentColor,
@ -313,6 +317,8 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
const flattenedSettings = { const flattenedSettings = {
...settings.userPreferences, ...settings.userPreferences,
...settings.theme, ...settings.theme,
...settings.theme.faqSettings,
...settings.theme.popupSettings,
...settings.apiKeys, ...settings.apiKeys,
...settings.generalSettings, ...settings.generalSettings,
}; };
@ -323,6 +329,8 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
}, [ }, [
...Object.values(settings.userPreferences), ...Object.values(settings.userPreferences),
...Object.values(settings.theme), ...Object.values(settings.theme),
...Object.values(settings.theme.faqSettings),
...Object.values(settings.theme.popupSettings),
...Object.values(settings.apiKeys), ...Object.values(settings.apiKeys),
...Object.values(settings.generalSettings), ...Object.values(settings.generalSettings),
]); ]);