diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/bodyshop-desktop.iml b/.idea/bodyshop-desktop.iml
new file mode 100644
index 0000000..24643cc
--- /dev/null
+++ b/.idea/bodyshop-desktop.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..03d9549
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
new file mode 100644
index 0000000..d23208f
--- /dev/null
+++ b/.idea/jsLibraryMappings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
new file mode 100644
index 0000000..0cb5647
--- /dev/null
+++ b/.idea/material_theme_project_new.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..82d3dd5
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/http-server/http-server.ts b/src/main/http-server/http-server.ts
index 7329160..c57dac7 100644
--- a/src/main/http-server/http-server.ts
+++ b/src/main/http-server/http-server.ts
@@ -8,9 +8,8 @@ import ImportJob from "../decoder/decoder";
import folderScan from "../decoder/folder-scan";
import { handleEMSPartsOrder } from "../ems-parts-order/ems-parts-order-handler";
import { handleShopMetaDataFetch } from "../ipc/ipcMainHandler.user";
-import { handlePartsPariceChangeRequest } from "../ppc/ppc-handler";
+import { handlePartsPriceChangeRequest } from "../ppc/ppc-handler";
import { handleQuickBookRequest } from "../quickbooks-desktop/quickbooks-desktop";
-import { c } from "vite/dist/node/moduleRunnerTransport.d-CXw_Ws6P";
export default class LocalServer {
private app: express.Application;
@@ -121,7 +120,7 @@ export default class LocalServer {
res.status(200).json(files);
return;
});
- this.app.post("/ppc", handlePartsPariceChangeRequest);
+ this.app.post("/ppc", handlePartsPriceChangeRequest);
this.app.post("/oec", handleEMSPartsOrder);
this.app.post(
"/import",
diff --git a/src/main/ipc/ipcMainConfig.ts b/src/main/ipc/ipcMainConfig.ts
index 8073725..7a6f3ad 100644
--- a/src/main/ipc/ipcMainConfig.ts
+++ b/src/main/ipc/ipcMainConfig.ts
@@ -7,15 +7,15 @@ import ImportJob from "../decoder/decoder";
import store from "../store/store";
import { StartWatcher, StopWatcher } from "../watcher/watcher";
import {
- SettingsPpcFilPathGet,
- SettingsPpcFilPathSet,
+ SettingsPpcFilePathGet,
+ SettingsPpcFilePathSet,
SettingsWatchedFilePathsAdd,
SettingsWatchedFilePathsGet,
SettingsWatchedFilePathsRemove,
SettingsWatcherPollingGet,
SettingsWatcherPollingSet,
- SettingEmsOutFilPathSet,
- SettingEmsOutFilPathGet,
+ SettingEmsOutFilePathSet,
+ SettingEmsOutFilePathGet,
} from "./ipcMainHandler.settings";
import {
ipcMainHandleAuthStateChanged,
@@ -98,15 +98,15 @@ ipcMain.handle(
SettingsWatcherPollingSet,
);
-ipcMain.handle(ipcTypes.toMain.settings.getPpcFilePath, SettingsPpcFilPathGet);
-ipcMain.handle(ipcTypes.toMain.settings.setPpcFilePath, SettingsPpcFilPathSet);
+ipcMain.handle(ipcTypes.toMain.settings.getPpcFilePath, SettingsPpcFilePathGet);
+ipcMain.handle(ipcTypes.toMain.settings.setPpcFilePath, SettingsPpcFilePathSet);
ipcMain.handle(
ipcTypes.toMain.settings.getEmsOutFilePath,
- SettingEmsOutFilPathGet,
+ SettingEmsOutFilePathGet,
);
ipcMain.handle(
ipcTypes.toMain.settings.setEmsOutFilePath,
- SettingEmsOutFilPathSet,
+ SettingEmsOutFilePathSet,
);
ipcMain.handle(ipcTypes.toMain.user.getActiveShop, () => {
diff --git a/src/main/ipc/ipcMainHandler.settings.ts b/src/main/ipc/ipcMainHandler.settings.ts
index cc6eccf..93f0d5d 100644
--- a/src/main/ipc/ipcMainHandler.settings.ts
+++ b/src/main/ipc/ipcMainHandler.settings.ts
@@ -1,14 +1,9 @@
-import { dialog, IpcMainInvokeEvent } from "electron";
+import {dialog, IpcMainInvokeEvent} from "electron";
import log from "electron-log/main";
import _ from "lodash";
import Store from "../store/store";
-import { getMainWindow } from "../util/toRenderer";
-import {
- addWatcherPath,
- removeWatcherPath,
- StartWatcher,
- StopWatcher,
-} from "../watcher/watcher";
+import {getMainWindow} from "../util/toRenderer";
+import {addWatcherPath, removeWatcherPath, StartWatcher, StopWatcher,} from "../watcher/watcher";
const SettingsWatchedFilePathsAdd = async (): Promise => {
const mainWindow = getMainWindow();
@@ -75,11 +70,10 @@ const SettingsWatcherPollingSet = async (
return { enabled, interval };
};
-const SettingsPpcFilPathGet = async (): Promise => {
- const ppcFilePath: string = Store.get("settings.ppcFilePath");
- return ppcFilePath;
+const SettingsPpcFilePathGet = async (): Promise => {
+ return Store.get("settings.ppcFilePath");
};
-const SettingsPpcFilPathSet = async (): Promise => {
+const SettingsPpcFilePathSet = async (): Promise => {
const mainWindow = getMainWindow();
if (!mainWindow) {
log.error("No main window found when trying to open dialog");
@@ -95,12 +89,10 @@ const SettingsPpcFilPathSet = async (): Promise => {
return (Store.get("settings.ppcFilePath") as string) || "";
};
-
-const SettingEmsOutFilPathGet = async (): Promise => {
- const emsOutFilePath: string = Store.get("settings.emsOutFilePath");
- return emsOutFilePath;
+const SettingEmsOutFilePathGet = async (): Promise => {
+ return Store.get("settings.emsOutFilePath");
};
-const SettingEmsOutFilPathSet = async (): Promise => {
+const SettingEmsOutFilePathSet = async (): Promise => {
const mainWindow = getMainWindow();
if (!mainWindow) {
log.error("No main window found when trying to open dialog");
@@ -118,13 +110,13 @@ const SettingEmsOutFilPathSet = async (): Promise => {
};
export {
- SettingsPpcFilPathGet,
- SettingsPpcFilPathSet,
+ SettingsPpcFilePathGet,
+ SettingsPpcFilePathSet,
SettingsWatchedFilePathsAdd,
SettingsWatchedFilePathsGet,
SettingsWatchedFilePathsRemove,
SettingsWatcherPollingGet,
SettingsWatcherPollingSet,
- SettingEmsOutFilPathGet,
- SettingEmsOutFilPathSet,
+ SettingEmsOutFilePathGet,
+ SettingEmsOutFilePathSet,
};
diff --git a/src/main/ppc/ppc-handler.ts b/src/main/ppc/ppc-handler.ts
index c1687c2..51874ef 100644
--- a/src/main/ppc/ppc-handler.ts
+++ b/src/main/ppc/ppc-handler.ts
@@ -8,7 +8,7 @@ import createdDirectoryIfNotExist from "../util/createDirectoryIfNotExist";
import GenerateEnvFile from "./ppc-generate-env";
import GenerateLinFile from "./ppc-generate-lin";
-const handlePartsPariceChangeRequest = async (
+const handlePartsPriceChangeRequest = async (
req: express.Request,
res: express.Response,
): Promise => {
@@ -64,4 +64,4 @@ export interface PpcJob {
};
}
-export { handlePartsPariceChangeRequest };
+export { handlePartsPriceChangeRequest };
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index f658531..4e9edf9 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -1,13 +1,12 @@
import "@ant-design/v5-patch-for-react-19";
import { Layout, Skeleton, ConfigProvider, Badge } from "antd";
import { User } from "firebase/auth";
-import { useEffect, useState } from "react";
+import { useEffect, useState, FC } from "react";
import { ErrorBoundary } from "react-error-boundary";
import { Provider } from "react-redux";
import { HashRouter, Route, Routes } from "react-router";
import ipcTypes from "../../util/ipcTypes.json";
import ErrorBoundaryFallback from "./components/ErrorBoundaryFallback/ErrorBoundaryFallback";
-import NavigationHeader from "./components/NavigationHeader/Navigationheader";
import Settings from "./components/Settings/Settings";
import SignInForm from "./components/SignInForm/SignInForm";
import UpdateAvailable from "./components/UpdateAvailable/UpdateAvailable";
@@ -15,7 +14,7 @@ import reduxStore from "./redux/redux-store";
import { auth } from "./util/firebase";
import { NotificationProvider } from "./util/notificationContext";
-const App: React.FC = () => {
+const App: FC = () => {
const [user, setUser] = useState(false);
useEffect(() => {
@@ -40,6 +39,7 @@ const App: React.FC = () => {
// Clean up the listener when component unmounts
return (): void => unsubscribe();
}, []);
+
const isTest = window.api.isTest();
return (