From 21ff896d65dfd75d0d30b5fd7d8555f5da1c6cb0 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Mon, 23 Jan 2017 13:24:13 +0100 Subject: [PATCH 001/216] Fixed css and confirmation for logged in already --- website/public/styles/index.css | 6 +++--- website/views/login_head.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/public/styles/index.css b/website/public/styles/index.css index 4b55904..e128c64 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -13,7 +13,7 @@ a.button { /* Body */ body { - height: 900px; + height: 100%; background-color: #C8CABD; /*background-image: url(http://play.pokemonshowdown.com/fx/client-bg-shaymin.jpg); background-size: cover; @@ -46,7 +46,7 @@ body { form { /*background-color: #a87a87;*/ border-radius: 12px; - height: 80%; + height: 70%; margin: auto; width: 70%; overflow-y:auto; @@ -159,7 +159,7 @@ label { background-repeat: repeat-x; background-attachment: fixed;*/ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); - height: 550px; + height: 500px; margin: 34px auto; overflow-y: auto; padding: 20px; diff --git a/website/views/login_head.php b/website/views/login_head.php index 836a9cc..26d439e 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -7,6 +7,6 @@ - - + + -- 2.49.1 From e6f5044a9ac66a4b295b05a386f1fc29860f4177 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Mon, 23 Jan 2017 16:04:59 +0100 Subject: [PATCH 002/216] add page functionality --- website/public/styles/search.css | 12 ++++++ website/queries/group_page.php | 18 ++++++++ website/queries/user.php | 25 +++++++++++- website/views/search-view.php | 70 ++++++++++++++++++++++++++++---- 4 files changed, 116 insertions(+), 9 deletions(-) diff --git a/website/public/styles/search.css b/website/public/styles/search.css index b54723d..86fd41d 100644 --- a/website/public/styles/search.css +++ b/website/public/styles/search.css @@ -14,4 +14,16 @@ .searchleft, .searchright { display: inline-block; vertical-align: top; +} + +.user-pageselect, .searchleft h4, .group-pageselect, .searchright h4 { + display: inline-block; +} + +.user-pageselect, .group-pageselect { + float: right; +} + +li.search-item:hover{ + background-color: #EEE; } \ No newline at end of file diff --git a/website/queries/group_page.php b/website/queries/group_page.php index d704e8c..9a3461d 100644 --- a/website/queries/group_page.php +++ b/website/queries/group_page.php @@ -194,4 +194,22 @@ function searchSomeGroups($n, $m, $search) { $stmt->execute(); return $stmt; } + +function countSomeGroups($search) { + $stmt = $GLOBALS["db"]->prepare(" + SELECT + COUNT(*) + FROM + `group_page` + WHERE + `name` LIKE :keyword + ORDER BY + `name` + "); + + $search = "%$search%"; + $stmt->bindParam(':keyword', $search); + $stmt->execute(); + return $stmt; +} ?> \ No newline at end of file diff --git a/website/queries/user.php b/website/queries/user.php index 114d673..0af5262 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -273,7 +273,8 @@ function selectRandomNotFriendUser($userID) { return $stmt->fetch(); } -function searchSomeUsers($n, $m, $search) { +function searchSomeUsers($n, $m, $search) +{ $stmt = $GLOBALS["db"]->prepare(" SELECT `username`, @@ -301,3 +302,25 @@ function searchSomeUsers($n, $m, $search) { $stmt->execute(); return $stmt; } + +function countSomeUsers($search) { + $q = $GLOBALS["db"]->prepare(" + SELECT + COUNT(*) + FROM + `user` + WHERE + `username` LIKE :keyword OR + `fname` LIKE :keyword OR + `lname` LIKE :keyword + ORDER BY + `fname`, + `lname`, + `username` + "); + + $search = "%$search%"; + $q->bindParam(':keyword', $search); + $q->execute(); + return $q; +} diff --git a/website/views/search-view.php b/website/views/search-view.php index 0d650d4..ad93659 100644 --- a/website/views/search-view.php +++ b/website/views/search-view.php @@ -1,6 +1,16 @@ fetchColumn(); + +$group_n = ($group_currentpage - 1) * $group_perpage; +$group_count = countSomeGroups($search)->fetchColumn(); ?>
-
+ >

Gebruikers

+ + +