Skip to content

Commit a36475c

Browse files
supalarrysupalarry
authored
Merge branch 'dev' into 325-profile-page
2 parents 29ec347 + 12f2c05 commit a36475c

File tree

7 files changed

+30
-27
lines changed

7 files changed

+30
-27
lines changed

‎backend/PyMatcha/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107

108108
logging.debug("Configuring Celery Redis URLs")
109109
# Celery configuration
110-
application.config["CELERY_BROKER_URL"] = CELERY_BROKER_URL
111-
application.config["CELERY_RESULT_BACKEND"] = CELERY_RESULT_BACKEND
110+
application.config["CELERY_broker_url"] = CELERY_BROKER_URL
111+
application.config["result_backend"] = CELERY_RESULT_BACKEND
112112

113113
logging.debug("Initializing Celery")
114114
# Initialize Celery

‎backend/PyMatcha/routes/api/profile/edit.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def edit_email():
185185
token = generate_confirmation_token(email=new_email, token_type="confirm")
186186
link = FRONTEND_EMAIL_CONFIRMATION_URL + token
187187
rendered_html = render_template("confirm_email.html", link=link)
188-
send_mail_html.delay(dest=data["email"], subject="Confirm your email on PyMatcha", html=rendered_html)
188+
send_mail_html.delay(dest=new_email, subject="Confirm your email on PyMatcha", html=rendered_html)
189189
return Success("Email sent for new email")
190190

191191

‎backend/PyMatcha/utils/decorators.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ def wrapper(*args, **kwargs):
2727
if not data:
2828
raise BadRequestError("Missing json body.")
2929

30+
if not isinstance(data, dict):
31+
raise BadRequestError("JSON body must be a dict")
32+
3033
missing = []
3134
for item in required.keys():
3235
# If a key is missing in the sent data

‎backend/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cryptography==3.1.1
2020

2121
flask_jwt_extended==3.24.1
2222

23-
flake8==3.8.3
23+
flake8==3.8.4
2424
black==20.8b1
2525
pre-commit==2.7.1
2626

‎frontend/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"@sentry/tracing": "^5.24.2",
1414
"axios": "^0.20.0",
1515
"core-js": "^3.6.5",
16-
"jwt-decode": "^3.0.0-beta.2",
16+
"jwt-decode": "^3.0.0",
1717
"nouislider": "^14.6.2",
1818
"secure-ls": "^1.2.6",
1919
"tailwindcss": "^1.8.10",
20-
"vee-validate": "^3.3.11",
20+
"vee-validate": "^3.4.1",
2121
"vue": "^2.6.11",
22-
"vue-router": "^3.2.0",
22+
"vue-router": "^3.4.6",
2323
"vuex": "^3.4.0",
2424
"vuex-persistedstate": "^3.1.0"
2525
},
@@ -33,7 +33,7 @@
3333
"@vue/eslint-config-airbnb": "^5.0.2",
3434
"babel-eslint": "^10.1.0",
3535
"eslint": "^6.7.2",
36-
"eslint-plugin-import": "^2.20.2",
36+
"eslint-plugin-import": "^2.22.1",
3737
"eslint-plugin-vue": "^7.0.1",
3838
"vue-template-compiler": "^2.6.11"
3939
},

‎frontend/yarn.lock‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3610,7 +3610,7 @@ eslint-config-airbnb-base@^14.0.0:
36103610
object.assign "^4.1.0"
36113611
object.entries "^1.1.2"
36123612

3613-
eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.4:
3613+
eslint-import-resolver-node@^0.3.4:
36143614
version "0.3.4"
36153615
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
36163616
integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
@@ -3653,17 +3653,17 @@ eslint-module-utils@^2.6.0:
36533653
debug "^2.6.9"
36543654
pkg-dir "^2.0.0"
36553655

3656-
eslint-plugin-import@^2.20.2, eslint-plugin-import@^2.21.2:
3657-
version "2.22.0"
3658-
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz#92f7736fe1fde3e2de77623c838dd992ff5ffb7e"
3659-
integrity sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==
3656+
eslint-plugin-import@^2.21.2, eslint-plugin-import@^2.22.1:
3657+
version "2.22.1"
3658+
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
3659+
integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
36603660
dependencies:
36613661
array-includes "^3.1.1"
36623662
array.prototype.flat "^1.2.3"
36633663
contains-path "^0.1.0"
36643664
debug "^2.6.9"
36653665
doctrine "1.5.0"
3666-
eslint-import-resolver-node "^0.3.3"
3666+
eslint-import-resolver-node "^0.3.4"
36673667
eslint-module-utils "^2.6.0"
36683668
has "^1.0.3"
36693669
minimatch "^3.0.4"
@@ -5329,10 +5329,10 @@ jsprim@^1.2.2:
53295329
json-schema "0.2.3"
53305330
verror "1.10.0"
53315331

5332-
jwt-decode@^3.0.0-beta.2:
5333-
version "3.0.0-beta.2"
5334-
resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.0.0-beta.2.tgz#5d928dd0d582caab47b252a5f12ad1721f2f6eef"
5335-
integrity sha512-AnENY5syz7PzgpTzos9sxkqKTmHU0JeJOXZFHUc41bDyybC2yzZ+1r43ZLhk7+JCwF0yjISPuVK9ZWfA1nCUPA==
5332+
jwt-decode@^3.0.0:
5333+
version "3.0.0"
5334+
resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.0.0.tgz#d9a17ddf6d37c03bf037b0b27cf8756cfd01c5c7"
5335+
integrity sha512-RBQv2MTm3FNKQkdzhEyQwh5MbdNgMa+FyIJIK5RMWEn6hRgRHr7j55cRxGhRe6vGJDElyi6f6u/yfkP7AoXddA==
53365336

53375337
killable@^1.0.1:
53385338
version "1.0.1"
@@ -8628,10 +8628,10 @@ vary@~1.1.2:
86288628
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
86298629
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
86308630

8631-
vee-validate@^3.3.11:
8632-
version "3.3.11"
8633-
resolved "https://registry.yarnpkg.com/vee-validate/-/vee-validate-3.3.11.tgz#0f634845b7a8f121eeb230915faa3690befeba33"
8634-
integrity sha512-+/M2g0VYwBDX8o7PkW/CRUxDkyudo9C/8S/Q7EoGV1duIrK2Q9W08BFcbDkkNnSAVVfknPOWkFGHeAGOgfOxCw==
8631+
vee-validate@^3.4.1:
8632+
version "3.4.1"
8633+
resolved "https://registry.yarnpkg.com/vee-validate/-/vee-validate-3.4.1.tgz#27d8792de16c731f812961b7c53fedafddde437d"
8634+
integrity sha512-anWhI3EMF+EWLWtAIcQ9Kj/jyNUA/Bu5GAHE2jEO7D4TRCrO+8S0ZqDw3ydlJSEJPv6dwvkHvqp3WgL6P2Mrew==
86358635

86368636
vendors@^1.0.0:
86378637
version "1.0.4"
@@ -8692,10 +8692,10 @@ vue-loader@^15.9.2:
86928692
vue-hot-reload-api "^2.3.0"
86938693
vue-style-loader "^4.1.0"
86948694

8695-
vue-router@^3.2.0:
8696-
version "3.4.3"
8697-
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz#fa93768616ee338aa174f160ac965167fa572ffa"
8698-
integrity sha512-BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A==
8695+
vue-router@^3.4.6:
8696+
version "3.4.6"
8697+
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.6.tgz#f7bda2c9a43d39837621c9a02ba7789f5daa24b2"
8698+
integrity sha512-kaXnB3pfFxhAJl/Mp+XG1HJMyFqrL/xPqV7oXlpXn4AwMmm6VNgf0nllW8ksflmZANfI4kdo0bVn/FYSsAolPQ==
86998699

87008700
vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
87018701
version "4.1.2"

‎workers.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ENV PYTHONDONTWRITEBYTECODE 1
77
EXPOSE 5000
88
ADD .env .
99
RUN export $(cat .env | xargs)
10-
CMD celery worker --workdir . -A PyMatcha.celery -B --loglevel=info --concurrency=1
10+
CMD celery -A PyMatcha.celery worker --concurrency=1 -E --loglevel=INFO -B

0 commit comments

Comments
 (0)