Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
bbe3d3c
산점도 행렬 차트 추가
prisml Dec 8, 2022
73b7a2e
상관계수식 수정
prisml Dec 9, 2022
4610241
billboardjs 버전 업데이트, 그래프 모양 수정
prisml Dec 9, 2022
c708f5b
[#5209] [WS] 데이터 분석에 새로운 기능(산점도 행렬, 차트 크게 보기 등)을 추가 - 마크업
jooheemoon Dec 14, 2022
037c9b8
Merge pull request #386 from entrylabs/issue/5209_markup
prisml Dec 14, 2022
034c9a1
add scatter grid
prisml Dec 14, 2022
2513fd0
Merge branch 'issue/5209' of https://github.com/entrylabs/entry-tool …
prisml Dec 14, 2022
3e45aa8
데이터 분석 탭 크게보기 기능 추가
prisml Dec 14, 2022
a26e0eb
테이블 불러오기 빈 화면 개선
prisml Dec 14, 2022
412cd22
데이터가 없을때 정보탭 화면 수정
prisml Dec 14, 2022
142b96b
정보탭 수정
prisml Dec 14, 2022
c4e8d83
요약 탭 차트 레이아웃 수정
prisml Dec 14, 2022
1ab8993
[#5209] [WS] 데이터 분석에 새로운 기능(산점도 행렬, 차트 크게 보기 등)을 추가 - 산점도 행렬 그래프 축 레이…
jooheemoon Dec 15, 2022
177af2d
Merge pull request #387 from entrylabs/issue/5209_markup_2
prisml Dec 15, 2022
ece6206
eslint setting
prisml Dec 15, 2022
60708d8
update entry sheet
prisml Dec 15, 2022
711820c
update entry sheet
prisml Dec 16, 2022
60db429
차트탭 산점도 행렬 토글 버튼 추가
prisml Dec 16, 2022
0e6f82a
차트 컴포넌트 타입별로 분리
prisml Dec 16, 2022
fb8619e
차트 컴포넌트 index 파일 정의
prisml Dec 16, 2022
710b932
산점도 행렬 아이콘 수정
Dec 18, 2022
866d3be
차트컴포넌트 분리 이전 및 레거시 삭제
Dec 18, 2022
8a6f7f7
remove import unused react
Dec 18, 2022
8c72481
산점도 행렬 차트 위치 마크업 적용
Dec 18, 2022
eed58a0
산점도 행렬 차트 추가
Dec 18, 2022
d547fec
산점도 행렬 축값 추가
prisml Dec 18, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
{
"plugins": ["prettier"],
"extends": ["plugin:prettier/recommended"],
"plugins": ["react", "prettier", "react-hooks"],
"extends": [
"plugin:prettier/recommended",
"eslint:recommended",
"plugin:react/recommended",
"plugin:react/jsx-runtime"
],
"env": {
"es6": true,
"browser": true,
"jquery": true
},
"parser": "babel-eslint",
"settings": {
"react": {
"version": "detect"
}
},
"parser": "@babel/eslint-parser",
"parserOptions": {
"ecmaVersion": 2017,
"ecmaVersion": 11,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"requireConfigFile": false
},
"rules": {
"no-unused-vars": "warn",
"prefer-const": "warn",
"no-var": "warn",
"eqeqeq": 0,
Expand Down Expand Up @@ -72,7 +84,10 @@
"camelcase": ["warn", { "properties": "never" }],
"new-cap": ["warn", { "capIsNewExceptionPattern": "^Entry." }],
"curly": "warn",
"keyword-spacing": "warn"
"keyword-spacing": "warn",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
"react/prop-types": "off"
},
"globals": {
"$": true,
Expand Down
13 changes: 11 additions & 2 deletions .storybook/.babelrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
{
"plugins": [
"@babel/plugin-transform-runtime",
[
"@babel/plugin-transform-runtime",
{
"useESModules": true
}
],
// "@babel/plugin-transform-runtime",,
"@babel/plugin-transform-regenerator",
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-transform-object-assign",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-modules-commonjs",
"@babel/plugin-proposal-object-rest-spread",
"@babel/plugin-proposal-private-methods",
[
"module-resolver",
{
Expand Down Expand Up @@ -32,6 +41,6 @@
}
}
],
"@babel/react"
["@babel/react", { "runtime": "automatic" }]
]
}
6 changes: 4 additions & 2 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "ES6",
"target": "ES2022",
"baseUrl": "./",
"paths": {
"@hoc/*": ["src/hoc/*"],
Expand All @@ -10,7 +10,9 @@
"@components/*": ["src/components/*"],
"@utils/*": ["src/utils/*"],
"@reducers/*": ["src/reducers/*"],
"@contexts/*": ["src/contexts/*"]
"@contexts/*": ["src/contexts/*"],
"@selectors/*": ["src/selectors/*"],
"@constants/*": ["src/constants/*"]
}
},
"exclude": ["node_modules", "**/node_modules/*", "dist", "component"]
Expand Down
53 changes: 30 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,31 @@
"prepublish": "npm run build"
},
"devDependencies": {
"@babel/cli": "^7.8.3",
"@babel/core": "^7.12.3",
"@babel/plugin-proposal-class-properties": "^7.3.0",
"@babel/plugin-proposal-object-rest-spread": "^7.12.1",
"@babel/plugin-proposal-private-methods": "^7.12.1",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
"@babel/plugin-transform-object-assign": "^7.2.0",
"@babel/plugin-transform-regenerator": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.2.0",
"@babel/preset-env": "^7.3.1",
"@babel/preset-react": "^7.0.0",
"@babel/register": "^7.9.0",
"@babel/cli": "^7.19.3",
"@babel/core": "^7.20.5",
"@babel/eslint-parser": "^7.19.1",
"@babel/eslint-plugin": "^7.19.1",
"@babel/parser": "^7.20.5",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-object-rest-spread": "^7.20.2",
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-modules-commonjs": "^7.19.6",
"@babel/plugin-transform-object-assign": "^7.18.6",
"@babel/plugin-transform-regenerator": "^7.20.5",
"@babel/plugin-transform-runtime": "^7.19.6",
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"@babel/register": "^7.18.9",
"@storybook/addon-actions": "^3.4.10",
"@storybook/addon-knobs": "^3.4.10",
"@storybook/addon-links": "^3.4.10",
"@storybook/react": "^3.4.10",
"autoprefixer": "7.1.6",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.0.1",
"babel-jest": "^29.3.1",
"babel-loader": "^8.1.0",
"babel-plugin-module-resolver": "^4.0.0",
"babel-plugin-module-resolver": "^4.1.0",
"case-sensitive-paths-webpack-plugin": "2.1.1",
"chalk": "1.1.3",
"cross-env": "^6.0.3",
Expand All @@ -63,11 +65,15 @@
"dotenv-expand": "4.2.0",
"enzyme": "^3.4.2",
"enzyme-adapter-react-16": "^1.2.0",
"eslint": "^7.14.0",
"eslint-config-prettier": "^6.15.0",
"eslint-config-react-app": "^6.0.0",
"eslint": "^8.30.0",
"eslint-config-next": "^13.0.6",
"eslint-config-prettier": "^8.5.0",
"eslint-config-react-app": "^7.0.1",
"eslint-loader": "^4.0.2",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react-hooks": "^5.0.0-next-4dda96a40-20221213",
"events": "^3.0.0",
"extract-text-webpack-plugin": "3.0.2",
"file-loader": "1.1.5",
Expand All @@ -82,8 +88,8 @@
"postcss-flexbugs-fixes": "3.2.0",
"postcss-loader": "^3.0.0",
"postcss-prefixer": "^2.1.2",
"prettier": "^1.19.1",
"prettier-eslint": "^12.0.0",
"prettier": "^2.8.1",
"prettier-eslint": "^15.0.1",
"promise": "8.0.1",
"raf": "3.4.0",
"react": "^17.0.1",
Expand All @@ -97,6 +103,7 @@
"recompose": "^0.30.0",
"redux": "^4.0.0",
"redux-thunk": "^2.3.0",
"regenerator-runtime": "^0.13.11",
"resolve": "1.6.0",
"rimraf": "^2.6.2",
"safe-umd-webpack-plugin": "^4.0.0",
Expand All @@ -120,7 +127,7 @@
"@entrylabs/postcss-url": "^8.0.1",
"@toast-ui/react-grid": "^4.10.1",
"axios": "^0.18.0",
"billboard.js": "^1.11.1",
"billboard.js": "^3.6.3",
"chroma-js": "^1.4.0",
"classnames": "^2.2.6",
"clipboard": "^2.0.11",
Expand Down
2 changes: 1 addition & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Component } from 'react';
import { Component } from 'react';
import { connect } from 'react-redux';

class App extends Component {
Expand Down
1 change: 1 addition & 0 deletions src/assets/entry/images/IconArrowRightChartList.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/entry/images/IconButtonZoomIn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/entry/images/IconButtonZoomOut.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading