From c6277163ee2093967ed37d0f1d4741fe49c65860 Mon Sep 17 00:00:00 2001 From: Max Behzadi <69126271+MaxTheGeeek@users.noreply.github.com> Date: Thu, 10 Apr 2025 03:15:49 +0200 Subject: [PATCH 1/7] ADD: vite and config --- launcher/package.json | 9 +++++++-- launcher/vite.config.js | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 launcher/vite.config.js diff --git a/launcher/package.json b/launcher/package.json index 5b5b017ef..ce28cdd86 100755 --- a/launcher/package.json +++ b/launcher/package.json @@ -12,9 +12,11 @@ "serve": "vue-cli-service serve --port 8081", "build": "vue-cli-service build", "lint": "vue-cli-service lint", + "dev": "vite", + "build:vite": "vite build", "build-themes": "node-sass src/styles/themes -o public/themes", "electron:build": "vue-cli-service electron:build", - "electron:serve": "vue-cli-service electron:serve", + "electron:serve": "wait-on http://localhost:5173 && electron src/background.js", "postinstall": "electron-builder install-app-deps", "postuninstall": "electron-builder install-app-deps", "test:unit": "jest '(\\.test|\\.spec)\\.js' --coverage", @@ -23,7 +25,7 @@ "test:coverage": "jest --coverage", "watch:css": "npx tailwindcss -i ./src/main.css -o ./public/output.css --watch", "lint:fix": "eslint src --fix", - "stereum": "concurrently \"npm:electron:serve\" \"npm:watch:css\"", + "stereum": "concurrently \"vite\" \"npm:electron:serve\"", "backend:watch": "nodemon --watch 'src/backend' --exec 'npm run electron:serve'", "format": "prettier . --write", "format:check": "prettier . --check" @@ -72,6 +74,7 @@ "@babel/preset-env": "^7.26.9", "@tailwindcss/forms": "^0.5.10", "@tailwindcss/typography": "^0.5.16", + "@vitejs/plugin-vue": "^5.2.3", "@vue/cli-service": "^5.0.8", "@vue/compiler-sfc": "^3.5.13", "@vue/test-utils": "^2.4.6", @@ -95,8 +98,10 @@ "prettier": "^3.5.3", "tailwind-scrollbar": "^3.1.0", "tailwindcss": "^3.4.17", + "vite": "^6.2.5", "vue-cli-plugin-electron-builder": "^3.0.0-alpha.4", "vue-loader": "^17.4.2", + "wait-on": "^8.0.3", "web3": "^4.16.0" }, "license": "https://wrapbootstrap.com/help/licenses", diff --git a/launcher/vite.config.js b/launcher/vite.config.js new file mode 100644 index 000000000..da041c157 --- /dev/null +++ b/launcher/vite.config.js @@ -0,0 +1,23 @@ +import { defineConfig } from "vite"; +import vue from "@vitejs/plugin-vue"; +import path from "path"; + +export default defineConfig({ + root: "src", // your app's entry point + publicDir: path.resolve(__dirname, "public"), // ✅ Tell Vite where static files are + base: "./", + plugins: [vue()], + resolve: { + alias: { + "@": path.resolve(__dirname, "src"), + }, + }, + build: { + outDir: path.resolve(__dirname, "dist"), + emptyOutDir: true, + }, + server: { + port: 5173, + }, + assetsInclude: ["**/*.png", "**/*.jpg", "**/*.jpeg", "**/*.gif", "**/*.svg"], +}); From 08edd36e0467e6f59207856c4e254e3998a144bd Mon Sep 17 00:00:00 2001 From: Max Behzadi <69126271+MaxTheGeeek@users.noreply.github.com> Date: Thu, 10 Apr 2025 03:16:20 +0200 Subject: [PATCH 2/7] REFACTOR: html file moved to src --- launcher/public/index.html | 15 ++++++--------- launcher/src/index.html | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) create mode 100755 launcher/src/index.html diff --git a/launcher/public/index.html b/launcher/public/index.html index ad3e9f0d0..3d151afff 100755 --- a/launcher/public/index.html +++ b/launcher/public/index.html @@ -1,20 +1,17 @@ - + - - <%= htmlWebpackPlugin.options.title %> - + + Stereum Launcher +
- + diff --git a/launcher/src/index.html b/launcher/src/index.html new file mode 100755 index 000000000..3d151afff --- /dev/null +++ b/launcher/src/index.html @@ -0,0 +1,17 @@ + + + + + + + Stereum Launcher + + + + +
+ + + From 6e809d41e035cee8caeb76b77981f73711c1f72c Mon Sep 17 00:00:00 2001 From: Max Behzadi <69126271+MaxTheGeeek@users.noreply.github.com> Date: Thu, 10 Apr 2025 03:16:47 +0200 Subject: [PATCH 3/7] REFACTOR: tailwind config --- launcher/tailwind.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/launcher/tailwind.config.js b/launcher/tailwind.config.js index 906834652..8d56d041d 100755 --- a/launcher/tailwind.config.js +++ b/launcher/tailwind.config.js @@ -1,5 +1,6 @@ module.exports = { - content: ["./index.html", "./src/**/*.{vue,js,ts,jsx,tsx}", "./node_modules/preline/dist/preline.js"], + content: ["./src/index.html", "./src/**/*.{vue,js,ts,jsx,tsx}"], + theme: { extend: { backgroundImage: { From aeb0d4e1a875ab2a449b03393301d6b8cc88ea4f Mon Sep 17 00:00:00 2001 From: Max Behzadi <69126271+MaxTheGeeek@users.noreply.github.com> Date: Thu, 10 Apr 2025 03:17:09 +0200 Subject: [PATCH 4/7] ADD: localhost fro vite --- .env | 1 + 1 file changed, 1 insertion(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 000000000..d210cca62 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +VITE_DEV_SERVER_URL=http://localhost:5173 From 8a3c82907bc00136dab56d4941a28a1ef7b8a983 Mon Sep 17 00:00:00 2001 From: Max Behzadi <69126271+MaxTheGeeek@users.noreply.github.com> Date: Thu, 10 Apr 2025 03:18:05 +0200 Subject: [PATCH 5/7] FIX: vite issues in components --- .../UI/base-header/components/modals/LogoutModal.vue | 2 +- launcher/src/components/UI/edit-page/EditScreen.vue | 2 +- .../UI/edit-page/components/modals/AddModal.vue | 4 ++-- .../UI/edit-page/components/modals/AddPanel.vue | 2 +- .../UI/edit-page/components/modals/SwitchContent.vue | 2 +- .../UI/edit-page/components/modals/SwitchModal.vue | 2 +- .../components/UI/edit-page/sections/ChangesSection.vue | 2 +- launcher/src/components/UI/node-page/NodeScreen.vue | 2 +- .../components/UI/node-page/components/logs/LogBody.vue | 2 +- .../node-page/components/node/clients/ClientButtons.vue | 2 +- .../UI/node-page/components/service/ServiceButtons.vue | 2 +- .../components/UI/node-page/sections/SidebarSection.vue | 2 +- .../components/two-factor-auth/TwoFactorAuth.vue | 2 +- launcher/src/components/UI/services-modal/ObolModal.vue | 2 +- launcher/src/components/UI/services-modal/SsvDkg.vue | 2 +- launcher/src/components/UI/services-modal/SsvModal.vue | 2 +- launcher/src/components/UI/setting-page/SettingScreen.vue | 8 ++++---- launcher/src/components/UI/staking-page/StakingScreen.vue | 2 +- .../UI/staking-page/components/management/EpochDuty.vue | 2 +- .../management/components/epoch-duty/BlockEpoch.vue | 2 +- .../components/UI/welcome-page/components/WelcomeBody.vue | 2 +- launcher/src/pages/LoginPage.vue | 6 ++++++ launcher/src/router/index.js | 2 +- 23 files changed, 32 insertions(+), 26 deletions(-) create mode 100755 launcher/src/pages/LoginPage.vue diff --git a/launcher/src/components/UI/base-header/components/modals/LogoutModal.vue b/launcher/src/components/UI/base-header/components/modals/LogoutModal.vue index c698126d5..6251585c6 100755 --- a/launcher/src/components/UI/base-header/components/modals/LogoutModal.vue +++ b/launcher/src/components/UI/base-header/components/modals/LogoutModal.vue @@ -6,7 +6,7 @@ {{ $t("logOutModal.logOutTitle") }}
- + Stop {{ $t("logOutModal.logOutQuestion") }}
diff --git a/launcher/src/components/UI/edit-page/EditScreen.vue b/launcher/src/components/UI/edit-page/EditScreen.vue index c134ecf77..6adecc4de 100644 --- a/launcher/src/components/UI/edit-page/EditScreen.vue +++ b/launcher/src/components/UI/edit-page/EditScreen.vue @@ -152,7 +152,7 @@ import DrawerBox from "./components/drawer/DrawerBox.vue"; import DrawerMenu from "./components/drawer/DrawerMenu.vue"; import ServicesDrawer from "./components/drawer/ServicesDrawer.vue"; import SetupsDrawer from "./components/drawer/SetupsDrawer.vue"; -import EditBody from "./components/edit/EditBody"; +import EditBody from "./components/edit/EditBody.vue"; import LoaderAnime from "./components/loader-anime/LoaderAnime.vue"; import AddModal from "./components/modals/AddModal.vue"; import InfoModal from "./components/modals/InfoModal.vue"; diff --git a/launcher/src/components/UI/edit-page/components/modals/AddModal.vue b/launcher/src/components/UI/edit-page/components/modals/AddModal.vue index adaa97a45..ca11f16fb 100644 --- a/launcher/src/components/UI/edit-page/components/modals/AddModal.vue +++ b/launcher/src/components/UI/edit-page/components/modals/AddModal.vue @@ -18,8 +18,8 @@ diff --git a/launcher/src/router/index.js b/launcher/src/router/index.js index 461783133..ed9a81794 100755 --- a/launcher/src/router/index.js +++ b/launcher/src/router/index.js @@ -2,7 +2,7 @@ import { createRouter, createWebHashHistory } from "vue-router"; // import BaseHome from "../pages/BaseHome.vue"; import LanguagePage from "../pages/LanguagePage.vue"; -import LoginPage from "../pages/LoginPage.vue"; +import LoginPage from "@/pages/LoginPage.vue"; import OneclickPage from "@/pages/OneclickPage.vue"; import SelectPreset from "../../src/components/UI/one-click/sections/SelectPreset.vue"; import ConfigPlugins from "../../src/components/UI/one-click/sections/ConfigPlugins.vue"; From e4ea717ae073a5ce8d5804e79fcc7ead4f1d0c27 Mon Sep 17 00:00:00 2001 From: Max Behzadi <69126271+MaxTheGeeek@users.noreply.github.com> Date: Thu, 10 Apr 2025 03:18:23 +0200 Subject: [PATCH 6/7] FIX: dupplicated format --- launcher/src/pages/LoginPage.vue.vue | 6 ------ 1 file changed, 6 deletions(-) delete mode 100755 launcher/src/pages/LoginPage.vue.vue diff --git a/launcher/src/pages/LoginPage.vue.vue b/launcher/src/pages/LoginPage.vue.vue deleted file mode 100755 index 6823b680f..000000000 --- a/launcher/src/pages/LoginPage.vue.vue +++ /dev/null @@ -1,6 +0,0 @@ - - From 4b8be1034cc317725ce6653dac9a478ebb10a028 Mon Sep 17 00:00:00 2001 From: Max Behzadi <69126271+MaxTheGeeek@users.noreply.github.com> Date: Thu, 10 Apr 2025 03:19:20 +0200 Subject: [PATCH 7/7] ADD: vite into background js --- launcher/src/background.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/launcher/src/background.js b/launcher/src/background.js index 3e7abc15f..6b6baf007 100755 --- a/launcher/src/background.js +++ b/launcher/src/background.js @@ -1,3 +1,4 @@ +#!/usr/bin/env node "use strict"; import { app, protocol, BrowserWindow, shell, dialog, ipcMain, Menu } from "electron"; @@ -909,11 +910,12 @@ async function createWindow(type = "main") { win.setMenuBarVisibility(false); // Load correct URL based on environment - if (process.env.WEBPACK_DEV_SERVER_URL) { - const url = type === "update" ? `${process.env.WEBPACK_DEV_SERVER_URL}#/update` : process.env.WEBPACK_DEV_SERVER_URL; + const devServerUrl = process.env.VITE_DEV_SERVER_URL || process.env.WEBPACK_DEV_SERVER_URL; - await win.loadURL(url); + if (devServerUrl) { + const url = type === "update" ? `${devServerUrl}#/update` : devServerUrl; + await win.loadURL(url); if (!process.env.IS_TEST) win.webContents.openDevTools(); } else { createProtocol("app");