From 6a093929190e31eb91f169f062b3f8a30933d5d3 Mon Sep 17 00:00:00 2001
From: Lawrence Zawahri <louza078@student.liu.se>
Date: Sat, 5 Mar 2022 16:05:41 +0100
Subject: [PATCH] lab 3 progress
---
.../database_helper.cpython-38.pyc | Bin 0 -> 2377 bytes
Lab_3/Twidder/database.db | Bin 16384 -> 16384 bytes
Lab_3/Twidder/server.py | 9 +++
Lab_3/Twidder/static/client.html | 2 +-
Lab_3/Twidder/static/client.js | 63 ++++++++++++++++--
5 files changed, 68 insertions(+), 6 deletions(-)
create mode 100644 Lab_3/Twidder/__pycache__/database_helper.cpython-38.pyc
diff --git a/Lab_3/Twidder/__pycache__/database_helper.cpython-38.pyc b/Lab_3/Twidder/__pycache__/database_helper.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7e4a18eb4153651973e42af292cfa4aab521d882
GIT binary patch
literal 2377
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
literal 0
HcmV?d00001
diff --git a/Lab_3/Twidder/database.db b/Lab_3/Twidder/database.db
index 98febc27663f0c5d5627b399039324589b6a13ed..f7004e4eedc2f4728e612ffa78607a16335fe279 100644
GIT binary patch
delta 120
zcmZo@U~Fh$oFL7}Hc`fzm5o6!+-qaX0)8GA{)r6yFZnO=@8+MlSx}&nUrU39Ls(Q;
zTvSmw$04U6vA8%RH7g@ECnrBQF()-AGcWt_wt~#O^y2c=$-Ct}d06-#GVp)of64!l
a|L0~wg^T<g?99T9ISx52n_udS3jhFoiY5*K
delta 64
zcmZo@U~Fh$oFL7}I#I@%m6buyL}6pf0)8%L{@o1xFZnO=@7^q^u$F)FZh22GX8xB9
V{2%#W^8ef{XmFc<^Gkhk0RUbY6qx`3
diff --git a/Lab_3/Twidder/server.py b/Lab_3/Twidder/server.py
index d5936c7..26705d7 100644
--- a/Lab_3/Twidder/server.py
+++ b/Lab_3/Twidder/server.py
@@ -18,6 +18,10 @@ session = {'token':'email'}
def root():
return app.send_static_file('client.html')
+@app.route('/myServer')
+def myServer():
+ return app.send_static_file('client.html')
+
def token_has_error(token):
"""All token standard error checks"""
@@ -44,6 +48,7 @@ def input_has_error(input):
@app.route("/myServer/sign_in", methods=['POST'])
def sign_in():
"""Sign in user"""
+ # return jsonify({}), 204
email = request.get_json()['email']
password = request.get_json()['password']
@@ -77,8 +82,12 @@ def sign_in():
@app.route("/myServer/sign_up", methods=['POST'])
def sign_up():
+ print('hello')
"""Sign up a user"""
json_obj = request.get_json()
+
+ print(json_obj)
+
email = json_obj['email']
tmp = input_has_error(email)
diff --git a/Lab_3/Twidder/static/client.html b/Lab_3/Twidder/static/client.html
index 4c4df13..8ebd769 100644
--- a/Lab_3/Twidder/static/client.html
+++ b/Lab_3/Twidder/static/client.html
@@ -6,7 +6,7 @@
<link href="static/client.css" type="text/css" rel="stylesheet">
<script src="static/client.js"></script>
<script src="static/serverstub.js"></script>
- <script src="server.py"></script>
+ <!-- <script src="server.py"></script> -->
<script type="text/view" id="welcomeview">
<div id="repeat_pass"></div>
diff --git a/Lab_3/Twidder/static/client.js b/Lab_3/Twidder/static/client.js
index 99540d2..6658aae 100644
--- a/Lab_3/Twidder/static/client.js
+++ b/Lab_3/Twidder/static/client.js
@@ -3,6 +3,13 @@ var minPassLength = 2;
var windowDiv;
var welcomeDiv;
var profileDiv;
+var url = 'http://127.0.0.1:5000/myServer';
+
+
+
+
+
+
// - - - - - Init functions - - - - - //
@@ -65,6 +72,7 @@ function setUserDetails(who) {
// - - - - - Sign Up/In/Out - - - - - //
function sign_up() {
+
let form = document.getElementById("signup_form");
let errorMess = document.getElementById("signUpError");
let user = {
@@ -85,11 +93,38 @@ function sign_up() {
errorMess.innerHTML = "Passwords does not match";
else {
- // Todo
- // Submission to "server"
- let signUpObj = serverstub.signUp(user);
- // Set message to user
- errorMess.innerHTML = signUpObj["message"];
+ // // Todo
+ // // Submission to "server"
+ // let signUpObj = serverstub.signUp(user);
+ // // Set message to user
+ // errorMess.innerHTML = signUpObj["message"];
+
+
+ //----------------//----------------//----------------//----------------
+ let xhttp = new XMLHttpRequest();
+ // xhttp.onreadystatechange = function () {
+ // if (this.readyState == 4 && this.status == 200) {
+ // // Typical action to be performed when the document is ready:
+ // errorMess.innerHTML = xhttp.responseText;
+ // }
+ // };
+ //xhttp.addEventListener("load", reqListener);
+ xhttp.open("POST", "http://127.0.0.1:5000/myServer/sign_up", true);
+ xhttp.setRequestHeader('Authorization', '1f191d40-c128-477d-9f9f-196c81810f02');
+ //xhttp.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+ xhttp.send(JSON.stringify({
+ "email": "k@k",
+ "password": "kass",
+ "firstname": "kk",
+ "familyname": "hello",
+ "gender": "male",
+ "city": "linköping",
+ "country": "swe"
+ }));
+ // obj = JSON.parse(xhttp.responseText);
+ // alert(obj.alert)
+//----------------//----------------//----------------//----------------
+
}
return false;
}
@@ -108,6 +143,23 @@ function sign_in() {
//Todo
// Sending sign_in request to "server"
let signInObj = serverstub.signIn(email, password);
+ var signInRequest = new XMLHttpRequest();
+ signInRequest.onreadystatechange = function() {
+
+ if (this.readyState == 4) {
+ if (this.status == 204) {
+ console.log('success')
+ }
+ else if (this.status == 404) {
+ console.log('nor found')
+ }
+ else {
+ console.log('unknown error')
+ }
+ }
+ };
+ signInRequest.open("POST", "http://127.0.0.1:5000/myServer/sign_in", true);
+ signInRequest.send();
// Set message to user
errorMess.innerHTML = signInObj["message"];
@@ -216,6 +268,7 @@ function updateWall(who){
serverstub.postMessage(token, messageToWall, email);
document.getElementById(who + 'Textarea').value = "";
+
return false;
}
--
GitLab