diff --git a/.env.imex b/.env.imex index 44d4b5c..1d6ab25 100644 --- a/.env.imex +++ b/.env.imex @@ -2,4 +2,6 @@ VITE_FIREBASE_CONFIG={"apiKey":"AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU","authDo VITE_GRAPHQL_ENDPOINT=https://db.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 \ No newline at end of file +VITE_COMPANY=IMEX +VITE_FE_URL=https://imex.online +VITE_FE_URL_TEST=https://test.imex.online \ No newline at end of file diff --git a/.env.local b/.env.local index 76ebbaf..5ca67ff 100644 --- a/.env.local +++ b/.env.local @@ -2,4 +2,6 @@ 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 \ No newline at end of file +VITE_COMPANY=IMEX +VITE_FE_URL=https://imex.online +VITE_FE_URL_TEST=https://test.imex.online \ No newline at end of file diff --git a/.env.rome b/.env.rome index defbe85..4180038 100644 --- a/.env.rome +++ b/.env.rome @@ -2,4 +2,6 @@ VITE_FIREBASE_CONFIG={ "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE", "a VITE_GRAPHQL_ENDPOINT=https://db.romeonline.io/v1/graphql VITE_FIREBASE_CONFIG_TEST={ "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE", "authDomain": "rome-prod-1.firebaseapp.com", "projectId": "rome-prod-1", "storageBucket": "rome-prod-1.appspot.com", "messagingSenderId": "147786367145", "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8", "measurementId": "G-G8Z9DRHTZS"} VITE_GRAPHQL_ENDPOINT_TEST=https://db.test.romeonline.io/v1/graphql -VITE_COMPANY=ROME \ No newline at end of file +VITE_COMPANY=ROME +VITE_FE_URL=https://romeonline.io +VITE_FE_URL_TEST=https://test.romeonline.io \ No newline at end of file diff --git a/src/main/decoder/decoder.ts b/src/main/decoder/decoder.ts index a0f6d1f..9cc021d 100644 --- a/src/main/decoder/decoder.ts +++ b/src/main/decoder/decoder.ts @@ -1,6 +1,6 @@ import { platform } from "@electron-toolkit/utils"; import { UUID } from "crypto"; -import { Notification } from "electron"; +import { Notification, shell } from "electron"; import log from "electron-log/main"; import fs from "fs"; import _ from "lodash"; @@ -173,21 +173,32 @@ async function ImportJob(filepath: string): Promise { }, ); setAppProgressbar(-1); - new Notification({ + const uploadNotification = new Notification({ title: "Job Imported", - body: `Job ${newAvailableJob.cieca_id} imported successfully`, + //subtitle: `${newAvailableJob.ownr_name} - ${newAvailableJob.vehicle_info}`, + body: `${newAvailableJob.ownr_name} - ${newAvailableJob.vehicle_info}. Click to view.`, actions: [{ text: "View Job", type: "button" }], - subtitle: newAvailableJob.ownr_name, - }).show(); + }); + uploadNotification.on("click", () => { + shell.openExternal( + `${ + store.get("app.isTest") + ? import.meta.env.VITE_FE_URL_TEST + : import.meta.env.VITE_FE_URL + }/manage/available`, + ); + }); + uploadNotification.show(); log.debug("Job inserted", insertRecordResult); } catch (error) { log.error("Error encountered while decoding job. ", errorTypeCheck(error)); - new Notification({ + const uploadNotificationFailure = new Notification({ title: "Job Upload Failure", body: errorTypeCheck(error).message, //TODO: Remove after debug. - actions: [{ text: "View Job", type: "button" }], - }).show(); + }); + + uploadNotificationFailure.show(); } } diff --git a/src/main/ipc/ipcMainHandler.user.ts b/src/main/ipc/ipcMainHandler.user.ts index b97f19a..8a4a18f 100644 --- a/src/main/ipc/ipcMainHandler.user.ts +++ b/src/main/ipc/ipcMainHandler.user.ts @@ -11,7 +11,7 @@ import { QUERY_ACTIVE_BODYSHOP_TYPED, QUERY_MASTERDATA_TYPED, } from "../graphql/queries"; -import Store from "../store/store"; +import { default as Store, default as store } from "../store/store"; import { checkForAppUpdatesContinuously } from "../util/checkForAppUpdates"; import { sendIpcToRenderer } from "../util/toRenderer"; @@ -66,9 +66,9 @@ const ipcMainHandleAuthStateChanged = async ( const ipMainHandleResetPassword = async (): Promise => { shell.openExternal( - import.meta.env.VITE_COMPANY === "IMEX" - ? "https://imex.online/resetpassword" - : "https://romeonline.io/resetpassword", + store.get("app.isTest") + ? `${import.meta.env.VITE_FE_URL_TEST}/resetpassword` + : `${import.meta.env.VITE_FE_URL}/resetpassword`, ); };