Merge branch 'joey-testing' into 'master'

Joey testing

See merge request !13
This commit was merged in pull request #17.
This commit is contained in:
Marijn Jansen
2017-01-11 15:55:05 +01:00
3 changed files with 278 additions and 16 deletions

View File

@@ -1,21 +1,127 @@
<!DOCTYPE html>
<html>
<?php
include("views/head.php");
?>
<head>
<link rel="stylesheet" type="text/css" href="styles/index.css">
<meta charset="utf-8">
<title>MyHyvesbook+</title>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header and menu.
*/
include("views/main.php");
<div>
<img style="width:50%;margin-left:25%" src="Logo.png" alt="MyHyvesbook+">
</div>
/* Add your view files here. */
include("views/homepage.php");
<form action="../~lars/" method="post">
<h1>Welkom bij MyHyvesbook+</h1>
<div class="containercenter">
<label><b>Gebruikersnaam</b></label>
<input type="text" placeholder="Voer je gebruikersnaam in" name="uname"
pattern=".{6,}" title="Moet zes of meer karakters zijn" required>
</div>
/* This adds the footer. */
include("views/footer.php");
?>
<div class="containercenter">
<label><b>Wachtwoord</b></label>
<input type="password" placeholder="Voer je wachtwoord in" name="psw"
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}"
title="Moet miniaal 1 cijfer, 1 hoofdletter en kleine letter hebben en minstens 8 of meer karakters zijn" required>
</div>
<div class="containercenter">
<input type="submit" value="Login" name="Submit" id="frm1_submit" />
</div>
</form>
<div class="containercenter">
<button onclick="document.getElementById('id01').style.display='block'">Registreer</button>
</div>
<div class="container">
<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="../~lars/" onsubmit="return passwordfunction()" method="post">
<h2>Registreer je account</h2>
<div class="container">
<label><b>Naam</b></label>
<input type="text" placeholder="Voer je naam in" name="name"
pattern="[A-Za-z]{1,}" title="Moet alleen letters zijn" required>
</div>
<div class="container">
<label><b>Achternaam</b></label>
<input type="text" placeholder="Voer je achternaam in" name="surname"
pattern="[A-Za-z]{1,}" title="Moet alleen letters zijn" required>
</div>
<div class="container">
<label><b>Gebruikersnaam</b></label>
<input type="text" placeholder="Voer je gebruikersnaam in" name="username"
pattern=".{6,}" title="Moet meer dan 6 karakers zijn" required>
</div>
<div class="container">
<label><b>Wachtwoord</b></label>
<input type="password" placeholder="Voer je wachtwoord in" name="password"
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" id="password"
title="Moet miniaal 1 cijfer, 1 hoofdletter en kleine letter hebben en minstens 8 of meer karakters zijn" required>
</div>
<div class="container">
<label><b>Herhaal wachtwoord</b></label>
<input type="password" placeholder="Herhaal wachtwoord"
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" id="confirmpassword"
title="Wachtwoord matchen niet" required>
</div>
<div class="container">
<label><b>Straatnaam</b></label>
<input type="text" placeholder="Voer jouw straatnaam in" name="name"
pattern="[A-Za-z]{1,}" title="Moet alleen letters zijn" required>
</div>
<div class="container">
<label><b>Straatnummer</b></label>
<input type="text" placeholder="Voer jouw straatnummer in" name="name"
pattern="[1-9][0-9]{0,}" title="Moet alleen nummers zijn" required>
</div>
<div class="container">
<label><b>Email</b></label>
<input type="email" placeholder="Voer je email in" title="Voer een geldige email in">
<div class="container">
<input type="submit" value="Registreer je account" name="Submit" id="frm1_submit" />
</div>
</form>
</div>
</div>
</body>
</html>
<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 matching = true;
if (password1 != password2) {
document.getElementById("password").style.borderColor = "red";;
document.getElementById("confirmpassword").style.borderColor = "red";;
ok = false;
confirmpassword.setCustomValidity("Wachwoord match niet")
}
return matching;
}
</script>

135
website/styles/index.css Normal file
View File

@@ -0,0 +1,135 @@
/* Body */
body {
background-color: #B78996;
}
/* Bordered form */
form {
background-color: #a87a87;
border: 5px solid #325da3;
border-radius: 12px;
height: 50%;
margin: auto;
width: 45%;
}
h1 {
padding: 16px;
text-align: center;
}
h2 {
padding: 16px;
text-align: left;
}
label {
display: block;
}
/* Full-width inputs */
input[type=text], input[type=password], input[type=email] {
border-radius: 12px;
border: 5px solid #ccc;
box-sizing: border-box;
display: inline-block;
height: 50%;
padding: 12px 20px;
margin: 8px 0;
width: 50%;
}
input[type=submit]{
background-color: #845663;
border: 2px solid black;
border-radius: 12px;
color: white;
cursor: pointer;
height: 50%;
margin: 8px 0;
padding: 14px 20px;
width: 50%;
}
/* Set a style for all buttons */
button {
background-color: #845663;
border: 2px solid black;
border-radius: 12px;
color: white;
cursor: pointer;
height: 50%;
margin: 8px 0;
padding: 14px 20px;
width: 25%;
}
/* Add padding to containers */
.container {
padding: 16px;
text-align: left;
}
.containercenter {
padding: 16px;
text-align: center;
}
/* The Modal (background) */
.modal {
background-color: rgb(0,0,0); /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
display: none; /* Hidden by default */
height: 100%;
left: 0;
margin: auto;
overflow: auto; /* Enable scroll if needed */
padding-top: 60px;
position: fixed; /* Stay in place */
top: 0;
width: 100%; /* Full width */
z-index: 1; /* Sit on top */
}
/* Modal Content/Box */
.modal-content {
background-color: #B78996;
border: 5px solid #325da3;
margin: 5px auto; /* 15% from the top and centered */
overflow-y: auto;
width: 50% /* Could be more or less, depending on screen size */
}
/* The Close Button */
.close {
/* Position it in the top right corner outside of the modal */
color: white;
font-size: 100px;
font-weight: bold;
position: absolute;
right: 25px;
top: 0;
}
/* Close button on hover */
.close:hover,
.close:focus {
color: red;
cursor: pointer;
}
/* Add Zoom Animation */
.animate {
animation: animatezoom 0.6s
-webkit-animation: animatezoom 0.6s;
}
@-webkit-keyframes animatezoom {
from {-webkit-transform: scale(0)}
to {-webkit-transform: scale(1)}
}
@keyframes animatezoom {
from {transform: scale(0)}
to {transform: scale(1)}
}

21
website/template.php Normal file
View File

@@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<?php
include("views/head.php");
?>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header and menu.
*/
include("views/main.php");
/* Add your view files here. */
include("views/homepage.php");
/* This adds the footer. */
include("views/footer.php");
?>
</body>
</html>