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

.gitignore

@@ -1,3 +1,3 @@
-config/*.env
-.vscode
+config/*.env
+.vscode
 node_modules

Makefile

@@ -1,42 +1,42 @@
-## COMMON COMMANDS
-
-.PHONY: stop
-
-stop:
-	docker-compose down
-
-## DEVELOPMENT MODE
-
-.PHONY: build-dev dev destroy-dev restart-dev
-
-build-dev:
-	docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --build
-
-dev:
-	docker-compose -f docker-compose.yml -f docker-compose.dev.yml up
-
-destroy-dev:
-	docker-compose -f docker-compose.yml -f docker-compose.dev.yml down -v
-
-restart-dev: destroy-dev build-dev
-
-## PRODUCTION MODE
-
-.PHONY: build run restart
-
-build:
-	docker-compose up --build -d
-
-run:
-	docker-compose up -d
-
-restart:
-	docker-compose down -v
-	docker-compose up --build -d
-
-## TESTS
-
-.PHONY: test-backend
-
-test-backend:
-	docker-compose exec backend pytest . $(args)
+## COMMON COMMANDS
+
+.PHONY: stop
+
+stop:
+	docker-compose down
+
+## DEVELOPMENT MODE
+
+.PHONY: build-dev dev destroy-dev restart-dev
+
+build-dev:
+	docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --build
+
+dev:
+	docker-compose -f docker-compose.yml -f docker-compose.dev.yml up
+
+destroy-dev:
+	docker-compose -f docker-compose.yml -f docker-compose.dev.yml down -v
+
+restart-dev: destroy-dev build-dev
+
+## PRODUCTION MODE
+
+.PHONY: build run restart
+
+build:
+	docker-compose up --build -d
+
+run:
+	docker-compose up -d
+
+restart:
+	docker-compose down -v
+	docker-compose up --build -d
+
+## TESTS
+
+.PHONY: test-backend
+
+test-backend:
+	docker-compose exec backend pytest . $(args)

Pipfile

@@ -0,0 +1,11 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3.8"

backend/Pipfile

@@ -1,28 +1,28 @@
-[[source]]
-url = "https://pypi.python.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-Flask = "*"
-Flask-SQLAlchemy = "*"
-Flask-Login = "*"
-psycopg2-binary = "*"
-email-validator = "*"
-argon2-cffi = "*"
-flask-jwt-extended = "*"
-redis = "*"
-flask-cors = "*"
-flask-mail = "*"
-gunicorn = "*"
-itsdangerous = "*"
-
-[dev-packages]
-pytest = "*"
-requests = "*"
-freezegun = "*"
-fakeredis = "*"
-pytest-mock = "*"
-
-[requires]
-python_version = "3.8"
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+Flask = "*"
+Flask-SQLAlchemy = "*"
+Flask-Login = "*"
+psycopg2-binary = "*"
+email-validator = "*"
+argon2-cffi = "*"
+flask-jwt-extended = "*"
+redis = "*"
+flask-cors = "*"
+flask-mail = "*"
+gunicorn = "*"
+itsdangerous = "*"
+
+[dev-packages]
+pytest = "*"
+requests = "*"
+freezegun = "*"
+fakeredis = "*"
+pytest-mock = "*"
+
+[requires]
+python_version = "3.8"

backend/auth/user.py

@@ -39,7 +39,7 @@ def _username_exists(cursor, username):
     @staticmethod
     def _add_user(conn, cursor, email, username, password):
         """Given the details of a user, adds them to the database."""
-        cursor.execute("INSERT INTO Users (email, username, password, numStars, score) VALUES (%s, %s, %s, 0, 0)",
+        cursor.execute("INSERT INTO Users (email, username, password) VALUES (%s, %s, %s, 0, 0)",
                        (email, username, password))
         conn.commit()