diff --git a/client/main.ts b/client/main.ts index bcf4f3c..ceed539 100644 --- a/client/main.ts +++ b/client/main.ts @@ -16,6 +16,9 @@ process.on('unhandledRejection', async (reason: any, _promise: Promise) => // Initialize electron remote so that we can get console logs all in the same place import * as electronMain from '@electron/remote/main'; + +LOG.silly('modules loaded'); + electronMain.initialize(); (async () => { @@ -35,7 +38,7 @@ electronMain.initialize(); webPreferences: { //@ts-ignore enableRemoteModule is enabled with @electron/remote and not included in electron's typing enableRemoteModule: true, // so we can get console logs properly - preload: path.join(__dirname, 'webapp', 'entrypoint.js') + preload: path.join(__dirname, 'webapp', 'preload.js') } }); diff --git a/client/webapp/img/add-server-icon.png b/client/webapp/img/add-guild-icon.png similarity index 100% rename from client/webapp/img/add-server-icon.png rename to client/webapp/img/add-guild-icon.png diff --git a/client/webapp/entrypoint.ts b/client/webapp/preload.ts similarity index 97% rename from client/webapp/entrypoint.ts rename to client/webapp/preload.ts index 95c06d7..7b0098f 100644 --- a/client/webapp/entrypoint.ts +++ b/client/webapp/preload.ts @@ -3,7 +3,7 @@ const electronConsole = electronRemote.getGlobal('console') as Console; import Logger from '../../logger/logger'; const LOG = Logger.create(__filename, electronConsole); -LOG.silly('script begins'); +LOG.silly('preload begins'); import * as path from 'path'; import * as fs from 'fs/promises'; diff --git a/client/webapp/styles/server-list.scss b/client/webapp/styles/guild-list.scss similarity index 100% rename from client/webapp/styles/server-list.scss rename to client/webapp/styles/guild-list.scss diff --git a/client/webapp/styles/server-members.scss b/client/webapp/styles/guild-members.scss similarity index 100% rename from client/webapp/styles/server-members.scss rename to client/webapp/styles/guild-members.scss diff --git a/client/webapp/styles/server.scss b/client/webapp/styles/guild.scss similarity index 100% rename from client/webapp/styles/server.scss rename to client/webapp/styles/guild.scss diff --git a/logger/logger.ts b/logger/logger.ts index 0ce9806..3ae70b4 100644 --- a/logger/logger.ts +++ b/logger/logger.ts @@ -208,7 +208,7 @@ export default class Logger { line = NaN; } - let prefixFileName = padLeft(fileName, ' ', Math.min(this.longestFileNameLength, MAX_FILE_NAME_PADDING)); + let prefixFileName = padLeft(fileName, ' ', MAX_FILE_NAME_PADDING); // Math.min(this.longestFileNameLength, ) let prefixLine = padRight(line + '', ' ', LINE_NUM_LENGTH); let prefixLogType = colorize(level, LoggerLevel[level].charAt(0).toLowerCase()); let prefixTime = moment().format('HH:mm:ss.SSS');