diff --git a/Lab2/database_helper.py b/Lab2/database_helper.py index f69e47ba0138f2407b2e9803b2dd16f837424463..cd923d7aff01753a8477d1f12601b791f13effce 100644 --- a/Lab2/database_helper.py +++ b/Lab2/database_helper.py @@ -10,15 +10,6 @@ def get_db(): return db -def clean_db(): - try: - get_db().execute("DROP table USERS;") - get_db().execute("DROP table LOGGEDINUSERS;") - return True - except: - return False - - def create_user(email, password, firstname, familyname, gender, city, country): try: get_db().execute("INSERT into USERS values(?, ?, ?, ?, ?, ?, ?);", [firstname, familyname, gender, city, country, email, password]) diff --git a/Lab2/server.py b/Lab2/server.py index 98ccdfdffc22d000efb3fcab6efc46c7cc67f93c..3504ab728ad07aaff9a437ae6b2451fc232f9b9f 100644 --- a/Lab2/server.py +++ b/Lab2/server.py @@ -14,15 +14,6 @@ def hello_world(): return "<p>Hello, Lab_2!</p>", 200 -@app.route("/delete", methods = ['GET']) -def delete(): - resp = database_helper.clean_db() - if resp: - return "", 200 - else: - return "", 409 - - @app.route("/users/sign_up", methods = ['POST']) def sign_up(): data = request.get_json() diff --git a/Twidder (Lab3)/database.db b/Twidder (Lab3)/database.db index b6cf4525b5d293f9e54549358aecdf98cdb5cf98..65f3830459f6eb4eeac00519831c3d02ae1efa70 100644 Binary files a/Twidder (Lab3)/database.db and b/Twidder (Lab3)/database.db differ diff --git a/Twidder (Lab3)/server.py b/Twidder (Lab3)/server.py index a7d6b6206785a22e0668f0902a42db7fd05847de..ea204889a36e3c85698a80843d18d25f9915740e 100644 --- a/Twidder (Lab3)/server.py +++ b/Twidder (Lab3)/server.py @@ -14,15 +14,6 @@ def hello_world(): return app.send_static_file("client.html"), 200 -@app.route("/delete", methods = ['GET']) -def delete(): - resp = database_helper.clean_db() - if resp: - return "", 200 - else: - return "", 409 - - @app.route("/users/sign_up", methods = ['POST']) def sign_up(): data = request.get_json() diff --git a/Twidder (Lab3)/static/client.js b/Twidder (Lab3)/static/client.js index 6366231e0ae50ad459f4c8135a7288c33c5eb201..c832ee339d044f3d048a95484e6136068ec82eca 100644 --- a/Twidder (Lab3)/static/client.js +++ b/Twidder (Lab3)/static/client.js @@ -81,20 +81,34 @@ function signUp(formData) { country : formData.country.value } + let messageDiv = document.getElementById("error"); + let form = document.getElementById("signup"); + + if(checkPasswords(formData)) { - let serverAnswer = serverstub.signUp(user); - let success = serverAnswer.success; - let message = serverAnswer.message; - let form = document.getElementById("signup"); - if (success) { - document.getElementById("error").style.display = "block"; - document.getElementById("error").innerHTML = message; - form.reset(); - } else { - document.getElementById("error").style.display = "block"; - document.getElementById("error").innerHTML = message; + let req = new XMLHttpRequest(); + req.open("POST", "/users/sign_up", true); + req.setRequestHeader("Content-type", "application/json;charset=UTF-8") + req.setRequestHeader("Authorization", "12332432iuh32kj4gh3h2jkg") + req.send(JSON.stringify(user)); + + req.onreadystatechange = function(){ + if (req.readyState == 4){ + if (req.status == 201){ + messageDiv.style.display = "block"; + messageDiv.innerHTML = "User Created!"; + form.reset() + } else if(req.status == 409){ + messageDiv.style.display = "block"; + messageDiv.innerHTML = "User already exists!"; + } else if(req.status == 400){ + messageDiv.style.display = "block"; + messageDiv.innerHTML = "Wrong data format!"; + } + } } + } }