Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #267

Merged
merged 20 commits into from
Apr 5, 2024
Merged

Dev #267

Show file tree
Hide file tree
Changes from 10 commits
Commits
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
13 changes: 3 additions & 10 deletions docker-compose-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
version: '3.8'
x-airflow-common:
&airflow-common
image: apache/airflow:2.7.2-python3.9
# build: .
build:
context: .
dockerfile: Dockerfile-airflow-domino.dev
environment:
&airflow-common-env
AIRFLOW__CORE__EXECUTOR: CeleryExecutor
Expand Down Expand Up @@ -226,10 +227,6 @@ services:
# Modified Airflow Scheduler with Domino
airflow-scheduler:
<<: *airflow-common
# # image: ghcr.io/tauffer-consulting/domino-airflow-base:latest
build:
context: .
dockerfile: Dockerfile-airflow-domino.dev
container_name: airflow-domino-scheduler
command: scheduler
healthcheck:
Expand Down Expand Up @@ -261,10 +258,6 @@ services:
# Modified Airflow Worker with Domino
airflow-worker:
<<: *airflow-common
# image: ghcr.io/tauffer-consulting/domino-airflow-base:latest
build:
context: .
dockerfile: Dockerfile-airflow-domino.dev
container_name: airflow-domino-worker
command: celery worker
healthcheck:
Expand Down
3 changes: 2 additions & 1 deletion frontend/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"extends": [
"standard-with-typescript",
"plugin:react/recommended",
"plugin:prettier/recommended"
"plugin:prettier/recommended",
"plugin:@tanstack/eslint-plugin-query/recommended"
],
"parserOptions": {
"ecmaVersion": "latest",
Expand Down
2 changes: 0 additions & 2 deletions frontend/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,4 @@ FROM base
WORKDIR /usr/src/app
COPY --from=build /usr/src/app/node_modules ./node_modules
COPY . .
RUN chmod -R 777 node_modules/
USER node
CMD ["pnpm", "run", "debug"]
82 changes: 42 additions & 40 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,85 +5,87 @@
"engines": {
"node": ">=18 < 20"
},
"browserslist": [
">0.2%",
"not dead",
"not op_mini all"
],
"scripts": {
"debug": "VITE_CJS_IGNORE_WARNING=true vite dev",
"start": "vite",
"build": "tsc && vite build",
"lint": "eslint . --ext js,jsx,ts,tsx",
"lint:fix": "eslint . --ext js,jsx,ts,tsx --fix"
},
"dependencies": {
"@emotion/react": "^11.11.3",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"@iconify/react": "^4.1.1",
"@import-meta-env/cli": "^0.6.8",
"@import-meta-env/unplugin": "^0.4.10",
"@mui/icons-material": "^5.15.10",
"@mui/icons-material": "^5.15.14",
"@mui/lab": "5.0.0-alpha.165",
"@mui/material": "^5.15.10",
"@mui/x-data-grid": "^6.19.4",
"@mui/x-date-pickers": "^6.19.4",
"@mui/material": "^5.15.14",
"@mui/x-data-grid": "^6.19.6",
"@mui/x-date-pickers": "^6.19.7",
"@tanstack/react-query": "^5.28.4",
"@tanstack/react-query-devtools": "^5.28.4",
"@uiw/react-textarea-code-editor": "^2.1.9",
"@vitejs/plugin-react": "^4.2.1",
"axios": "^1.6.7",
"axios": "^1.6.8",
"axios-mock-adapter": "^1.22.0",
"cross-env": "^7.0.3",
"dayjs": "^1.11.10",
"elkjs": "^0.8.2",
"pdfjs-dist": "^3.11.174",
"plotly.js": "^2.29.1",
"plotly.js": "^2.30.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-draggable": "^4.4.6",
"react-hook-form": "^7.50.1",
"react-hook-form": "^7.51.1",
"react-markdown": "9.0.0",
"react-pdf": "^7.7.0",
"react-pdf": "^7.7.1",
"react-plotly.js": "^2.6.0",
"react-router-dom": "^6.22.0",
"react-to-print": "^2.14.15",
"react-router-dom": "^6.22.3",
"react-to-print": "^2.15.1",
"react-toastify": "^9.1.3",
"reactflow": "^11.10.3",
"reactflow": "^11.10.4",
"remark-gfm": "^4.0.0",
"swr": "^2.2.4",
"swr": "^2.2.5",
"uuid": "^9.0.1",
"vite": "^5.1.1",
"vite": "^5.1.6",
"vite-plugin-svgr": "^4.2.0",
"vite-tsconfig-paths": "^4.3.1",
"vite-tsconfig-paths": "^4.3.2",
"web-worker": "^1.3.0",
"yup": "^1.3.3"
},
"scripts": {
"debug": "VITE_CJS_IGNORE_WARNING=true vite dev",
"start": "vite",
"start:mock": "cross-env NODE_OPTIONS=--openssl-legacy-provider VITE_USE_MOCK=true vite",
"build": "tsc && vite build",
"lint": "eslint . --ext js,jsx,ts,tsx",
"lint:fix": "eslint . --ext js,jsx,ts,tsx --fix"
"yup": "^1.4.0"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": [
">0.2%",
"not dead",
"not op_mini all"
],
"devDependencies": {
"@tanstack/eslint-plugin-query": "^5.27.7",
"@types/dompurify": "^3.0.5",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
"@types/react": "^18.2.67",
"@types/react-dom": "^18.2.22",
"@types/react-plotly.js": "^2.6.3",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard-with-typescript": "^39.1.1",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-testing-library": "^6.2.0",
"prettier": "^3.2.5",
"typescript": "^5.3.3"
"typescript": "^5.4.2"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
}
}
Loading
Loading