admin/bodyshop-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup and add sentry.

Browse Source
This commit is contained in:
Patrick Fic
2025-03-31 13:03:31 -07:00
parent 38cdb1e04c
commit eeaeba2252
12 changed files with 3921 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
.circleci/config.yml Normal file
View File

@@ -0,0 +1,47 @@
version: 2.1
orbs:
#snyk: snyk/snyk@0.0.8
#cypress: cypress-io/cypress@1.23.0
aws-s3: circleci/aws-s3@4.0.0
aws-cli: circleci/aws-cli@4.0
eb: circleci/aws-elastic-beanstalk@2.0.1
jira: circleci/jira@2.1.0
jobs:
partner-win-build:
docker:
- image: electronuserland/builder:wine
parameters:
secret:
type: string
default: $HASURA_TEST_SECRET
working_directory: ~/repo/hasura
steps:
- checkout:
path: ~/repo
- run:
name: Execute migration
command: |
curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash
hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
sleep 15
hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
sleep 30
hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
- jira/notify:
environment: Test (ImEX) - Hasura
environment_type: testing
pipeline_id: << pipeline.id >>
job_type: deployment
pipeline_number: << pipeline.number >>
workflows:
deploy_and_build:
jobs:
- partner-win-build:
filters:
branches:
only: main
- partner-mac-build:
filters:
branches:
only: main

3896
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
package.json
View File

@@ -24,6 +24,7 @@
"@apollo/client": "^3.13.5",
"@electron-toolkit/preload": "^3.0.1",
"@electron-toolkit/utils": "^4.0.0",
"@sentry/electron": "^6.3.0",
"electron-log": "^5.3.2",
"electron-store": "^8.2.0",
"electron-updater": "^6.3.9",
@@ -39,7 +40,7 @@
"@types/express": "^5.0.1",
"@types/lodash": "^4.17.16",
"@types/node": "^22.13.10",
"@types/react": "^19.0.10",
"@types/react": "^19.0.12",
"@types/react-dom": "^19.0.4",
"@vitejs/plugin-react": "^4.3.4",
"antd": "^5.24.3",

5
src/main/index.ts
View File

@@ -15,6 +15,11 @@ import LocalServer from "./http-server/http-server";
import { TestQB } from "./quickbooks-desktop/quickbooks-desktop";
import store from "./store/store";
import fs from "fs";
import Sentry from "@sentry/electron/main";
Sentry.init({
dsn: "https://ba41d22656999a8c1fd63bcb7df98650@o492140.ingest.us.sentry.io/4509074139447296",
});
log.initialize();
const isMac = process.platform === "darwin";

6
src/main/ipc/ipcMainConfig.ts
View File

@@ -1,8 +1,10 @@
import { app, ipcMain } from "electron";
import log from "electron-log/main";
import { autoUpdater } from "electron-updater";
import path from "path";
import ipcTypes from "../../util/ipcTypes.json";
import ImportJob from "../decoder/decoder";
import store from "../store/store";
import { StartWatcher, StopWatcher } from "../watcher/watcher";
import {
SettingsWatchedFilePathsAdd,
@@ -12,7 +14,6 @@ import {
SettingsWatcherPollingSet,
} from "./ipcMainHandler.settings";
import { ipcMainHandleAuthStateChanged } from "./ipcMainHandler.user";
import { autoUpdater } from "electron-updater";
// Log all IPC messages and their payloads
const logIpcMessages = (): void => {
@@ -88,6 +89,9 @@ ipcMain.handle(
ipcTypes.toMain.settings.watcher.setpolling,
SettingsWatcherPollingSet,
);
ipcMain.handle(ipcTypes.toMain.user.getActiveShop, () => {
return store.get("app.bodyshop.shopname");
});
//Watcher Handlers
ipcMain.on(ipcTypes.toMain.watcher.start, () => {

3
src/renderer/src/components/Settings/Settings.Watcher.tsx
View File

@@ -100,6 +100,8 @@ const SettingsWatcher: React.FC = () => {
checkedChildren={t("settings.labels.watchermoderealtime")}
unCheckedChildren={t("settings.labels.watchermodepolling")}
/>
<Space size="small">
<span>{t("settings.labels.pollinginterval")}</span>
<InputNumber
title={t("settings.labels.pollinginterval")}
disabled={!pollingState.enabled}
@@ -107,6 +109,7 @@ const SettingsWatcher: React.FC = () => {
value={pollingState.interval}
onChange={handlePollingIntervalChange}
/>
</Space>
{watcherError && <Alert message={watcherError} />}
</Space>
</Card>

4
src/renderer/src/components/Settings/Settings.tsx
View File

@@ -1,10 +1,14 @@
import { Col, Row } from "antd";
import SettingsWatchedPaths from "./Settings.WatchedPaths";
import SettingsWatcher from "./Settings.Watcher";
import Welcome from "../Welcome/Welcome";
const Settings: React.FC = () => {
return (
<Row gutter={[32, 32]}>
<Col span={24}>
<Welcome />
</Col>
<Col span={24}>
<SettingsWatchedPaths />
</Col>

31
src/renderer/src/components/Welcome/Welcome.tsx Normal file
View File

@@ -0,0 +1,31 @@
import { auth } from "@renderer/util/firebase";
import { Card, Typography } from "antd";
import { JSX, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import ipcTypes from "../../../../util/ipcTypes.json";
const Welcome = (): JSX.Element => {
const { t } = useTranslation();
const [shopName, setShopName] = useState<string | null>(null);
useEffect(() => {
window.electron.ipcRenderer
.invoke(ipcTypes.toMain.user.getActiveShop)
.then((shopName: string) => {
console.log("Active shop name:", shopName);
setShopName(shopName);
});
}, []);
return (
<>
<Card>
<Typography.Title level={3}>
{t("auth.labels.welcome", { name: auth.currentUser?.displayName })}
</Typography.Title>
<Typography.Paragraph>{shopName || ""}</Typography.Paragraph>
</Card>
</>
);
};
export default Welcome;

5
src/renderer/src/main.tsx
View File

@@ -3,6 +3,11 @@ import ReactDOM from "react-dom/client";
import App from "./App";
import "./util/i18n";
import "./util/ipcRendererHandler";
import * as Sentry from "@sentry/electron/renderer";
Sentry.init({
dsn: "https://ba41d22656999a8c1fd63bcb7df98650@o492140.ingest.us.sentry.io/4509074139447296",
});
ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
<React.StrictMode>

3
src/util/ipcTypes.json
View File

@@ -26,7 +26,8 @@
}
},
"user": {
"getTokenResponse": "toMain_user_getTokenResponse"
"getTokenResponse": "toMain_user_getTokenResponse",
"getActiveShop": "toMain_user_getActiveShopify"
}
},
"toRenderer": {

4
src/util/translations/en-US/renderer.json
View File

@@ -1,6 +1,9 @@
{
"translation": {
"auth": {
"labels": {
"welcome": "Welcome {{name}}"
},
"login": {
"error": "The username and password combination provided is not valid.",
"login": "Log In",
@@ -19,6 +22,7 @@
"stopwatcher": "Stop Watcher\n"
},
"labels": {
"pollinginterval": "Polling Interval (ms)",
"started": "Started",
"stopped": "Stopped",
"watchedpaths": "Watched Paths",

31
translations.babel
View File

@@ -48,6 +48,24 @@
<folder_node>
<name>auth</name>
<children>
<folder_node>
<name>labels</name>
<children>
<concept_node>
<name>welcome</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node>
<name>login</name>
<children>
@@ -188,6 +206,19 @@
<folder_node>
<name>labels</name>
<children>
<concept_node>
<name>pollinginterval</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>started</name>
<definition_loaded>false</definition_loaded>