From e36caf46ce66b86b6459f7ad3e287ab417cdbbc3 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Wed, 11 Jan 2017 15:41:27 +0100 Subject: [PATCH 01/11] Added Login page --- website/index.php | 138 ++++++++++++++++++++++++++++++++++++++----- website/template.php | 21 +++++++ 2 files changed, 143 insertions(+), 16 deletions(-) create mode 100644 website/template.php diff --git a/website/index.php b/website/index.php index b594d58..e562eb4 100644 --- a/website/index.php +++ b/website/index.php @@ -1,21 +1,127 @@ - - - + + + MyHyvesbook+ + + +
+ MyHyvesbook+ +
- /* Add your view files here. */ - include("views/homepage.php"); +
+

Welkom bij MyHyvesbook+

+
+ + +
- /* This adds the footer. */ - include("views/footer.php"); - ?> - +
+ + +
+ +
+ +
+
+ +
+ +
+ +
+ + + + + + diff --git a/website/template.php b/website/template.php new file mode 100644 index 0000000..b594d58 --- /dev/null +++ b/website/template.php @@ -0,0 +1,21 @@ + + + + + + + From 392a60baffb76b2155ba80611b8256fff43431f5 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Wed, 11 Jan 2017 15:42:58 +0100 Subject: [PATCH 02/11] Added style for index --- website/styles/index.css | 135 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 website/styles/index.css diff --git a/website/styles/index.css b/website/styles/index.css new file mode 100644 index 0000000..6823115 --- /dev/null +++ b/website/styles/index.css @@ -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)} +} From 1ecf8196de4b93add595dbf19e2d49a46e4e310f Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Wed, 11 Jan 2017 15:46:39 +0100 Subject: [PATCH 03/11] fixed style link --- website/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/index.php b/website/index.php index e562eb4..4d29199 100644 --- a/website/index.php +++ b/website/index.php @@ -1,7 +1,7 @@ - + MyHyvesbook+ From fae353fee3832f6a90d612f3e20dba0b6317674e Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Wed, 11 Jan 2017 16:06:49 +0100 Subject: [PATCH 04/11] Fixed the data-title hover bug --- website/styles/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/styles/main.css b/website/styles/main.css index fb50ae3..0560a25 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -120,7 +120,7 @@ td { } /* 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; } From 05beb054d26991522c25c6e9de9bb14e575fc069 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Wed, 11 Jan 2017 16:13:42 +0100 Subject: [PATCH 05/11] submit links fixed --- website/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/index.php b/website/index.php index 4d29199..ad4654d 100644 --- a/website/index.php +++ b/website/index.php @@ -7,10 +7,10 @@
- MyHyvesbook+ + MyHyvesbook+
-
+

Welkom bij MyHyvesbook+

@@ -40,7 +40,7 @@ class="close" title="Close Modal">× - +

Registreer je account

From 35aa7b240a204c991c8cb6dc720fab905945508d Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 12 Jan 2017 10:10:09 +0100 Subject: [PATCH 06/11] changes --- website/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/index.php b/website/index.php index ad4654d..1a0c8e3 100644 --- a/website/index.php +++ b/website/index.php @@ -7,7 +7,7 @@
- MyHyvesbook+ + MyHyvesbook+
From 93e35704e1a05ed53dd4ca860830dcd77def19d7 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 12 Jan 2017 10:33:48 +0100 Subject: [PATCH 07/11] email matching --- website/index.php | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/website/index.php b/website/index.php index 1a0c8e3..b808caf 100644 --- a/website/index.php +++ b/website/index.php @@ -10,8 +10,8 @@ MyHyvesbook+
- -

Welkom bij MyHyvesbook+

+ +

Welkom

× - +

Registreer je account

@@ -70,9 +70,9 @@
- + title="Herhaal wachtwoord" required>
@@ -89,7 +89,16 @@
- + +
+ +
+ + +
+
@@ -115,13 +124,22 @@ window.onclick = function(event) { 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; } From 1858a0964e2cb80c5aa763ec91e56dd3326e019c Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 10:44:30 +0100 Subject: [PATCH 08/11] Added some .idea files to the gitignore. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index d68555a..b1a2ad1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ # User-specific stuff: .idea/workspace.xml .idea/tasks.xml +.idea/deployment.xml +.idea/webServers.xml # Sensitive or high-churn files: .idea/dataSources/ From 1912e11f76cc4b83020daae356429ee8e1c472b1 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 10:44:58 +0100 Subject: [PATCH 09/11] Added href to the links. Zoek -> search.php Instellingen -> settings.php Uitloggen -> login.php --- website/views/header.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/views/header.php b/website/views/header.php index 45cb2b9..86686a5 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -3,15 +3,15 @@ MyHyvesbook+
- | - | + | + |
From 3505090eb9fb93b64cfd91b9c9a82e317490347d Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 11:20:27 +0100 Subject: [PATCH 10/11] Initial search page and added class platform --- website/search.php | 7 +++++++ website/styles/main.css | 7 +++++++ website/views/search-view.php | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 website/search.php create mode 100644 website/views/search-view.php diff --git a/website/search.php b/website/search.php new file mode 100644 index 0000000..e72081b --- /dev/null +++ b/website/search.php @@ -0,0 +1,7 @@ + Date: Thu, 12 Jan 2017 11:22:30 +0100 Subject: [PATCH 11/11] Real initial search commit --- website/search.php | 28 +++++++++++++++++++++------- website/views/search-view.php | 12 +++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/website/search.php b/website/search.php index e72081b..6a045c3 100644 --- a/website/search.php +++ b/website/search.php @@ -1,7 +1,21 @@ - + + + + + + diff --git a/website/views/search-view.php b/website/views/search-view.php index dec5b7c..4116e31 100644 --- a/website/views/search-view.php +++ b/website/views/search-view.php @@ -1,7 +1,5 @@ - +
+ Hey +
+
\ No newline at end of file