diff --git a/client/craco.config.js b/client/craco.config.js index ac2174e3f..e6e701d81 100644 --- a/client/craco.config.js +++ b/client/craco.config.js @@ -20,37 +20,6 @@ module.exports = { ignore: ["node_modules", "webpack.config.js"], }, }, - { - plugin: CracoLessPlugin, - options: { - lessLoaderOptions: { - lessOptions: { - modifyVars: { - ...(process.env.NODE_ENV === "development" - ? { "@primary-color": "#a51d1d" } - : { - //"@primary-color": "#1DA57A" - }), - // "@primary-color": " #1890ff", // primary color for all components - // "@link-color": "#1890ff", // link color - // "@success-color": "#52c41a", // success state color - // "@warning-color": "#faad14", // warning state color - // "@error-color": "#f5222d", // error state color - // "@font-size-base": "14px", // major text font size - // " @heading-color": "rgba(0, 0, 0, 0.85)", // heading text color - // "@text-color": "rgba(0, 0, 0, 0.65)", // major text color - // "@text-color-secondary": "rgba(0, 0, 0, 0.45)", // secondary text color - // "@disabled-color": "rgba(0, 0, 0, 0.25)", // disable state color - // "@border-radius-base": "2px", // major border radius - // "@border-color-base": "#d9d9d9", // major border color - // "@box-shadow-base": - // "0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08),0 9px 28px 8px rgba(0, 0, 0, 0.05); // major shadow for layers }", - }, - javascriptEnabled: true, - }, - }, - }, - }, ], webpack: { configure: (webpackConfig) => ({ diff --git a/client/package.json b/client/package.json index f752db97b..7ff21decd 100644 --- a/client/package.json +++ b/client/package.json @@ -12,10 +12,9 @@ "@sentry/tracing": "^7.28.1", "@splitsoftware/splitio-react": "^1.6.0", "@tanem/react-nprogress": "^5.0.8", - "antd": "4.24.5", + "antd": "5.1.5", "apollo-link-logger": "^2.0.0", - "axios": "^1.2.2", - "craco-less": "^2.0.0", + "axios": "^1.2.3", "dinero.js": "^1.9.1", "enquire-js": "^0.2.1", "env-cmd": "^10.1.0", diff --git a/client/src/index.js b/client/src/index.js index 5de379556..f9365f2e3 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -1,6 +1,4 @@ import * as Sentry from "@sentry/react"; -import "antd/dist/antd.css"; -//import "antd/dist/antd.less"; import Dinero from "dinero.js"; import React from "react"; import { createRoot } from "react-dom/client"; diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx index 7a71f2cd1..d9075598a 100644 --- a/client/src/pages/manage/manage.page.component.jsx +++ b/client/src/pages/manage/manage.page.component.jsx @@ -1,4 +1,4 @@ -import { BackTop, Layout } from "antd"; +import { Layout } from "antd"; import preval from "preval.macro"; import React, { lazy, Suspense, useEffect } from "react"; import { useTranslation } from "react-i18next"; @@ -11,6 +11,7 @@ import ConflictComponent from "../../components/conflict/conflict.component"; import ErrorBoundary from "../../components/error-boundary/error-boundary.component"; //import FooterComponent from "../../components/footer/footer.component"; //Component Imports +import * as Sentry from "@sentry/react"; import HeaderContainer from "../../components/header/header.container"; import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component"; import PartnerPingComponent from "../../components/partner-ping/partner-ping.component"; @@ -20,9 +21,8 @@ import TestComponent from "../../components/_test/test.component"; import { requestForToken } from "../../firebase/firebase.utils"; import { selectBodyshop, - selectInstanceConflict, + selectInstanceConflict } from "../../redux/user/user.selectors"; -import * as Sentry from "@sentry/react"; import "./manage.page.styles.scss"; @@ -403,7 +403,7 @@ export function Manage({ match, conflict, bodyshop }) { {PageContent} - +