Skip to content

Commit

Permalink
feat: reload setting on authentication
Browse files Browse the repository at this point in the history
  • Loading branch information
adkif committed Oct 1, 2024
1 parent f42e68a commit 0b8a5d7
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
7 changes: 7 additions & 0 deletions packages/desktop-libs/src/lib/desktop-tray.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
getApiBaseUrl,
loginPage,
RegisteredWindow,
settingsPage,
timeTrackerPage,
WindowManager
} from '@gauzy/desktop-window';
Expand Down Expand Up @@ -371,6 +372,12 @@ export class TrayIcon {
console.error('An error occurred while loading Time Tracker Page', error);
}

try {
await settingsWindow.loadURL(settingsPage(windowPath.timeTrackerUi));
} catch (error) {
console.error('An error occurred while loading settings Page', error);
}

manager.webContents(timeTrackerWindow).send('auth_success_tray_init', arg);

if (!isGauzyWindow) {
Expand Down
11 changes: 10 additions & 1 deletion packages/desktop-window/src/lib/desktop-window-setting.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as remoteMain from '@electron/remote/main';
import { attachTitlebarToWindow } from 'custom-electron-titlebar/main';
import { BrowserWindow } 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';
Expand Down Expand Up @@ -73,3 +73,12 @@ const windowSetting = (preloadPath?) => {
mainWindowSettings.icon = filesPath.iconPath;
return mainWindowSettings;
};

export function settingsPage(filePath) {
return url.format({
pathname: filePath,
protocol: 'file:',
slashes: true,
hash: '/settings'
});
}

0 comments on commit 0b8a5d7

Please sign in to comment.