diff --git a/.DS_Store b/.DS_Store
index 3d84be2c3d7ebd3f0e99950d0963b2f63021575c..2067e18c81d47726e9c76a26f4f07b6e153c175f 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Twidder (Lab3)/.DS_Store b/Twidder (Lab3)/.DS_Store
index 59fe7b9e940faf99a0c0ee33651262d9a742251a..d183d492008786c97f626967e964132a3d915107 100644
Binary files a/Twidder (Lab3)/.DS_Store and b/Twidder (Lab3)/.DS_Store differ
diff --git a/Twidder (Lab3)/__pycache__/database_helper.cpython-310.pyc b/Twidder (Lab3)/__pycache__/database_helper.cpython-310.pyc
index c0cb2b59bf7e62a54d13752438c29730b94473b0..a91da005f812861abfe013073287b48847ed3440 100644
Binary files a/Twidder (Lab3)/__pycache__/database_helper.cpython-310.pyc and b/Twidder (Lab3)/__pycache__/database_helper.cpython-310.pyc differ
diff --git a/Twidder (Lab3)/__pycache__/server.cpython-310.pyc b/Twidder (Lab3)/__pycache__/server.cpython-310.pyc
index 9b004867109a8db67ebe33d1813dc745cabcd9d6..8b3cf9d8810871ddae71355c35d4efa59533d797 100644
Binary files a/Twidder (Lab3)/__pycache__/server.cpython-310.pyc and b/Twidder (Lab3)/__pycache__/server.cpython-310.pyc differ
diff --git a/Twidder (Lab3)/server.py b/Twidder (Lab3)/server.py
index 98ccdfdffc22d000efb3fcab6efc46c7cc67f93c..a7d6b6206785a22e0668f0902a42db7fd05847de 100644
--- a/Twidder (Lab3)/server.py
+++ b/Twidder (Lab3)/server.py
@@ -11,7 +11,7 @@ app = Flask(__name__)
@app.route("/", methods = ['GET'])
def hello_world():
- return "<p>Hello, Lab_2!</p>", 200
+ return app.send_static_file("client.html"), 200
@app.route("/delete", methods = ['GET'])
diff --git a/Twidder (Lab3)/static/client.html b/Twidder (Lab3)/static/client.html
index 182620efb839300c3545d215e949ef890f5d7552..a868b208d537748ff325055cdd535fe0a57a4b78 100644
--- a/Twidder (Lab3)/static/client.html
+++ b/Twidder (Lab3)/static/client.html
@@ -3,16 +3,16 @@
<html lang="en">
<head>
<title>Twidder</title>
- <link href="client.css" type="text/css" rel="stylesheet">
- <script src="client.js"></script>
- <script src="serverstub.js"></script>
+ <link href="/static/client.css" type="text/css" rel="stylesheet">
+ <script src="/static/client.js"></script>
+ <script src="/static/serverstub.js"></script>
<script id="welcomeview" type="text/view">
<div id="center">
- <img src="../Lab1_Ressources/wimage.png">
+ <img src="/static/wimage.png">
<div id="forms">
<form id="login" onsubmit="signIn(this); return false;">
- <div><label for="email">Email</label><input class="logintexts" type="email" id="email" required></div>
- <div><label for="password">Password</label><input class="logintexts" type="password" id="password" required></div>
+ <div><label for="email">Email</label><input class="logintexts" type="email" id="l_email" required></div>
+ <div><label for="password">Password</label><input class="logintexts" type="password" id="l_password" required></div>
<input value="Login" class="lbutton" type="submit">
</form>
<form id="signup" onsubmit="signUp(this); return false;">
@@ -107,4 +107,4 @@
<div id="displayprofil"></div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/Twidder (Lab3)/static/client.js b/Twidder (Lab3)/static/client.js
index c0bdf3f83df751574bcb7423bc5e577cdc1c0740..6366231e0ae50ad459f4c8135a7288c33c5eb201 100644
--- a/Twidder (Lab3)/static/client.js
+++ b/Twidder (Lab3)/static/client.js
@@ -42,7 +42,7 @@ function checkPasswords(formData){
return true;
-}
+}
function changePassword(formData) {
let oldPassword = formData.oldPassword.value;
@@ -102,8 +102,8 @@ function signUp(formData) {
//---------------------------------------SIGN IN---------------------------------------
function signIn(formData) {
- let username = formData.email.value;
- let password = formData.password.value;
+ let username = formData.l_email.value;
+ let password = formData.l_password.value;
let tokens;
@@ -112,7 +112,7 @@ function signIn(formData) {
let success = serverAnswer.success;
let message = serverAnswer.message;
let token = serverAnswer.data;
-
+
if(success) {
localStorage.setItem("token", token);
localStorage.setItem("email_username", username);
@@ -164,7 +164,7 @@ function message_management(tab){
default:
email = localStorage.getItem("browsed_email");
}
-
+
if(message.length > 0) {
serverstub.postMessage(localStorage.getItem("token"), message, email);
display_wall(email, tab);
@@ -189,7 +189,7 @@ function openTab(tabName) {
// Declare all variables
var i, tabcontent, tablinks;
localStorage.setItem("tab", tabName);
-
+
if(tabName != "browsePage") {
if(!(serverstub.getUserMessagesByEmail(localStorage.getItem("token"), localStorage.getItem("browsed_email")).success)) {
localStorage.removeItem("browsed_email");
@@ -224,7 +224,7 @@ function openTab(tabName) {
function display_wall_info(email, tab) {
//check if we already have the data stored of if we have to call the server
let data_user = get_user_info(email, tab);
-
+
if(data_user.success) {
if(tab == "BP") {
browsecontent = document.getElementsByClassName("browsecontent");
@@ -284,7 +284,7 @@ function display_wall(email, tab) {
document.getElementById(tab + i).style.marginBottom = "2px";
document.getElementById("writer" + tab + i).style.color = "grey";
}
-
+
}
function fills_data(tab, data_user) {
@@ -294,4 +294,4 @@ function fills_data(tab, data_user) {
document.getElementById(tab + "_country").innerHTML = "Country = " + data_user.data.country;
document.getElementById(tab + "_city").innerHTML = "City = " + data_user.data.city;
document.getElementById(tab + "_gender").innerHTML = "Gender = " + data_user.data.gender;
-}
\ No newline at end of file
+}
diff --git a/Twidder (Lab3)/static/wimage.png b/Twidder (Lab3)/static/wimage.png
new file mode 100644
index 0000000000000000000000000000000000000000..048bdd2fcf666069f57f0aab8521dc49f9914725
Binary files /dev/null and b/Twidder (Lab3)/static/wimage.png differ