support dev env, minor window changes

rebelvg · Nov 27, 2024 · 4ffef03 · 4ffef03
1 parent c5a1ed3
commit 4ffef03
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 20 deletions.
diff --git a/.config/.gitkeep b/.config/.gitkeep
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@ dist-api/
 dist-app/
 node_modules/
 *.log
+.config/*
+!.config/.gitkeep
diff --git a/api/channel-play.ts b/api/channel-play.ts
@@ -61,8 +61,11 @@ export async function playInWindow(channel: Channel): Promise<boolean> {
     webPreferences: {
       nodeIntegration: false,
     },
+    autoHideMenuBar: true,
   });
 
+  window.setMenu(null);
+
   await window.loadURL(embedLink);
 
   window.on('closed', () => {

diff --git a/api/config-class.ts b/api/config-class.ts
@@ -15,7 +15,7 @@ import { SourcesEnum } from './enums';
 import { config } from './settings-file';
 
 const SETTINGS_FILE_PATH = path.join(
-  app.getPath('documents'),
+  process.env.NODE_ENV !== 'dev' ? app.getPath('documents') : './.config',
   'KolpaqueClientElectron.json',
 );
 

diff --git a/api/logs.ts b/api/logs.ts
@@ -7,7 +7,8 @@ import { app } from 'electron';
 import * as util from 'util';
 import { AxiosError } from 'axios';
 
-const clientAppDataPath = app.getPath('userData');
+const clientAppDataPath =
+  process.env.NODE_ENV !== 'dev' ? app.getPath('userData') : './.config';
 
 export const appLogPath = path.join(clientAppDataPath, 'app.log');
 export const crashLogPath = path.join(clientAppDataPath, 'crash.log');
@@ -19,7 +20,7 @@ ipcMain.handle('config_logs', () => logsUi.slice().reverse());
 ipcMain.on('logs_open_folder', () => {
   addLogs('info', 'logs_open_folder');
 
-  shell.showItemInFolder(appLogPath);
+  shell.openPath(path.resolve(clientAppDataPath));
 });
 
 export function addLogs(

diff --git a/api/main.ts b/api/main.ts
@@ -28,9 +28,13 @@ import { addLogs, crashLogPath } from './logs';
 import { init } from './client-init';
 import { CLIENT_VERSION } from './globals';
 
-const isDev = process.env.NODE_ENV === 'dev';
-
-addLogs('info', 'is_dev', isDev, CLIENT_VERSION);
+addLogs(
+  'info',
+  'is_dev',
+  process.env.NODE_ENV,
+  process.env.REACT_ENV,
+  CLIENT_VERSION,
+);
 
 let forceQuit = false;
 
@@ -82,14 +86,16 @@ export const main: { mainWindow: BrowserWindow | undefined } = {
 
 app.setName('Kolpaque Client');
 
-app.on('second-instance', () => {
-  main.mainWindow!.show();
-});
+if (process.env.NODE_ENV !== 'dev') {
+  app.on('second-instance', () => {
+    main.mainWindow!.show();
+  });
 
-const lockStatus = app.requestSingleInstanceLock();
+  const lockStatus = app.requestSingleInstanceLock();
 
-if (!lockStatus) {
-  app.quit();
+  if (!lockStatus) {
+    app.quit();
+  }
 }
 
 function createWindow(): void {
@@ -116,10 +122,12 @@ function createWindow(): void {
 
   mainWindow.setMenu(null);
 
-  if (isDev) {
+  if (process.env.REACT_ENV === 'dev') {
     mainWindow.loadURL('http://localhost:10000');
 
-    mainWindow.webContents.openDevTools();
+    mainWindow.webContents.openDevTools({
+      mode: 'detach',
+    });
   } else {
     mainWindow.loadURL(
       url.format({

diff --git a/api/sync-settings.ts b/api/sync-settings.ts
@@ -11,11 +11,11 @@ import { config } from './settings-file';
 import { ISavedSettingsFile } from './config-class';
 
 const SYNC_ID_FILE_PATH = path.join(
-  app.getPath('documents'),
+  process.env.NODE_ENV !== 'dev' ? app.getPath('documents') : './.config',
   'KolpaqueClientElectron_sync_id',
 );
 const SYNC_ENCRYPTION_KEY_FILE_PATH = path.join(
-  app.getPath('documents'),
+  process.env.NODE_ENV !== 'dev' ? app.getPath('documents') : './.config',
   'KolpaqueClientElectron_encryption_key',
 );
 

diff --git a/api/version-check.ts b/api/version-check.ts
@@ -36,7 +36,10 @@ ipcMain.on('client_getInfo', async () => {
 
 ipcMain.on(
   'client_getVersion',
-  (event) => (event.returnValue = CLIENT_VERSION),
+  (event) =>
+    (event.returnValue = `${CLIENT_VERSION}${
+      process.env.NODE_ENV === 'dev' ? ' DEV' : ''
+    }`),
 );
 
 function sendInfo(update: string): void {

diff --git a/app/webpack.config.js b/app/webpack.config.js
@@ -38,7 +38,9 @@ module.exports = {
     ],
   },
   plugins: [
-    new HtmlWebpackPlugin(),
+    new HtmlWebpackPlugin({
+      title: 'Webpack Dev Server',
+    }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NamedModulesPlugin(),
     new webpack.NoEmitOnErrorsPlugin(),

diff --git a/package.json b/package.json
@@ -12,9 +12,9 @@
     "build:api": "tsc --project api/tsconfig.json",
     "build": "yarn run build:api && yarn workspace app run build && ts-node build.ts",
     "release": "yarn ts-node release.ts",
-    "start:api": "yarn build:api && cross-env NODE_ENV=dev electron .",
+    "start:api": "yarn run build:api && cross-env NODE_ENV=dev REACT_ENV=dev electron .",
     "start:dev": "concurrently --kill-others \"yarn run start:api\" \"yarn workspace app run start\"",
-    "start": "yarn run build:api && yarn workspace app run build && electron ."
+    "start": "yarn run build:api && yarn workspace app run build && cross-env NODE_ENV=dev electron ."
   },
   "author": "KLPQ",
   "license": "CC0-1.0",