diff --git a/.gitignore b/.gitignore index 4380cce54..1b6b1acfc 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ scripts/themes/tokens .env # content trace files for electron electron-app/traces +# The IDE2 preload file is generated on the fly +electron-app/resources/preload.html diff --git a/.vscode/launch.json b/.vscode/launch.json index 802b130d6..820ba07b8 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -20,7 +20,6 @@ "--no-app-auto-install", "--plugins=local-dir:../plugins", "--hosted-plugin-inspect=9339", - "--nosplash", "--content-trace", "--open-devtools" ], diff --git a/arduino-ide-extension/src/electron-browser/theia/core/electron-window-module.ts b/arduino-ide-extension/src/electron-browser/theia/core/electron-window-module.ts index 9328572b1..52a5eb272 100644 --- a/arduino-ide-extension/src/electron-browser/theia/core/electron-window-module.ts +++ b/arduino-ide-extension/src/electron-browser/theia/core/electron-window-module.ts @@ -6,10 +6,6 @@ import { ElectronMainWindowServiceExt, electronMainWindowServiceExtPath, } from '../../../electron-common/electron-main-window-service-ext'; -import { - SplashService, - splashServicePath, -} from '../../../electron-common/splash-service'; import { ElectronWindowService } from './electron-window-service'; export default new ContainerModule((bind, unbind, isBound, rebind) => { @@ -24,9 +20,4 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => { ) ) .inSingletonScope(); - bind(SplashService) - .toDynamicValue(({ container }) => - ElectronIpcConnectionProvider.createProxy(container, splashServicePath) - ) - .inSingletonScope(); }); diff --git a/arduino-ide-extension/src/electron-browser/theia/core/electron-window-service.ts b/arduino-ide-extension/src/electron-browser/theia/core/electron-window-service.ts index 2f571b419..d0d0a1ef2 100644 --- a/arduino-ide-extension/src/electron-browser/theia/core/electron-window-service.ts +++ b/arduino-ide-extension/src/electron-browser/theia/core/electron-window-service.ts @@ -1,17 +1,15 @@ -import { - inject, - injectable, - postConstruct, -} from '@theia/core/shared/inversify'; import * as remote from '@theia/core/electron-shared/@electron/remote'; -import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state'; import { ConnectionStatus, ConnectionStatusService, } from '@theia/core/lib/browser/connection-status-service'; -import { ElectronWindowService as TheiaElectronWindowService } from '@theia/core/lib/electron-browser/window/electron-window-service'; -import { SplashService } from '../../../electron-common/splash-service'; import { nls } from '@theia/core/lib/common'; +import { ElectronWindowService as TheiaElectronWindowService } from '@theia/core/lib/electron-browser/window/electron-window-service'; +import { + inject, + injectable, + postConstruct, +} from '@theia/core/shared/inversify'; import { WindowServiceExt } from '../../../browser/theia/core/window-service-ext'; import { ElectronMainWindowServiceExt } from '../../../electron-common/electron-main-window-service-ext'; @@ -23,20 +21,14 @@ export class ElectronWindowService @inject(ConnectionStatusService) private readonly connectionStatusService: ConnectionStatusService; - @inject(SplashService) - private readonly splashService: SplashService; - - @inject(FrontendApplicationStateService) - private readonly appStateService: FrontendApplicationStateService; - @inject(ElectronMainWindowServiceExt) private readonly mainWindowServiceExt: ElectronMainWindowServiceExt; @postConstruct() protected override init(): void { - this.appStateService - .reachedAnyState('initialized_layout') - .then(() => this.splashService.requestClose()); + // NOOP + // Does not listen on Theia's `window.zoomLevel` changes. + // TODO: IDE2 must switch to the Theia preferences and drop the custom one. } protected shouldUnload(): boolean { diff --git a/arduino-ide-extension/src/electron-common/splash-service.ts b/arduino-ide-extension/src/electron-common/splash-service.ts deleted file mode 100644 index d7d4ba6b2..000000000 --- a/arduino-ide-extension/src/electron-common/splash-service.ts +++ /dev/null @@ -1,5 +0,0 @@ -export const splashServicePath = '/services/splash-service'; -export const SplashService = Symbol('SplashService'); -export interface SplashService { - requestClose(): Promise; -} diff --git a/arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts b/arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts index 0146fd02a..ea25a4e09 100644 --- a/arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts +++ b/arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts @@ -16,13 +16,8 @@ import { ElectronMainWindowServiceExt, electronMainWindowServiceExtPath, } from '../electron-common/electron-main-window-service-ext'; -import { - SplashService, - splashServicePath, -} from '../electron-common/splash-service'; import { ElectronMainWindowServiceExtImpl } from './electron-main-window-service-ext-impl'; import { IDEUpdaterImpl } from './ide-updater/ide-updater-impl'; -import { SplashServiceImpl } from './splash/splash-service-impl'; import { ElectronMainApplication } from './theia/electron-main-application'; import { ElectronMainWindowServiceImpl } from './theia/electron-main-window-service'; import { TheiaElectronWindow } from './theia/theia-electron-window'; @@ -34,17 +29,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => { bind(ElectronMainWindowServiceImpl).toSelf().inSingletonScope(); rebind(ElectronMainWindowService).toService(ElectronMainWindowServiceImpl); - bind(SplashServiceImpl).toSelf().inSingletonScope(); - bind(SplashService).toService(SplashServiceImpl); - bind(ElectronConnectionHandler) - .toDynamicValue( - (context) => - new JsonRpcConnectionHandler(splashServicePath, () => - context.container.get(SplashService) - ) - ) - .inSingletonScope(); - // IDE updater bindings bind(IDEUpdaterImpl).toSelf().inSingletonScope(); bind(IDEUpdater).toService(IDEUpdaterImpl); diff --git a/arduino-ide-extension/src/electron-main/splash/splash-screen.ts b/arduino-ide-extension/src/electron-main/splash/splash-screen.ts deleted file mode 100644 index 2120f5968..000000000 --- a/arduino-ide-extension/src/electron-main/splash/splash-screen.ts +++ /dev/null @@ -1,158 +0,0 @@ -/* -MIT License - -Copyright (c) 2017 Troy McKinnon - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ -// Copied from https://raw.githubusercontent.com/trodi/electron-splashscreen/2f5052a133be021cbf9a438d0ef4719cd1796b75/index.ts - -/** - * Module handles configurable splashscreen to show while app is loading. - */ - -import { Event } from '@theia/core/lib/common/event'; -import { BrowserWindow } from 'electron'; - -/** - * When splashscreen was shown. - * @ignore - */ -let splashScreenTimestamp = 0; -/** - * Splashscreen is loaded and ready to show. - * @ignore - */ -let splashScreenReady = false; -/** - * Main window has been loading for a min amount of time. - * @ignore - */ -let slowStartup = false; -/** - * True when expected work is complete and we've closed splashscreen, else user prematurely closed splashscreen. - * @ignore - */ -let done = false; -/** - * Show splashscreen if criteria are met. - * @ignore - */ -const showSplash = () => { - if (splashScreen && splashScreenReady && slowStartup) { - splashScreen.show(); - splashScreenTimestamp = Date.now(); - } -}; -/** - * Close splashscreen / show main screen. Ensure screen is visible for a min amount of time. - * @ignore - */ -const closeSplashScreen = (main: Electron.BrowserWindow, min: number): void => { - if (splashScreen) { - const timeout = min - (Date.now() - splashScreenTimestamp); - setTimeout(() => { - done = true; - if (splashScreen) { - splashScreen.isDestroyed() || splashScreen.close(); // Avoid `Error: Object has been destroyed` (#19) - splashScreen = null; - } - if (!main.isDestroyed()) { - main.show(); - } - }, timeout); - } -}; -/** `electron-splashscreen` config object. */ -export interface Config { - /** Options for the window that is loading and having a splashscreen tied to. */ - windowOpts: Electron.BrowserWindowConstructorOptions; - /** - * URL to the splashscreen template. This is the path to an `HTML` or `SVG` file. - * If you want to simply show a `PNG`, wrap it in an `HTML` file. - */ - templateUrl: string; - - /** - * Full set of browser window options for the splashscreen. We override key attributes to - * make it look & feel like a splashscreen; the rest is up to you! - */ - splashScreenOpts: Electron.BrowserWindowConstructorOptions; - /** Number of ms the window will load before splashscreen appears (default: 500ms). */ - delay?: number; - /** Minimum ms the splashscreen will be visible (default: 500ms). */ - minVisible?: number; - /** Close window that is loading if splashscreen is closed by user (default: true). */ - closeWindow?: boolean; -} -/** - * The actual splashscreen browser window. - * @ignore - */ -let splashScreen: Electron.BrowserWindow | null; -/** - * Initializes a splashscreen that will show/hide smartly (and handle show/hiding of main window). - * @param config - Configures splashscreen - * @returns {BrowserWindow} the main browser window ready for loading - */ -export const initSplashScreen = async ( - config: Config, - windowFactory: ( - options: Electron.BrowserViewConstructorOptions - ) => Promise, - onCloseRequested?: Event -): Promise => { - const xConfig: Required = { - windowOpts: config.windowOpts, - templateUrl: config.templateUrl, - splashScreenOpts: config.splashScreenOpts, - delay: config.delay ?? 500, - minVisible: config.minVisible ?? 500, - closeWindow: config.closeWindow ?? true, - }; - xConfig.splashScreenOpts.center = true; - xConfig.splashScreenOpts.frame = false; - xConfig.windowOpts.show = false; - const window = await windowFactory(xConfig.windowOpts); - splashScreen = new BrowserWindow(xConfig.splashScreenOpts); - splashScreen.loadURL(`file://${xConfig.templateUrl}`); - xConfig.closeWindow && - splashScreen.on('close', () => { - done || window.close(); - }); - // Splashscreen is fully loaded and ready to view. - splashScreen.webContents.on('did-finish-load', () => { - splashScreenReady = true; - showSplash(); - }); - // Startup is taking enough time to show a splashscreen. - setTimeout(() => { - slowStartup = true; - showSplash(); - }, xConfig.delay); - if (onCloseRequested) { - onCloseRequested(() => closeSplashScreen(window, xConfig.minVisible)); - } else { - window.webContents.on('did-finish-load', () => { - closeSplashScreen(window, xConfig.minVisible); - }); - } - window.on('closed', () => closeSplashScreen(window, 0)); // XXX: close splash when main window is closed - return window; -}; diff --git a/arduino-ide-extension/src/electron-main/splash/splash-service-impl.ts b/arduino-ide-extension/src/electron-main/splash/splash-service-impl.ts deleted file mode 100644 index 64168c01b..000000000 --- a/arduino-ide-extension/src/electron-main/splash/splash-service-impl.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { injectable } from '@theia/core/shared/inversify'; -import { Event, Emitter } from '@theia/core/lib/common/event'; -import { SplashService } from '../../electron-common/splash-service'; - -@injectable() -export class SplashServiceImpl implements SplashService { - protected requested = false; - protected readonly onCloseRequestedEmitter = new Emitter(); - - get onCloseRequested(): Event { - return this.onCloseRequestedEmitter.event; - } - - async requestClose(): Promise { - if (!this.requested) { - this.requested = true; - this.onCloseRequestedEmitter.fire(); - } - } -} diff --git a/arduino-ide-extension/src/electron-main/splash/static/splash.html b/arduino-ide-extension/src/electron-main/splash/static/splash.html deleted file mode 100644 index e372bae3a..000000000 --- a/arduino-ide-extension/src/electron-main/splash/static/splash.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - -
-

-
- - - diff --git a/arduino-ide-extension/src/electron-main/splash/static/splash.png b/arduino-ide-extension/src/electron-main/splash/static/splash.png deleted file mode 100644 index 51f0cca4a..000000000 Binary files a/arduino-ide-extension/src/electron-main/splash/static/splash.png and /dev/null differ diff --git a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts index e5159a149..9c990f0a3 100644 --- a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts +++ b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts @@ -1,18 +1,15 @@ -import { inject, injectable } from '@theia/core/shared/inversify'; +import { injectable } from '@theia/core/shared/inversify'; import { app, BrowserWindow, - BrowserWindowConstructorOptions, contentTracing, ipcMain, - screen, Event as ElectronEvent, } from '@theia/core/electron-shared/electron'; import { fork } from 'child_process'; import { AddressInfo } from 'net'; import { join, dirname } from 'path'; import * as fs from 'fs-extra'; -import { initSplashScreen } from '../splash/splash-screen'; import { MaybePromise } from '@theia/core/lib/common/types'; import { ElectronSecurityToken } from '@theia/core/lib/electron-common/electron-token'; import { FrontendApplicationConfig } from '@theia/application-package/lib/application-props'; @@ -20,7 +17,6 @@ import { ElectronMainApplication as TheiaElectronMainApplication, ElectronMainExecutionParams, } from '@theia/core/lib/electron-main/electron-main-application'; -import { SplashServiceImpl } from '../splash/splash-service-impl'; import { URI } from '@theia/core/shared/vscode-uri'; import { Deferred } from '@theia/core/lib/common/promise-util'; import * as os from '@theia/core/lib/common/os'; @@ -42,14 +38,6 @@ interface WorkspaceOptions { const WORKSPACES = 'workspaces'; -/** - * Purely a dev thing. If you start the app with the `--nosplash` argument, - * then you won't have the splash screen (which is always on top :confused:) and can debug the app at startup. - * Note: if you start the app from VS Code with the `App (Electron)` config, the splash screen will be disabled. - */ -const APP_STARTED_WITH_NOSPLASH = - typeof process !== 'undefined' && process.argv.indexOf('--nosplash') !== -1; - /** * If the app is started with `--open-devtools` argument, the `Dev Tools` will be opened. */ @@ -70,9 +58,6 @@ export class ElectronMainApplication extends TheiaElectronMainApplication { private _firstWindowId: number | undefined; private openFilePromise = new Deferred(); - @inject(SplashServiceImpl) - private readonly splashService: SplashServiceImpl; - override async start(config: FrontendApplicationConfig): Promise { // Explicitly set the app name to have better menu items on macOS. ("About", "Hide", and "Quit") // See: https://github.com/electron-userland/electron-builder/issues/2468 @@ -289,69 +274,10 @@ export class ElectronMainApplication extends TheiaElectronMainApplication { super.onSecondInstance(event, argv, cwd); } - /** - * Use this rather than creating `BrowserWindow` instances from scratch, since some security parameters need to be set, this method will do it. - * - * @param options - */ override async createWindow( asyncOptions: MaybePromise = this.getDefaultTheiaWindowOptions() ): Promise { - let options = await asyncOptions; - options = this.avoidOverlap(options); - let electronWindow: BrowserWindow | undefined; - if (this.windows.size || APP_STARTED_WITH_NOSPLASH) { - electronWindow = await this.doCreateWindow(options); - } else { - const { bounds } = screen.getDisplayNearestPoint( - screen.getCursorScreenPoint() - ); - const splashHeight = 450; - const splashWidth = 600; - const splashY = Math.floor(bounds.y + (bounds.height - splashHeight) / 2); - const splashX = Math.floor(bounds.x + (bounds.width - splashWidth) / 2); - const splashScreenOpts: BrowserWindowConstructorOptions = { - height: splashHeight, - width: splashWidth, - x: splashX, - y: splashY, - transparent: true, - alwaysOnTop: true, - focusable: false, - minimizable: false, - maximizable: false, - hasShadow: false, - resizable: false, - }; - electronWindow = await initSplashScreen( - { - windowOpts: options, - templateUrl: join( - __dirname, - '..', - '..', - '..', - 'src', - 'electron-main', - 'splash', - 'static', - 'splash.html' - ), - delay: 0, - minVisible: 2000, - splashScreenOpts, - }, - (windowOptions) => this.doCreateWindow(windowOptions), - this.splashService.onCloseRequested - ); - } - return electronWindow; - } - - private async doCreateWindow( - options: TheiaBrowserWindowOptions - ): Promise { - const electronWindow = await super.createWindow(options); + const electronWindow = await super.createWindow(asyncOptions); if (APP_STARTED_WITH_DEV_TOOLS) { electronWindow.webContents.openDevTools(); } diff --git a/electron-app/package.json b/electron-app/package.json index 26ff29316..b73757d3f 100644 --- a/electron-app/package.json +++ b/electron-app/package.json @@ -25,12 +25,16 @@ }, "devDependencies": { "@theia/cli": "1.25.0", - "electron": "^15.3.5" + "electron": "^15.3.5", + "html-webpack-plugin": "^5.5.0", + "lottie-web": "^5.9.6", + "remove-files-webpack-plugin": "^1.5.0" }, "scripts": { - "prepare": "theia build --mode development", + "prepare": "yarn preload:generate && theia build --mode development", "start": "theia start --plugins=local-dir:../plugins", - "watch": "theia build --watch --mode development" + "watch": "theia build --watch --mode development", + "preload:generate": "webpack --config ./preload/webpack.config.js" }, "theia": { "target": "electron", @@ -61,7 +65,7 @@ }, "generator": { "config": { - "preloadTemplate": "
" + "preloadTemplate": "./resources/preload.html" } } } diff --git a/electron-app/preload/assets/preload.json b/electron-app/preload/assets/preload.json new file mode 100644 index 000000000..0ab7e95ad --- /dev/null +++ b/electron-app/preload/assets/preload.json @@ -0,0 +1 @@ +{"v":"4.8.0","meta":{"g":"LottieFiles AE 2.0.4","a":"","k":"","d":"","tc":""},"fr":25,"ip":0,"op":81,"w":1920,"h":1080,"nm":"Loop Animation - final","ddd":0,"assets":[{"id":"image_0","w":123,"h":123,"u":"","p":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHsAAAB7CAYAAABUx/9/AAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAABnUlEQVR4nO3cwU3DUBRFQRu5kHQCpaQQUAiIPlJKCotiFrBFyYof68xUcPWP7OWbpy34+NpP63U/esafDm8voyfcYxk94C7rdTdN8/PoGVv3NHoA/0fsELFDxA4RO0TsELFDxA4RO0TsELFDxA4RO0TsELFDxA4RO0TsELFDxA4RO0TsELFDxA4RO0TsELFDxA4RO0TsELFDxA4RO0TsELFDxA4RO0TsELFD5t+DcrvRQ254eew7aOtx9IKb1uW0/FwOfOSH3IL5MHrBbZez33iI2CFih4gdInaI2CFih4gdInaI2CFih4gdInaI2CFih4gdInaI2CFih4gdInaI2CFih4gdInaI2CFih4gdInaI2CFih4gdInaI2CFih4gdInaI2CHz6AF3OX6+P/T5qcPrJt7Rlx0idojYIWKHiB0idojYIWKHiB0idojYIWKHiB0idojYIWKHiB0idojYIWKHiB0idojYIWKHiB0idojYIWKHiB0idojYIWKHiB0idojYIWKHiB0idojYIWKHLKMH3GVdTtN0OY+esXXfRdAatjR1KdMAAAAASUVORK5CYII=","e":1},{"id":"image_1","w":123,"h":40,"u":"","p":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHsAAAAoCAYAAADe3YUmAAAACXBIWXMAAAABAAAAAQBPJcTWAAAAJHpUWHRDcmVhdG9yAAAImXNMyU9KVXBMK0ktUnBNS0tNLikGAEF6Bs5qehXFAAAAn0lEQVR4nO3RQQ3CQAAAweulApCCAyxhgQd/pCEFBYUHGkoTdkbBJruM2/0xxnYe/Lf3vK7f0cvl6Bb2tp3m0Qn8jtkhZoeYHWJ2iNkhZoeYHWJ2iNkhZoeYHWJ2iNkhZoeYHWJ2iNkhZoeYHWJ2iNkhZoeYHWJ2iNkhZoeYHWJ2iNkhZoeYHWJ2iNkhZoeYHWJ2yDrGfI6xHd3B7ubrA1DkCccjZ/S5AAAAAElFTkSuQmCC","e":1}],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"loop/loop_logo Outlines 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":180,"ix":10},"p":{"a":0,"k":[960,452,0],"ix":2},"a":{"a":0,"k":[554,340,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[73.006,-10.478],[8.951,0],[0,88.059],[-92.012,0],[-8.358,-1.212],[-30.248,-39.959],[-4.927,-8.906],[0,0],[-3.717,-5.144],[-68.277,-9.799],[-8.93,0],[0,88.059],[92.009,0],[8.471,-1.227],[29.287,-43.105]],"o":[[0,0],[-29.346,43.147],[-8.363,1.179],[-91.965,0],[0,-88.062],[8.887,0],[65.213,9.302],[6.144,8.115],[0,0],[3.072,5.554],[29.911,41.401],[8.49,1.193],[91.96,0],[0,-88.062],[-8.87,0],[-73.023,10.415],[0,0]],"v":[[-0.039,-0.002],[-28.014,50.664],[-180.673,157.917],[-206.808,159.7],[-373.593,-0.002],[-206.721,-159.703],[-180.731,-157.875],[-38.166,-64.896],[-21.649,-39.252],[23.875,43.065],[34.014,59.146],[180.562,157.905],[206.815,159.703],[373.592,0.002],[206.729,-159.701],[180.632,-157.857],[28.087,-50.766]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.505882382393,0.517647087574,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":72.106,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[553.857,339.969],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Trasformazione"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":65,"s":[100]},{"t":82.0000651041667,"s":[0]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":50.0083333333333,"op":87,"st":51.0166666666667,"bm":0},{"ddd":0,"ind":2,"ty":2,"nm":"+ 2","refId":"image_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.812]},"o":{"x":[0.167],"y":[0]},"t":61,"s":[100]},{"t":69.9995442708333,"s":[0]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[1.167]},"o":{"x":[0.167],"y":[0.167]},"t":61,"s":[0]},{"t":77.9995442708333,"s":[-45]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":61,"s":[1161.248,450.162,0],"to":[0,27.59,0],"ti":[0,-27.59,0]},{"t":77.9907552083333,"s":[1161.248,615.7,0]}],"ix":2},"a":{"a":0,"k":[61.179,61.228,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":51.0083333333333,"op":88,"st":58.0083333333333,"bm":0},{"ddd":0,"ind":3,"ty":2,"nm":"- 2","refId":"image_1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.722]},"o":{"x":[0.167],"y":[0]},"t":54,"s":[100]},{"t":63.9995442708333,"s":[0]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":54,"s":[0]},{"t":70.1684895833333,"s":[-45]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":54,"s":[754.437,450.163,0],"to":[0,-30,0],"ti":[0,30.667,0]},{"t":69.9995442708333,"s":[754.437,266.162,0]}],"ix":2},"a":{"a":0,"k":[61.189,19.892,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":51.0083333333333,"op":88,"st":65.0083333333333,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"loop/loop_logo Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[960,452,0],"ix":2},"a":{"a":0,"k":[554,340,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[73.006,-10.478],[8.951,0],[0,88.059],[-92.012,0],[-8.358,-1.212],[-30.248,-39.959],[-4.927,-8.906],[0,0],[-3.717,-5.144],[-68.277,-9.799],[-8.93,0],[0,88.059],[92.009,0],[8.471,-1.227],[29.287,-43.105]],"o":[[0,0],[-29.346,43.147],[-8.363,1.179],[-91.965,0],[0,-88.062],[8.887,0],[65.213,9.302],[6.144,8.115],[0,0],[3.072,5.554],[29.911,41.401],[8.49,1.193],[91.96,0],[0,-88.062],[-8.87,0],[-73.023,10.415],[0,0]],"v":[[-0.039,-0.002],[-28.014,50.664],[-180.673,157.917],[-206.808,159.7],[-373.593,-0.002],[-206.721,-159.703],[-180.731,-157.875],[-38.166,-64.896],[-21.649,-39.252],[23.875,43.065],[34.014,59.146],[180.562,157.905],[206.815,159.703],[373.592,0.002],[206.729,-159.701],[180.632,-157.857],[28.087,-50.766]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0.505882382393,0.517647087574,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":72.106,"ix":5},"lc":1,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[553.857,339.969],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Trasformazione"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":17,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":53,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":2,"nm":"+","refId":"image_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":16,"s":[0]},{"t":26,"s":[100]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.106],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":16,"s":[45]},{"t":33,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.106,"y":1},"o":{"x":0.167,"y":0.167},"t":16,"s":[1161.248,266.162,0],"to":[0,30.667,0],"ti":[0,-30.667,0]},{"t":33,"s":[1161.248,450.162,0]}],"ix":2},"a":{"a":0,"k":[61.179,61.228,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":16,"op":53,"st":23,"bm":0},{"ddd":0,"ind":6,"ty":2,"nm":"-","refId":"image_1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":12,"s":[0]},{"t":22,"s":[100]}],"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.106],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":12.16,"s":[-45]},{"t":28.8798828125,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.106,"y":1},"o":{"x":0.167,"y":0.167},"t":12.16,"s":[754.437,630.163,0],"to":[0,-30,0],"ti":[0,30,0]},{"t":28.8798828125,"s":[754.437,450.163,0]}],"ix":2},"a":{"a":0,"k":[61.189,19.892,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":2,"op":53,"st":16,"bm":0}],"markers":[]} diff --git a/electron-app/preload/index.js b/electron-app/preload/index.js new file mode 100644 index 000000000..a65b76220 --- /dev/null +++ b/electron-app/preload/index.js @@ -0,0 +1,7 @@ +require('lottie-web').loadAnimation({ + container: document.getElementById('custom-spinner'), + renderer: 'svg', + loop: true, + autoplay: true, + animationData: require('./assets/preload.json') +}); diff --git a/electron-app/preload/webpack.config.js b/electron-app/preload/webpack.config.js new file mode 100644 index 000000000..213757c5f --- /dev/null +++ b/electron-app/preload/webpack.config.js @@ -0,0 +1,112 @@ +const path = require('path'); +const RemoveWebpackPlugin = require('remove-files-webpack-plugin'); +const HtmlWebpackPlugin = require('html-webpack-plugin'); + +module.exports = { + mode: 'production', + target: 'electron-renderer', + devtool: 'inline-source-map', + entry: path.join(__dirname, 'index.js'), + output: { + filename: 'bundle.js', + path: path.join(__dirname, 'dist'), + }, + resolve: { + extensions: ['.js'], + }, + plugins: [ + new HtmlWebpackPlugin({ + inject: false, + templateContent: ({ htmlWebpackPlugin, compilation }) => ` + + + + + + + +