diff --git a/Pipfile b/Pipfile index ef352c1d..7c717235 100644 --- a/Pipfile +++ b/Pipfile @@ -19,7 +19,7 @@ django = "<3" whitenoise = "==4.0b4" psycopg2 = "==2.7.3.2" gunicorn = "==19.7.1" -python-dotenv = "==0.7.1" +python-dotenv = "==0.13.0" dj-database-url = "==0.4.1" raven = "==6.9.0" django-extensions = "==1.9.8" diff --git a/Pipfile.lock b/Pipfile.lock index ffabcc31..b5ef916b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "4d584e2ea8f3bfad3bbec808cf3c1cc8fa3f1e484a6627551aac012407c9aab7" + "sha256": "886f06e25f5fffc2690a1937d3e7994ad68438a416347568831ebbbfb965387c" }, "pipfile-spec": 6, "requires": { @@ -48,18 +48,18 @@ }, "boto3": { "hashes": [ - "sha256:2a97c9e8fd2c0f8d8a92262a0ccbd00aad8c4786acb74f620f54164070cb72ff", - "sha256:650d67b0d47b7bc0d79f04cc944506823dbbc2f76f60e64ce6d7cdd89f60a2eb" + "sha256:009d0b483513e4c8639895c2b8dc451b41c9b863116d0234506b8b88b30a3d1b", + "sha256:f5218afc43c4c21ae2e8a1d4620d27ab6765250fe1f913ab234fbb686de87ae1" ], "index": "pypi", - "version": "==1.13.16" + "version": "==1.13.17" }, "botocore": { "hashes": [ - "sha256:0275023d023f0e3f9c27e5f23c437dd09ee715577cc628cf724e8bfbba2b459e", - "sha256:70d52f606bab2867971c0ea0c7723a769d81aa3cfd09f819d2b56e186e64ea0b" + "sha256:cca04cd4bdb092a727772c38808f97e15f07dc609f6fbd7d7ba09c7734058794", + "sha256:f9627c718d480225cbfeeeb7b4a694b9cea3cae67940a4b673770cfaca328a81" ], - "version": "==1.16.16" + "version": "==1.16.17" }, "certifi": { "hashes": [ @@ -75,13 +75,6 @@ ], "version": "==3.0.4" }, - "click": { - "hashes": [ - "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", - "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc" - ], - "version": "==7.1.2" - }, "decorator": { "hashes": [ "sha256:41fa54c2a0cc4ba648be4fd43cff00aedf5b9465c9bf18d64325bc225f08f760", @@ -491,11 +484,11 @@ }, "python-dotenv": { "hashes": [ - "sha256:45e927c34204c90f5faa35ea8709b894f6b1a7712d77eb50940601068040993b", - "sha256:dc7940052cfe170e881aea40feb4ea7776e6a97170ed038fd2ee7e26e47585f2" + "sha256:25c0ff1a3e12f4bde8d592cc254ab075cfe734fc5dd989036716fd17ee7e5ec7", + "sha256:3b9909bc96b0edc6b01586e1eed05e71174ef4e04c71da5786370cebea53ad74" ], "index": "pypi", - "version": "==0.7.1" + "version": "==0.13.0" }, "python-http-client": { "hashes": [ @@ -709,11 +702,11 @@ }, "awscli": { "hashes": [ - "sha256:8201b2763b29e60b2b2fa3c795c8ed9a686a0bb6480dd247918eb78337b002e0", - "sha256:b8487b76aff0fb5c9533921274ef716697923e23b966756f20c0c83c4b03687b" + "sha256:23a65b27b732b00ff42162b03334771f54ff84ade91cff504f870cb931e67a95", + "sha256:d853d0d81ef17eb02f9703dca9f221beee0efe8edbb7acb4ec7e2ffdef792eb3" ], "index": "pypi", - "version": "==1.18.66" + "version": "==1.18.67" }, "backcall": { "hashes": [ @@ -724,10 +717,10 @@ }, "botocore": { "hashes": [ - "sha256:0275023d023f0e3f9c27e5f23c437dd09ee715577cc628cf724e8bfbba2b459e", - "sha256:70d52f606bab2867971c0ea0c7723a769d81aa3cfd09f819d2b56e186e64ea0b" + "sha256:cca04cd4bdb092a727772c38808f97e15f07dc609f6fbd7d7ba09c7734058794", + "sha256:f9627c718d480225cbfeeeb7b4a694b9cea3cae67940a4b673770cfaca328a81" ], - "version": "==1.16.16" + "version": "==1.16.17" }, "certifi": { "hashes": [ diff --git a/client/package.json b/client/package.json index c5ce50e6..58164b51 100644 --- a/client/package.json +++ b/client/package.json @@ -6,7 +6,7 @@ "private": true, "scripts": { "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", - "start": "npm run dev", + "start": ". ../server/.env && npm run dev", "lint": "eslint --ext .js,.vue src", "build": "node build/build.js", "open:cypress": "cypress open", diff --git a/server/.env.example b/server/.env.example index 723145d5..f7758e23 100644 --- a/server/.env.example +++ b/server/.env.example @@ -1,8 +1,9 @@ -SECRET_KEY=FOOBAR -DATABASE_URL=postgres://skillbox:skillbox@localhost:5432/skillbox -DEBUG=True -USE_AWS=False -AWS_ACCESS_KEY_ID= -AWS_SECRET_ACCESS_KEY= -AWS_STORAGE_BUCKET_NAME= -SENDGRID_API_KEY= +export SECRET_KEY=FOOBAR +export DATABASE_URL=postgres://skillbox:skillbox@localhost:5432/skillbox +export HEP_URL=https://stage.hep-verlag.ch +export DEBUG=True +export USE_AWS=False +export AWS_ACCESS_KEY_ID= +export AWS_SECRET_ACCESS_KEY= +export AWS_STORAGE_BUCKET_NAME= +export SENDGRID_API_KEY=