From 4e8fa2701345b053e6f86307e3cbf601cad6816a Mon Sep 17 00:00:00 2001
From: MaximeOLIVA <maxime.oliva@etu.univ-cotedazur.fr>
Date: Thu, 9 Feb 2023 18:17:15 +0100
Subject: [PATCH] first_impl
---
Lab2/database_helper.py | 9 --------
Lab2/server.py | 9 --------
Twidder (Lab3)/database.db | Bin 28672 -> 28672 bytes
Twidder (Lab3)/server.py | 9 --------
Twidder (Lab3)/static/client.js | 36 ++++++++++++++++++++++----------
5 files changed, 25 insertions(+), 38 deletions(-)
diff --git a/Lab2/database_helper.py b/Lab2/database_helper.py
index f69e47b..cd923d7 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 98ccdfd..3504ab7 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
GIT binary patch
delta 312
zcmZp8z}WDBae_2s<U|=~)<_1uaIcLi3;0Di_$=7@efit@=JMU(Kg=)5m&IqXSy4cN
zFV%p9Lr_puRMb$iDzz##H!&v_M1yc{Vns=6YH^7}dTwH7j$U$pZXy^MvU7-vii!&A
zOIB5Z)FJBv>p|9%1O}7m%2k=LN*b_nhzg1di|R|3q!yRtXM=1@Oiawl%*zG|<R(@i
z*_D)>lA5;JTYjg22nW9x1OGApd;FXE=kxdSd+{gomv0tSFyeO>V>V<2+lk^%4pC-(
Uh%mBK*g>Kg_ONa4wJ$aR03Xm~U;qFB
delta 98
zcmZp8z}WDBae_2s*hCp;)-VP=|Jscy3;6k1`R20o`|`K*&E>nne|WQ?LKhz+|Kz!H
zRqW=HqN0+Tl9QLqsk0?kr52S`ZuXYnDZt0d-^;*%jQ<}0X8!s7y_*FUs`)qf+7}xD
E0Kl9cF8}}l
diff --git a/Twidder (Lab3)/server.py b/Twidder (Lab3)/server.py
index a7d6b62..ea20488 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 6366231..c832ee3 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!";
+ }
+ }
}
+
}
}
--
GitLab