diff --git a/src/main/exit-app.ts b/src/main/exit-app.ts index ad3adaa21a..3fcd3799ff 100644 --- a/src/main/exit-app.ts +++ b/src/main/exit-app.ts @@ -10,7 +10,7 @@ export function exitApp() { const windowManager = WindowManager.getInstance() const clusterManager = ClusterManager.getInstance() appEventBus.emit({ name: "service", action: "close" }) - windowManager.navigate(closingURL()); + windowManager?.hide(); clusterManager?.stop(); logger.info('SERVICE:QUIT'); setTimeout(() => { diff --git a/src/main/menu.ts b/src/main/menu.ts index 9865c5331d..08260d8e53 100644 --- a/src/main/menu.ts +++ b/src/main/menu.ts @@ -9,7 +9,6 @@ import { clusterSettingsURL } from "../renderer/components/+cluster-settings/clu import { extensionsURL } from "../renderer/components/+extensions/extensions.route"; import { menuRegistry } from "../extensions/registries/menu-registry"; import logger from "./logger"; -import { appEventBus } from "../common/event-bus"; import { exitApp } from "./exit-app"; export type MenuTopId = "mac" | "file" | "edit" | "view" | "help" diff --git a/src/main/window-manager.ts b/src/main/window-manager.ts index b5cb73b8b6..034e14b61a 100644 --- a/src/main/window-manager.ts +++ b/src/main/window-manager.ts @@ -157,6 +157,11 @@ export class WindowManager extends Singleton { this.splashWindow.show(); } + hide() { + if (!this.mainWindow?.isDestroyed()) this.mainWindow.hide(); + if (!this.splashWindow.isDestroyed()) this.splashWindow.hide(); + } + destroy() { this.mainWindow.destroy(); this.splashWindow.destroy(); diff --git a/src/renderer/components/+closing-page/closing-page.route.ts b/src/renderer/components/+closing-page/closing-page.route.ts deleted file mode 100644 index 288212a1da..0000000000 --- a/src/renderer/components/+closing-page/closing-page.route.ts +++ /dev/null @@ -1,8 +0,0 @@ -import type { RouteProps } from "react-router"; -import { buildURL } from "../../../common/utils/buildUrl"; - -export const closingRoute: RouteProps = { - path: "/closing" -} - -export const closingURL = buildURL(closingRoute.path) diff --git a/src/renderer/components/+closing-page/closing-page.scss b/src/renderer/components/+closing-page/closing-page.scss deleted file mode 100644 index b8f45f000e..0000000000 --- a/src/renderer/components/+closing-page/closing-page.scss +++ /dev/null @@ -1,6 +0,0 @@ -.ClosingPage { - width: 100%; - height: 100%; - text-align: center; - z-index: 0; -} \ No newline at end of file diff --git a/src/renderer/components/+closing-page/closing-page.tsx b/src/renderer/components/+closing-page/closing-page.tsx deleted file mode 100644 index e113a45739..0000000000 --- a/src/renderer/components/+closing-page/closing-page.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import "./closing-page.scss" -import React from "react"; -import { observer } from "mobx-react"; -import { Trans } from "@lingui/macro"; -import { Icon } from "../icon" - -@observer -export class ClosingPage extends React.Component { - - render() { - return ( -
- {( -
- -

- Bye bye, see you soon! -

-
- )} -
- ) - } -} diff --git a/src/renderer/components/+closing-page/index.tsx b/src/renderer/components/+closing-page/index.tsx deleted file mode 100644 index a40a79ac26..0000000000 --- a/src/renderer/components/+closing-page/index.tsx +++ /dev/null @@ -1,2 +0,0 @@ -export * from "./closing-page.route" -export * from "./closing-page" \ No newline at end of file diff --git a/src/renderer/components/cluster-manager/cluster-manager.tsx b/src/renderer/components/cluster-manager/cluster-manager.tsx index 4829b32491..1522376c3e 100644 --- a/src/renderer/components/cluster-manager/cluster-manager.tsx +++ b/src/renderer/components/cluster-manager/cluster-manager.tsx @@ -18,7 +18,6 @@ import { hasLoadedView, initView, lensViews, refreshViews } from "./lens-views"; import { globalPageRegistry } from "../../../extensions/registries/page-registry"; import { Extensions, extensionsRoute } from "../+extensions"; import { getMatchedClusterId } from "../../navigation"; -import { ClosingPage, closingRoute } from "../+closing-page"; @observer export class ClusterManager extends React.Component { @@ -64,7 +63,6 @@ export class ClusterManager extends React.Component {
-