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

upgrade prisma & update fetch projects api #196

Merged
merged 1 commit into from
Jun 1, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 0 additions & 2 deletions .env.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
# See the documentation for all the connection string options: https://pris.ly/d/connection-strings

DATABASE_URL=postgresql://w3badmin:PaSsW0Rd@127.0.0.1/w3bstream
DATABASE_URL_APPLET_MANAGEMENT=${DATABASE_URL}?schema=applet_management
DATABASE_URL_MONITOR=${DATABASE_URL}?schema=monitor
ADMIN_KEY=iotex.W3B.admin
JWT_SIGN_KEY=xxxx
NEXT_PUBLIC_API_URL=http://localhost:8888
Expand Down
2 changes: 0 additions & 2 deletions docker-compose-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ services:
- '3000:3000'
environment:
DATABASE_URL: postgresql://${POSTGRES_USER:-w3badmin}:${POSTGRES_PASSWORD:-PaSsW0Rd}@postgres:5432/${POSTGRES_DB:-w3bstream}
DATABASE_URL_APPLET_MANAGEMENT: postgresql://${POSTGRES_USER:-w3badmin}:${POSTGRES_PASSWORD:-PaSsW0Rd}@postgres:5432/${POSTGRES_DB:-w3bstream}?schema=applet_management
DATABASE_URL_MONITOR: postgresql://${POSTGRES_USER:-w3badmin}:${POSTGRES_PASSWORD:-PaSsW0Rd}@postgres:5432/${POSTGRES_DB:-w3bstream}?schema=monitor
NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-http://w3bapp:8888}
NEXT_PUBLIC_EVENT_URL: ${NEXT_PUBLIC_EVENT_URL:-http://w3bapp:8889}
NEXT_PUBLIC_MQTT_URL: ${NEXT_PUBLIC_MQTT_URL:-mqtt://mqtt_server:1883}
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ services:
- '3000:3000'
environment:
DATABASE_URL: postgresql://${POSTGRES_USER:-w3badmin}:${POSTGRES_PASSWORD:-PaSsW0Rd}@postgres:5432/${POSTGRES_DB:-w3bstream}
DATABASE_URL_APPLET_MANAGEMENT: postgresql://${POSTGRES_USER:-w3badmin}:${POSTGRES_PASSWORD:-PaSsW0Rd}@postgres:5432/${POSTGRES_DB:-w3bstream}?schema=applet_management
DATABASE_URL_MONITOR: postgresql://${POSTGRES_USER:-w3badmin}:${POSTGRES_PASSWORD:-PaSsW0Rd}@postgres:5432/${POSTGRES_DB:-w3bstream}?schema=monitor
NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-http://w3bapp:8888}
NEXT_PUBLIC_EVENT_URL: ${NEXT_PUBLIC_EVENT_URL:-http://w3bapp:8889}
NEXT_PUBLIC_MQTT_URL: ${NEXT_PUBLIC_MQTT_URL:-mqtt://mqtt_server:1883}
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"test": "concurrently \"yarn start \"",
"test:ci": "cypress run --headless",
"postinstall": "npm run gen",
"gen": "prisma generate; prisma generate --schema ./prisma/monitor.prisma",
"gen": "prisma generate",
"db:pull": "npx prisma db pull",
"dev:docker": "dp -f docker-compose-dev.yaml build; dp -f docker-compose-dev.yaml up -d"
},
Expand Down Expand Up @@ -48,7 +48,7 @@
"@nivo/core": "0.83.0",
"@nivo/line": "0.83.0",
"@nivo/scales": "0.83.0",
"@prisma/client": "4.4.0",
"@prisma/client": "4.15.0",
"@rainbow-me/rainbowkit": "0.12.1",
"@rjsf/chakra-ui": "5.0.0-beta.9",
"@rjsf/core": "5.0.0-beta.13",
Expand Down Expand Up @@ -154,7 +154,7 @@
"@types/swagger-ui-react": "4.11.0",
"@types/uuid": "8.3.4",
"concurrently": "6.5.1",
"prisma": "4.4.0",
"prisma": "4.15.0",
"typescript": "4.9.5"
},
"resolutions": {
Expand Down
30 changes: 15 additions & 15 deletions pnpm-lock.yaml

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

137 changes: 0 additions & 137 deletions prisma/bak.prisma

This file was deleted.

79 changes: 0 additions & 79 deletions prisma/monitor.prisma

This file was deleted.

Loading