From d158c98fb69ba9e903c7860fb1d71c1878c2a420 Mon Sep 17 00:00:00 2001 From: Akinari Date: Sat, 27 Mar 2021 00:48:16 +0100 Subject: [PATCH] fix electron dev tools --- index.js | 23 +++++++++++++++-------- package.json | 24 ++++++++++++++---------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/index.js b/index.js index c02ff4d..eaa7128 100644 --- a/index.js +++ b/index.js @@ -8,13 +8,19 @@ const fetch = require('node-fetch') const socket = require('socket.io') const appexp = express() -const { app, BrowserWindow, Menu, Tray, autoUpdater } = require('electron'); +const { app, BrowserWindow, Menu, Tray, globalShortcut } = require('electron'); -require('update-electron-app')({ - repo: 'AkinariHex/oTMD', - updateInterval: '1 hour', - logger: require('electron-log') -}) +const { NsisUpdater } = require("electron-updater") + +const options = { + provider: 'generic', + url: 'https://github.com/AkinariHex/oTMD/releases/latest' +} + +const autoUpdater = new NsisUpdater(options) +autoUpdater.checkForUpdatesAndNotify() +autoUpdater.logger = require("electron-log") +autoUpdater.logger.transports.file.level = "info" appexp.use(express.json()) appexp.use(cors()) @@ -141,7 +147,8 @@ app.on('ready', function() { console.log(`Running on http://localhost:${server.address().port}`) }) - + globalShortcut.unregister('Control+Shift+I') + /*let loading = new BrowserWindow({show: false, width: 1000, height: 600, frame: false}) var mainWindow = null;*/ @@ -154,7 +161,7 @@ app.on('ready', function() { darkTheme: true, frame: false, webPreferences: { - devTools: true + devTools: false }, titleBarStyle: 'hidden', show: false, diff --git a/package.json b/package.json index cceec1c..0c98db1 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,21 @@ { "name": "osu-tourney-match-displayer", "version": "1.5.0", - "description": "osu! Tourney Match Displayer", + "description": "Displayer for osu! Tournament Matches", "main": "index.js", + "repository": { + "type": "git", + "url": "git+https://github.com/AkinariHex/oTMD.git" + }, + "homepage": "https://github.com/AkinariHex/oTMD#otmd-project", "build": { "appId": "com.akinari.osu-tourney-match-displayer", "productName": "osu! Tourney Match Displayer", "copyright": "Copyright © 2021 Akinari", "win": { "target": [ - "nsis", - "zip", - "portable" + "nsis", + "zip" ], "artifactName": "otmd_v${version}_${arch}.${ext}" }, @@ -20,7 +24,7 @@ "perMachine": true, "allowToChangeInstallationDirectory": true, "deleteAppDataOnUninstall": true, - "artifactName": "otmd_v${version}_${arch}_installer.${ext}" + "artifactName": "otmd_v${version}_${arch}_installer.${ext}" }, "files": [ "frontend/**/*", @@ -30,19 +34,19 @@ ], "directories": { "buildResources": "resources" - }, - "publish": null + } }, "scripts": { "build": "pkg index.js", "server:dev": "nodemon index.js", "server": "node index.js", "electron": "electron .", - "builder": "electron-builder --x64" + "builder": "electron-builder --x64 -p always", + "pack": "electron-builder -w" }, - "keywords": [], + "keywords": ["osu", "displayer", "tournament", "match", "lobby", "score", "obs", "slobs", "osugame", "tourney", "tournament-match"], "author": "Akinari", - "license": "MIT", + "license": "GPL-3.0", "dependencies": { "cors": "^2.8.5", "electron-log": "^4.3.2",