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

Merge branch 'feature/IO-1828-Front-End-Package-Updates' into feature/IO-2456-Customized-Report-Filtering

Browse Source
This commit is contained in:
Dave Richer
2024-02-06 15:32:31 -05:00
parent 6131009a31 30c530bcc4
commit c0ebe990cc
3 changed files with 475 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1047
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
client/package.json
View File

@@ -6,18 +6,18 @@
"dependencies": {
"@ant-design/compatible": "^5.1.2",
"@ant-design/pro-layout": "^7.17.16",
"@apollo/client": "^3.9.0",
"@apollo/client": "^3.8.10",
"@asseinfo/react-kanban": "^2.2.0",
"@craco/craco": "^7.1.0",
"@fingerprintjs/fingerprintjs": "^4.2.2",
"@jsreport/browser-client": "^3.1.0",
"@reduxjs/toolkit": "^2.1.0",
"@sentry/cli": "^2.27.0",
"@sentry/react": "^7.99.0",
"@sentry/tracing": "^7.99.0",
"@sentry/cli": "^2.28.0",
"@sentry/react": "^7.100.0",
"@sentry/tracing": "^7.100.0",
"@splitsoftware/splitio-react": "^1.11.0",
"@tanem/react-nprogress": "^5.0.51",
"antd": "^5.13.3",
"antd": "^5.14.0",
"apollo-link-logger": "^2.0.1",
"apollo-link-sentry": "^3.3.0",
"axios": "^1.6.7",
@@ -29,21 +29,21 @@
"enquire-js": "^0.2.1",
"env-cmd": "^10.1.0",
"exifr": "^7.1.3",
"firebase": "^10.7.2",
"firebase": "^10.8.0",
"graphql": "^16.6.0",
"i18next": "^23.8.1",
"i18next": "^23.8.2",
"i18next-browser-languagedetector": "^7.0.2",
"jsoneditor": "^10.0.0",
"jsonic": "^1.0.1",
"jsreport-browser-client-dist": "^1.3.0",
"libphonenumber-js": "^1.10.54",
"libphonenumber-js": "^1.10.55",
"logrocket": "^7.0.0",
"markerjs2": "^2.32.0",
"normalize-url": "^8.0.0",
"phone": "^3.1.42",
"preval.macro": "^5.0.0",
"prop-types": "^15.8.1",
"query-string": "^8.1.0",
"query-string": "^8.2.0",
"rc-queue-anim": "^2.0.0",
"rc-scroll-anim": "^2.7.6",
"react": "^18.2.0",
@@ -54,15 +54,15 @@
"react-drag-listview": "^2.0.0",
"react-grid-gallery": "^1.0.0",
"react-grid-layout": "1.3.4",
"react-i18next": "^14.0.1",
"react-i18next": "^14.0.4",
"react-icons": "^5.0.1",
"react-image-lightbox": "^5.1.4",
"react-intersection-observer": "^9.5.3",
"react-intersection-observer": "^9.7.0",
"react-markdown": "^9.0.1",
"react-number-format": "^5.1.4",
"react-redux": "^9.1.0",
"react-resizable": "^3.0.5",
"react-router-dom": "^6.21.3",
"react-router-dom": "^6.22.0",
"react-scripts": "^5.0.1",
"react-sticky": "^6.0.3",
"react-sublime-video": "^0.2.5",
@@ -124,7 +124,7 @@
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@sentry/webpack-plugin": "^2.10.3",
"@sentry/webpack-plugin": "^2.14.0",
"@testing-library/cypress": "^10.0.1",
"cypress": "^13.6.4",
"eslint-plugin-cypress": "^2.15.1",

61
client/src/index.js
View File

@@ -2,17 +2,17 @@ import * as Sentry from "@sentry/react";
import Dinero from "dinero.js";
import React from "react";
import ReactDOM from "react-dom/client";
import { Provider } from "react-redux";
import {Provider} from "react-redux";
import {createBrowserRouter, createRoutesFromElements, Route, RouterProvider} from "react-router-dom";
import { PersistGate } from "redux-persist/integration/react";
import {PersistGate} from "redux-persist/integration/react";
import AppContainer from "./App/App.container";
import LoadingSpinner from "./components/loading-spinner/loading-spinner.component";
import "./index.css";
import { persistor, store } from "./redux/store";
import {persistor, store} from "./redux/store";
import reportWebVitals from "./reportWebVitals";
import "./translations/i18n";
import "./utils/CleanAxios";
import { ConfigProvider } from "antd";
import {ConfigProvider} from "antd";
//import { BrowserTracing } from "@sentry/tracing";
//import "antd/dist/antd.css";
@@ -23,38 +23,43 @@ import { ConfigProvider } from "antd";
Dinero.globalRoundingMode = "HALF_EVEN";
if (process.env.NODE_ENV !== "development") {
Sentry.init({
dsn: "https://fd7e89369b6b4bdc9c6c4c9f22fa4ee4@o492140.ingest.sentry.io/5651027",
ignoreErrors: [
"ResizeObserver loop",
"Module specifier, 'fs' does not start",
"Module specifier, 'zlib' does not start with",
],
integrations: [
Sentry.replayIntegration({
maskAllText: false,
blockAllMedia: true,
}),
new Sentry.BrowserTracing(),
],
tracesSampleRate: 1.0,
replaysOnErrorSampleRate: 1.0,
environment: process.env.NODE_ENV,
});
Sentry.init({
dsn: "https://fd7e89369b6b4bdc9c6c4c9f22fa4ee4@o492140.ingest.sentry.io/5651027",
ignoreErrors: [
"ResizeObserver loop",
"Module specifier, 'fs' does not start",
"Module specifier, 'zlib' does not start with",
],
integrations: [
Sentry.replayIntegration({
maskAllText: false,
blockAllMedia: true,
}),
new Sentry.BrowserTracing({}),
],
tracePropagationTargets: [
"api.imex.online",
"api.test.imex.online",
"db.imex.online",
],
tracesSampleRate: 1.0,
replaysOnErrorSampleRate: 1.0,
environment: process.env.NODE_ENV,
});
}
const router = createBrowserRouter(
createRoutesFromElements(
<Route path="*" element={<AppContainer />} />
<Route path="*" element={<AppContainer/>}/>
)
);
function App() {
return (
<PersistGate loading={<LoadingSpinner message="Restoring your settings..." />} persistor={persistor}>
<Provider store={store}>
<RouterProvider router={router} />
</Provider>
<PersistGate loading={<LoadingSpinner message="Restoring your settings..."/>} persistor={persistor}>
<Provider store={store}>
<RouterProvider router={router}/>
</Provider>
</PersistGate>
);
}
@@ -63,7 +68,7 @@ function App() {
// https://ant.design/docs/react/migrate-less-variables
ReactDOM.createRoot(document.getElementById('root')).render(
<ConfigProvider>
<App />
<App/>
</ConfigProvider>
);