Skip to content
Snippets Groups Projects
Commit ef7d572a authored by MaximeOLIVA's avatar MaximeOLIVA
Browse files

start lab3

parent 6f13960e
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 17 deletions
.DS_Store
+ 0
− 0
View file @ ef7d572a
No preview for this file type
Twidder (Lab3)/.DS_Store
+ 0
− 0
View file @ ef7d572a
No preview for this file type
Twidder (Lab3)/__pycache__/database_helper.cpython-310.pyc
+ 0
− 0
View file @ ef7d572a
No preview for this file type
Twidder (Lab3)/__pycache__/server.cpython-310.pyc
+ 0
− 0
View file @ ef7d572a
No preview for this file type
Twidder (Lab3)/server.py
+ 1
− 1
View file @ ef7d572a
...@@ -11,7 +11,7 @@ app = Flask(__name__) ...@@ -11,7 +11,7 @@ app = Flask(__name__)
@app.route("/", methods = ['GET']) @app.route("/", methods = ['GET'])
def hello_world(): def hello_world():
return "<p>Hello, Lab_2!</p>", 200 return app.send_static_file("client.html"), 200
@app.route("/delete", methods = ['GET']) @app.route("/delete", methods = ['GET'])
......
Twidder (Lab3)/static/client.html
+ 7
− 7
View file @ ef7d572a
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
<html lang="en"> <html lang="en">
<head> <head>
<title>Twidder</title> <title>Twidder</title>
<link href="client.css" type="text/css" rel="stylesheet"> <link href="/static/client.css" type="text/css" rel="stylesheet">
<script src="client.js"></script> <script src="/static/client.js"></script>
<script src="serverstub.js"></script> <script src="/static/serverstub.js"></script>
<script id="welcomeview" type="text/view"> <script id="welcomeview" type="text/view">
<div id="center"> <div id="center">
<img src="../Lab1_Ressources/wimage.png"> <img src="/static/wimage.png">
<div id="forms"> <div id="forms">
<form id="login" onsubmit="signIn(this); return false;"> <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="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="password" 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"> <input value="Login" class="lbutton" type="submit">
</form> </form>
<form id="signup" onsubmit="signUp(this); return false;"> <form id="signup" onsubmit="signUp(this); return false;">
...@@ -107,4 +107,4 @@ ...@@ -107,4 +107,4 @@
<div id="displayprofil"></div> <div id="displayprofil"></div>
</body> </body>
</html> </html>
\ No newline at end of file
Twidder (Lab3)/static/client.js
+ 9
− 9
View file @ ef7d572a
...@@ -42,7 +42,7 @@ function checkPasswords(formData){ ...@@ -42,7 +42,7 @@ function checkPasswords(formData){
return true; return true;
} }
function changePassword(formData) { function changePassword(formData) {
let oldPassword = formData.oldPassword.value; let oldPassword = formData.oldPassword.value;
...@@ -102,8 +102,8 @@ function signUp(formData) { ...@@ -102,8 +102,8 @@ function signUp(formData) {
//---------------------------------------SIGN IN--------------------------------------- //---------------------------------------SIGN IN---------------------------------------
function signIn(formData) { function signIn(formData) {
let username = formData.email.value; let username = formData.l_email.value;
let password = formData.password.value; let password = formData.l_password.value;
let tokens; let tokens;
...@@ -112,7 +112,7 @@ function signIn(formData) { ...@@ -112,7 +112,7 @@ function signIn(formData) {
let success = serverAnswer.success; let success = serverAnswer.success;
let message = serverAnswer.message; let message = serverAnswer.message;
let token = serverAnswer.data; let token = serverAnswer.data;
if(success) { if(success) {
localStorage.setItem("token", token); localStorage.setItem("token", token);
localStorage.setItem("email_username", username); localStorage.setItem("email_username", username);
...@@ -164,7 +164,7 @@ function message_management(tab){ ...@@ -164,7 +164,7 @@ function message_management(tab){
default: default:
email = localStorage.getItem("browsed_email"); email = localStorage.getItem("browsed_email");
} }
if(message.length > 0) { if(message.length > 0) {
serverstub.postMessage(localStorage.getItem("token"), message, email); serverstub.postMessage(localStorage.getItem("token"), message, email);
display_wall(email, tab); display_wall(email, tab);
...@@ -189,7 +189,7 @@ function openTab(tabName) { ...@@ -189,7 +189,7 @@ function openTab(tabName) {
// Declare all variables // Declare all variables
var i, tabcontent, tablinks; var i, tabcontent, tablinks;
localStorage.setItem("tab", tabName); localStorage.setItem("tab", tabName);
if(tabName != "browsePage") { if(tabName != "browsePage") {
if(!(serverstub.getUserMessagesByEmail(localStorage.getItem("token"), localStorage.getItem("browsed_email")).success)) { if(!(serverstub.getUserMessagesByEmail(localStorage.getItem("token"), localStorage.getItem("browsed_email")).success)) {
localStorage.removeItem("browsed_email"); localStorage.removeItem("browsed_email");
...@@ -224,7 +224,7 @@ function openTab(tabName) { ...@@ -224,7 +224,7 @@ function openTab(tabName) {
function display_wall_info(email, tab) { function display_wall_info(email, tab) {
//check if we already have the data stored of if we have to call the server //check if we already have the data stored of if we have to call the server
let data_user = get_user_info(email, tab); let data_user = get_user_info(email, tab);
if(data_user.success) { if(data_user.success) {
if(tab == "BP") { if(tab == "BP") {
browsecontent = document.getElementsByClassName("browsecontent"); browsecontent = document.getElementsByClassName("browsecontent");
...@@ -284,7 +284,7 @@ function display_wall(email, tab) { ...@@ -284,7 +284,7 @@ function display_wall(email, tab) {
document.getElementById(tab + i).style.marginBottom = "2px"; document.getElementById(tab + i).style.marginBottom = "2px";
document.getElementById("writer" + tab + i).style.color = "grey"; document.getElementById("writer" + tab + i).style.color = "grey";
} }
} }
function fills_data(tab, data_user) { function fills_data(tab, data_user) {
...@@ -294,4 +294,4 @@ 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 + "_country").innerHTML = "Country = " + data_user.data.country;
document.getElementById(tab + "_city").innerHTML = "City = " + data_user.data.city; document.getElementById(tab + "_city").innerHTML = "City = " + data_user.data.city;
document.getElementById(tab + "_gender").innerHTML = "Gender = " + data_user.data.gender; document.getElementById(tab + "_gender").innerHTML = "Gender = " + data_user.data.gender;
} }
\ No newline at end of file
Twidder (Lab3)/static/wimage.png 0 → 100644
+ 0
− 0
View file @ ef7d572a
Twidder (Lab3)/static/wimage.png

14 KiB

0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment