From 6790fe5ef633066423197bd7be91f0700d8c4892 Mon Sep 17 00:00:00 2001 From: HorizonCode Date: Wed, 10 Jan 2024 16:26:45 +0100 Subject: [PATCH] kms electron --- main.js | 11 ++- package-lock.json | 14 +--- package.json | 1 + rollup.config.js | 2 +- src/App.svelte | 160 ++++++++++++++++--------------------- src/consts/pages.ts | 4 + src/lib/Progressbar.svelte | 4 +- src/pages/Launch.svelte | 24 ++++++ src/pages/Login.svelte | 59 ++++++++++++++ src/storage/localStore.ts | 6 ++ src/types/error.ts | 4 + src/types/images.d.ts | 1 + src/types/user.ts | 5 ++ src/util/loginUtil.ts | 30 +++++++ 14 files changed, 217 insertions(+), 108 deletions(-) create mode 100644 src/consts/pages.ts create mode 100644 src/pages/Launch.svelte create mode 100644 src/pages/Login.svelte create mode 100644 src/storage/localStore.ts create mode 100644 src/types/error.ts create mode 100644 src/types/user.ts create mode 100644 src/util/loginUtil.ts diff --git a/main.js b/main.js index 708d26c..7f69089 100644 --- a/main.js +++ b/main.js @@ -1,5 +1,5 @@ // Modules to control application life and create native browser window -const { app, BrowserWindow, Menu } = require("electron"); +const { app, BrowserWindow, Menu, ipcMain } = require("electron"); const path = require("path"); const serve = require("electron-serve"); const loadURL = serve({ directory: "public" }); @@ -15,6 +15,13 @@ function isDev() { return !app.isPackaged; } +function registerIPCPipes() { + ipcMain.handle("ezpplauncher:login", (e, args) => { + console.log(args); + return "yes"; + }); +} + function createWindow() { setupTitlebar(); @@ -50,6 +57,8 @@ function createWindow() { loadURL(mainWindow); } + registerIPCPipes(); + // Uncomment the following line of code when app is ready to be packaged. // loadURL(mainWindow); diff --git a/package-lock.json b/package-lock.json index a9d0cd0..d9bbd77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "2.0.0", "license": "MIT", "dependencies": { + "axios": "^1.6.5", "custom-electron-titlebar": "^4.2.7", "electron-serve": "^1.1.0" }, @@ -1875,8 +1876,7 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/at-least-node": { "version": "1.0.0", @@ -1928,7 +1928,6 @@ "version": "1.6.5", "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", - "dev": true, "dependencies": { "follow-redirects": "^1.15.4", "form-data": "^4.0.0", @@ -2447,7 +2446,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -2924,7 +2922,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -3578,7 +3575,6 @@ "version": "1.15.4", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", - "dev": true, "funding": [ { "type": "individual", @@ -3614,7 +3610,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -4573,7 +4568,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -4582,7 +4576,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, "dependencies": { "mime-db": "1.52.0" }, @@ -5664,8 +5657,7 @@ "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, "node_modules/pump": { "version": "3.0.0", diff --git a/package.json b/package.json index 792b41a..f38d8ae 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "check": "svelte-check --tsconfig ./tsconfig.json" }, "dependencies": { + "axios": "^1.6.5", "custom-electron-titlebar": "^4.2.7", "electron-serve": "^1.1.0" }, diff --git a/rollup.config.js b/rollup.config.js index cc856de..079f0fe 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -70,11 +70,11 @@ export default { browser: true, dedupe: ["svelte"], }), - commonjs(), typescript({ sourceMap: !production, inlineSources: !production, }), + commonjs(), image(), // In dev mode, call `npm run start` once diff --git a/src/App.svelte b/src/App.svelte index 0051df4..fda272f 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -7,7 +7,6 @@ DropdownDivider, Button, Checkbox, - DarkMode, } from "flowbite-svelte"; import Progressbar from "./lib/Progressbar.svelte"; import { @@ -18,13 +17,12 @@ UserSolid, } from "flowbite-svelte-icons"; import ezppLogo from "../public/favicon.png"; + import { currentPage } from "./storage/localStore"; + import { Page } from "./consts/pages"; + import Login from "./pages/Login.svelte"; + import Launch from "./pages/Launch.svelte"; - let loggedIn = true; - - let patch = true; - let loading = false; - let currentStatus = "Preparing launch..."; - let rand = 0; + let loggedIn = false;
@@ -34,98 +32,74 @@ >EZPPLauncher
-
- -
- - - {loggedIn ? "Quetzalcoatl" : "Guest"} - - {loggedIn ? "me@horizonco.de" : "Please log in!"} - - - {#if loggedIn} + {#if $currentPage != Page.Login} +
+ +
+ + + {loggedIn ? "Quetzalcoatl" : "Guest"} + + {loggedIn ? "me@horizonco.de" : "Please log in!"} + + + {#if loggedIn} + + + Profile + + {/if} - - Profile + + Settings - {/if} - - - Settings - - - {#if loggedIn} - (loggedIn = false)} - > - - Sign out - - {:else} - (loggedIn = true)} - > - - Login - - - - Register - - {/if} - + + {#if loggedIn} + (loggedIn = false)} + > + + Sign out + + {:else} + currentPage.set(Page.Login)} + > + + Login + + + + Register + + {/if} +
+ {/if} -
-
- - - Patching {patch ? "enabled" : "disabled"} - - {#if loading} -
-

{currentStatus}

- -
- {/if} -
-
+{#if $currentPage == Page.Login} + +{:else} + +{/if}