Merge branch 'master' into kevin-prototype
This commit is contained in:
Kevin Nobel
5
.gitignore
vendored
5
.gitignore
vendored
@@ -10,7 +10,10 @@
|
|||||||
|
|
||||||
|
|
||||||
# User-specific stuff:
|
# User-specific stuff:
|
||||||
/.idea/*
|
.idea/workspace.xml
|
||||||
|
.idea/tasks.xml
|
||||||
|
.idea/deployment.xml
|
||||||
|
.idea/webServers.xml
|
||||||
|
|
||||||
# Sensitive or high-churn files:
|
# Sensitive or high-churn files:
|
||||||
.idea/dataSources/
|
.idea/dataSources/
|
||||||
|
|||||||
@@ -1,21 +1,145 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<?php
|
<head>
|
||||||
include("views/head.php");
|
<link rel="stylesheet" type="text/css" href="styles/index.css">
|
||||||
?>
|
<meta charset="utf-8">
|
||||||
<body>
|
<title>MyHyvesbook+</title>
|
||||||
<?php
|
</head>
|
||||||
/*
|
<body>
|
||||||
* This view adds the main layout over the screen.
|
<div>
|
||||||
* Header and menu.
|
<img style="width:50%;margin-left:25%" src="img/top-logo.png" alt="MyHyvesbook+">
|
||||||
*/
|
</div>
|
||||||
include("views/main.php");
|
|
||||||
|
|
||||||
/* Add your view files here. */
|
<form action="../profile.php/" method="post">
|
||||||
include("views/homepage.php");
|
<h1>Welkom </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. */
|
<div class="containercenter">
|
||||||
include("views/footer.php");
|
<label><b>Wachtwoord</b></label>
|
||||||
?>
|
<input type="password" placeholder="Voer je wachtwoord in" name="psw"
|
||||||
</body>
|
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">×</span>
|
||||||
|
|
||||||
|
<!-- Register Content -->
|
||||||
|
<form class="modal-content animate" action="../profile.php/" 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" name="confirmpassword"
|
||||||
|
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" id="confirmpassword"
|
||||||
|
title="Herhaal wachtwoord" 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" id="email"
|
||||||
|
title="Voer een geldige email in" required>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
<label><b>Herhaal email</b></label>
|
||||||
|
<input type="email" placeholder="Herhaal email" id="confirmemail"
|
||||||
|
title="Herhaal je email" required>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
<input type="submit" value="Registreer je account" name="Submit" id="frm1_submit" />
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
</html>
|
</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 email1 = document.getElementById("email").value;
|
||||||
|
var email2 = document.getElementById("confirmemail").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")
|
||||||
|
}
|
||||||
|
if (email != email2){
|
||||||
|
document.getElementById("email").style.borderColor = "red";;
|
||||||
|
document.getElementById("confirmemail").style.borderColor = "red";;
|
||||||
|
ok = false;
|
||||||
|
confirmemail.setCustomValidity("Email match niet")
|
||||||
|
}
|
||||||
|
return matching;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|||||||
21
website/search.php
Normal file
21
website/search.php
Normal 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/search-view.php");
|
||||||
|
|
||||||
|
/* This adds the footer. */
|
||||||
|
include("views/footer.php");
|
||||||
|
?>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
135
website/styles/index.css
Normal file
135
website/styles/index.css
Normal 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)}
|
||||||
|
}
|
||||||
@@ -41,6 +41,13 @@ body {
|
|||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.platform {
|
||||||
|
padding: 20px;
|
||||||
|
border-radius: 10px;
|
||||||
|
background-color: #FFFFFF;
|
||||||
|
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
|
||||||
|
}
|
||||||
|
|
||||||
::selection {
|
::selection {
|
||||||
background: #845663;
|
background: #845663;
|
||||||
color: white;
|
color: white;
|
||||||
@@ -120,7 +127,7 @@ td {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Custom title box, appears instantaneously */
|
/* Custom title box, appears instantaneously */
|
||||||
a:hover, img:hover, span:hover, div:hover {
|
a[data-title]:hover, img[data-title]:hover, span[data-title]:hover, div[data-title]:hover {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
21
website/template.php
Normal file
21
website/template.php
Normal 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>
|
||||||
@@ -3,15 +3,15 @@
|
|||||||
<a href="profile.php"><img src="img/top-logo.png" alt="MyHyvesbook+" /></a>
|
<a href="profile.php"><img src="img/top-logo.png" alt="MyHyvesbook+" /></a>
|
||||||
</div>
|
</div>
|
||||||
<div id="header-search">
|
<div id="header-search">
|
||||||
<form action="php/search.php" method="get">
|
<form action="search.php" method="get">
|
||||||
<input type="text" placeholder="search people, friends and pages" />
|
<input name="search" type="text" placeholder="search people, friends and pages" />
|
||||||
<input type="submit" value="Zoek"/>
|
<input type="submit" value="Zoek"/>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="right profile-menu">
|
<div class="right profile-menu">
|
||||||
<div id="profile-menu-popup">
|
<div id="profile-menu-popup">
|
||||||
<a href="#"><span style="color: red;" class="fa fa-sign-out" data-title="Uitloggen"></span></a> |
|
<a href="login.php"><span style="color: red;" class="fa fa-sign-out" data-title="Uitloggen"></span></a> |
|
||||||
<a href="#"><span style="color: blue;" class="fa fa-cog" data-title="Instellingen"></span></a> |
|
<a href="setting.php"><span style="color: blue;" class="fa fa-cog" data-title="Instellingen"></span></a> |
|
||||||
<a href="profile.php"><span style="color: green;" class="fa fa-user" data-title="Profiel"></span></a>
|
<a href="profile.php"><span style="color: green;" class="fa fa-user" data-title="Profiel"></span></a>
|
||||||
</div>
|
</div>
|
||||||
<div id="profile-hello-popup">
|
<div id="profile-hello-popup">
|
||||||
|
|||||||
5
website/views/search-view.php
Normal file
5
website/views/search-view.php
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
<div class="content">
|
||||||
|
<div class="platform">
|
||||||
|
Hey
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
Reference in New Issue
Block a user