Umbra/electron-vite-app
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 6 Wiki Activity

Compare commits

base: Umbra:main
Branches Tags
Umbra:main
Umbra:1.0.5
Umbra:1.0.4
Umbra:1.0.3
Umbra:1.0.2
Umbra:1.0.1
Umbra:1.0.0
..
compare: Umbra:1.0.5
Branches Tags
Umbra:main
Umbra:1.0.5
Umbra:1.0.4
Umbra:1.0.3
Umbra:1.0.2
Umbra:1.0.1
Umbra:1.0.0

No commits in common. "main" and "1.0.5" have entirely different histories.
main ... 1.0.5

7 changed files with 14 additions and 153 deletions
Show stats Expand all files Collapse all files

16
package-lock.json generated
View file

@ -11,8 +11,7 @@
"dependencies": {
"@electron-toolkit/preload": "^3.0.2",
"@electron-toolkit/utils": "^4.0.0",
"electron-updater": "^6.3.9",
"sonner": "^2.0.7"
"electron-updater": "^6.3.9"
},
"devDependencies": {
"@electron-toolkit/eslint-config-prettier": "^3.0.0",
@ -7846,6 +7845,7 @@
"version": "19.2.3",
"resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
"integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.10.0"
@ -7855,6 +7855,7 @@
"version": "19.2.3",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
"integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
"dev": true,
"license": "MIT",
"dependencies": {
"scheduler": "^0.27.0"
@ -8234,6 +8235,7 @@
"version": "0.27.0",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
"integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
"dev": true,
"license": "MIT"
},
"node_modules/semver": {
@ -8506,16 +8508,6 @@
"node": ">= 14"
}
},
"node_modules/sonner": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/sonner/-/sonner-2.0.7.tgz",
"integrity": "sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w==",
"license": "MIT",
"peerDependencies": {
"react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
"react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc"
}
},
"node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",

3
package.json
View file

@ -24,8 +24,7 @@
"dependencies": {
"@electron-toolkit/preload": "^3.0.2",
"@electron-toolkit/utils": "^4.0.0",
"electron-updater": "^6.3.9",
"sonner": "^2.0.7"
"electron-updater": "^6.3.9"
},
"devDependencies": {
"@electron-toolkit/eslint-config-prettier": "^3.0.0",

29
src/main/index.ts
View file

@ -2,9 +2,8 @@ import { app, shell, BrowserWindow, ipcMain, Notification } from 'electron'
import { join } from 'path'
import { electronApp, optimizer, is } from '@electron-toolkit/utils'
import icon from '../../resources/icon.png?asset'
import { autoUpdater, UpdateInfo } from 'electron-updater'
import { autoUpdater } from 'electron-updater'
import Store from './lib/Store'
import { registerToastTarget, showErrorToast, showSuccessToast, showToast } from './lib/Toast'
autoUpdater.autoDownload = false;
autoUpdater.autoInstallOnAppQuit = true;
@ -81,7 +80,6 @@ function finishSetup(): void {
store.set('showSetupWindow', false);
createMainWindow();
mainWindow.on('ready-to-show', () => {
registerToastTarget(mainWindow);
mainWindow.show();
setupWindow.close();
})
@ -100,8 +98,6 @@ function createWindow(): void {
} else {
createMainWindow();
mainWindow.on('ready-to-show', () => {
registerToastTarget(mainWindow);
checkForUpdates();
splashWindow.close();
mainWindow.show();
})
@ -124,10 +120,7 @@ app.whenReady().then(() => {
})
// IPC test
ipcMain.on('ping', () => {
console.log('pong');
showToast('pong');
});
ipcMain.on('ping', () => console.log('pong'))
ipcMain.on('finish-setup', () => finishSetup())
ipcMain.handle('get-version', () => app.getVersion())
@ -139,6 +132,8 @@ app.whenReady().then(() => {
// dock icon is clicked and there are no other windows open.
if (BrowserWindow.getAllWindows().length === 0) createWindow()
})
checkForUpdates();
})
// Quit when all windows are closed, except on macOS. There, it's common
@ -161,36 +156,30 @@ function showNotification(value: any) {
function checkForUpdates() {
autoUpdater.checkForUpdates();
console.log(`Checking for updates. Current version ${app.getVersion()}`);
showToast(`Checking for updates. Current version ${app.getVersion()}`);
showNotification(`Checking for updates. Current version ${app.getVersion()}`);
}
/*New Update Available*/
autoUpdater.on("update-available", (info: UpdateInfo) => {
console.log(`Update available. Current version ${app.getVersion()}`, info.version);
showToast(`Update available. Current version ${app.getVersion()}`);
autoUpdater.on("update-available", () => {
console.log(`Update available. Current version ${app.getVersion()}`);
showNotification(`Update available. Current version ${app.getVersion()}`);
let pth = autoUpdater.downloadUpdate();
console.log(pth);
showToast(`Download update path : ${pth}`);
showNotification(`Download update path : ${pth}`);
});
autoUpdater.on("update-not-available", (info: UpdateInfo) => {
console.log(`No update available. Current version ${app.getVersion()}`, info.version);
showToast(`No update available. Current version ${app.getVersion()}, ${info.version}`);
showNotification(`No update available. Current version ${app.getVersion()}, ${info.version}`);
autoUpdater.on("update-not-available", () => {
console.log(`No update available. Current version ${app.getVersion()}`);
showNotification(`No update available. Current version ${app.getVersion()}`);
});
/*Download Completion Message*/
autoUpdater.on("update-downloaded", () => {
console.log(`Update downloaded. Current version ${app.getVersion()}`);
showSuccessToast(`Update downloaded. Current version ${app.getVersion()}`);
showNotification(`Update downloaded. Current version ${app.getVersion()}`);
});
autoUpdater.on("error", (info) => {
console.log(info);
showErrorToast(`Error: ${info}`);
showNotification(`Error: ${info}`);
});

51
src/main/lib/Toast.ts
View file

@ -1,51 +0,0 @@
import { BrowserWindow } from 'electron';
export type ToastType = 'default' | 'info' | 'success' | 'warning' | 'error';
export interface Toast {
type: 'toast';
payload: {
toastType: ToastType;
message: string;
options?: {
duration?: number;
[key: string]: any;
};
};
}
let toastTarget: BrowserWindow | null = null;
export function registerToastTarget(win: BrowserWindow) {
toastTarget = win;
}
function sendToast(toastType: ToastType, message: string, options?: object): void {
if (!toastTarget) {
console.warn('No target window registered for toasts.');
return;
}
let optionsJSON;
if (options) {
optionsJSON = JSON.stringify(options);
}
toastTarget.webContents.send('toast', {
type: 'toast',
payload: { toastType, message, optionsJSON },
});
}
export function showToast(message: string, options?: object): void {
return sendToast('default', message, options)
}
export function showInformationToast(message: string, options?: object): void {
return sendToast('info', message, options)
}
export function showSuccessToast(message: string, options?: object): void {
return sendToast('success', message, options)
}
export function showWarningToast(message: string, options?: object): void {
return sendToast('warning', message, options)
}
export function showErrorToast(message: string, options?: object): void {
return sendToast('error', message, options)
}

3
src/renderer/src/App.tsx
View file

@ -1,6 +1,5 @@
import Versions from './components/Versions'
import electronLogo from './assets/electron.svg'
import ToastHandler from './components/ToastHandler'
function App(): React.JSX.Element {
const ipcHandle = (): void => window.electron.ipcRenderer.send('ping')
@ -29,8 +28,6 @@ function App(): React.JSX.Element {
</div>
</div>
<Versions></Versions>
<ToastHandler></ToastHandler>
</>
)
}

34
src/renderer/src/components/ToastHandler.tsx
View file

@ -1,34 +0,0 @@
import { useEffect } from "react";
import { handleToast, Toast } from "./handleToasts";
import { Toaster } from 'sonner';
function ToastHandler(): React.JSX.Element {
useEffect(() => {
const listener = (_: any, toast: Toast) => {
handleToast(toast);
};
// @ts-ignore (define in dts)
window.electron.ipcRenderer.on('toast', listener);
return () => {
// @ts-ignore (define in dts)
window.electron.ipcRenderer.removeAllListeners('toast');
};
}, []);
return (
<Toaster
expand={true}
visibleToasts={9}
theme={"dark"}
toastOptions={{
style: {
background: 'var(--color-background)',
},
}} />
)
}
export default ToastHandler

31
src/renderer/src/components/handleToasts.ts
View file

@ -1,31 +0,0 @@
import { toast as sonnerToast } from 'sonner';
export type Toast = {
type: 'toast';
payload: {
toastType: 'default' | 'info' | 'success' | 'warning' | 'error';
message: string;
optionsJSON?: string;
options?: object;
};
};
export function handleToast(toast: Toast) {
if (toast.type === 'toast') {
const { toastType, message, optionsJSON } = toast.payload;
// @ts-ignore
let options;
if (optionsJSON) {
options = JSON.parse(optionsJSON);
}
if (toastType == 'default') {
sonnerToast(message, options);
} else if (['info', 'success', 'warning', 'error'].includes(toastType)) {
sonnerToast[toastType](message, options);
} else {
console.warn('Type de toast invalide :', toastType);
}
} else {
console.warn('toast inconnue :', toast);
}
}