Marijn button #99

Merged
11166932 merged 152 commits from marijn-button into master 2017-01-23 13:25:08 +01:00
57 changed files with 966 additions and 694 deletions
Showing only changes of commit 3a9b851009 - Show all commits

10
.idea/WebDB.iml generated
View File

@@ -14,15 +14,5 @@
</SOURCES> </SOURCES>
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library">
<library name="PHP" type="php">
<CLASSES>
<root url="file:///usr/share/php" />
</CLASSES>
<SOURCES>
<root url="file:///usr/share/php" />
</SOURCES>
</library>
</orderEntry>
</component> </component>
</module> </module>

View File

@@ -1,21 +0,0 @@
<!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/adminpanel.php");
/* This adds the footer. */
include("views/footer.php");
?>
</body>
</html>

View File

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

View File

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

View File

@@ -1,158 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<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="js/dobPicker.min.js"></script>
<meta charset="utf-8">
<title>MyHyvesbook+</title>
</head>
<body>
<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">&times;</span>
<!-- Register Content -->
<form class="modal-content animate" action="../profile.php" onsubmit="return passwordfunction()" 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"
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"
pattern="[A-Za-z]{1,}" title="Mag alleen letters bevatten" required>
</div>
<div class="login_containerregister">
<label><b>Geboortedatum</b></label>
<!-- These are the select elements we will target -->
<select id="dobday" title="Voer een dag in" ></select>
<select id="dobmonth" title="Voer een maand in" required></select>
<select id="dobyear" title="Voer een jaar in" required></select>
<!-- And here's the library being called! -->
<script>
$(document).ready(function() {
$.dobPicker({
daySelector: '#dobday',
monthSelector: '#dobmonth',
yearSelector: '#dobyear',
dayDefault: 'Dag',
monthDefault: 'Maand',
yearDefault: 'Jaar',
minimumAge: 12,
maximumAge: 80
});
});
</script>
</div>
<div class="login_containerregister">
<label><b>Gebruikersnaam</b></label>
<input type="text" placeholder="Voer uw gebruikersnaam in" name="username"
pattern=".{6,}" title="Moet minstens 6 karakters bevatten" required>
</div>
<div class="login_containerregister">
<label><b>Wachtwoord</b></label>
<input type="password" placeholder="Voer uw wachtwoord in" name="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>
</div>
<div class="login_containerregister">
<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="login_containerregister">
<label><b>Straatnaam</b></label>
<input type="text" placeholder="Voer uw straatnaam in" name="name"
pattern="[A-Za-z]{1,}" title="Mag alleen letters bevatten" required>
</div>
<div class="login_containerregister">
<label><b>Straatnummer</b></label>
<input type="text" placeholder="Voer uw straatnummer in" name="name"
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" 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>
$("#default-settings").birthdayPicker();
</script>
</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 passwordmatching = true;
if (password1 != password2) {
document.getElementById("password").style.borderColor = "red";
document.getElementById("confirmpassword").style.borderColor = "red";
passwordmatching = false;
confirmpassword.setCustomValidity("Wachtwoorden matchen niet")
}
return passwordmatching;
}
</script>

View File

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

24
website/public/admin.php Normal file
View File

@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<?php include("../views/head.php"); ?>
<style>
@import url("styles/adminpanel.css");
</style>
</head>
<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/adminpanel.php");
/* This adds the footer. */
include("../views/footer.php");
?>
</body>
</html>

24
website/public/chat.php Normal file
View File

@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<?php include("../views/head.php"); ?>
<style>
@import url("styles/chat.css");
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header, menu, footer.
*/
include("../views/main.php");
/* Add your view files here. */
include("../views/chat-view.php");
/* This adds the footer. */
include("../views/footer.php");
?>
</body>
</html>

View File

Before

Width:  |  Height:  |  Size: 434 KiB

After

Width:  |  Height:  |  Size: 434 KiB

24
website/public/group.php Normal file
View File

@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<?php include("../views/head.php"); ?>
<style>
@import url("styles/profile.css");
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header, menu, footer.
*/
include("../views/main.php");
/* Add your view files here. */
include("../views/group.php");
/* This adds the footer. */
include("../views/footer.php");
?>
</body>
</html>

View File

Before

Width:  |  Height:  |  Size: 676 B

After

Width:  |  Height:  |  Size: 676 B

View File

Before

Width:  |  Height:  |  Size: 526 B

After

Width:  |  Height:  |  Size: 526 B

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

5
website/public/index.php Normal file
View File

@@ -0,0 +1,5 @@
<html>
<head>
<meta http-equiv="refresh" content="0; url=login.php" />
</head>
</html>

14
website/public/login.php Normal file
View File

@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<?php
include("../views/login_head.php");
?>
<body>
<?php
/*
* This view adds login view
*/
include("../views/login-view.php");
?>
</body>
</html>

View File

@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<?php include("../views/head.php"); ?>
<style>
@import url("styles/profile.css");
</style>
</head>
<body>
<?php
/*
* This view adds the main layout over the screen.
* Header, menu, footer.
*/
include("../views/main.php");
/* Add your view files here. */
include("../views/profile.php");
/* This adds the footer. */
include("../views/footer.php");
?>
</body>
</html>

24
website/public/search.php Normal file
View File

@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<?php include("../views/head.php"); ?>
<style>
@import url("styles/search.css");
</style>
</head>
<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>

View File

@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<?php include("../views/head.php"); ?>
<style>
@import url("styles/settings.css");
</style>
</head>
<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/settings-view.php");
/* This adds the footer. */
include("../views/footer.php");
?>
</body>
</html>

View File

@@ -3,7 +3,6 @@
position: fixed; position: fixed;
top: 80px; top: 80px;
left: 256px; left: 256px;
text-align: center;
padding: 15px 0; padding: 15px 0;
width: calc(100% - 256px); width: calc(100% - 256px);
height: calc(100% - 120px); height: calc(100% - 120px);
@@ -12,32 +11,14 @@
.chat-left { .chat-left {
width: 256px; width: 256px;
height: 100%; height: calc(100% - 100px);
margin-left: 10px; margin: 0 10px;
margin-right: 10px;
display: inline-flex;
}
.chat-recent, .chat-history {
width: 100%;
}
/* List of chats. */
.chat-recent {
height: 600px;
overflow-y: auto; overflow-y: auto;
padding: 10px;
text-align: left;
}
.chat-conversation {
margin: 5px;
} }
.chat-right { .chat-right {
width: calc(100% - 256px - 40px); width: calc(100% - 256px - 40px);
height: calc(100% - 80px); height: calc(100% - 80px);
vertical-align: bottom;
margin-right: 10px; margin-right: 10px;
} }
@@ -45,9 +26,10 @@
.chat-history { .chat-history {
overflow-y: auto; overflow-y: auto;
height: 100%; height: 100%;
padding: 0 0 10px 0; padding: 10px;
} }
/* Chat-message takes the whole width of the chat area */
.chat-message { .chat-message {
width: 100%; width: 100%;
min-height: 40px; min-height: 40px;
@@ -56,9 +38,8 @@
} }
.chat-message-self, .chat-message-other { .chat-message-self, .chat-message-other {
text-align: left;
border-radius: 20px; border-radius: 20px;
padding: 10px 12px; padding: 10px;
max-width: 45%; max-width: 45%;
} }
@@ -79,7 +60,6 @@
.chat-field { .chat-field {
width: 100%; width: 100%;
padding: 15px 0;
display: table; display: table;
} }
@@ -95,8 +75,8 @@
.chat-field input[type="text"] { .chat-field input[type="text"] {
width: 100%; width: 100%;
border-top-left-radius: 10px; border: none;
border-bottom-left-radius: 10px; border-radius: 10px 0 0 10px;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
} }
@@ -106,7 +86,6 @@
background-color: #845663; background-color: #845663;
color: white; color: white;
padding: 5px 10px; padding: 5px 10px;
border-top-right-radius: 10px; border-radius: 0 10px 10px 0;
border-bottom-right-radius: 10px;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
} }

File diff suppressed because one or more lines are too long

View File

@@ -9,4 +9,5 @@ footer p {
padding: 5px; padding: 5px;
font-size: 14px; font-size: 14px;
color: #dddddd;
} }

View File

@@ -8,7 +8,7 @@ header {
width: 100%; width: 100%;
color: white; color: white;
background-color: #845663; background-color: rgba(132,86,99, 0.98);
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
} }
@@ -25,19 +25,11 @@ header {
padding-left: 48px; padding-left: 48px;
} }
#header-search input[type="text"] {
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
#header-search input[type="submit"] { #header-search input {
background: none; border: none;
color: white;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
} }
header div { header div {
display: inline-block; display: inline-block;
} }

View File

@@ -1,6 +1,88 @@
::selection {
background: #845663;
color: white;
}
::-moz-selection {
background: #845663;
color: white;
}
a, a:link, a:visited, a:hover, a:active {
color: inherit;
text-decoration: none;
}
a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after,
div[data-title]:hover:after{
content: attr(data-title);
padding: 4px 4px;
color: #FFFFFF;
position: absolute;
left: 0;
top: 100%;
z-index: 20;
white-space: nowrap;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-box-shadow: 0px 0px 4px #222;
-webkit-box-shadow: 0px 0px 4px #222;
box-shadow: 0px 0px 4px #222;
background-color: #333;
font-size: 15px;
line-height: normal;
font-family: Arial, sans-serif;
}
/* Add Zoom Animation */
.animate {
animation: animatezoom 0.6s
-webkit-animation: animatezoom 0.6s;
}
/* Body */ /* Body */
body { body {
background-color: #B78996; height: 100%;
background-color: #B78996;
color: #333;
font-family: Arial, sans-serif;
}
/* stijl voor alle 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%;
font-family: Arial;
font-size: 16px;
}
/* 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;
} }
/* inlogform */ /* inlogform */
@@ -17,77 +99,57 @@ form {
h1 { h1 {
padding: 16px; padding: 16px;
text-align: center; text-align: center;
font-size: 2.2em;
} }
/* registreer titel*/ /* registreer titel*/
h2 { h2 {
padding: 16px; padding: 16px;
text-align: left; text-align: left;
font-size: 2.0em;
}
input[type=text], input[type=password], input[type=email], input[type="date"] {
border-radius: 12px;
border: 5px solid #ccc;
box-sizing: border-box;
display: inline-block;
height: 50%;
padding: 12px 20px;
margin: 8px 0;
width: 50%;
font-family: Arial;
font-size: 16px;
}
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%;
font-family: Arial;
font-size: 16px;
} }
/* text */
label { label {
display: block; display: block;
} }
/* datepicker */
select {
border-radius: 12px;
border: 5px solid #ccc;
box-sizing: border-box;
display: inline-block;
height: 50%;
padding: 12px 20px;
margin: 8px 0;
width: 15%;
}
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%;
}
/* stijl voor alle 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%;
}
/* padding voor registreer container */ /* padding voor registreer container */
.login_containerregister { .login_containerregister {
padding: 16px; padding: 16px;
text-align: left; text-align: left;
} }
/* padding voor login_containers */ /* padding voor login_containers */
.login_containerlogin { .login_containerlogin {
padding: 16px; padding: 16px;
text-align: center; text-align: center;
} }
/* The Modal (background) */ /* The Modal (background) */
@@ -116,28 +178,23 @@ button {
height: 80%; height: 80%;
} }
/* The Close Button */ @keyframes animatezoom {
.close { from {transform: scale(0)}
/* Position it in the top right corner outside of the modal */ to {transform: scale(1)}
color: white;
font-size: 100px;
font-weight: bold;
position: absolute;
right: 25px;
top: 0;
} }
/* Close button on hover */ /* datepicker */
.close:hover, select {
.close:focus { border-radius: 12px;
color: red; border: 5px solid #ccc;
cursor: pointer; box-sizing: border-box;
} display: inline-block;
height: 50%;
/* Add Zoom Animation */ padding: 12px 20px;
.animate { margin: 8px 0;
animation: animatezoom 0.6s width: 18%;
-webkit-animation: animatezoom 0.6s; font-family: Arial;
font-size: 16px;
} }
@-webkit-keyframes animatezoom { @-webkit-keyframes animatezoom {
@@ -145,7 +202,7 @@ button {
to {-webkit-transform: scale(1)} to {-webkit-transform: scale(1)}
} }
@keyframes animatezoom { ul {
from {transform: scale(0)} font-family: Arial;
to {transform: scale(1)} font-size: 16px;
} }

View File

@@ -1,64 +1,10 @@
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
Default Stylesheet Default Stylesheet
last update: 10-01-2017 last update: 13-01-2017
Website: myhyvesbookplus.tk Website: myhyvesbookplus.tk
-----------------------------------------------------------------------------*/ -----------------------------------------------------------------------------*/
.profile-picture {
border-radius: 50%;
height: 42px;
width: 42px;
object-fit: cover;
vertical-align: middle;
}
.group-picture {
border-radius: 5px;
height: 42px;
width: 42px;
object-fit: cover;
vertical-align: middle;
}
html {
height: 100%;
}
body {
height: 100%;
background-color: #B78996;
color: #333;
font-family: Arial, sans-serif;
}
.content {
padding: 20px;
margin-top: 80px;
margin-left: 256px;
min-height: 100%;
}
.platform {
padding: 20px;
margin-bottom: 10px;
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 {
background: #845663;
color: white;
}
::-moz-selection {
background: #845663;
color: white;
}
/* Remove padding and margin */ /* Remove padding and margin */
* { * {
margin: 0; margin: 0;
@@ -66,19 +12,15 @@ body {
border: 0; border: 0;
} }
/* Move element down (clear), below floating elements */ html {
.clear { height: 100%;
clear: both;
} }
/* Float element to the left side of its containing block */ body {
.right { height: 100%;
float: right; background-color: #B78996;
} color: #333;
font-family: Arial, sans-serif;
/* Float element to the left side of its containing block */
.left {
float: left;
} }
/* Font sizes */ /* Font sizes */
@@ -110,23 +52,101 @@ p {
font-size: 1.2em; font-size: 1.2em;
} }
/* Selection colors */
::selection {
background: #845663;
color: white;
}
::-moz-selection {
background: #845663;
color: white;
}
/* All content underneath the menu */
.content {
padding: 20px;
margin-top: 80px;
margin-left: 256px;
min-height: 100%;
}
/* White boxes (squares) */
.platform {
padding: 20px;
margin-bottom: 10px;
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);
}
.profile-picture, .group-picture {
height: 42px;
width: 42px;
object-fit: cover;
vertical-align: middle;
}
.profile-picture {
border-radius: 50%;
}
.group-picture {
border-radius: 5px;
}
.item-box, .item-box-full-width {
margin: 20px 0 0 0;
padding: 25px;
background-color: #FFFFFF;
}
.item-box {
width: calc(50% - 60px);
}
@media only screen and (max-width: 900px) {
.item-box {
width: calc(100% - 50px);
}
}
.item-box-full-width {
width: calc(100% - 50px);
}
/* Move element down (clear), below floating elements */
.clear {
clear: both;
}
/* Float element to the left side of its containing block */
.right {
float: right;
}
/* Float element to the left side of its containing block */
.left {
float: left;
}
/* All links */
a, a:link, a:visited, a:hover, a:active { a, a:link, a:visited, a:hover, a:active {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
} }
/* All buttons, inputfields/selectfields. */
button, input, select { button, input, select {
width: auto; width: auto;
height: 32px; height: 32px;
cursor: pointer; cursor: pointer;
border: none; border: none;
font-family: Arial, sans-serif;
font-size: 16px; font-size: 16px;
border-radius: 7px; border-radius: 7px;
} }
/* All textinput and sections */
textarea, input, select { textarea, input, select {
padding: 0 5px; padding: 0 5px;
background: white; background: white;
@@ -134,11 +154,12 @@ textarea, input, select {
border: 1px solid #845663; border: 1px solid #845663;
border-radius: 7px; border-radius: 7px;
font-size: 16px; font-size: 16px;
} }
button, input[type="submit"], input[type="reset"] { /* All buttons */
button,
input[type="submit"],
input[type="reset"] {
background-color: #845663; background-color: #845663;
color: white; color: white;
padding: 0 10px; padding: 0 10px;
@@ -157,12 +178,17 @@ td {
} }
/* Custom title box, appears instantaneously */ /* Custom title box, appears instantaneously */
a[data-title]:hover, img[data-title]:hover, span[data-title]:hover, div[data-title]:hover { a[data-title]:hover,
img[data-title]:hover,
span[data-title]:hover,
div[data-title]:hover {
position: relative; position: relative;
} }
a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after, a[data-title]:hover:after,
div[data-title]:hover:after{ img[data-title]:hover:after,
span[data-title]:hover:after,
div[data-title]:hover:after {
content: attr(data-title); content: attr(data-title);
padding: 4px 4px; padding: 4px 4px;
color: #FFFFFF; color: #FFFFFF;

View File

@@ -23,4 +23,5 @@
padding: 5px 20px; padding: 5px 20px;
color: #666; color: #666;
font-size: 14px; font-size: 14px;
cursor: pointer;
} }

View File

@@ -14,26 +14,6 @@
padding-top: 50px; padding-top: 50px;
} }
.item-box, .item-box-full-width {
margin: 20px 0 0 0;
padding: 25px;
background-color: #FFFFFF;
}
.item-box {
width: calc(50% - 60px);
}
@media only screen and (max-width: 900px) {
.item-box {
width: calc(100% - 50px);
}
}
.item-box-full-width {
width: calc(100% - 50px);
}
.posts { .posts {
z-index: -1; z-index: -1;
margin-right: 0; margin-right: 0;

View File

@@ -0,0 +1,12 @@
.search-output {
width: calc(50% - 48px);
display: inline-flex;
}
.search-output:nth-child(n) {
display: inline-block;
}
#search-friends-output {
margin-right: 10px;
}

View File

@@ -1,10 +1,22 @@
.settings input, .settings .item-box {
.settings textarea{ display: inline-flex;
}
.settings-password {
margin-right: 15px;
}
.settings li {
margin: 5px; margin: 5px;
} }
.settings textarea {
resize: none;
}
.settings label { .settings label {
width: 125px; width: 175px;
display: inline-block; display: inline-block;
text-align: right; text-align: right;
} }
@@ -13,7 +25,10 @@
.settings input[type="password"], .settings input[type="password"],
.settings input[type="text"], .settings input[type="text"],
.settings input[type="date"], .settings input[type="date"],
.settings input[type="email"], .settings input[type="email"] {
.settings textarea {
width: 200px; width: 200px;
} }
.settings textarea {
width: calc(100% - 350px);
}

View File

@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<?php include("../views/head.php"); ?>
<style>
/*Insert own stylesheet here ;)*/
</style>
</head>
<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>

View File

@@ -1,21 +0,0 @@
<!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>

View File

@@ -1,19 +0,0 @@
<!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/settings-view.php");
/* This adds the footer. */
include("views/footer.php");
?>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

@@ -1,3 +0,0 @@
.search-form input {
border-bottom: #845663 solid 1px;
}

View File

@@ -1,21 +0,0 @@
<!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>

View File

@@ -1,20 +1,15 @@
<div class="content"> <div class="content">
<div class="chat"> <div class="chat">
<div class="chat-left"> <nav class="chat-left left platform chat-recent">
<nav class="chat-recent platform"> <h5>Chats</h5>
<h5>Chats</h5> <a href="#">
<a href="#"><div class="chat-conversation"> <div class="chat-conversation">
<img class="profile-picture" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTDnuRSeeyPve7KwDvJJ6OBzj3gyghwLcE2z9kZeYBOyZavh3mw"> <img class="profile-picture" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTDnuRSeeyPve7KwDvJJ6OBzj3gyghwLcE2z9kZeYBOyZavh3mw">
Rudolf Leslo Rudolf Leslo
</div></a> </div>
<a href="#"><div class="chat-conversation"> </a>
<img class="profile-picture" src=http://www.kpop-map.com/wp-content/uploads/2016/01/sm-rookies-kun-profile.jpg"> </nav>
Henk de Boer <div class="chat-right right">
</div></a>
</nav>
</div>
<div class="chat-right">
<div class="chat-history platform"> <div class="chat-history platform">
<div class="chat-message"> <div class="chat-message">
<div class="chat-message-self">Hi!</div> <div class="chat-message-self">Hi!</div>

View File

@@ -1,3 +1,3 @@
<footer> <footer>
<p>Copyright &copy; 2017 MyHyvesbook+ <span style="float: right">Like ons op Facebook!</span</p> <p>Copyright &copy; 2017 MyHyvesbook+ <span style="float: right">Like ons op Facebook!</span> </p>
</footer> </footer>

View File

@@ -2,7 +2,7 @@
<div class="profile-box platform"> <div class="profile-box platform">
<img class="left group-picture" src="http://i.imgur.com/afjEUx2.jpg"> <img class="left group-picture" src="http://i.imgur.com/afjEUx2.jpg">
<div class="profile-button"> <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> </div>
<h1 class="profile-username">[groepnaam]</h1> <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> <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>

View File

@@ -1,21 +1,14 @@
<head> <meta charset="utf-8">
<meta charset="utf-8"> <title>MyHyvesbook+</title>
<title>MyHyvesbook+</title> <!-- Add your javascript files here. -->
<!-- Add your javascript files here. --> <script src="js/jquery.js"></script>
<script src="js/jquery.js"></script> <script src="js/header.js"></script>
<script src="js/header.js"></script> <script src="js/menu.js"></script>
<script src="js/menu.js"></script> <style>
<style> /* Add your css files here. */
/* Add your css files here. */ @import url("styles/main.css");
@import url("styles/main.css"); @import url("styles/font-awesome.css");
@import url("styles/profile.css"); @import url("styles/header.css");
@import url("styles/font-awesome.css"); @import url("styles/menu.css");
@import url("styles/header.css"); @import url("styles/footer.css");
@import url("styles/menu.css"); </style>
@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>

View File

@@ -4,8 +4,13 @@
</div> </div>
<div id="header-search"> <div id="header-search">
<form action="search.php" method="get"> <form action="search.php" method="get">
<input name="search" type="text" placeholder="zoek naar van alles" /> <input name="search"
<input type="submit" value="Zoek"/> type="text"
placeholder="Zoek naar wat je wil"
required
/>
<input type="submit"
value="Zoek"/>
</form> </form>
</div> </div>
<div class="right profile-menu"> <div class="right profile-menu">

View 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">
&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

@@ -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

View File

@@ -2,7 +2,7 @@
<div class="profile-box platform"> <div class="profile-box platform">
<img class="left profile-picture" src="http://i.imgur.com/afjEUx2.jpg"> <img class="left profile-picture" src="http://i.imgur.com/afjEUx2.jpg">
<div class="profile-button"> <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> </div>
<h1 class="profile-username">[gebruikersnaam]</h1> <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> <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

View File

@@ -1,88 +1,125 @@
<div class="content"> <div class="content">
<div class="settings"> <div class="settings">
<form class="settings-profile platform"> <form class="settings-profile platform">
<h5>Profiel Instllingen</h5> <h5>Profiel Instellingen</h5>
<label for="first-name">Voornaam</label> <ul>
<input type="text" <li>
name="first-name" <label for="first-name">Voornaam</label>
id="first-name" <input type="text"
placeholder="Voornaam" name="first-name"
title="Voornaam" id="first-name"
><br /> placeholder="Voornaam"
<label for="last-name">Achternaam</label> title="Voornaam"
<input type="text" >
name="last-name" </li>
id="last-name" <li>
placeholder="Lastname" <label for="last-name">Achternaam</label>
><br /> <input type="text"
<label for="place">Woonplaats</label> name="last-name"
<input type="text" id="last-name"
name="place" placeholder="Achternaam"
id="place" >
placeholder="Woonplaats" </li>
><br /> <li>
<label for="bday">Geboortedatum</label> <label for="place">Woonplaats</label>
<input type="date" <input type="text"
name="bday" name="place"
id="bday" id="place"
placeholder="01/01/1900" placeholder="Woonplaats"
><br /> >
<label for="location">Locatie</label> </li>
<input type="text" <li>
name="location" <label for="bday">Geboortedatum</label>
id="location" <input type="date"
placeholder="Locatie" name="bday"
><br /> id="bday"
<label for="bio">Bio</label> placeholder="01/01/1900"
<textarea name="bio" >
rows="5" </li>
cols="10" <li>
title="bio" <label for="location">Locatie</label>
id="bio" <input type="text"
></textarea> name="location"
<br /> id="location"
placeholder="Locatie"
<label></label> >
<input type="submit" </li>
value="Opslaan" <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>
<form class="settings-password platform item-box" method="post">
<form class="settings-password platform" method="post">
<h5>Verander Wachtwoord</h5> <h5>Verander Wachtwoord</h5>
<br /> <ul>
<input type="password" <li>
name="password-old" <label>Oud wachtwoord</label>
placeholder="Oud wachtwoord" <input type="password"
><br /> name="password-old"
<input type="password" placeholder="Oud wachtwoord"
name="password-new" >
placeholder="Nieuw wachtwoord" </li>
><br /> <li>
<input type="password" <label>Nieuw wachtwoord</label>
name="password-confirm" <input type="password"
placeholder="Bevestig wachtwoord" name="password-new"
><br /> placeholder="Nieuw wachtwoord"
<input type="submit" >
value="Verander 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>
<form class="settings-email platform" method="post"> <form class="settings-email platform item-box" method="post">
<h5>Verander Email</h5> <h5>Verander Email</h5>
<br /> <ul>
<input type="email" <li>
name="email" <label for="email">Nieuw Email</label>
placeholder="Nieuw Email-adres" <input type="email"
><br /> name="email"
<input type="email" id="email"
name="email-confirm" placeholder="Nieuw Email"
placeholder="Bevestig Email" >
><br /> </li>
<input type="submit" <li>
value="Verander Email" <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> </form>
</div> </div>
</div> </div>