From ab2dcdedf7dee3c4e6ade6d3f6a9b6005578aa79 Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Mon, 9 Mar 2026 14:25:09 -0700 Subject: [PATCH] Fixes to that last commit --- bun.lock | 33 ++++------- src-tauri/tauri.conf.json | 10 +++- src-tauri/tauri.linux.conf.json | 29 ---------- src-tauri/tauri.macos.conf.json | 37 ------------ src-tauri/tauri.windows.conf.json | 37 ------------ src/app/game/berrydash/leaderboards/page.tsx | 1 - src/app/layout.tsx | 60 -------------------- src/app/page.tsx | 1 - src/app/settings/page.tsx | 29 ---------- src/lib/Clipboard.ts | 10 ---- src/lib/Notifications.ts | 17 ------ 11 files changed, 21 insertions(+), 243 deletions(-) delete mode 100644 src-tauri/tauri.linux.conf.json delete mode 100644 src-tauri/tauri.macos.conf.json delete mode 100644 src-tauri/tauri.windows.conf.json delete mode 100644 src/lib/Clipboard.ts delete mode 100644 src/lib/Notifications.ts diff --git a/bun.lock b/bun.lock index 6c53425..045ce80 100644 --- a/bun.lock +++ b/bun.lock @@ -10,14 +10,11 @@ "@fortawesome/free-solid-svg-icons": "7.2.0", "@fortawesome/react-fontawesome": "3.2.0", "@tauri-apps/api": "2.10.1", - "@tauri-apps/plugin-clipboard-manager": "2.3.2", "@tauri-apps/plugin-dialog": "2.6.0", "@tauri-apps/plugin-fs": "2.4.5", "@tauri-apps/plugin-http": "2.5.7", - "@tauri-apps/plugin-notification": "2.3.3", "@tauri-apps/plugin-opener": "2.5.3", "@tauri-apps/plugin-os": "2.3.2", - "@tauri-apps/plugin-window-state": "2.4.1", "next": "16.1.6", "pretty-bytes": "7.1.0", "react": "19.2.4", @@ -266,22 +263,16 @@ "@tauri-apps/cli-win32-x64-msvc": ["@tauri-apps/cli-win32-x64-msvc@2.10.1", "", { "os": "win32", "cpu": "x64" }, "sha512-6Cn7YpPFwzChy0ERz6djKEmUehWrYlM+xTaNzGPgZocw3BD7OfwfWHKVWxXzdjEW2KfKkHddfdxK1XXTYqBRLg=="], - "@tauri-apps/plugin-clipboard-manager": ["@tauri-apps/plugin-clipboard-manager@2.3.2", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-CUlb5Hqi2oZbcZf4VUyUH53XWPPdtpw43EUpCza5HWZJwxEoDowFzNUDt1tRUXA8Uq+XPn17Ysfptip33sG4eQ=="], - "@tauri-apps/plugin-dialog": ["@tauri-apps/plugin-dialog@2.6.0", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-q4Uq3eY87TdcYzXACiYSPhmpBA76shgmQswGkSVio4C82Sz2W4iehe9TnKYwbq7weHiL88Yw19XZm7v28+Micg=="], "@tauri-apps/plugin-fs": ["@tauri-apps/plugin-fs@2.4.5", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-dVxWWGE6VrOxC7/jlhyE+ON/Cc2REJlM35R3PJX3UvFw2XwYhLGQVAIyrehenDdKjotipjYEVc4YjOl3qq90fA=="], "@tauri-apps/plugin-http": ["@tauri-apps/plugin-http@2.5.7", "", { "dependencies": { "@tauri-apps/api": "^2.10.1" } }, "sha512-+F2lEH/c9b0zSsOXKq+5hZNcd9F4IIKCK1T17RqMwpCmVnx2aoqY8yIBccCd25HTYUb3j6NPVbRax/m00hKG8A=="], - "@tauri-apps/plugin-notification": ["@tauri-apps/plugin-notification@2.3.3", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-Zw+ZH18RJb41G4NrfHgIuofJiymusqN+q8fGUIIV7vyCH+5sSn5coqRv/MWB9qETsUs97vmU045q7OyseCV3Qg=="], - "@tauri-apps/plugin-opener": ["@tauri-apps/plugin-opener@2.5.3", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-CCcUltXMOfUEArbf3db3kCE7Ggy1ExBEBl51Ko2ODJ6GDYHRp1nSNlQm5uNCFY5k7/ufaK5Ib3Du/Zir19IYQQ=="], "@tauri-apps/plugin-os": ["@tauri-apps/plugin-os@2.3.2", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A=="], - "@tauri-apps/plugin-window-state": ["@tauri-apps/plugin-window-state@2.4.1", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-OuvdrzyY8Q5Dbzpj+GcrnV1iCeoZbcFdzMjanZMMcAEUNy/6PH5pxZPXpaZLOR7whlzXiuzx0L9EKZbH7zpdRw=="], - "@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="], "@types/crypto-js": ["@types/crypto-js@4.2.2", "", {}, "sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ=="], @@ -298,25 +289,25 @@ "@types/react-dom": ["@types/react-dom@19.2.3", "", { "peerDependencies": { "@types/react": "^19.2.0" } }, "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ=="], - "@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.56.1", "", { "dependencies": { "@eslint-community/regexpp": "^4.12.2", "@typescript-eslint/scope-manager": "8.56.1", "@typescript-eslint/type-utils": "8.56.1", "@typescript-eslint/utils": "8.56.1", "@typescript-eslint/visitor-keys": "8.56.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.56.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A=="], + "@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.57.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.12.2", "@typescript-eslint/scope-manager": "8.57.0", "@typescript-eslint/type-utils": "8.57.0", "@typescript-eslint/utils": "8.57.0", "@typescript-eslint/visitor-keys": "8.57.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.57.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-qeu4rTHR3/IaFORbD16gmjq9+rEs9fGKdX0kF6BKSfi+gCuG3RCKLlSBYzn/bGsY9Tj7KE/DAQStbp8AHJGHEQ=="], - "@typescript-eslint/parser": ["@typescript-eslint/parser@8.56.1", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.56.1", "@typescript-eslint/types": "8.56.1", "@typescript-eslint/typescript-estree": "8.56.1", "@typescript-eslint/visitor-keys": "8.56.1", "debug": "^4.4.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg=="], + "@typescript-eslint/parser": ["@typescript-eslint/parser@8.57.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.57.0", "@typescript-eslint/types": "8.57.0", "@typescript-eslint/typescript-estree": "8.57.0", "@typescript-eslint/visitor-keys": "8.57.0", "debug": "^4.4.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-XZzOmihLIr8AD1b9hL9ccNMzEMWt/dE2u7NyTY9jJG6YNiNthaD5XtUHVF2uCXZ15ng+z2hT3MVuxnUYhq6k1g=="], - "@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.56.1", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.56.1", "@typescript-eslint/types": "^8.56.1", "debug": "^4.4.3" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ=="], + "@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.57.0", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.57.0", "@typescript-eslint/types": "^8.57.0", "debug": "^4.4.3" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-pR+dK0BlxCLxtWfaKQWtYr7MhKmzqZxuii+ZjuFlZlIGRZm22HnXFqa2eY+90MUz8/i80YJmzFGDUsi8dMOV5w=="], - "@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.56.1", "", { "dependencies": { "@typescript-eslint/types": "8.56.1", "@typescript-eslint/visitor-keys": "8.56.1" } }, "sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w=="], + "@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.57.0", "", { "dependencies": { "@typescript-eslint/types": "8.57.0", "@typescript-eslint/visitor-keys": "8.57.0" } }, "sha512-nvExQqAHF01lUM66MskSaZulpPL5pgy5hI5RfrxviLgzZVffB5yYzw27uK/ft8QnKXI2X0LBrHJFr1TaZtAibw=="], - "@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.56.1", "", { "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ=="], + "@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.57.0", "", { "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-LtXRihc5ytjJIQEH+xqjB0+YgsV4/tW35XKX3GTZHpWtcC8SPkT/d4tqdf1cKtesryHm2bgp6l555NYcT2NLvA=="], - "@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.56.1", "", { "dependencies": { "@typescript-eslint/types": "8.56.1", "@typescript-eslint/typescript-estree": "8.56.1", "@typescript-eslint/utils": "8.56.1", "debug": "^4.4.3", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg=="], + "@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.57.0", "", { "dependencies": { "@typescript-eslint/types": "8.57.0", "@typescript-eslint/typescript-estree": "8.57.0", "@typescript-eslint/utils": "8.57.0", "debug": "^4.4.3", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-yjgh7gmDcJ1+TcEg8x3uWQmn8ifvSupnPfjP21twPKrDP/pTHlEQgmKcitzF/rzPSmv7QjJ90vRpN4U+zoUjwQ=="], - "@typescript-eslint/types": ["@typescript-eslint/types@8.56.1", "", {}, "sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw=="], + "@typescript-eslint/types": ["@typescript-eslint/types@8.57.0", "", {}, "sha512-dTLI8PEXhjUC7B9Kre+u0XznO696BhXcTlOn0/6kf1fHaQW8+VjJAVHJ3eTI14ZapTxdkOmc80HblPQLaEeJdg=="], - "@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.56.1", "", { "dependencies": { "@typescript-eslint/project-service": "8.56.1", "@typescript-eslint/tsconfig-utils": "8.56.1", "@typescript-eslint/types": "8.56.1", "@typescript-eslint/visitor-keys": "8.56.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg=="], + "@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.57.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.57.0", "@typescript-eslint/tsconfig-utils": "8.57.0", "@typescript-eslint/types": "8.57.0", "@typescript-eslint/visitor-keys": "8.57.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-m7faHcyVg0BT3VdYTlX8GdJEM7COexXxS6KqGopxdtkQRvBanK377QDHr4W/vIPAR+ah9+B/RclSW5ldVniO1Q=="], - "@typescript-eslint/utils": ["@typescript-eslint/utils@8.56.1", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "@typescript-eslint/scope-manager": "8.56.1", "@typescript-eslint/types": "8.56.1", "@typescript-eslint/typescript-estree": "8.56.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA=="], + "@typescript-eslint/utils": ["@typescript-eslint/utils@8.57.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "@typescript-eslint/scope-manager": "8.57.0", "@typescript-eslint/types": "8.57.0", "@typescript-eslint/typescript-estree": "8.57.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-5iIHvpD3CZe06riAsbNxxreP+MuYgVUsV0n4bwLH//VJmgtt54sQeY2GszntJ4BjYCpMzrfVh2SBnUQTtys2lQ=="], - "@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.56.1", "", { "dependencies": { "@typescript-eslint/types": "8.56.1", "eslint-visitor-keys": "^5.0.0" } }, "sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw=="], + "@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.57.0", "", { "dependencies": { "@typescript-eslint/types": "8.57.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-zm6xx8UT/Xy2oSr2ZXD0pZo7Jx2XsCoID2IUh9YSTFRu7z+WdwYTRk6LhUftm1crwqbuoF6I8zAFeCMw0YjwDg=="], "@unrs/resolver-binding-android-arm-eabi": ["@unrs/resolver-binding-android-arm-eabi@1.11.1", "", { "os": "android", "cpu": "arm" }, "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw=="], @@ -532,7 +523,7 @@ "flat-cache": ["flat-cache@4.0.1", "", { "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.4" } }, "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw=="], - "flatted": ["flatted@3.3.4", "", {}, "sha512-3+mMldrTAPdta5kjX2G2J7iX4zxtnwpdA8Tr2ZSjkyPSanvbZAcy6flmtnXbEybHrDcU9641lxrMfFuUxVz9vA=="], + "flatted": ["flatted@3.4.1", "", {}, "sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ=="], "for-each": ["for-each@0.3.5", "", { "dependencies": { "is-callable": "^1.2.7" } }, "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg=="], @@ -886,7 +877,7 @@ "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], - "typescript-eslint": ["typescript-eslint@8.56.1", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.56.1", "@typescript-eslint/parser": "8.56.1", "@typescript-eslint/typescript-estree": "8.56.1", "@typescript-eslint/utils": "8.56.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-U4lM6pjmBX7J5wk4szltF7I1cGBHXZopnAXCMXb3+fZ3B/0Z3hq3wS/CCUB2NZBNAExK92mCU2tEohWuwVMsDQ=="], + "typescript-eslint": ["typescript-eslint@8.57.0", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.57.0", "@typescript-eslint/parser": "8.57.0", "@typescript-eslint/typescript-estree": "8.57.0", "@typescript-eslint/utils": "8.57.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-W8GcigEMEeB07xEZol8oJ26rigm3+bfPHxHvwbYUlu1fUDsGuQ7Hiskx5xGW/xM4USc9Ephe3jtv7ZYPQntHeA=="], "unbox-primitive": ["unbox-primitive@1.1.0", "", { "dependencies": { "call-bound": "^1.0.3", "has-bigints": "^1.0.2", "has-symbols": "^1.1.0", "which-boxed-primitive": "^1.1.1" } }, "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw=="], diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 584257b..3391825 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -10,6 +10,7 @@ "frontendDist": "../out" }, "app": { + "withGlobalTauri": true, "windows": [ { "title": "Lncvrt Games Launcher", @@ -24,6 +25,13 @@ } }, "bundle": { - "active": false + "active": true, + "icon": ["icons/icon.ico"], + "targets": "nsis", + "windows": { + "webviewInstallMode": { + "type": "embedBootstrapper" + } + } } } diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json deleted file mode 100644 index 584257b..0000000 --- a/src-tauri/tauri.linux.conf.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "$schema": "https://schema.tauri.app/config/2", - "productName": "Lncvrt Games Launcher", - "version": "1.6.5", - "identifier": "xyz.lncvrt.games-launcher", - "build": { - "beforeDevCommand": "next dev --webpack", - "devUrl": "http://localhost:3000", - "beforeBuildCommand": "next build", - "frontendDist": "../out" - }, - "app": { - "windows": [ - { - "title": "Lncvrt Games Launcher", - "width": 1000, - "height": 600, - "minWidth": 875, - "minHeight": 500 - } - ], - "security": { - "csp": null - } - }, - "bundle": { - "active": false - } -} diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json deleted file mode 100644 index 20f5b56..0000000 --- a/src-tauri/tauri.macos.conf.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "$schema": "https://schema.tauri.app/config/2", - "productName": "Lncvrt Games Launcher", - "version": "1.6.5", - "identifier": "xyz.lncvrt.games-launcher", - "build": { - "beforeDevCommand": "next dev --webpack", - "devUrl": "http://localhost:3000", - "beforeBuildCommand": "next build", - "frontendDist": "../out" - }, - "app": { - "macOSPrivateApi": true, - "windows": [ - { - "title": "Lncvrt Games Launcher", - "width": 1000, - "height": 600, - "minWidth": 875, - "minHeight": 500, - "titleBarStyle": "Overlay", - "hiddenTitle": true - } - ], - "security": { - "csp": null - } - }, - "bundle": { - "active": true, - "targets": ["app"], - "macOS": { - "minimumSystemVersion": "13.0" - }, - "icon": ["icons/icon.icns"] - } -} diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json deleted file mode 100644 index 92e3bcd..0000000 --- a/src-tauri/tauri.windows.conf.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "$schema": "https://schema.tauri.app/config/2", - "productName": "Lncvrt Games Launcher", - "version": "1.6.5", - "identifier": "xyz.lncvrt.games-launcher", - "build": { - "beforeDevCommand": "next dev --webpack", - "devUrl": "http://localhost:3000", - "beforeBuildCommand": "next build", - "frontendDist": "../out" - }, - "app": { - "withGlobalTauri": true, - "windows": [ - { - "title": "Lncvrt Games Launcher", - "width": 1000, - "height": 632, - "minWidth": 875, - "minHeight": 532 - } - ], - "security": { - "csp": null - } - }, - "bundle": { - "active": true, - "icon": ["icons/icon.ico"], - "targets": "nsis", - "windows": { - "webviewInstallMode": { - "type": "embedBootstrapper" - } - } - } -} diff --git a/src/app/game/berrydash/leaderboards/page.tsx b/src/app/game/berrydash/leaderboards/page.tsx index 46bba9e..5c9c52c 100644 --- a/src/app/game/berrydash/leaderboards/page.tsx +++ b/src/app/game/berrydash/leaderboards/page.tsx @@ -6,7 +6,6 @@ import { GetIconForUser } from '@/lib/BerryDash' import Image from 'next/image' import './styles.css' import { useRouter } from 'next/navigation' -import { platform } from '@tauri-apps/plugin-os' import { fetch } from '@tauri-apps/plugin-http' interface BaseEntry { diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 76de49d..7240115 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -24,11 +24,6 @@ import { Game } from '@/types/Game' import { listen } from '@tauri-apps/api/event' import { usePathname } from 'next/navigation' import { arch, platform } from '@tauri-apps/plugin-os' -import { notifyUser } from '@/lib/Notifications' -import { - isPermissionGranted, - requestPermission -} from '@tauri-apps/plugin-notification' import { BaseDirectory, exists, remove } from '@tauri-apps/plugin-fs' import VersionsDownloadPopup from '@/componets/popups/VersionsDownload' @@ -36,11 +31,6 @@ import GamesDownloadPopup from '@/componets/popups/GamesDownload' import DownloadsPopup from '@/componets/popups/Downloads' import VersionVersionPopup from '@/componets/popups/VersionVersion' import { fetch } from '@tauri-apps/plugin-http' -import { - getCurrentWindow, - ProgressBarStatus, - UserAttentionType -} from '@tauri-apps/api/window' const roboto = Roboto({ subsets: ['latin'] @@ -83,7 +73,6 @@ export default function RootLayout ({ const pathname = usePathname() const revisionCheck = useRef(false) - const previousQueueLength = useRef(0) function getSpecialVersionsList (game?: number): GameVersion[] { if (!normalConfig || !serverVersionList) return [] @@ -237,10 +226,6 @@ export default function RootLayout ({ setDownloadedVersionsConfig(versionsConfig) setNormalConfig(normalConfig) setLoading(false) - - if (!(await isPermissionGranted())) { - await requestPermission() - } })() }, []) @@ -310,14 +295,6 @@ export default function RootLayout ({ : d ) ) - if (normalConfig?.settings.allowNotifications) - await notifyUser( - 'Download Failed', - `The download for version ${info.displayName} has failed.` - ) - await getCurrentWindow().requestUserAttention( - UserAttentionType.Critical - ) return } @@ -350,14 +327,6 @@ export default function RootLayout ({ : d ) ) - if (normalConfig?.settings.allowNotifications) - await notifyUser( - 'Download Failed', - `The download for version ${info.displayName} has failed.` - ) - await getCurrentWindow().requestUserAttention( - UserAttentionType.Critical - ) } setDownloadQueue(prev => prev.slice(1)) @@ -373,35 +342,6 @@ export default function RootLayout ({ normalConfig ]) - useEffect(() => { - if ( - downloadQueue.length === 0 && - downloadProgress.length === 0 && - !isProcessingQueue && - previousQueueLength.current > 0 && - normalConfig?.settings.allowNotifications - ) { - notifyUser('Downloads Finished', 'All downloads have finished.') - setTimeout(() => closePopup(), 0) - ;(async () => { - await getCurrentWindow().setProgressBar({ - status: ProgressBarStatus.None, - progress: 0 - }) - await getCurrentWindow().requestUserAttention( - UserAttentionType.Informational - ) - })() - } - previousQueueLength.current = downloadQueue.length + downloadProgress.length - }, [ - downloadQueue, - downloadProgress, - isProcessingQueue, - normalConfig, - closePopup - ]) - useEffect(() => { if (revisionCheck.current) return if (!serverVersionList || !downloadedVersionsConfig) return diff --git a/src/app/page.tsx b/src/app/page.tsx index c6d49d3..36a1d9e 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -9,7 +9,6 @@ import { faShieldHalved, faWarning } from '@fortawesome/free-solid-svg-icons' -import { platform } from '@tauri-apps/plugin-os' import { useRouter } from 'next/navigation' export default function Installs () { diff --git a/src/app/settings/page.tsx b/src/app/settings/page.tsx index f3a8136..d611502 100644 --- a/src/app/settings/page.tsx +++ b/src/app/settings/page.tsx @@ -4,11 +4,9 @@ import { useEffect, useState } from 'react' import { Setting } from '@/componets/Setting' import { writeNormalConfig } from '@/lib/BazookaManager' import { useGlobal } from '@/app/GlobalProvider' -import { copyToClipboard } from '@/lib/Clipboard' import { platform } from '@tauri-apps/plugin-os' export default function Settings () { - const [allowNotifications, setAllowNotifications] = useState(false) const [alwaysShowGamesInSidebar, setAlwaysShowGamesInSidebar] = useState(false) const [useWineOnUnixWhenNeeded, setUseWineOnUnixWhenNeeded] = useState(false) @@ -21,7 +19,6 @@ export default function Settings () { useEffect(() => { ;(async () => { while (normalConfig != null) { - setAllowNotifications(normalConfig.settings.allowNotifications) setAlwaysShowGamesInSidebar( normalConfig.settings.alwaysShowGamesInSidebar ) @@ -41,29 +38,6 @@ export default function Settings () {

Settings

{loaded && (
- { - if (!normalConfig) return - setAllowNotifications(!allowNotifications) - setNormalConfig({ - ...normalConfig, - settings: { - ...normalConfig.settings, - allowNotifications: !allowNotifications - } - }) - await writeNormalConfig({ - ...normalConfig, - settings: { - ...normalConfig.settings, - allowNotifications: !allowNotifications - } - }) - }} - title='This setting does as you expect, allow the launcher to send notifications for when stuff like downloading is done.' - /> { - await copyToClipboard(`v${version}`, normalConfig) - }} title='The current launcher version.' > v{version} diff --git a/src/lib/Clipboard.ts b/src/lib/Clipboard.ts deleted file mode 100644 index de0204b..0000000 --- a/src/lib/Clipboard.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NormalConfig } from '@/types/NormalConfig' -import { notifyUser } from './Notifications' - -export async function copyToClipboard ( - text: string, - normalConfig: NormalConfig | null -) { - if (normalConfig?.settings.allowNotifications) - await notifyUser('Copied', 'Text "' + text + '" copied to clipboard') -} diff --git a/src/lib/Notifications.ts b/src/lib/Notifications.ts deleted file mode 100644 index d0040a4..0000000 --- a/src/lib/Notifications.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { - isPermissionGranted, - requestPermission, - sendNotification -} from '@tauri-apps/plugin-notification' - -export async function notifyUser (title: string, body: string) { - let permissionGranted = await isPermissionGranted() - if (!permissionGranted) { - const permission = await requestPermission() - permissionGranted = permission === 'granted' - } - - if (permissionGranted) { - sendNotification({ title, body }) - } -}