refactor client

8 files changed, 15 insertions, 9 deletions

diff --git a/src/client/init.ts b/src/client/init.ts
index 00dcc60244..123d4020e1 100644
--- a/src/client/init.ts
+++ b/src/client/init.ts
@@ -166,7 +166,7 @@ const app = createApp(await (
 	ui === 'deck'                     ? import('@client/ui/deck.vue') :
 	ui === 'desktop'                  ? import('@client/ui/desktop.vue') :
 	ui === 'chat'                     ? import('@client/ui/chat/index.vue') :
-	ui === 'default'                  ? import('@client/ui/default.vue') :
+	ui === 'classic'                  ? import('@client/ui/classic.vue') :
 	import('@client/ui/universal.vue')
 ).then(x => x.default));
 
diff --git a/src/client/menu.ts b/src/client/menu.ts
index 0a9e2b5475..c884772a47 100644
--- a/src/client/menu.ts
+++ b/src/client/menu.ts
@@ -2,6 +2,7 @@ import { computed, ref } from 'vue';
 import { search } from '@client/scripts/search';
 import * as os from '@client/os';
 import { i18n } from '@client/i18n';
+import { ui } from '@client/config';
 import { $i } from './account';
 import { unisonReload } from '@client/scripts/unison-reload';
 import { router } from './router';
@@ -184,35 +185,40 @@ export const menuDef = {
 		action: (ev) => {
 			os.popupMenu([{
 				text: i18n.locale.default,
+				active: ui === 'default' || ui === null,
 				action: () => {
 					localStorage.setItem('ui', 'default');
 					unisonReload();
 				}
 			}, {
 				text: i18n.locale.deck,
+				active: ui === 'deck',
 				action: () => {
 					localStorage.setItem('ui', 'deck');
 					unisonReload();
 				}
 			}, {
-				text: 'pope',
+				text: i18n.locale.classic,
+				active: ui === 'classic',
 				action: () => {
-					localStorage.setItem('ui', 'pope');
+					localStorage.setItem('ui', 'classic');
 					unisonReload();
 				}
 			}, {
 				text: 'Chat (β)',
+				active: ui === 'chat',
 				action: () => {
 					localStorage.setItem('ui', 'chat');
 					unisonReload();
 				}
-			}, {
+			}, /*{
 				text: i18n.locale.desktop + ' (β)',
+				active: ui === 'desktop',
 				action: () => {
 					localStorage.setItem('ui', 'desktop');
 					unisonReload();
 				}
-			}], ev.currentTarget || ev.target);
+			}*/], ev.currentTarget || ev.target);
 		},
 	},
 };
diff --git a/src/client/ui/default.header.vue b/src/client/ui/classic.header.vue
index 908a4719a4..908a4719a4 100644
--- a/src/client/ui/default.header.vue
+++ b/src/client/ui/classic.header.vue
diff --git a/src/client/ui/default.side.vue b/src/client/ui/classic.side.vue
index c7d2abff26..c7d2abff26 100644
--- a/src/client/ui/default.side.vue
+++ b/src/client/ui/classic.side.vue
diff --git a/src/client/ui/default.sidebar.vue b/src/client/ui/classic.sidebar.vue
index cce74a53cd..cce74a53cd 100644
--- a/src/client/ui/default.sidebar.vue
+++ b/src/client/ui/classic.sidebar.vue
diff --git a/src/client/ui/default.vue b/src/client/ui/classic.vue
index 792aa197ad..79cdbe3af1 100644
--- a/src/client/ui/default.vue
+++ b/src/client/ui/classic.vue
@@ -64,7 +64,7 @@
 import { defineComponent, defineAsyncComponent, markRaw } from 'vue';
 import { instanceName } from '@client/config';
 import { StickySidebar } from '@client/scripts/sticky-sidebar';
-import XSidebar from './default.sidebar.vue';
+import XSidebar from './classic.sidebar.vue';
 import XDrawerSidebar from '@client/ui/_common_/sidebar.vue';
 import XCommon from './_common_/common.vue';
 import * as os from '@client/os';
@@ -79,8 +79,8 @@ export default defineComponent({
 		XCommon,
 		XSidebar,
 		XDrawerSidebar,
-		XHeaderMenu: defineAsyncComponent(() => import('./default.header.vue')),
-		XWidgets: defineAsyncComponent(() => import('./default.widgets.vue')),
+		XHeaderMenu: defineAsyncComponent(() => import('./classic.header.vue')),
+		XWidgets: defineAsyncComponent(() => import('./classic.widgets.vue')),
 	},
 
 	provide() {
diff --git a/src/client/ui/default.widgets.vue b/src/client/ui/classic.widgets.vue
index f9584402a2..f9584402a2 100644
--- a/src/client/ui/default.widgets.vue
+++ b/src/client/ui/classic.widgets.vue
diff --git a/src/client/ui/universal.vue b/src/client/ui/universal.vue
index e79ad80f61..d8f1c2a934 100644
--- a/src/client/ui/universal.vue
+++ b/src/client/ui/universal.vue
@@ -58,7 +58,7 @@ import { instanceName } from '@client/config';
 import { StickySidebar } from '@client/scripts/sticky-sidebar';
 import XSidebar from '@client/ui/_common_/sidebar.vue';
 import XCommon from './_common_/common.vue';
-import XSide from './default.side.vue';
+import XSide from './classic.side.vue';
 import * as os from '@client/os';
 import { menuDef } from '@client/menu';
 import * as symbols from '@client/symbols';