Merge remote-tracking branch 'origin/IT19076362' into IT19070704

# Conflicts:
#	backend/backend/database.db

backend/backend/routes/auth_routes.py

@@ -26,9 +26,6 @@ def register():
     if len(password) < 6:
         return jsonify({'err': "Password is too short"}), HTTP_400_BAD_REQUEST
 
-    if not username.isalnum() or " " in username:
-        return jsonify({'err': "Username should be alphanumeric, also no spaces"}), HTTP_400_BAD_REQUEST
-
     if not validators.email(email):
         return jsonify({'err': "Email is not valid"}), HTTP_400_BAD_REQUEST
 
@@ -60,9 +57,6 @@ def login():
     if not username or not password:
         return jsonify({'err': 'Missing email or password'}), HTTP_400_BAD_REQUEST
 
-    if not username.isalnum() or " " in username:
-        return jsonify({'err': "Username should be alphanumeric, also no spaces"}), HTTP_400_BAD_REQUEST
-
     user = User.query.filter_by(username=username).first()
 
     if user is None:

frontend/src/pages/Register.js

@@ -16,6 +16,7 @@ const Login = () => {
 		username: "",
 		password: "",
 		email: "",
+		type: "student",
 	});
 
 	const registerUser = async e => {
@@ -25,21 +26,15 @@ const Login = () => {
 		setSuccess(false);
 
 		try {
-			const res = await axios.post("register", user);
-
-			if (res.statusText === "Created") {
-				setUser({
-					username: "",
-					password: "",
-					email: "",
-				});
+			const res = await axios.post("auth/register", user);
 
 			setBtnState(false);
-				return setSuccess("You are registered. Thank you");
-			}
+			window.alert("You are registered. Please login to continue");
+			setSuccess("You are registered. Thank you");
+			return window.location.replace("/login");
 		} catch (err) {
 			console.log(err.response);
-			setError(err.response.data.message);
+			setError(err.response.data.err);
 			setBtnState(false);
 		}
 	};