From 893364d52d0fef5e9ad676661ef4514bf17612dc Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Thu, 31 Mar 2022 17:39:53 +0200
Subject: [PATCH] Cleanup AppUser and AdminApp

---
 dev/App/Abstract.js | 14 +-------------
 dev/App/Admin.js    |  8 +++++---
 dev/App/User.js     | 14 ++++++++++----
 dev/admin.js        |  4 ++--
 dev/app.js          |  4 ++--
 5 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/dev/App/Abstract.js b/dev/App/Abstract.js
index 6ea1d7307..a1a385bba 100644
--- a/dev/App/Abstract.js
+++ b/dev/App/Abstract.js
@@ -1,7 +1,6 @@
 import ko from 'ko';
 
-import { Settings, SettingsGet } from 'Common/Globals';
-import { changeTheme } from 'Common/Utils';
+import { Settings } from 'Common/Globals';
 
 import { logoutLink } from 'Common/Links';
 import { i18nToNodes, initOnStartOrLangChange } from 'Common/Translator';
@@ -33,17 +32,6 @@ export class AbstractApp {
 		}
 	}
 
-	refresh() {
-//		rl.adminArea() || !translatorReload(false, );
-		rl.adminArea() || (
-			LanguageStore.language(SettingsGet('Language'))
-			& ThemeStore.populate()
-			& changeTheme(SettingsGet('Theme'))
-		);
-
-		this.start();
-	}
-
 	bootstart() {
 		const register = (key, ClassObject, templateID) => ko.components.register(key, {
 				template: { element: templateID || (key + 'Component') },
diff --git a/dev/App/Admin.js b/dev/App/Admin.js
index bbf3e5f66..755cb0d5f 100644
--- a/dev/App/Admin.js
+++ b/dev/App/Admin.js
@@ -10,12 +10,16 @@ import { LoginAdminScreen } from 'Screen/Admin/Login';
 import { startScreens } from 'Knoin/Knoin';
 import { AbstractApp } from 'App/Abstract';
 
-class AdminApp extends AbstractApp {
+export class AdminApp extends AbstractApp {
 	constructor() {
 		super(Remote);
 		this.weakPassword = ko.observable(false);
 	}
 
+	refresh() {
+		this.start();
+	}
+
 	start() {
 		if (!Settings.app('adminAllowed')) {
 			rl.route.root();
@@ -28,5 +32,3 @@ class AdminApp extends AbstractApp {
 		}
 	}
 }
-
-export default new AdminApp();
diff --git a/dev/App/User.js b/dev/App/User.js
index 75f12ec51..cc7850531 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -1,6 +1,6 @@
 import 'External/User/ko';
 
-import { isArray, pString } from 'Common/Utils';
+import { isArray, pString, changeTheme } from 'Common/Utils';
 import { mailToHelper, setLayoutResizer, dropdownsDetectVisibility } from 'Common/UtilsUser';
 
 import {
@@ -41,6 +41,7 @@ import { FolderUserStore } from 'Stores/User/Folder';
 import { PgpUserStore } from 'Stores/User/Pgp';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { ThemeStore } from 'Stores/Theme';
+import { LanguageStore } from 'Stores/Language';
 
 import Remote from 'Remote/User/Fetch';
 
@@ -68,7 +69,7 @@ import {
 } from 'Common/Folders';
 import { loadFolders } from 'Model/FolderCollection';
 
-class AppUser extends AbstractApp {
+export class AppUser extends AbstractApp {
 	constructor() {
 		super(Remote);
 
@@ -93,6 +94,13 @@ class AppUser extends AbstractApp {
 		addEventListener('click', dropdownsDetectVisibility);
 	}
 
+	refresh() {
+		LanguageStore.language(SettingsGet('Language'));
+		ThemeStore.populate();
+		changeTheme(SettingsGet('Theme'));
+		this.start();
+	}
+
 	/**
 	 * @param {number} iDeleteType
 	 * @param {string} sFromFolderFullName
@@ -376,5 +384,3 @@ class AppUser extends AbstractApp {
 		showScreenPopup(ComposePopupView, params);
 	}
 }
-
-export default new AppUser();
diff --git a/dev/admin.js b/dev/admin.js
index 88fd6c8c8..ba2626cf1 100644
--- a/dev/admin.js
+++ b/dev/admin.js
@@ -1,4 +1,4 @@
 import bootstrap from 'bootstrap';
-import App from 'App/Admin';
+import { AdminApp } from 'App/Admin';
 
-bootstrap(App);
+bootstrap(new AdminApp);
diff --git a/dev/app.js b/dev/app.js
index 7f4dcd596..d7c0ffd6d 100644
--- a/dev/app.js
+++ b/dev/app.js
@@ -1,4 +1,4 @@
 import bootstrap from 'bootstrap';
-import App from 'App/User';
+import { AppUser } from 'App/User';
 
-bootstrap(App);
+bootstrap(new AppUser);