diff options
| author | Alex Vitkov <alexvitkov98@gmail.com> | 2021-01-29 13:43:53 +0200 |
|---|---|---|
| committer | Alex Vitkov <alexvitkov98@gmail.com> | 2021-01-29 13:43:53 +0200 |
| commit | dcf61354050bfe81d6983f1aec34d7d3d6733a0d (patch) | |
| tree | 87535d87bc498d8d852f30bb1de96864d68e9ba4 | |
| parent | 33e533d28dbf9ad7bfc7ad9af467e5efe25ae8a0 (diff) | |
| download | fileup-dcf61354050bfe81d6983f1aec34d7d3d6733a0d.tar.gz | |
index.html + login.html => index.php
those files had the entire HTML tree duplicated, which would make it
difficult to make any changes to the front end. this commit combines the
two files in one, with some front-end JS to switch between the login and
register forms.
| -rw-r--r-- | css/style.css | 4 | ||||
| -rw-r--r-- | index.html | 65 | ||||
| -rw-r--r-- | index.php | 77 | ||||
| -rw-r--r-- | js/arrows.js | 37 | ||||
| -rw-r--r-- | login.html | 55 | ||||
| -rw-r--r-- | main.js (renamed from js/validate_hero.js) | 44 | ||||
| -rw-r--r-- | php/configuration.php | 18 | ||||
| -rw-r--r-- | php/database.php | 8 | ||||
| -rw-r--r-- | php/misc.php | 5 | ||||
| -rw-r--r-- | php/register.php | 7 |
10 files changed, 145 insertions, 175 deletions
diff --git a/css/style.css b/css/style.css index 31778c4..18d4817 100644 --- a/css/style.css +++ b/css/style.css @@ -195,3 +195,7 @@ input[type=submit]:hover { bottom: 0; z-index: -200; } + +#loginform { + display: none; +} diff --git a/index.html b/index.html deleted file mode 100644 index 6a2018b..0000000 --- a/index.html +++ /dev/null @@ -1,65 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="utf-8"> - <title>shady file upload</title> - <link rel="stylesheet" type="text/css" href="css/style.css"> - </head> - - <body> - <div class="overlay" style="height: 100%;"> - <div class="vert2"> - <div id="header"> - <p class="logo">shady_file_upload</p> - </div> - - <div id="page"> - <div id="hero" class="overlay"> - <div id="arrows"> - <img src="svg/arrow.svg" id="protoarrow" style="display: none"> - </div> - - <div class="vcenter"> - <p>file upload service</p> - <p class="big">that <span class="blue">just about works</span></p> - <p>most of the time</p> - </div> - </div> - - <div class="vcenter"> - <form name="hero_form" action="/php/register.php" method="post" onsubmit="return validate_hero_form()"> - <h2>Get started</h2> - <div class="content"> - <p>Username</p> - <input type="text" id="username" name="username"> - <p id="username-length-error" class="hero_form_error" hidden>Please specify a username</p> - - <p>Email address</p> - <input type="text" id="email" name="email"> - <p id="email-error" class="hero_form_error" hidden>Invalid email address</p> - - <p>Password</p> - <input type="password" id="password" name="password"> - <p id="password-length-error" class="hero_form_error" hidden>Please provide a password</p> - - <p>Repeat Password</p> - <input type="password" id="password2" name="password2"> - <p id="password-match-error" class="hero_form_error" hidden>Passwords didn't match</p> - <input type="submit" value="Sign up"> - <p style="font-size: 1.1em;">Don't have an account? <a href="login.html">Log in</a> - </div> - </form> - </div> - - - </div> - </div> - - <img src="svg/bottom.svg" class="bgbottom"> - </div> - - <script src="js/arrows.js"></script> - <script src="js/validate_hero.js"></script> - - </body> - <html> diff --git a/index.php b/index.php new file mode 100644 index 0000000..3e92167 --- /dev/null +++ b/index.php @@ -0,0 +1,77 @@ +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8"> + <title>shady file upload</title> <link rel="stylesheet" type="text/css" href="css/style.css"> </head> + + <body> + <div class="overlay" style="height: 100%;"> + <div class="vert2"> + <div id="header"> + <p class="logo">shady_file_upload</p> + </div> + + <div id="page"> + <div id="hero" class="overlay"> + <div id="arrows"> + <img src="svg/arrow.svg" id="protoarrow" style="display: none"> + </div> + + <div class="vcenter"> + <p>file upload service</p> + <p class="big">that <span class="blue">just about works</span></p> + <p>most of the time</p> + </div> + </div> + + <div class="vcenter" id="signupform"> + <form name="hero_form" action="/php/register.php" method="post" onsubmit="return validate_hero_form()"> + <h2>Get started</h2> + <div class="content"> + <p>Username</p> + <input type="text" id="username" name="username"> + <p id="username-length-error" class="hero_form_error" hidden>Please specify a username</p> + + <p>Email address</p> + <input type="text" id="email" name="email"> + <p id="email-error" class="hero_form_error" hidden>Invalid email address</p> + + <p>Password</p> + <input type="password" id="password" name="password"> + <p id="password-length-error" class="hero_form_error" hidden>Please provide a password</p> + + <p>Repeat Password</p> + <input type="password" id="password2" name="password2"> + <p id="password-match-error" class="hero_form_error" hidden>Passwords didn't match</p> + <input type="submit" value="Sign up"> + <p style="font-size: 1.1em;">Already have an account? <a href="#" onclick="showLogin(true)">Log in</a> + </div> + </form> + </div> + + <div class="vcenter" id="loginform"> + <form name="hero_form" action="/php/login.php" method="post" onsubmit="return validate_hero_login_form()"> + <h2>Login</h2> + <div class="content"> + <p>Username</p> + <input type="text" id="username" name="username"> + <p id="username-length-error" class="hero_form_error" hidden>Please enter a username</p> + <p>Password</p> + <input type="password" id="password" name="password"> + <input type="submit" value="Login"> + <p style="font-size: 1.1em;">Don't have an account? <a href="#" onclick="showLogin(false)">Sign up</a> + </div> + </form> + </div> + + + </div> + </div> + + <img src="svg/bottom.svg" class="bgbottom"> + </div> + + <script src="main.js"></script> + + </body> + <html> diff --git a/js/arrows.js b/js/arrows.js deleted file mode 100644 index 10ad416..0000000 --- a/js/arrows.js +++ /dev/null @@ -1,37 +0,0 @@ - -arrows = []; - -const minSpeed = 3; -const maxSpeed = 8; -const delay = 1500; -const lifetime = 20000; - -function make_arrow() { - const svg = document.getElementById("protoarrow").cloneNode(); - svg.style.left = Math.random() * 100 + '%'; - svg.style.display = 'block'; - document.getElementById('arrows').append(svg); - const ob = { - y: -800, - svg: svg, - speed: Math.random() * (maxSpeed - minSpeed) + minSpeed - }; - arrows.push(ob); - setTimeout(make_arrow, delay); - setTimeout(() => { - svg.remove(); - arrows.shift(); - }, lifetime); -} - -function update() { - for (const arrow of arrows) { - arrow.y += arrow.speed; - arrow.svg.style.bottom = arrow.y + 'px'; - } - - window.requestAnimationFrame(update); -} - -make_arrow(); -update(); diff --git a/login.html b/login.html deleted file mode 100644 index 525358f..0000000 --- a/login.html +++ /dev/null @@ -1,55 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta charset="utf-8"> - <title>shady file upload</title> - <link rel="stylesheet" type="text/css" href="css/style.css"> - </head> - - <body> - <div class="overlay" style="height: 100%;"> - <div class="vert2"> - <div id="header"> - <p class="logo">shady_file_upload</p> - </div> - - <div id="page"> - <div id="hero" class="overlay"> - <div id="arrows"> - <img src="svg/arrow.svg" id="protoarrow" style="display: none"> - </div> - - <div class="vcenter"> - <p>file upload service</p> - <p class="big">that <span class="blue">just about works</span></p> - <p>most of the time</p> - </div> - </div> - - <div class="vcenter"> - <form name="hero_form" action="/php/login.php" method="post" onsubmit="return validate_hero_login_form()"> - <h2>Login</h2> - <div class="content"> - <p>Username</p> - <input type="text" id="username" name="username"> - <p id="username-length-error" class="hero_form_error" hidden>Please enter a username</p> - <p>Password</p> - <input type="password" id="password" name="password"> - <input type="submit" value="Login"> - <p style="font-size: 1.1em;">Already have an account? <a href="index.html">Sign up</a> - </div> - </form> - </div> - - - </div> - </div> - - <img src="svg/bottom.svg" class="bgbottom"> - </div> - - <script src="js/arrows.js"></script> - <script src="js/validate_hero.js"></script> - - </body> - <html> diff --git a/js/validate_hero.js b/main.js index 6d29a53..a775eb7 100644 --- a/js/validate_hero.js +++ b/main.js @@ -1,3 +1,42 @@ +arrows = []; + +const minSpeed = 3; +const maxSpeed = 8; +const delay = 1500; +const lifetime = 20000; + +function make_arrow() { + const svg = document.getElementById("protoarrow").cloneNode(); + svg.style.left = Math.random() * 100 + '%'; + svg.style.display = 'block'; + document.getElementById('arrows').append(svg); + const ob = { + y: -800, + svg: svg, + speed: Math.random() * (maxSpeed - minSpeed) + minSpeed + }; + arrows.push(ob); + setTimeout(make_arrow, delay); + setTimeout(() => { + svg.remove(); + arrows.shift(); + }, lifetime); +} + +function update() { + for (const arrow of arrows) { + arrow.y += arrow.speed; + arrow.svg.style.bottom = arrow.y + 'px'; + } + + window.requestAnimationFrame(update); +} + +make_arrow(); +update(); + + + function clear_hero_errors() { @@ -56,3 +95,8 @@ function validate_hero_form() return flag; } + +function showLogin(l) { + document.getElementById("loginform").style.display = l ? "flex" : "none"; + document.getElementById("signupform").style.display = l ? "none" : "flex"; +} diff --git a/php/configuration.php b/php/configuration.php index 6b87508..89efb2a 100644 --- a/php/configuration.php +++ b/php/configuration.php @@ -3,15 +3,21 @@ $domain_name="localhost"; -$database_name="adam"; -$database_username="adam"; -$database_password="asdfd"; -$database_location="127.0.0.1"; - +if (file_exists("/home/alex")) { + $database_name="alex"; + $database_username="alex"; + $database_password="lol"; + $database_location="127.0.0.1"; +} +else { + $database_name="adam"; + $database_username="adam"; + $database_password="asdfd"; + $database_location="127.0.0.1"; +} $password_hash_algo=PASSWORD_BCRYPT; - $has_email_verification=false; ?> diff --git a/php/database.php b/php/database.php index ef2b825..f472cbf 100644 --- a/php/database.php +++ b/php/database.php @@ -16,14 +16,8 @@ require_once "misc.php"; global $database_username; global $database_password; global $database_location; - try - { + $this->pdo=new PDO("mysql:dbname={$database_name};host={$database_location}",$database_username,$database_password); - }catch(PDOException $e) - { - error_log("Could not get database {$database_name} from {$database_location}, {$e} "); - die("The cow bought the farm"); - } } /*returns false if this isn't a user, otherwise returns the user*/ diff --git a/php/misc.php b/php/misc.php index 3ab0277..69cd654 100644 --- a/php/misc.php +++ b/php/misc.php @@ -1,11 +1,6 @@ <?php require_once "user.php"; -function validate_credentials(string $username,string $email,string $password,string $password2) : bool -{ - return true; -} - function generate_email_verification_link() { /*TODO*/ diff --git a/php/register.php b/php/register.php index b6b164c..ef1f238 100644 --- a/php/register.php +++ b/php/register.php @@ -8,6 +8,13 @@ $password=$_POST["password"]; $password2=$_POST["password2"]; $email=$_POST["email"]; + +function validate_credentials(string $username,string $email,string $password,string $password2) : bool +{ + return true; +} + + /*check if we are given shady credentials*/ if(!validate_credentials($username,$email,$password,$password2)) { |