From 2699b80e1aa2ddd96b7f4615e7ee687956e2702d Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Wed, 17 Jan 2024 20:02:41 -0500 Subject: [PATCH 1/3] - adjust circle ci Signed-off-by: Dave Richer --- .circleci/config.yml | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e047be49..ac700fdb7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -69,6 +69,26 @@ jobs: to: "s3://imex-online-production/" - jira/notify + app-beta-build: + docker: + - image: cimg/node:18.18.2 + resource_class: large + working_directory: ~/repo/client + + steps: + - checkout: + path: ~/repo + - run: + name: Install Dependencies + command: npm i + + - run: npm run build + + - aws-s3/sync: + from: build + to: "s3://imex-online-beta/" + - jira/notify + test-hasura-migrate: docker: - image: cimg/node:16.15.0 @@ -119,6 +139,27 @@ jobs: to: "s3://imex-online-test/" - jira/notify + test-app-beta-build: + docker: + - image: cimg/node:18.18.2 + + working_directory: ~/repo/client + + steps: + - checkout: + path: ~/repo + + - run: + name: Install Dependencies + command: npm i + + - run: npm run build + + - aws-s3/sync: + from: build + to: "s3://imex-online-test-beta/" + - jira/notify + admin-app-build: docker: - image: cimg/node:16.15.0 @@ -160,6 +201,10 @@ workflows: filters: branches: only: master + - app-beta-build: + filters: + branches: + only: master-beta - hasura-migrate: secret: ${HASURA_PROD_SECRET} filters: @@ -169,6 +214,10 @@ workflows: filters: branches: only: test + - test-app-beta-build: + filters: + branches: + only: test-beta - test-hasura-migrate: secret: ${HASURA_TEST_SECRET} filters: From eb96f6467ffe5445e9b493b2dfe3f934c40f2cb3 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Wed, 17 Jan 2024 20:03:55 -0500 Subject: [PATCH 2/3] - adjust circle ci Signed-off-by: Dave Richer --- client/src/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/src/index.js b/client/src/index.js index 9bcdc55ec..f93b74910 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -12,7 +12,6 @@ import { persistor, store } from "./redux/store"; import reportWebVitals from "./reportWebVitals"; import "./translations/i18n"; import "./utils/CleanAxios"; -import {defaultTheme} from "@ant-design/compatible"; //import { BrowserTracing } from "@sentry/tracing"; //import "antd/dist/antd.css"; // import "antd/dist/antd.less"; @@ -64,6 +63,10 @@ function App() { // Used for ANTD Component Tokens // https://ant.design/docs/react/migrate-less-variables +function ConfigProvider(props) { + return null; +} + // TODO - Client Update - At a later time it might be worth removing these defaults ReactDOM.createRoot(document.getElementById('root')).render( From 1cb4b228ce7d1ebbaa800133526ca5b51a3f73c4 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Wed, 17 Jan 2024 20:05:38 -0500 Subject: [PATCH 3/3] - fix issue Signed-off-by: Dave Richer --- client/src/index.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/client/src/index.js b/client/src/index.js index f93b74910..2a4118568 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -12,6 +12,7 @@ import { persistor, store } from "./redux/store"; import reportWebVitals from "./reportWebVitals"; import "./translations/i18n"; import "./utils/CleanAxios"; +import { ConfigProvider } from "antd"; //import { BrowserTracing } from "@sentry/tracing"; //import "antd/dist/antd.css"; // import "antd/dist/antd.less"; @@ -63,11 +64,6 @@ function App() { // Used for ANTD Component Tokens // https://ant.design/docs/react/migrate-less-variables -function ConfigProvider(props) { - return null; -} - -// TODO - Client Update - At a later time it might be worth removing these defaults ReactDOM.createRoot(document.getElementById('root')).render(