diff --git a/electron/windows/mainWindow.ts b/electron/windows/mainWindow.ts index 709b25b..e827428 100644 --- a/electron/windows/mainWindow.ts +++ b/electron/windows/mainWindow.ts @@ -10,7 +10,7 @@ export function createMainWindow( preloadPath?: string ) { mainWin = new BrowserWindow({ - icon: path.join(process.env.VITE_PUBLIC ?? RENDERER_DIST, 'electron-vite.svg'), + icon: path.join(process.env.VITE_PUBLIC ?? RENDERER_DIST, 'matmal-icon.png'), webPreferences: { preload: preloadPath ?? path.join(RENDERER_DIST, 'preload.mjs'), }, diff --git a/forge.config.js b/forge.config.js index e210b4f..106404b 100644 --- a/forge.config.js +++ b/forge.config.js @@ -4,8 +4,8 @@ import { FuseV1Options, FuseVersion } from '@electron/fuses'; export default { packagerConfig: { asar: true, - icon: './src/assets/matmal-icon', - executableName: 'matmal', + icon: './public/matmal-icon.png', + executableName: '/src/assets/matmal-icon', name: 'MATMAL', }, rebuildConfig: {}, @@ -13,29 +13,32 @@ export default { { name: '@electron-forge/maker-squirrel', config: { - setupIcon: './src/assets/matmal-icon.ico', + setupIcon: '/src/assets/matmal-icon.ico', }, }, { name: '@electron-forge/maker-zip', platforms: ['darwin'], + config: { + icon: './src/assets/matmal-icon.png', + }, }, { name: '@electron-forge/maker-deb', config: { - icon: '/src/assets/matmal-icon.png', + icon: './public/matmal-icon.png', }, }, { name: '@electron-forge/maker-dmg', config: { - icon: '/src/assets/matmal-icon.icns', + icon: './src/assets/matmal-icon.icns', }, }, { name: '@electron-forge/maker-rpm', config: { - icon: '/src/assets/matmal-icon.png', + icon: './src/assets/matmal-icon.png', }, }, ], diff --git a/src/assets/matmal-icon.png b/src/assets/matmal-icon.png new file mode 100644 index 0000000..186b3b1 Binary files /dev/null and b/src/assets/matmal-icon.png differ diff --git a/src/shared/components/ui/Loading.tsx b/src/shared/components/ui/Loading.tsx index c67b1b2..e1e4d83 100644 --- a/src/shared/components/ui/Loading.tsx +++ b/src/shared/components/ui/Loading.tsx @@ -1,6 +1,6 @@ export function LoadingSpinner() { return ( -