diff --git a/.env.local b/.env.local index 26fdcdd..30b4eab 100644 --- a/.env.local +++ b/.env.local @@ -2,7 +2,7 @@ VITE_FIREBASE_CONFIG={"apiKey":"AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc","authDo VITE_GRAPHQL_ENDPOINT=https://db.dev.imex.online/v1/graphql VITE_FIREBASE_CONFIG_TEST={ "apiKey":"AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c", "authDomain":"imex-test.firebaseapp.com", "projectId":"imex-test", "storageBucket":"imex-test.appspot.com", "messagingSenderId":"991923618608", "appId":"1:991923618608:web:633437569cdad78299bef5", "measurementId":"G-TW0XLZEH18"} VITE_GRAPHQL_ENDPOINT_TEST=https://db.test.bodyshop.app/v1/graphql -VITE_COMPANY=IMEX +VITE_COMPANY=ROME VITE_FE_URL=https://imex.online VITE_FE_URL_TEST=https://test.imex.online VITE_API_URL="http://localhost:4000" diff --git a/electron-builder.rome.yml b/electron-builder.rome.yml index 04fd8c9..05f107a 100644 --- a/electron-builder.rome.yml +++ b/electron-builder.rome.yml @@ -17,7 +17,7 @@ asarUnpack: - resources/** win: executableName: ShopPartner - icon: resources/icon.png + icon: resources/ro-icon.png azureSignOptions: endpoint: https://eus.codesigning.azure.net certificateProfileName: ImEXRPS diff --git a/package.json b/package.json index 38acc4c..8b713d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bodyshop-desktop", - "version": "1.0.2", + "version": "1.0.2-alpha.1", "description": "Shop Management System Partner", "main": "./out/main/index.js", "author": "Convenient Brands, LLC", diff --git a/resources/ro-icon.png b/resources/ro-icon.png new file mode 100644 index 0000000..163407a Binary files /dev/null and b/resources/ro-icon.png differ diff --git a/src/main/index.ts b/src/main/index.ts index 5e00ecb..b10fc0e 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -13,7 +13,9 @@ import { import log from "electron-log/main"; import { autoUpdater } from "electron-updater"; import path, { join } from "path"; -import appIcon from "../../resources/icon.png?asset"; +import imexAppIcon from "../../resources/icon.png?asset"; +import romeAppIcon from "../../resources/ro-icon.png?asset"; + import { default as ErrorTypeCheck, default as errorTypeCheck, @@ -35,6 +37,9 @@ import { } from "./setup-keep-alive-task"; import ensureWindowOnScreen from "./util/ensureWindowOnScreen"; +const appIconToUse = + import.meta.env.VITE_COMPANY === "IMEX" ? imexAppIcon : romeAppIcon; + Sentry.init({ dsn: "https://ba41d22656999a8c1fd63bcb7df98650@o492140.ingest.us.sentry.io/4509074139447296", }); @@ -69,7 +74,11 @@ function createWindow(): void { minWidth: 600, minHeight: 400, //autoHideMenuBar: true, - ...(process.platform === "linux" ? { icon: appIcon } : {}), + ...(process.platform === "linux" + ? { + icon: appIconToUse, + } + : {}), title: "Shop Partner", webPreferences: { preload: join(__dirname, "../preload/index.js"), @@ -497,7 +506,7 @@ app.whenReady().then(async () => { } //Create Tray - const trayicon = nativeImage.createFromPath(appIcon); + const trayicon = nativeImage.createFromPath(appIconToUse); const tray = new Tray(trayicon.resize({ width: 16 })); const contextMenu = Menu.buildFromTemplate([ { diff --git a/src/util/translations/en-US/renderer.json b/src/util/translations/en-US/renderer.json index 80c7f64..94ef64b 100644 --- a/src/util/translations/en-US/renderer.json +++ b/src/util/translations/en-US/renderer.json @@ -29,26 +29,26 @@ "duplicatePath": "The selected directory is already used in another configuration." }, "labels": { + "actions": "Actions", + "addPaintScalePath": "Add Paint Scale Path", "emsOutFilePath": "EMS Out File Path (Parts Order, etc.)", + "invalidPath": "Path not set or invalid", + "paintScalePath": "Paint Scale Path", + "paintScaleSettingsInput": "BSMS To Paint Scale", + "paintScaleSettingsOutput": "Paint Scale To BSMS", + "paintScaleType": "Paint Scale Type", + "pollingInterval": "Polling Interval (m)", "pollinginterval": "Polling Interval (ms)", "ppcfilepath": "Parts Price Change File Path", + "remove": "Remove", + "selectPaintScaleType": "Select Paint Scale Type", "started": "Started", "stopped": "Stopped", + "validPath": "Valid path", "watchedpaths": "Watched Paths", "watchermodepolling": "Polling", "watchermoderealtime": "Real Time", - "watcherstatus": "Watcher Status", - "paintScaleSettingsInput": "BSMS To Paint Scale", - "paintScaleSettingsOutput": "Paint Scale To BSMS", - "paintScalePath": "Paint Scale Path", - "paintScaleType": "Paint Scale Type", - "addPaintScalePath": "Add Paint Scale Path", - "remove": "Remove", - "actions": "Actions", - "pollingInterval": "Polling Interval (m)", - "validPath": "Valid path", - "invalidPath": "Path not set or invalid", - "selectPaintScaleType": "Select Paint Scale Type" + "watcherstatus": "Watcher Status" } }, "title": { @@ -57,6 +57,7 @@ }, "updates": { "apply": "Apply Update", + "applying": "Applying update", "available": "An update is available.", "download": "Download Update", "downloading": "An update is downloading." diff --git a/translations.babel b/translations.babel index 741c65d..fd071eb 100644 --- a/translations.babel +++ b/translations.babel @@ -234,9 +234,53 @@ + + errors + + + duplicatePath + false + + + + + + en-US + false + + + + + labels + + actions + false + + + + + + en-US + false + + + + + addPaintScalePath + false + + + + + + en-US + false + + + emsOutFilePath false @@ -250,6 +294,84 @@ + + invalidPath + false + + + + + + en-US + false + + + + + paintScalePath + false + + + + + + en-US + false + + + + + paintScaleSettingsInput + false + + + + + + en-US + false + + + + + paintScaleSettingsOutput + false + + + + + + en-US + false + + + + + paintScaleType + false + + + + + + en-US + false + + + + + pollingInterval + false + + + + + + en-US + false + + + pollinginterval false @@ -276,6 +398,32 @@ + + remove + false + + + + + + en-US + false + + + + + selectPaintScaleType + false + + + + + + en-US + false + + + started false @@ -302,6 +450,19 @@ + + validPath + false + + + + + + en-US + false + + + watchedpaths false @@ -405,6 +566,19 @@ + + applying + false + + + + + + en-US + false + + + available false