Skip to content

Commit

Permalink
Merge pull request #156 from juanky201271/dev_finsight
Browse files Browse the repository at this point in the history
Finsight
  • Loading branch information
juanky201271 authored Nov 6, 2023
2 parents b1d3d92 + 00d9042 commit a5cd31d
Show file tree
Hide file tree
Showing 11 changed files with 1,469 additions and 45 deletions.
13 changes: 11 additions & 2 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -378,14 +378,14 @@ module.exports = function (webpackEnv) {
options: {
customize: require.resolve("babel-preset-react-app/webpack-overrides"),
presets: [
[require.resolve("@babel/preset-env")],
[
require.resolve("babel-preset-react-app"),
{
runtime: hasJsxRuntime ? "automatic" : "classic",
},
],
],

plugins: [
[
require.resolve("babel-plugin-named-asset-import"),
Expand All @@ -397,6 +397,12 @@ module.exports = function (webpackEnv) {
},
},
],
[
require.resolve("@babel/plugin-proposal-class-properties"),
{
"loose": true,
},
],
isEnvDevelopment && shouldUseReactRefresh && require.resolve("react-refresh/babel"),
].filter(Boolean),
// This is a feature of `babel-loader` for webpack (not Babel itself).
Expand Down Expand Up @@ -430,7 +436,10 @@ module.exports = function (webpackEnv) {
babelrc: false,
configFile: false,
compact: false,
presets: [[require.resolve("babel-preset-react-app/dependencies"), { helpers: true }]],
presets: [
[require.resolve("@babel/preset-env")],
[require.resolve("babel-preset-react-app/dependencies"), { helpers: true }],
],
cacheDirectory: true,
// See #6846 for context on why cacheCompression is disabled
cacheCompression: false,
Expand Down
80 changes: 41 additions & 39 deletions native/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
},
"dependencies": {
"@babel/core": "7.12.3",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/preset-env": "^7.22.5",
"@fortawesome/fontawesome-free": "^6.4.2",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
Expand All @@ -30,8 +32,10 @@
"@types/jest": "^26.0.24",
"@types/lodash": "^4.14.196",
"@types/node": "^14.18.21",
"@types/randomcolor": "^0.5.7",
"@types/react": "^17.0.45",
"@types/react-dom": "^17.0.17",
"@types/react-svg": "^5.0.0",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"babel-eslint": "^10.1.0",
Expand All @@ -42,6 +46,7 @@
"bfj": "^7.0.2",
"camelcase": "^6.3.0",
"case-sensitive-paths-webpack-plugin": "2.3.0",
"chart.js": "3.9.1",
"cross-env": "^7.0.3",
"css-loader": "4.3.0",
"dateformat": "^4.6.3",
Expand Down Expand Up @@ -84,9 +89,11 @@
"progress-stream": "^2.0.0",
"prompts": "2.4.0",
"qrcode.react": "^3.1.0",
"randomcolor": "^0.6.2",
"react": "^17.0.2",
"react-accessible-accordion": "^3.3.5",
"react-app-polyfill": "^2.0.0",
"react-chartjs-2": "4.3.1",
"react-dev-utils": "^11.0.3",
"react-dom": "^17.0.2",
"react-modal": "^3.15.1",
Expand Down Expand Up @@ -117,6 +124,7 @@
"lint": "eslint . --fix --ext .js,.jsx,.ts,.tsx",
"start": "concurrently -k \"cross-env NODE_ENV=production BROWSER=none yarn react-start\" \"wait-on http://localhost:3000 && electronmon .\"",
"build": "yarn clean && yarn neon && cross-env NODE_OPTIONS=--openssl-legacy-provider node scripts/build.js",
"script:build": "cross-env NODE_OPTIONS=--openssl-legacy-provider node scripts/build.js",
"clean": "cd native && cargo clean && cd ..",
"update": "cd native && cargo clean && cargo update && cd ..",
"build-mac-x64": "yarn clean && yarn neon-mac-x64 && cross-env NODE_OPTIONS=--openssl-legacy-provider node scripts/build.js",
Expand Down
6 changes: 6 additions & 0 deletions src/components/insight/Insight.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.insightcontainer {
display: flex;
flex-direction: column;
margin-left: 16px;
margin-right: 16px;
}
Loading

0 comments on commit a5cd31d

Please sign in to comment.