diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js index 709d3e31..153c3fe3 100644 --- a/ui/.eslintrc.js +++ b/ui/.eslintrc.js @@ -1,16 +1,10 @@ module.exports = { - root: true, - parser: '@typescript-eslint/parser', - plugins: [ - '@typescript-eslint', - ], - extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/recommended', - ], - rules: { - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-empty-interface": "off" - }, - }; - \ No newline at end of file + root: true, + parser: '@typescript-eslint/parser', + plugins: ['@typescript-eslint'], + extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'], + rules: { + '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/no-empty-interface': 'off', + }, +}; diff --git a/ui/.prettierignore b/ui/.prettierignore new file mode 100644 index 00000000..227b71fe --- /dev/null +++ b/ui/.prettierignore @@ -0,0 +1,2 @@ +build +coverage \ No newline at end of file diff --git a/ui/.prettierrc.json b/ui/.prettierrc.json new file mode 100644 index 00000000..6a8af5e9 --- /dev/null +++ b/ui/.prettierrc.json @@ -0,0 +1,5 @@ +{ + "tabWidth": 2, + "semi": true, + "singleQuote": true +} diff --git a/ui/craco.config.js b/ui/craco.config.js index 165cb7e8..21767add 100644 --- a/ui/craco.config.js +++ b/ui/craco.config.js @@ -7,7 +7,7 @@ module.exports = { options: { lessLoaderOptions: { lessOptions: { - modifyVars: { + modifyVars: { // Custom theme // https://github.com/ant-design/ant-design/blob/master/components/style/themes/default.less // Colors @@ -17,8 +17,8 @@ module.exports = { // Layout '@layout-header-background': '@purple-10', '@layout-body-background': '#fff', - // - '@border-radius-base': '5px' + // + '@border-radius-base': '5px', }, javascriptEnabled: true, }, @@ -26,4 +26,4 @@ module.exports = { }, }, ], -}; \ No newline at end of file +}; diff --git a/ui/package-lock.json b/ui/package-lock.json index fd07218e..177b63dd 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "ui", "version": "0.1.0", "dependencies": { "@craco/craco": "^6.1.2", @@ -37,6 +38,7 @@ "@typescript-eslint/eslint-plugin": "^4.28.4", "@typescript-eslint/parser": "^4.28.4", "eslint": "^7.31.0", + "prettier": "2.6.2", "typescript": "^4.3.5" } }, @@ -15036,6 +15038,21 @@ "node": ">=0.10.0" } }, + "node_modules/prettier": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", + "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", @@ -33451,6 +33468,12 @@ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, + "prettier": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz", + "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", + "dev": true + }, "pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", diff --git a/ui/package.json b/ui/package.json index e3dfb418..839964f5 100644 --- a/ui/package.json +++ b/ui/package.json @@ -10,6 +10,7 @@ "@testing-library/user-event": "^12.8.3", "antd": "^4.16.1", "craco-less": "^1.17.1", + "follow-redirects": "^1.14.7", "http-status-codes": "^2.1.4", "lodash.debounce": "^4.0.8", "moment": "^2.29.1", @@ -19,15 +20,15 @@ "react-redux": "^7.2.4", "react-router-dom": "^5.2.0", "react-scripts": "4.0.3", - "web-vitals": "^1.1.2", - "follow-redirects": "^1.14.7" + "web-vitals": "^1.1.2" }, "scripts": { "start": "craco start", "build": "craco build", "test": "craco test", "eject": "craco eject", - "lint": "npx eslint . --ext .ts,.tsx" + "lint": "npx eslint . --ext .ts,.tsx", + "prettier": "npx prettier --write ." }, "eslintConfig": { "extends": [ @@ -58,6 +59,7 @@ "@typescript-eslint/eslint-plugin": "^4.28.4", "@typescript-eslint/parser": "^4.28.4", "eslint": "^7.31.0", + "prettier": "2.6.2", "typescript": "^4.3.5" } } diff --git a/ui/public/index.html b/ui/public/index.html index 4ce1a7dd..de165bf4 100644 --- a/ui/public/index.html +++ b/ui/public/index.html @@ -4,10 +4,7 @@ - +