-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
118 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,97 +1,102 @@ | ||
|
|
||
| import { CLIENT_DEV_NORMAL_APP_PORT, CLIENT_DEV_WEBSQL_APP_PORT } from './app.hosts'; | ||
| import { | ||
| path, | ||
| //#region @backend | ||
| fse | ||
| //#endregion | ||
| } from 'tnp-core'; | ||
| path, | ||
| //#region @backend | ||
| fse, | ||
| Helpers | ||
| //#endregion | ||
| } from 'tnp-core/src'; | ||
| Helpers.hideNodeWarnings() | ||
| //#region @backend | ||
| import { app, BrowserWindow, screen } from 'electron'; | ||
|
|
||
| import start from './app'; | ||
| let win: BrowserWindow | null = null; | ||
| const args = process.argv.slice(1); | ||
| const serve = args.some(val => val === '--serve'); | ||
| const websql = args.some(val => val === '--websql'); | ||
|
|
||
| console.log('Helpers.isElectron', Helpers.isElectron) | ||
| function createWindow(): BrowserWindow { | ||
|
|
||
| const size = screen.getPrimaryDisplay().workAreaSize; | ||
| const size = screen.getPrimaryDisplay().workAreaSize; | ||
|
|
||
| // Create the browser window. | ||
| win = new BrowserWindow({ | ||
| x: 0, | ||
| y: 0, | ||
| autoHideMenuBar: true, | ||
| width: size.width / 1.5, | ||
| height: size.height / 1.5, | ||
| webPreferences: { | ||
| nodeIntegration: true, | ||
| allowRunningInsecureContent: (serve), | ||
| contextIsolation: false, | ||
| }, | ||
| }); | ||
| win.webContents.openDevTools(); | ||
|
|
||
| // Create the browser window. | ||
| win = new BrowserWindow({ | ||
| x: 0, | ||
| y: 0, | ||
| autoHideMenuBar: true, | ||
| width: size.width / 2, | ||
| height: size.height / 2, | ||
| webPreferences: { | ||
| nodeIntegration: true, | ||
| allowRunningInsecureContent: (serve), | ||
| contextIsolation: false, | ||
| }, | ||
| }); | ||
| if (serve) { | ||
| const debug = require('electron-debug'); | ||
| debug(); | ||
|
|
||
| if (serve) { | ||
| const debug = require('electron-debug'); | ||
| debug(); | ||
| require('electron-reloader')(module); | ||
| win.loadURL('http://localhost:' + (websql ? CLIENT_DEV_WEBSQL_APP_PORT : CLIENT_DEV_NORMAL_APP_PORT)); | ||
| } else { | ||
| // Path when running electron executable | ||
| let pathIndex = './index.html'; | ||
|
|
||
| require('electron-reloader')(module); | ||
| win.loadURL('http://localhost:' + (websql ? CLIENT_DEV_WEBSQL_APP_PORT : CLIENT_DEV_NORMAL_APP_PORT)); | ||
| } else { | ||
| // Path when running electron executable | ||
| let pathIndex = './index.html'; | ||
| if (fse.existsSync(path.join(__dirname, '../dist/index.html'))) { | ||
| // Path when running electron in local folder | ||
| pathIndex = '../dist/index.html'; | ||
| } | ||
|
|
||
| if (fse.existsSync(path.join(__dirname, '../dist/index.html'))) { | ||
| // Path when running electron in local folder | ||
| pathIndex = '../dist/index.html'; | ||
| const url = new URL(path.join('file:', __dirname, pathIndex)); | ||
| win.loadURL(url.href); | ||
| } | ||
|
|
||
| const url = new URL(path.join('file:', __dirname, pathIndex)); | ||
| win.loadURL(url.href); | ||
| } | ||
|
|
||
| // Emitted when the window is closed. | ||
| win.on('closed', () => { | ||
| // Dereference the window object, usually you would store window | ||
| // in an array if your app supports multi windows, this is the time | ||
| // when you should delete the corresponding element. | ||
| win = null; | ||
| }); | ||
| // Emitted when the window is closed. | ||
| win.on('closed', () => { | ||
| // Dereference the window object, usually you would store window | ||
| // in an array if your app supports multi windows, this is the time | ||
| // when you should delete the corresponding element. | ||
| win = null; | ||
| }); | ||
|
|
||
| return win; | ||
| return win; | ||
| } | ||
|
|
||
| async function startElectron() { | ||
| try { | ||
| // This method will be called when Electron has finished | ||
| // initialization and is ready to create browser windows. | ||
| // Some APIs can only be used after this event occurs. | ||
| // Added 400 ms to fix the black background issue while using transparent window. More detais at https://github.com/electron/electron/issues/15947 | ||
| app.on('ready', () => setTimeout(createWindow, 400)); | ||
|
|
||
| // Quit when all windows are closed. | ||
| app.on('window-all-closed', () => { | ||
| // On OS X it is common for applications and their menu bar | ||
| // to stay active until the user quits explicitly with Cmd + Q | ||
| if (process.platform !== 'darwin') { | ||
| app.quit(); | ||
| } | ||
| }); | ||
|
|
||
| app.on('activate', () => { | ||
| // On OS X it's common to re-create a window in the app when the | ||
| // dock icon is clicked and there are no other windows open. | ||
| if (win === null) { | ||
| createWindow(); | ||
| } | ||
| }); | ||
|
|
||
| } catch (e) { | ||
| // Catch Error | ||
| // throw e; | ||
| } | ||
| await start(); | ||
| try { | ||
| // This method will be called when Electron has finished | ||
| // initialization and is ready to create browser windows. | ||
| // Some APIs can only be used after this event occurs. | ||
| // Added 400 ms to fix the black background issue while using transparent window. More detais at https://github.com/electron/electron/issues/15947 | ||
| app.on('ready', () => setTimeout(createWindow, 400)); | ||
|
|
||
| // Quit when all windows are closed. | ||
| app.on('window-all-closed', () => { | ||
| // On OS X it is common for applications and their menu bar | ||
| // to stay active until the user quits explicitly with Cmd + Q | ||
| if (process.platform !== 'darwin') { | ||
| app.quit(); | ||
| } | ||
| }); | ||
|
|
||
| app.on('activate', () => { | ||
| // On OS X it's common to re-create a window in the app when the | ||
| // dock icon is clicked and there are no other windows open. | ||
| if (win === null) { | ||
| createWindow(); | ||
| } | ||
| }); | ||
|
|
||
| } catch (e) { | ||
| // Catch Error | ||
| // throw e; | ||
| } | ||
| } | ||
|
|
||
| startElectron(); | ||
| //#endregion | ||
| //#endregion |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters