Skip to content

Commit 5ee1ad1

Browse files
authored
Database fixing + Profile midway (#61)
* questions table correctly truncated * removed some bad functions from database * most auth tests passing, database functions fixed * puzzle skeleton, almost all tests passing except jwt token, added another stats function to prepare for leaderboard work * skeleton for leaderboard complete * added example tests for python * commented out some strings
1 parent e4ba918 commit 5ee1ad1

40 files changed

+38905
-38702
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
config/*.env
2-
.vscode
1+
config/*.env
2+
.vscode
33
node_modules

Makefile

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
## COMMON COMMANDS
2-
3-
.PHONY: stop
4-
5-
stop:
6-
docker-compose down
7-
8-
## DEVELOPMENT MODE
9-
10-
.PHONY: build-dev dev destroy-dev restart-dev
11-
12-
build-dev:
13-
docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --build
14-
15-
dev:
16-
docker-compose -f docker-compose.yml -f docker-compose.dev.yml up
17-
18-
destroy-dev:
19-
docker-compose -f docker-compose.yml -f docker-compose.dev.yml down -v
20-
21-
restart-dev: destroy-dev build-dev
22-
23-
## PRODUCTION MODE
24-
25-
.PHONY: build run restart
26-
27-
build:
28-
docker-compose up --build -d
29-
30-
run:
31-
docker-compose up -d
32-
33-
restart:
34-
docker-compose down -v
35-
docker-compose up --build -d
36-
37-
## TESTS
38-
39-
.PHONY: test-backend
40-
41-
test-backend:
42-
docker-compose exec backend pytest . $(args)
1+
## COMMON COMMANDS
2+
3+
.PHONY: stop
4+
5+
stop:
6+
docker-compose down
7+
8+
## DEVELOPMENT MODE
9+
10+
.PHONY: build-dev dev destroy-dev restart-dev
11+
12+
build-dev:
13+
docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --build
14+
15+
dev:
16+
docker-compose -f docker-compose.yml -f docker-compose.dev.yml up
17+
18+
destroy-dev:
19+
docker-compose -f docker-compose.yml -f docker-compose.dev.yml down -v
20+
21+
restart-dev: destroy-dev build-dev
22+
23+
## PRODUCTION MODE
24+
25+
.PHONY: build run restart
26+
27+
build:
28+
docker-compose up --build -d
29+
30+
run:
31+
docker-compose up -d
32+
33+
restart:
34+
docker-compose down -v
35+
docker-compose up --build -d
36+
37+
## TESTS
38+
39+
.PHONY: test-backend
40+
41+
test-backend:
42+
docker-compose exec backend pytest . $(args)

Pipfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[[source]]
2+
url = "https://pypi.python.org/simple"
3+
verify_ssl = true
4+
name = "pypi"
5+
6+
[packages]
7+
8+
[dev-packages]
9+
10+
[requires]
11+
python_version = "3.8"

backend/Pipfile

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
[[source]]
2-
url = "https://pypi.python.org/simple"
3-
verify_ssl = true
4-
name = "pypi"
5-
6-
[packages]
7-
Flask = "*"
8-
Flask-SQLAlchemy = "*"
9-
Flask-Login = "*"
10-
psycopg2-binary = "*"
11-
email-validator = "*"
12-
argon2-cffi = "*"
13-
flask-jwt-extended = "*"
14-
redis = "*"
15-
flask-cors = "*"
16-
flask-mail = "*"
17-
gunicorn = "*"
18-
itsdangerous = "*"
19-
20-
[dev-packages]
21-
pytest = "*"
22-
requests = "*"
23-
freezegun = "*"
24-
fakeredis = "*"
25-
pytest-mock = "*"
26-
27-
[requires]
28-
python_version = "3.8"
1+
[[source]]
2+
url = "https://pypi.python.org/simple"
3+
verify_ssl = true
4+
name = "pypi"
5+
6+
[packages]
7+
Flask = "*"
8+
Flask-SQLAlchemy = "*"
9+
Flask-Login = "*"
10+
psycopg2-binary = "*"
11+
email-validator = "*"
12+
argon2-cffi = "*"
13+
flask-jwt-extended = "*"
14+
redis = "*"
15+
flask-cors = "*"
16+
flask-mail = "*"
17+
gunicorn = "*"
18+
itsdangerous = "*"
19+
20+
[dev-packages]
21+
pytest = "*"
22+
requests = "*"
23+
freezegun = "*"
24+
fakeredis = "*"
25+
pytest-mock = "*"
26+
27+
[requires]
28+
python_version = "3.8"

backend/auth/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def _username_exists(cursor, username):
3939
@staticmethod
4040
def _add_user(conn, cursor, email, username, password):
4141
"""Given the details of a user, adds them to the database."""
42-
cursor.execute("INSERT INTO Users (email, username, password, numStars, score) VALUES (%s, %s, %s, 0, 0)",
42+
cursor.execute("INSERT INTO Users (email, username, password) VALUES (%s, %s, %s, 0, 0)",
4343
(email, username, password))
4444
conn.commit()
4545

0 commit comments

Comments
 (0)