diff --git a/client/craco.config.js b/client/craco.config.js index 2127d3bf8..e2dc0a839 100644 --- a/client/craco.config.js +++ b/client/craco.config.js @@ -1,7 +1,37 @@ // craco.config.js const TerserPlugin = require("terser-webpack-plugin"); +const CracoLessPlugin = require("craco-less"); module.exports = { + plugins: [ + { + plugin: CracoLessPlugin, + options: { + lessLoaderOptions: { + lessOptions: { + modifyVars: { + "@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) => ({ ...webpackConfig, diff --git a/client/package-lock.json b/client/package-lock.json index d588b5ab9..dc02929a0 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -4968,6 +4968,11 @@ } } }, + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=" + }, "clsx": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", @@ -5240,6 +5245,14 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, + "copy-anything": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz", + "integrity": "sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==", + "requires": { + "is-what": "^3.12.0" + } + }, "copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", @@ -5309,6 +5322,15 @@ "yaml": "^1.7.2" } }, + "craco-less": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/craco-less/-/craco-less-1.17.1.tgz", + "integrity": "sha512-T6V1aF3+eQZ22gUigHInX/i+ExPbWrnmdAhtuEXc4mOyhneDifmEzZFseq/BdRy1aUEs9s4z26jTxP+1I6P//g==", + "requires": { + "less": "^3.11.1", + "less-loader": "^6.1.0" + } + }, "create-ecdh": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", @@ -8831,6 +8853,12 @@ "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==" }, + "image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", + "optional": true + }, "immer": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz", @@ -9228,6 +9256,11 @@ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, + "is-what": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", + "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==" + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -10982,6 +11015,41 @@ "webpack-sources": "^1.1.0" } }, + "less": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/less/-/less-3.13.1.tgz", + "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==", + "requires": { + "copy-anything": "^2.0.1", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "native-request": "^1.0.5", + "source-map": "~0.6.0", + "tslib": "^1.10.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true + } + } + }, + "less-loader": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-6.2.0.tgz", + "integrity": "sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==", + "requires": { + "clone": "^2.1.2", + "less": "^3.11.3", + "loader-utils": "^2.0.0", + "schema-utils": "^2.7.0" + } + }, "leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", @@ -11565,6 +11633,12 @@ "to-regex": "^3.0.1" } }, + "native-request": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz", + "integrity": "sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==", + "optional": true + }, "native-url": { "version": "0.2.6", "resolved": "https://registry.npmjs.org/native-url/-/native-url-0.2.6.tgz", diff --git a/client/package.json b/client/package.json index cc8b9f36f..03832181f 100644 --- a/client/package.json +++ b/client/package.json @@ -17,6 +17,7 @@ "antd": "^4.12.3", "apollo-link-logger": "^2.0.0", "axios": "^0.21.1", + "craco-less": "^1.17.1", "dinero.js": "^1.8.1", "dotenv": "^8.2.0", "firebase": "^8.2.9", diff --git a/client/src/App/App.jsx b/client/src/App/App.jsx index 2fe9ad2fe..df68084f2 100644 --- a/client/src/App/App.jsx +++ b/client/src/App/App.jsx @@ -1,4 +1,4 @@ -import "antd/dist/antd.css"; + import React, { lazy, Suspense, useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/index.js b/client/src/index.js index 4106cab0e..805b5db5b 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -16,7 +16,8 @@ import { persistor, store } from "./redux/store"; import * as serviceWorker from "./serviceWorker"; import "./translations/i18n"; import "./utils/CleanAxios"; - +//import "antd/dist/antd.css"; +import "antd/dist/antd.less"; require("dotenv").config(); Dinero.defaultCurrency = "CAD";