fixes

synapticsim · Jul 11, 2023 · 99d168b · 99d168b
1 parent e173527
commit 99d168b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/src/index.tsx b/src/index.tsx
@@ -31,7 +31,6 @@ ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
                         <Route index element={<Home />} />
                         <Route path="/workspace" element={<Workspace />} />
                         <Route path="/settings" element={<SettingsMenu />} />
-                        <Route path="/appearancesettings" element={<AppearanceSettings />} />
                     </Routes>
                 </MemoryRouter>
             </Provider>

diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
@@ -83,17 +83,17 @@ export const Home: React.FC = () => {
     return (
         <>
             <div className="container px-20 pt-16 h-screen overflow-clip">
-                <h1 className="flex gap-4 items-center text-4xl text-theme-text mb-8">
+                <div className="flex gap-4 items-center text-4xl text-theme-text mb-8">
                     <span>Welcome to <span className="text-theme-primary font-medium">ACE</span></span>
                     <span
                         className="rounded-xl px-3 py-1 font-medium text-sm bg-theme-padding bg-opacity"
                     >v{version}
                     </span>
                     {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-                    <button onClick={navigateToSettings} className="rounded-md p-1 bg-theme-padding hover:opacity-50 transition">
-                        <MdSettings />
+                    <button onClick={navigateToSettings} className="ml-auto rounded-md p-1 hover:bg-theme-padding transition">
+                        <MdSettings size={25} />
                     </button>
-                </h1>
+                </div>
                 <div className="grid grid-cols-2 gap-6 mb-16">
                     <Card
                         className="flex gap-4 items-center"

diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
@@ -11,7 +11,6 @@ export const AppearanceSettings: React.FC = () => {
 
     const returnToHome = () => {
         navigate('/');
-        console.log('Return to home');
     };
 
     return (

diff --git a/src/redux/global/configSlice.ts b/src/redux/global/configSlice.ts
@@ -22,7 +22,7 @@ interface ConfigState {
 const configSlice = createSlice({
     name: 'config',
     initialState: {
-        theme: JSON.parse(localStorage.getItem(THEME_LOCAL_STORAGE_KEY)!) as ThemeConfig,
+        theme: JSON.parse(localStorage.getItem(THEME_LOCAL_STORAGE_KEY) || 'amethyst-dark') as ThemeConfig,
     } as ConfigState,
     reducers: {
         pushRecentProject(state, action: PayloadAction<AceProject>) {

diff --git a/src/redux/global/ui/colors.ts b/src/redux/global/ui/colors.ts
@@ -10,7 +10,7 @@ export interface ColorPalette {
 // using default export because tailwind.config.cjs doesn't support ESM modules.
 // eslint-disable-next-line import/no-default-export
 export default {
-    'default-dark': {
+    'amethyst-dark': {
         primary: '#B47EFA',
         secondary: '#9F59F8',
         text: '#ffffff',

diff --git a/src/redux/global/ui/uitheme.ts b/src/redux/global/ui/uitheme.ts
@@ -16,6 +16,6 @@ export const themeConfigs = new Map<String, ThemeConfig>();
 themes.forEach((theme) => themeConfigs.set(theme.name, theme));
 
 export const fallbackThemeConfig: ThemeConfig = {
-    name: 'default-dark',
-    colors: colors['default-dark'],
+    name: 'amthyst-dark',
+    colors: colors['amethyst-dark'],
 };