Merge branch 'master' into hendrik-testing
This commit is contained in:
Hendrik
@@ -1,20 +1,15 @@
|
||||
<div class="content">
|
||||
<div class="chat">
|
||||
<div class="chat-left">
|
||||
<nav class="chat-recent platform">
|
||||
<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>
|
||||
<a href="#"><div class="chat-conversation">
|
||||
<img class="profile-picture" src=http://www.kpop-map.com/wp-content/uploads/2016/01/sm-rookies-kun-profile.jpg">
|
||||
Henk de Boer
|
||||
</div></a>
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
<div class="chat-right">
|
||||
<nav class="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>
|
||||
</nav>
|
||||
<div class="chat-right right">
|
||||
<div class="chat-history platform">
|
||||
<div class="chat-message">
|
||||
<div class="chat-message-self">Hi!</div>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<footer>
|
||||
<p>Copyright © 2017 MyHyvesbook+ <span style="float: right">Like ons op Facebook!</span</p>
|
||||
<p>Copyright © 2017 MyHyvesbook+ <span style="float: right">Like ons op Facebook!</span> </p>
|
||||
</footer>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div class="profile-box platform">
|
||||
<img class="left group-picture" src="http://i.imgur.com/afjEUx2.jpg">
|
||||
<div class="profile-button">
|
||||
<p><img src="../website/img/leave-group.png"> Groep verlaten</p>
|
||||
<p><img src="img/leave-group.png"> Groep verlaten</p>
|
||||
</div>
|
||||
<h1 class="profile-username">[groepnaam]</h1>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
|
||||
|
||||
@@ -1,21 +1,14 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>MyHyvesbook+</title>
|
||||
<!-- Add your javascript files here. -->
|
||||
<script src="js/jquery.js"></script>
|
||||
<script src="js/header.js"></script>
|
||||
<script src="js/menu.js"></script>
|
||||
<style>
|
||||
/* Add your css files here. */
|
||||
@import url("styles/main.css");
|
||||
@import url("styles/profile.css");
|
||||
@import url("styles/font-awesome.css");
|
||||
@import url("styles/header.css");
|
||||
@import url("styles/menu.css");
|
||||
@import url("styles/footer.css");
|
||||
@import url("styles/search.css");
|
||||
@import url("styles/adminpanel.css");
|
||||
@import url("styles/chat.css");
|
||||
@import url("styles/settings.css");
|
||||
</style>
|
||||
</head>
|
||||
<meta charset="utf-8">
|
||||
<title>MyHyvesbook+</title>
|
||||
<!-- Add your javascript files here. -->
|
||||
<script src="js/jquery.js"></script>
|
||||
<script src="js/header.js"></script>
|
||||
<script src="js/menu.js"></script>
|
||||
<style>
|
||||
/* Add your css files here. */
|
||||
@import url("styles/main.css");
|
||||
@import url("styles/font-awesome.css");
|
||||
@import url("styles/header.css");
|
||||
@import url("styles/menu.css");
|
||||
@import url("styles/footer.css");
|
||||
</style>
|
||||
|
||||
@@ -4,8 +4,13 @@
|
||||
</div>
|
||||
<div id="header-search">
|
||||
<form action="search.php" method="get">
|
||||
<input name="search" type="text" placeholder="zoek naar van alles" />
|
||||
<input type="submit" value="Zoek"/>
|
||||
<input name="search"
|
||||
type="text"
|
||||
placeholder="Zoek naar wat je wil"
|
||||
required
|
||||
/>
|
||||
<input type="submit"
|
||||
value="Zoek"/>
|
||||
</form>
|
||||
</div>
|
||||
<div class="right profile-menu">
|
||||
|
||||
256
website/views/login-view.php
Normal file
256
website/views/login-view.php
Normal file
@@ -0,0 +1,256 @@
|
||||
<?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"
|
||||
method="post">
|
||||
<h1>Welkom bij MyHyvesbook+</h1>
|
||||
|
||||
<div class="login_containerlogin">
|
||||
<label><b>Gebruikersnaam</b></label>
|
||||
<input type="text"
|
||||
placeholder="Voer uw gebruikersnaam in"
|
||||
name="uname"
|
||||
pattern=".{6,}"
|
||||
title="Moet 6 of meer karakters bevatten"
|
||||
required>
|
||||
</div>
|
||||
|
||||
<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>
|
||||
</div>
|
||||
|
||||
<div class="login_containerlogin">
|
||||
<input type="submit"
|
||||
value="Login"
|
||||
name="Submit"
|
||||
id="frm1_submit" />
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="login_containerlogin">
|
||||
<button onclick="document.getElementById('id01').style.display='block'">Registreer</button>
|
||||
</div>
|
||||
|
||||
<div class="login_containerregister">
|
||||
<div id="id01" class="modal">
|
||||
<span onclick="document.getElementById('id01').style.display='none'"
|
||||
class="close"
|
||||
title="Close Modal">
|
||||
×</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>
|
||||
10
website/views/login_head.php
Normal file
10
website/views/login_head.php
Normal file
@@ -0,0 +1,10 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>MyHyvesbook+</title>
|
||||
<link rel="stylesheet"
|
||||
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>
|
||||
File diff suppressed because one or more lines are too long
@@ -2,7 +2,7 @@
|
||||
<div class="profile-box platform">
|
||||
<img class="left profile-picture" src="http://i.imgur.com/afjEUx2.jpg">
|
||||
<div class="profile-button">
|
||||
<p><img src="../website/img/add-friend.png"> Als vriend toevoegen</p>
|
||||
<p><img src="img/add-friend.png"> Als vriend toevoegen</p>
|
||||
</div>
|
||||
<h1 class="profile-username">[gebruikersnaam]</h1>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,88 +1,125 @@
|
||||
<div class="content">
|
||||
<div class="settings">
|
||||
<form class="settings-profile platform">
|
||||
<h5>Profiel Instllingen</h5>
|
||||
<label for="first-name">Voornaam</label>
|
||||
<input type="text"
|
||||
name="first-name"
|
||||
id="first-name"
|
||||
placeholder="Voornaam"
|
||||
title="Voornaam"
|
||||
><br />
|
||||
<label for="last-name">Achternaam</label>
|
||||
<input type="text"
|
||||
name="last-name"
|
||||
id="last-name"
|
||||
placeholder="Lastname"
|
||||
><br />
|
||||
<label for="place">Woonplaats</label>
|
||||
<input type="text"
|
||||
name="place"
|
||||
id="place"
|
||||
placeholder="Woonplaats"
|
||||
><br />
|
||||
<label for="bday">Geboortedatum</label>
|
||||
<input type="date"
|
||||
name="bday"
|
||||
id="bday"
|
||||
placeholder="01/01/1900"
|
||||
><br />
|
||||
<label for="location">Locatie</label>
|
||||
<input type="text"
|
||||
name="location"
|
||||
id="location"
|
||||
placeholder="Locatie"
|
||||
><br />
|
||||
<label for="bio">Bio</label>
|
||||
<textarea name="bio"
|
||||
rows="5"
|
||||
cols="10"
|
||||
title="bio"
|
||||
id="bio"
|
||||
></textarea>
|
||||
<br />
|
||||
|
||||
<label></label>
|
||||
<input type="submit"
|
||||
value="Opslaan"
|
||||
>
|
||||
<h5>Profiel Instellingen</h5>
|
||||
<ul>
|
||||
<li>
|
||||
<label for="first-name">Voornaam</label>
|
||||
<input type="text"
|
||||
name="first-name"
|
||||
id="first-name"
|
||||
placeholder="Voornaam"
|
||||
title="Voornaam"
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<label for="last-name">Achternaam</label>
|
||||
<input type="text"
|
||||
name="last-name"
|
||||
id="last-name"
|
||||
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"
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<label for="location">Locatie</label>
|
||||
<input type="text"
|
||||
name="location"
|
||||
id="location"
|
||||
placeholder="Locatie"
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<label for="bio">Bio</label>
|
||||
<textarea name="bio"
|
||||
rows="5"
|
||||
title="bio"
|
||||
id="bio"
|
||||
></textarea>
|
||||
</li>
|
||||
<li>
|
||||
<label></label>
|
||||
<input type="submit"
|
||||
value="Opslaan"
|
||||
>
|
||||
</li>
|
||||
</ul>
|
||||
</form>
|
||||
|
||||
|
||||
<form class="settings-password platform" method="post">
|
||||
<form class="settings-password platform item-box" method="post">
|
||||
<h5>Verander Wachtwoord</h5>
|
||||
<br />
|
||||
<input type="password"
|
||||
name="password-old"
|
||||
placeholder="Oud wachtwoord"
|
||||
><br />
|
||||
<input type="password"
|
||||
name="password-new"
|
||||
placeholder="Nieuw wachtwoord"
|
||||
><br />
|
||||
<input type="password"
|
||||
name="password-confirm"
|
||||
placeholder="Bevestig wachtwoord"
|
||||
><br />
|
||||
<input type="submit"
|
||||
value="Verander wachtwoord"
|
||||
>
|
||||
<ul>
|
||||
<li>
|
||||
<label>Oud wachtwoord</label>
|
||||
<input type="password"
|
||||
name="password-old"
|
||||
placeholder="Oud wachtwoord"
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<label>Nieuw wachtwoord</label>
|
||||
<input type="password"
|
||||
name="password-new"
|
||||
placeholder="Nieuw wachtwoord"
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<label>Bevestig wachtwoord</label>
|
||||
<input type="password"
|
||||
name="password-confirm"
|
||||
placeholder="Bevestig wachtwoord"
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<label></label>
|
||||
<input type="submit"
|
||||
value="Verander wachtwoord"
|
||||
>
|
||||
</li>
|
||||
</ul>
|
||||
</form>
|
||||
|
||||
<form class="settings-email platform" method="post">
|
||||
<form class="settings-email platform item-box" method="post">
|
||||
<h5>Verander Email</h5>
|
||||
<br />
|
||||
<input type="email"
|
||||
name="email"
|
||||
placeholder="Nieuw Email-adres"
|
||||
><br />
|
||||
<input type="email"
|
||||
name="email-confirm"
|
||||
placeholder="Bevestig Email"
|
||||
><br />
|
||||
<input type="submit"
|
||||
value="Verander Email"
|
||||
>
|
||||
<ul>
|
||||
<li>
|
||||
<label for="email">Nieuw Email</label>
|
||||
<input type="email"
|
||||
name="email"
|
||||
id="email"
|
||||
placeholder="Nieuw Email"
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<label for="email-confirm">Bevestig Email</label>
|
||||
<input type="email"
|
||||
name="email-confirm"
|
||||
id="email-confirm"
|
||||
placeholder="Bevestig Email"
|
||||
>
|
||||
</li>
|
||||
<li>
|
||||
<label></label>
|
||||
<input type="submit"
|
||||
value="Verander Email"
|
||||
>
|
||||
</li>
|
||||
</ul>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user