From 2bcac1f66a309b179bc28bcd10e8e7869cd78248 Mon Sep 17 00:00:00 2001
From: syns2191 <sutralian@gmail.com>
Date: Mon, 14 Oct 2024 22:40:44 +0700
Subject: [PATCH 1/6] fix: about page desktop window

---
 packages/desktop-libs/src/lib/desktop-menu.ts        |  2 +-
 .../src/lib/dialogs/about/about.component.html       | 12 +++++++-----
 .../src/lib/dialogs/about/about.component.scss       |  6 +++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/desktop-libs/src/lib/desktop-menu.ts b/packages/desktop-libs/src/lib/desktop-menu.ts
index 68ccf3658b3..a439701eed0 100644
--- a/packages/desktop-libs/src/lib/desktop-menu.ts
+++ b/packages/desktop-libs/src/lib/desktop-menu.ts
@@ -23,7 +23,7 @@ export class AppMenu {
 						label: TranslateService.instant('MENU.ABOUT'),
 						enabled: true,
 						async click() {
-							const window: BrowserWindow = await createAboutWindow(windowPath.timeTrackerUi);
+							const window: BrowserWindow = await createAboutWindow(windowPath.timeTrackerUi, windowPath.preloadPath);
 							window.show();
 						}
 					},
diff --git a/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.html b/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.html
index 6314cb813f9..6d8ec11a558 100644
--- a/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.html
+++ b/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.html
@@ -4,7 +4,7 @@
             <nb-card class="h-100">
                 <nb-card-body>
                     <div class="row">
-                        <div class="col-12 d-flex justify-content-center">
+                        <div class="col-12 d-flex justify-content-center cet-logo">
                             <div class="logo">
                                 <img [src]="application?.iconPath" />
                             </div>
@@ -19,11 +19,13 @@
                             <span>
                                 Copyright © 2020-{{'FOOTER.PRESENT' | translate}}
                                 <span class="link" (click)="openLink('EVER')">{{ application?.companyName}}</span>
-                                <br/>
+                                <br />
                                 {{'FOOTER.RIGHTS_RESERVED' | translate}}
-                                <br/>
-                                <span class="link" (click)="openLink('TOS')">{{'FOOTER.TERMS_OF_SERVICE' | translate}}</span> |
-                                <span (click)="openLink('PRIVACY')" class="link">{{'FOOTER.PRIVACY_POLICY' | translate}}</span>
+                                <br />
+                                <span class="link" (click)="openLink('TOS')">{{'FOOTER.TERMS_OF_SERVICE' |
+                                    translate}}</span> |
+                                <span (click)="openLink('PRIVACY')" class="link">{{'FOOTER.PRIVACY_POLICY' |
+                                    translate}}</span>
                             </span>
                         </div>
                     </div>
diff --git a/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.scss b/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.scss
index 020389953df..485f9cc6809 100644
--- a/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.scss
+++ b/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.scss
@@ -30,6 +30,10 @@ div.logo {
     font-weight: 500;
 }
 
+.cet-logo {
+    margin-top: 30px;
+}
+
 .copyright-text {
     font-size: 11px;
     font-weight: 500;
@@ -46,4 +50,4 @@ div.logo {
 
 ::ng-deep nb-layout .layout .layout-container .content nb-layout-footer nav {
     padding: 0px;
-  }
\ No newline at end of file
+}

From 641ab37f85db48faf988787eebd6c4d6523527c0 Mon Sep 17 00:00:00 2001
From: syns2191 <sutralian@gmail.com>
Date: Sat, 19 Oct 2024 00:08:58 +0700
Subject: [PATCH 2/6] fix: about window not fit in windows platform

---
 apps/desktop-timer/src/preload.ts      | 4 ++++
 apps/desktop/src/preload/preload.ts    | 4 ++++
 apps/server-api/src/preload/preload.ts | 4 ++++
 apps/server/src/preload/preload.ts     | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/apps/desktop-timer/src/preload.ts b/apps/desktop-timer/src/preload.ts
index fd1459c8709..d918b204482 100644
--- a/apps/desktop-timer/src/preload.ts
+++ b/apps/desktop-timer/src/preload.ts
@@ -17,6 +17,10 @@ window.addEventListener('DOMContentLoaded', async () => {
         titleBar.refreshMenu();
     });
 
+    ipcRenderer.on('hide-menu', () => {
+        titleBar.dispose();
+    })
+
     const overStyle = document.createElement('style');
     overStyle.innerHTML = `
         .cet-container {
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index dbcec63fd7b..96f890c7c53 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -21,6 +21,10 @@ window.addEventListener('DOMContentLoaded', async () => {
         titleBar.refreshMenu();
     });
 
+    ipcRenderer.on('hide-menu', () => {
+        titleBar.dispose();
+    })
+
     ipcRenderer.on('adjust_view', () => {
         clearInterval(contentInterval);
         const headerIcon = '/html/body/div[2]/ga-app/ngx-pages/ngx-one-column-layout/nb-layout/div[1]/div/div/nb-sidebar[1]/div/div/div';
diff --git a/apps/server-api/src/preload/preload.ts b/apps/server-api/src/preload/preload.ts
index c9b66089034..b5ba9a2fc97 100644
--- a/apps/server-api/src/preload/preload.ts
+++ b/apps/server-api/src/preload/preload.ts
@@ -17,6 +17,10 @@ window.addEventListener('DOMContentLoaded', async () => {
         titleBar.refreshMenu();
     });
 
+    ipcRenderer.on('hide-menu', () => {
+        titleBar.dispose();
+    })
+
     const overStyle = document.createElement('style');
     overStyle.innerHTML = `
         .cet-menubar-menu-container {
diff --git a/apps/server/src/preload/preload.ts b/apps/server/src/preload/preload.ts
index c9b66089034..b5ba9a2fc97 100644
--- a/apps/server/src/preload/preload.ts
+++ b/apps/server/src/preload/preload.ts
@@ -17,6 +17,10 @@ window.addEventListener('DOMContentLoaded', async () => {
         titleBar.refreshMenu();
     });
 
+    ipcRenderer.on('hide-menu', () => {
+        titleBar.dispose();
+    })
+
     const overStyle = document.createElement('style');
     overStyle.innerHTML = `
         .cet-menubar-menu-container {

From f8cfb5120e2a4e75b76de017bbc5c7ea3408e36f Mon Sep 17 00:00:00 2001
From: syns2191 <sutralian@gmail.com>
Date: Sat, 19 Oct 2024 00:10:31 +0700
Subject: [PATCH 3/6] fix: about window not fit in windows platform

---
 .../desktop-ui-lib/src/lib/dialogs/about/about.component.html | 2 +-
 .../desktop-ui-lib/src/lib/dialogs/about/about.component.scss | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.html b/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.html
index 6d8ec11a558..9f932d38438 100644
--- a/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.html
+++ b/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.html
@@ -4,7 +4,7 @@
             <nb-card class="h-100">
                 <nb-card-body>
                     <div class="row">
-                        <div class="col-12 d-flex justify-content-center cet-logo">
+                        <div class="col-12 d-flex justify-content-center">
                             <div class="logo">
                                 <img [src]="application?.iconPath" />
                             </div>
diff --git a/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.scss b/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.scss
index 485f9cc6809..cc210301002 100644
--- a/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.scss
+++ b/packages/desktop-ui-lib/src/lib/dialogs/about/about.component.scss
@@ -30,10 +30,6 @@ div.logo {
     font-weight: 500;
 }
 
-.cet-logo {
-    margin-top: 30px;
-}
-
 .copyright-text {
     font-size: 11px;
     font-weight: 500;

From 7072c6014c19eee2122f6cfa9bb08f761bc0ce36 Mon Sep 17 00:00:00 2001
From: syns2191 <sutralian@gmail.com>
Date: Sat, 19 Oct 2024 00:11:53 +0700
Subject: [PATCH 4/6] fix: prevent multiple about window

---
 .../src/lib/desktop-window-about.ts              | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/desktop-window/src/lib/desktop-window-about.ts b/packages/desktop-window/src/lib/desktop-window-about.ts
index 65b61879bcb..df4ba68c2dc 100644
--- a/packages/desktop-window/src/lib/desktop-window-about.ts
+++ b/packages/desktop-window/src/lib/desktop-window-about.ts
@@ -1,5 +1,5 @@
 import * as remoteMain from '@electron/remote/main';
-import { BrowserWindow, Menu } from 'electron';
+import { BrowserWindow, Menu, app } from 'electron';
 import * as url from 'url';
 import { attachTitlebarToWindow } from 'custom-electron-titlebar/main';
 
@@ -16,6 +16,13 @@ export async function createAboutWindow(filePath, preloadPath?) {
 	const mainWindowSettings: Electron.BrowserWindowConstructorOptions = windowSetting(preloadPath);
 	const manager = WindowManager.getInstance();
 
+	const allwindows = BrowserWindow.getAllWindows();
+	const aboutWindows = allwindows.find((win) => win.getTitle() === 'About');
+	if (aboutWindows) {
+		aboutWindows.show();
+		return aboutWindows;
+	}
+
 	const window = new BrowserWindow(mainWindowSettings);
 	remoteMain.enable(window.webContents);
 	const launchPath = url.format({
@@ -42,7 +49,7 @@ export async function createAboutWindow(filePath, preloadPath?) {
 
 	manager.register(RegisteredWindow.ABOUT, window);
 	if (preloadPath) {
-		attachTitlebarToWindow(window);
+		window.webContents.send('hide-menu');
 	}
 	return window;
 }
@@ -69,11 +76,6 @@ const windowSetting = (preloadPath) => {
 	};
 	if (preloadPath) {
 		mainWindowSettings.webPreferences.preload = preloadPath;
-		mainWindowSettings.titleBarOverlay = true;
-		mainWindowSettings.titleBarStyle = 'hidden';
-		if (process.platform === 'linux') {
-			mainWindowSettings.frame = false;
-		}
 	}
 	return mainWindowSettings;
 };

From e5517ffd79659684ac2b1f94d5c6ae83ceeae819 Mon Sep 17 00:00:00 2001
From: syns2191 <sutralian@gmail.com>
Date: Sat, 19 Oct 2024 00:29:42 +0700
Subject: [PATCH 5/6] fix: prevent timer window change size on drag the window

---
 .../src/lib/desktop-window-timer.ts           | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/desktop-window/src/lib/desktop-window-timer.ts b/packages/desktop-window/src/lib/desktop-window-timer.ts
index 35eb87ad7b7..53baaf5c2b5 100644
--- a/packages/desktop-window/src/lib/desktop-window-timer.ts
+++ b/packages/desktop-window/src/lib/desktop-window-timer.ts
@@ -12,6 +12,13 @@ Object.assign(console, log.functions);
 const Store = require('electron-store');
 const store = new Store();
 
+function getScreenSize() {
+	const sizes = screen.getPrimaryDisplay().workAreaSize;
+	const width = sizes.height < 768 ? 310 : 360;
+	const height = sizes.height < 768 ? sizes.height - 20 : 768;
+	return { width, height }
+}
+
 export async function createTimeTrackerWindow(timeTrackerWindow, filePath, preloadPath?) {
 	const mainWindowSettings: Electron.BrowserWindowConstructorOptions = windowSetting(preloadPath);
 	const manager = WindowManager.getInstance();
@@ -29,6 +36,11 @@ export async function createTimeTrackerWindow(timeTrackerWindow, filePath, prelo
 
 	timeTrackerWindow.hide();
 	await timeTrackerWindow.loadURL(launchPath);
+	if (preloadPath) {
+		attachTitlebarToWindow(timeTrackerWindow);
+	}
+	const { width, height } = getScreenSize();
+	timeTrackerWindow.setMinimumSize(width, height);
 	timeTrackerWindow.setMenu(null);
 	timeTrackerWindow.on('close', (event) => {
 		event.preventDefault();
@@ -36,17 +48,14 @@ export async function createTimeTrackerWindow(timeTrackerWindow, filePath, prelo
 	});
 
 	manager.register(RegisteredWindow.TIMER, timeTrackerWindow);
-	if (preloadPath) {
-		attachTitlebarToWindow(timeTrackerWindow);
-	}
+
 	return timeTrackerWindow;
 }
 
 const windowSetting = (preloadPath?) => {
 	const sizes = screen.getPrimaryDisplay().workAreaSize;
-	const height = sizes.height < 768 ? sizes.height - 20 : 768;
+	const { width, height } = getScreenSize();
 	const zoomF = sizes.height < 768 ? 0.8 : 1.0;
-	const width = sizes.height < 768 ? 310 : 360;
 	const filesPath = store.get('filePath');
 	console.log('file path == ', filesPath);
 	const mainWindowSettings: Electron.BrowserWindowConstructorOptions = {

From 50d38837a5c5320c53d6e4f0af9f03f2abf8a22c Mon Sep 17 00:00:00 2001
From: syns2191 <sutralian@gmail.com>
Date: Sat, 19 Oct 2024 19:42:17 +0700
Subject: [PATCH 6/6] fix: remove unnecessary code

---
 packages/desktop-window/src/lib/desktop-window-about.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/desktop-window/src/lib/desktop-window-about.ts b/packages/desktop-window/src/lib/desktop-window-about.ts
index df4ba68c2dc..6f4a61a9631 100644
--- a/packages/desktop-window/src/lib/desktop-window-about.ts
+++ b/packages/desktop-window/src/lib/desktop-window-about.ts
@@ -1,7 +1,6 @@
 import * as remoteMain from '@electron/remote/main';
-import { BrowserWindow, Menu, app } from 'electron';
+import { BrowserWindow, Menu } from 'electron';
 import * as url from 'url';
-import { attachTitlebarToWindow } from 'custom-electron-titlebar/main';
 
 import log from 'electron-log';
 import { WindowManager } from './concretes/window.manager';