Merge branch 'master' into hendrik-testing

This commit is contained in:
Hendrik
2017-01-18 16:02:02 +01:00
27 changed files with 1107 additions and 389 deletions

View File

@@ -1,52 +1,83 @@
<div class="content">
<div class="chat">
<nav class="chat-left left platform chat-recent">
<nav class="nav-list chat-left left platform chat-recent">
<h5>Chats</h5>
<a href="#">
<div class="chat-conversation">
<img class="profile-picture" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTDnuRSeeyPve7KwDvJJ6OBzj3gyghwLcE2z9kZeYBOyZavh3mw">
Rudolf Leslo
</div>
</a>
<ul>
<?php
include_once("../queries/friendship.php");
if (empty($_SESSION["userID"]))
$_SESSION["userID"] = 2;
// Get all the friends of a user.
$friends = selectAllFriends($db, $_SESSION["userID"]);
$i = 0;
// Print all the users.
while($friend = $friends->fetch(PDO::FETCH_ASSOC)) {
$i ++;
// Set default values of a friend.
$username = $friend["username"];
$userID = $friend["userID"];
$pf = "img/notbad.jpg";
// Change values if needed.
if (!empty($friend["profilepicture"]))
$pf = $friend["profilepicture"];
// Echo the friend.
echo "
<li class='friend-item' onclick='switchUser(\"$userID\")'>
<div class='friend'>
<img alt='PF' class='profile-picture' src='$pf'/>
$username
</div>
</li>
";
}
?>
</ul>
<!-- <a href="#">-->
<!-- <div class="chat-conversation">-->
<!-- <img class="profile-picture" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTDnuRSeeyPve7KwDvJJ6OBzj3gyghwLcE2z9kZeYBOyZavh3mw">-->
<!-- Rudolf Leslo-->
<!-- </div>-->
<!-- </a>-->
</nav>
<div class="chat-right right">
<div class="chat-history platform">
<div class="chat-message">
<div class="chat-message-self">Hi!</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Hi!</div>
</div>
<div class="chat-message">
<div class="chat-message-self">How it's going?</div>
</div>
<div class="chat-message">
<div class="chat-message-self">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Hi!</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
<div class="chat-message">
<div class="chat-message-self">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
<div id="chat-history" class="chat-history platform">
</div>
<form id="lastIDForm">
<input type="hidden"
id="lastID"
name="lastID"
value=""
/>
<input type="hidden"
name="destination"
class="destinationID"
value=""
/>
</form>
<div class="chat-field">
<form method="post">
<form id="sendMessageForm" action="javascript:sendMessage();">
<input type="hidden"
name="destination"
class="destinationID"
value=""
/>
<input type="submit"
value="Verstuur"
>
/>
<span>
<input type="text"
name="message"
name="content"
id="newContent"
placeholder="Reageer..."
autofocus
required
>
/>
</span>
</form>
</div>

View File

@@ -17,4 +17,4 @@
include_once("../queries/connect.php");
?>
session_start();

View File

@@ -1,256 +1,51 @@
<?php
// define variables and set to empty values
$name = $surname = $bday = $username = $password = $confirmpassword = $streetname = $housenumber = $email = "";
$passwordErr = $confirmpasswordErr = "";
$correct = true;
if (isset($_POST["name"])) {
$name = $_POST["name"];
}
if (isset($_POST["surname"])) {
$surname = $_POST["surname"];
}
if (isset($_POST["bday"])) {
$bday = $_POST["bday"];
}
if (isset($_POST["username"])) {
$username = $_POST["username"];
}
if (isset($_POST["password"])) {
$password = $_POST["password"];
}
if (isset($_POST["streetname"])) {
$streetname = $_POST["streetname"];
}
if (isset($_POST["housenumber"])) {
$housenumber = $_POST["housenumber"];
}
if (isset($_POST["email"])) {
$email = $_POST["email"];
}
if ($_SERVER["REQUEST_METHOD"] == "POST") {
if ($_POST["password"]!= $_POST["confirmpassword"]) {
$passwordErr = "Wachtwoorden matchen niet";
$confirmpasswordErr = "Wachtwoorden matchen niet";
$correct = false;
?>
<script>window.onload = function() {
document.getElementById('id01').style.display='block'
}</script>
<?php
}
}
?>
<div>
<img style="width:50%;margin-left:25%"
src="img/top-logo.png"
alt="MyHyvesbook+">
</div>
<form action="../profile.php"
<!-- Login content -->
<form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
return= $correct
method="post">
<h1>Welkom bij MyHyvesbook+</h1>
<!-- Login name -->
<div class="login_containerlogin">
<label><b>Gebruikersnaam</b></label>
<input type="text"
placeholder="Voer uw gebruikersnaam in"
name="uname"
pattern=".{6,}"
value="<?php echo $uname ?>"
title="Moet 6 of meer karakters bevatten"
required>
>
</div>
<!-- Login password -->
<div class="login_containerlogin">
<label><b>Wachtwoord</b></label>
<input type="password"
placeholder="Voer uw wachtwoord in"
name="psw"
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}"
title="Moet minimaal 1 cijfer, hoofdletter en kleine letter bevatten en minstens 8 karakters lang zijn"
required>
title="Moet minstens 8 karakters lang zijn"
>
</div>
<!-- Error message -->
<div class="login_containerfault"><span><?php echo $loginErr; ?></span></div>
<!-- Button for logging in -->
<div class="login_containerlogin">
<input type="submit"
<button type="submit"
value="Login"
name="Submit"
id="frm1_submit" />
name="submit"
id="frm1_submit">
Login
</button>
</div>
</form>
<!-- Button for going to the register screen -->
<div class="login_containerlogin">
<button onclick="document.getElementById('id01').style.display='block'">Registreer</button>
<a href="https://myhyvesbookplus.nl/~joey/public/register.php" class="button">Registreer een account</a>
</div>
<div class="login_containerregister">
<div id="id01" class="modal">
<span onclick="document.getElementById('id01').style.display='none'"
class="close"
title="Close Modal">
&times;</span>
<!-- Register Content -->
<form class="modal-content animate"
action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
return= $correct
method="post">
<h2>Registreer uw account</h2>
<div class="login_containerregister">
<label><b>Naam</b></label>
<input type="text"
placeholder="Voer uw naam in"
name="name"
value="<?php echo $name ?>"
pattern="[A-Za-z]{1,}"
title="Mag alleen letters bevatten"
required>
</div>
<div class="login_containerregister">
<label><b>Achternaam</b></label>
<input type="text"
placeholder="Voer uw achternaam in"
name="surname"
value="<?php echo $surname ?>"
pattern="[A-Za-z]{1,}"
title="Mag alleen letters bevatten"
required>
</div>
<div class="login_containerregister">
<label><b>Geboortedatum</b></label>
<input type="date"
name="bday"
value="<?php echo $bday ?>"
id="bday"
placeholder="01/01/1900">
</div>
<div class="login_containerregister">
<label><b>Gebruikersnaam</b></label>
<input type="text"
placeholder="Voer uw gebruikersnaam in"
name="username"
value="<?php echo $username ?>"
pattern=".{6,}"
title="Moet minstens 6 karakters bevatten"
required>
</div>
<ul>
<li>Minstens 6 karakters</li>
</ul>
<div class="login_containerregister">
<label><b>Wachtwoord</b></label>
<input type="password"
placeholder="Voer uw wachtwoord in"
name="password"
value="<?php echo $password ?>"
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}"
id="password"
title="Moet minimaal 1 cijfer, hoofdletter en kleine letter bevatten en minstens 8 karakters bevatten"
required>
<span class="error">* <?php echo $passwordErr;?></span>
</div>
<ul>
<li>Minstens 8 karakters</li>
<li>Minimaal 1 cijfer</li>
<li>Minimaal 1 hoofdletter</li>
<li>Minimaal 1 kleine letter</li>
</ul>
<div class="login_containerregister">
<label><b>Herhaal wachtwoord</b></label>
<input type="password"
placeholder="Herhaal wachtwoord"
name="confirmpassword"
value="<?php echo $confirmpassword ?>"
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}"
id="confirmpassword"
title="Herhaal wachtwoord"
required>
<span class="error">* <?php echo $confirmpasswordErr;?></span>
</div>
<div class="login_containerregister">
<label><b>Straatnaam</b></label>
<input type="text"
placeholder="Voer uw straatnaam in"
name="streetname"
value="<?php echo $streetname ?>"
pattern="[A-Za-z]{1,}"
title="Mag alleen letters bevatten"
required>
</div>
<div class="login_containerregister">
<label><b>Huisnummer</b></label>
<input type="text"
placeholder="Voer uw straatnummer in"
name="housenumber"
value="<?php echo $housenumber ?>"
pattern="[1-9][0-9]{0,}"
title="Mag alleen nummers bevatten"
required>
</div>
<div class="login_containerregister">
<label><b>Email</b></label>
<input type="email"
placeholder="Voer uw email in"
name="email"
value="<?php echo $email ?>"
id="email"
title="Voer een geldige email in"
required>
</div>
<div class="login_containerregister">
<input type="submit"
value="Registreer uw account"
name="Submit"
id="frm1_submit" />
</div>
</form>
</div>
</div>
<script>
// Get the modal
var modal = document.getElementById('id01');
// When the user clicks anywhere outside of the modal, close it
window.onclick = function(event) {
if (event.target == modal) {
modal.style.display = "none";
}
}
</script>
<script>
function passwordfunction() {
var password1 = document.getElementById("password").value;
var password2 = document.getElementById("confirmpassword").value;
var passwordmatching = false;
if (password1 == password2) {
document.getElementById("password").style.borderColor = "red";
document.getElementById("confirmpassword").style.borderColor = "red";
confirmpassword.setCustomValidity("Wachtwoorden matchen niet")
} else {
passwordmatching = true;
}
return passwordmatching;
}
</script>

View File

@@ -5,6 +5,4 @@
type="text/css"
href="styles/index.css">
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
<script src="js/dobPicker.min.js"></script>
</head>

View File

@@ -34,14 +34,18 @@
// Echo the friend.
echo "
<a href='#' class='$extraItem'>
<li class='friend-item'>
<div class='friend'>
<img alt='PF' class='profile-picture' src='$pf'/>
$username
</div>
</li>
</a>
<li class='friend-item $extraItem'>
<form action='profile.php' method='get'>
<button type='submit'
name='username'
value='$username'>
<div class='friend'>
<img alt='PF' class='profile-picture' src='$pf'/>
$username
</div>
</button>
</form>
</li>
";
}
if ($i > 1) {

View File

@@ -0,0 +1,135 @@
<div>
<img style="width:50%;margin-left:25%"
src="img/top-logo.png"
alt="MyHyvesbook+">
</div>
<!-- Register Content -->
<form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
return= $correct
method="post">
<h2>Registreer uw account</h2>
<!-- Error message -->
<div class="login_containerfault"><?php echo $genericErr;?></span></div>
<!-- Register name -->
<div class="login_containerregister">
<label><b>Naam</b></label>
<input type="text"
placeholder="Voer uw naam in"
name="name"
value="<?php echo $name ?>"
title="Mag alleen letters bevatten"
>
<span class="error">* <?php echo $nameErr;?></span>
</div>
<!-- Register surname -->
<div class="login_containerregister">
<label><b>Achternaam</b></label>
<input type="text"
placeholder="Voer uw achternaam in"
name="surname"
value="<?php echo $surname ?>"
title="Mag alleen letters bevatten"
>
<span class="error">* <?php echo $surnameErr;?></span>
</div>
<!-- Register birthday -->
<div class="login_containerregister">
<label><b>Geboortedatum</b></label>
<input type="date"
name="bday"
value="<?php echo $bday ?>"
id="bday"
placeholder="01/01/1900"
>
<span class="error">* <?php echo $bdayErr;?></span>
</div>
<!-- Register username -->
<div class="login_containerregister">
<label><b>Gebruikersnaam</b></label>
<input type="text"
placeholder="Voer uw gebruikersnaam in"
name="username"
value="<?php echo $username ?>"
title="Moet minimaal 6 karakters bevatten"
>
<span class="error">* <?php echo $usernameErr;?></span>
</div>
<ul>
<li>Minstens 6 karakters</li>
</ul>
<!-- Register password -->
<div class="login_containerregister">
<label><b>Wachtwoord</b></label>
<input type="password"
placeholder="Voer uw wachtwoord in"
name="password"
value="<?php echo $password ?>"
id="password"
>
<span class="error">* <?php echo $passwordErr;?></span>
</div>
<ul>
<li>Minstens 8 karakters</li>
</ul>
<!-- Repeat password -->
<div class="login_containerregister">
<label><b>Herhaal wachtwoord</b></label>
<input type="password"
placeholder="Herhaal wachtwoord"
name="confirmpassword"
value="<?php echo $confirmpassword ?>"
id="confirmpassword"
title="Herhaal wachtwoord"
>
<span class="error">* <?php echo $confirmpasswordErr;?></span>
</div>
<!-- Register location -->
<div class="login_containerregister">
<label><b>Woonplaats</b></label>
<input type="text"
placeholder="Voer uw woonplaats in"
name="location"
value="<?php echo $location ?>"
pattern="[A-Za-z]{1,}"
title="Mag alleen letters bevatten">
<span class="error">* <?php echo $locationErr;?></span>
</div>
<!-- Register email -->
<div class="login_containerregister">
<label><b>Email</b></label>
<input type="email"
placeholder="Voer uw email in"
name="email"
value="<?php echo $email ?>"
id="email"
title="Voer een geldige email in">
<span class="error">* <?php echo $emailErr;?></span>
</div>
<!-- Button for registering -->
<div class="login_containerregister">
<button type="submit"
value="Registreer uw account"
name="Submit"
id="frm1_submit">
Registreer uw account
</button>
</div>
</form>
<!-- Button for going back to login screen -->
<div class="login_containerlogin">
<a href="https://myhyvesbookplus.nl/~joey/public/login.php" class="button">Login met een account</a>
</div>

View File

@@ -1,39 +1,36 @@
<?php
$settings = getSettings();
?>
<div class="content">
<div class="settings">
<form class="settings-profile platform">
<?php
if ($_SERVER["REQUEST_METHOD"] == "POST") {
echo "<div class='platform settings-message ${result["type"]}'>
${result["message"]}
</div>";
}
?>
<form class="settings-profile platform" method="post">
<h5>Profiel Instellingen</h5>
<ul>
<li>
<label for="first-name">Voornaam</label>
<label for="fname">Voornaam</label>
<input type="text"
name="first-name"
id="first-name"
name="fname"
id="fname"
placeholder="Voornaam"
title="Voornaam"
value="<?= $settings["fname"]?>"
>
</li>
<li>
<label for="last-name">Achternaam</label>
<label for="lname">Achternaam</label>
<input type="text"
name="last-name"
id="last-name"
name="lname"
id="lname"
placeholder="Achternaam"
>
</li>
<li>
<label for="place">Woonplaats</label>
<input type="text"
name="place"
id="place"
placeholder="Woonplaats"
>
</li>
<li>
<label for="bday">Geboortedatum</label>
<input type="date"
name="bday"
id="bday"
placeholder="01/01/1900"
value="<?= $settings["lname"]?>"
>
</li>
<li>
@@ -42,6 +39,16 @@
name="location"
id="location"
placeholder="Locatie"
value="<?= $settings["location"]?>"
>
</li>
<li>
<label for="bday">Geboortedatum</label>
<input type="date"
name="bday"
id="bday"
placeholder="yyyy-mm-dd"
value="<?= $settings["birthdate"]?>"
>
</li>
<li>
@@ -50,17 +57,42 @@
rows="5"
title="bio"
id="bio"
></textarea>
><?= $settings["bio"]?></textarea>
</li>
<li>
<label></label>
<input type="submit"
value="Opslaan"
>
<button type="submit"
value="profile"
name="form"
>Opslaan</button>
</li>
</ul>
</form>
<form class="settings-profilepictue platform" method="post">
<h5>Verander profielfoto</h5>
<ul>
<li>
<label>Huidige profielfoto</label>
<img src="<?= $settings["profilepicture"] ?>"
class="profile-picture"
>
</li>
<li>
<label>Selecteer foto</label>
<input type="file"
name="pp"
accept="image/jpeg,image/gif,image/png"
>
</li>
<li>
<label></label>
<button type="submit"
name="form"
value="picture"
>Verander profielfoto</button>
</li>
</ul>
</form>
<form class="settings-password platform item-box" method="post">
<h5>Verander Wachtwoord</h5>
<ul>
@@ -86,10 +118,10 @@
>
</li>
<li>
<label></label>
<input type="submit"
value="Verander wachtwoord"
>
<button type="submit"
name="form"
value="password"
>Verander wachtwoord</button>
</li>
</ul>
</form>
@@ -97,6 +129,14 @@
<form class="settings-email platform item-box" method="post">
<h5>Verander Email</h5>
<ul>
<li>
<label for="email-old">Huidig Email </label>
<input type="email"
id="email-old"
value="<?= $settings["email"]?>"
disabled
>
</li>
<li>
<label for="email">Nieuw Email</label>
<input type="email"
@@ -114,10 +154,10 @@
>
</li>
<li>
<label></label>
<input type="submit"
value="Verander Email"
>
<button type="submit"
name="form"
value="email"
>Verander Email</button>
</li>
</ul>
</form>