Skip to content

Commit

Permalink
add react-hook-form and prop-type packages
Browse files Browse the repository at this point in the history
  • Loading branch information
SimNed committed Jun 5, 2024
1 parent 553e9cc commit e39b84d
Show file tree
Hide file tree
Showing 6 changed files with 147 additions and 104 deletions.
34 changes: 31 additions & 3 deletions .pnp.cjs

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

Binary file not shown.
56 changes: 27 additions & 29 deletions docker-compose-windows.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
# services:
# mysql:
# image: mysql:8
# environment:
# - MYSQL_ROOT_PASSWORD=my-secret-pw
# healthcheck:
# test: [ 'CMD', 'mysqladmin', 'ping', '-h', 'localhost' ]
# timeout: 20s
# retries: 10
# ports:
# - '3306:3306'
# - '33060:33060'
# volumes:
# - ./.mysql-data:/var/lib/mysql
# minio:
# image: minio/minio
# ports:
# - '9000:9000'
# - '9090:9090'
# environment:
# - MINIO_ROOT_USER=minioadmin
# - MINIO_ROOT_PASSWORD=minioadmin
# - MINIO_ACCESS_KEY=minio
# - MINIO_SECRET_KEY=minio123
# volumes:
# - ./.minio-data:/data
# command: server --console-address ":9090" /data


services:
mysql:
image: mysql:8
environment:
- MYSQL_ROOT_PASSWORD=my-secret-pw
healthcheck:
test: [ 'CMD', 'mysqladmin', 'ping', '-h', 'localhost' ]
timeout: 20s
retries: 10
ports:
- '3306:3306'
- '33060:33060'
volumes:
- ./.mysql-data:/var/lib/mysql
minio:
image: minio/minio
ports:
- '9000:9000'
- '9090:9090'
environment:
- MINIO_ROOT_USER=minioadmin
- MINIO_ROOT_PASSWORD=minioadmin
- MINIO_ACCESS_KEY=minio
- MINIO_SECRET_KEY=minio123
volumes:
- ./.minio-data:/data
command: server --console-address ":9090" /data
144 changes: 73 additions & 71 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,71 +1,73 @@
version: '3.7'
services:
backend:
build:
context: ./
dockerfile: Dockerfile.development
ports:
- '5000:5000'
links:
- mysql
- minio
env_file:
- .env
volumes:
- ./public:/app/public
- ./src:/app/src
- ./server:/app/server
- ./types:/app/types
depends_on:
migration:
condition: service_completed_successfully
mysql:
condition: service_healthy
dynamodb:
condition: service_started
migration:
build:
context: ./
dockerfile: Dockerfile.development
links:
- mysql
env_file:
- .env
depends_on:
mysql:
condition: service_healthy
command: [ 'yarn', 'run', 'migration:run-dev' ]
mysql:
image: mysql:8
environment:
- MYSQL_ROOT_PASSWORD=my-secret-pw
healthcheck:
test: [ 'CMD', 'mysqladmin', 'ping', '-h', 'localhost' ]
timeout: 20s
retries: 10
ports:
- '3307:3306'
- '33060:33060'
volumes:
- ./.mysql-data:/var/lib/mysql
minio:
image: minio/minio
ports:
- '9000:9000'
- '9090:9090'
environment:
- MINIO_ROOT_USER=minioadmin
- MINIO_ROOT_PASSWORD=minioadmin
- MINIO_ACCESS_KEY=minio
- MINIO_SECRET_KEY=minio123
volumes:
- ./.minio-data:/data
command: server --console-address ":9090" /data
dynamodb:
command: '-jar DynamoDBLocal.jar -sharedDb -dbPath ./data'
image: 'amazon/dynamodb-local:latest'
ports:
- '8000:8000'
volumes:
- './.dynamodb:/home/dynamodblocal/data'
working_dir: /home/dynamodblocal
# version: '3.7'
# services:
# backend:
# build:
# context: ./
# dockerfile: Dockerfile.development
# ports:
# - '5000:5000'
# links:
# - mysql
# - minio
# env_file:
# - .env
# volumes:
# - ./public:/app/public
# - ./src:/app/src
# - ./server:/app/server
# - ./types:/app/types
# depends_on:
# migration:
# condition: service_completed_successfully
# mysql:
# condition: service_healthy
# dynamodb:
# condition: service_started
# migration:
# build:
# context: ./
# dockerfile: Dockerfile.development
# links:
# - mysql
# env_file:
# - .env
# depends_on:
# mysql:
# condition: service_healthy
# command: [ 'yarn', 'run', 'migration:run-dev' ]
# mysql:
# image: mysql:8
# environment:
# - MYSQL_ROOT_PASSWORD=my-secret-pw
# healthcheck:
# test: [ 'CMD', 'mysqladmin', 'ping', '-h', 'localhost' ]
# timeout: 20s
# retries: 10
# ports:
# - '3307:3306'
# - '33060:33060'
# volumes:
# - ./.mysql-data:/var/lib/mysql
# minio:
# image: minio/minio
# ports:
# - '9000:9000'
# - '9090:9090'
# environment:
# - MINIO_ROOT_USER=minioadmin
# - MINIO_ROOT_PASSWORD=minioadmin
# - MINIO_ACCESS_KEY=minio
# - MINIO_SECRET_KEY=minio123
# volumes:
# - ./.minio-data:/data
# command: server --console-address ":9090" /data
# dynamodb:
# command: '-jar DynamoDBLocal.jar -sharedDb -dbPath ./data'
# image: 'amazon/dynamodb-local:latest'
# ports:
# - '8000:8000'
# volumes:
# - './.dynamodb:/home/dynamodblocal/data'
# working_dir: /home/dynamodblocal


3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"@types/nodemailer": "6.4.4",
"@types/nprogress": "0.2.0",
"@types/prettier": "2.6.3",
"@types/prop-types": "^15",
"@types/react": "17.0.47",
"@types/react-dom": "17.0.17",
"@types/react-simple-maps": "^3",
Expand Down Expand Up @@ -180,9 +181,11 @@
"nodemailer": "^6.7.5",
"notistack": "^2.0.5",
"nprogress": "^0.2.0",
"prop-types": "^15.8.1",
"query-string": "^7.1.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-hook-form": "^7.51.5",
"react-pdf": "^8.0.0",
"react-player": "^2.10.1",
"react-query": "^3.39.2",
Expand Down
14 changes: 13 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ __metadata:
"@types/nodemailer": "npm:6.4.4"
"@types/nprogress": "npm:0.2.0"
"@types/prettier": "npm:2.6.3"
"@types/prop-types": "npm:^15"
"@types/react": "npm:17.0.47"
"@types/react-dom": "npm:17.0.17"
"@types/react-simple-maps": "npm:^3"
Expand Down Expand Up @@ -126,9 +127,11 @@ __metadata:
notistack: "npm:^2.0.5"
nprogress: "npm:^0.2.0"
prettier: "npm:2.7.1"
prop-types: "npm:^15.8.1"
query-string: "npm:^7.1.1"
react: "npm:^17.0.2"
react-dom: "npm:^17.0.2"
react-hook-form: "npm:^7.51.5"
react-pdf: "npm:^8.0.0"
react-player: "npm:^2.10.1"
react-query: "npm:^3.39.2"
Expand Down Expand Up @@ -4146,7 +4149,7 @@ __metadata:
languageName: node
linkType: hard

"@types/prop-types@npm:^15.7.11, @types/prop-types@npm:^15.7.12":
"@types/prop-types@npm:^15, @types/prop-types@npm:^15.7.11, @types/prop-types@npm:^15.7.12":
version: 15.7.12
resolution: "@types/prop-types@npm:15.7.12"
checksum: 10/ac16cc3d0a84431ffa5cfdf89579ad1e2269549f32ce0c769321fdd078f84db4fbe1b461ed5a1a496caf09e637c0e367d600c541435716a55b1d9713f5035dfe
Expand Down Expand Up @@ -13835,6 +13838,15 @@ __metadata:
languageName: node
linkType: hard

"react-hook-form@npm:^7.51.5":
version: 7.51.5
resolution: "react-hook-form@npm:7.51.5"
peerDependencies:
react: ^16.8.0 || ^17 || ^18
checksum: 10/f4ff77989202b1faf2dede7a7730210635a6225189dcaeaeb191cea12422bcb97d2adfef0712c50d13bf5c5e14b8debc00fbba16491f86a6d24945a52cacfa59
languageName: node
linkType: hard

"react-is@npm:^17.0.1":
version: 17.0.2
resolution: "react-is@npm:17.0.2"
Expand Down

0 comments on commit e39b84d

Please sign in to comment.