diff --git a/.DS_Store b/.DS_Store index 9e193614c42ef9b4270225e6315878099bddc44d..04392a84bad9a9be07ab1469c240ba2659f2e948 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Lab_3/Twidder/database.db b/Lab_3/Twidder/database.db index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..98febc27663f0c5d5627b399039324589b6a13ed 100644 Binary files a/Lab_3/Twidder/database.db and b/Lab_3/Twidder/database.db differ diff --git a/Lab_3/Twidder/static/client.html b/Lab_3/Twidder/static/client.html index 8128cbd66d2b6833716f580c83850c219ce61e96..8ebd769443e0a5c90d0f268f0c563c4c13051edb 100644 --- a/Lab_3/Twidder/static/client.html +++ b/Lab_3/Twidder/static/client.html @@ -3,15 +3,15 @@ <head> <title>Twidder</title> <meta charset="utf-8"> - <link href="client.css" type="text/css" rel="stylesheet"> - <script src="client.js"></script> - <script src="serverstub.js"></script> - <script src="server.py"></script> + <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 type="text/view" id="welcomeview"> <div id="repeat_pass"></div> <div id="big_div"> - <img src="wimage.png"> + <img src="static/wimage.png"> <div id="rhs_div"> <div id="login_div"> <form id="sign_in_form" action ="" method="" onsubmit="return sign_in()"> @@ -172,7 +172,7 @@ <body> <div id="windowDiv"> - + haha hoho </div> </body> diff --git a/Lab_3/Twidder/static/client.js b/Lab_3/Twidder/static/client.js index 526924cf583683ec4ab4ee39ad92b84c32146fb1..89588f9b6383a49bd08fcc0cf75b7351f457e9cc 100644 --- a/Lab_3/Twidder/static/client.js +++ b/Lab_3/Twidder/static/client.js @@ -16,7 +16,7 @@ displayView = function(){ // - - - - - The function when page loads - - - - - // window.onload = function () { - + // All key/value pairs stored in out localStorage // If first time? check this: if (localStorage.getItem("currentUser") == null)