Update deps to work with latest redis

marcoacierno · marcoacierno · commit f7973fc69134 · 2021-05-16T16:49:29.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -112,3 +112,5 @@ types.tsx
 
 
 .terraform/
+
+.vercel
diff --git a/backend/Makefile b/backend/Makefile
@@ -1,5 +1,5 @@
 run-server:
-	poetry run uvicorn pycon_quiz.asgi:application --reload
+	poetry run uvicorn pycon_quiz.asgi:application --port 8100 --reload
 
 run-worker:
 	poetry run python manage.py rqworker
diff --git a/backend/poetry.lock b/backend/poetry.lock
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
@@ -25,11 +25,12 @@ pytest-django = "^3.9.0"
 django-storages = "^1.9.1"
 boto3 = "^1.13.15"
 Pillow = "^7.1.2"
-django-rq = "^2.3.2"
+django-rq = "^2.4.1"
 rq-scheduler = "^0.10.0"
 sentry-sdk = "^0.14.4"
 hashids = "^1.2.0"
 strawberry-graphql = "^0.61.3"
+rq = "^1.8.0"
 
 [tool.poetry.dev-dependencies]
 black = "^19.10b0"
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -1,3 +1,4 @@
 .env.local
 
-.now
+.now
+.vercel
diff --git a/frontend/codegen.yml b/frontend/codegen.yml
@@ -1,4 +1,4 @@
-schema: https://d2x84vjkgthxda.cloudfront.net/graphql
+schema: ${API_URL}
 documents: ./src/**/*.graphql
 generates:
   ./src/types.tsx:
diff --git a/frontend/package.json b/frontend/package.json
@@ -7,13 +7,14 @@
     "dev": "next",
     "build": "yarn run codegen && next build",
     "start": "next start",
-    "codegen": "graphql-codegen"
+    "codegen": "DOTENV_CONFIG_PATH=../.env graphql-codegen -r dotenv/config"
   },
   "dependencies": {
     "@emotion/core": "^10.0.28",
     "@urql/devtools": "^2.0.2",
     "@urql/exchange-graphcache": "^2.4.2",
     "@xstate/react": "^0.8.1",
+    "dotenv": "^9.0.2",
     "graphql": "^15.0.0",
     "next": "^9.3.5",
     "react": "^16.13.1",
diff --git a/frontend/src/utils/get-graphql-url.ts b/frontend/src/utils/get-graphql-url.ts
@@ -1,2 +1 @@
-export const getGraphQLUrl = () =>
-  `${process.env.NEXT_PUBLIC_BACKEND_URL}/graphql`;
+export const getGraphQLUrl = () => process.env.NEXT_PUBLIC_API_URL;
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -3574,6 +3574,11 @@ dotenv@^4.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
   integrity sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=
 
+dotenv@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
+  integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==
+
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"

Original file line number	Diff line number	Diff line change
`@@ -112,3 +112,5 @@ types.tsx`
`112`	`112`
`113`	`113`
`114`	`114`	`.terraform/`
	`115`	`+`
	`116`	`+.vercel`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 .env.local
 -.now
 +.now
 +.vercel
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-schema: https://d2x84vjkgthxda.cloudfront.net/graphql`
	`1`	`+schema: ${API_URL}`
`2`	`2`	`documents: ./src/*/.graphql`
`3`	`3`	`generates:`
`4`	`4`	`./src/types.tsx:`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-export const getGraphQLUrl = () =>`
`2`		- `${process.env.NEXT_PUBLIC_BACKEND_URL}/graphql`;
	`1`	`+export const getGraphQLUrl = () => process.env.NEXT_PUBLIC_API_URL;`