diff --git a/website/public/img/notbad.jpg b/website/public/img/notbad.jpg new file mode 100644 index 0000000..eeea126 Binary files /dev/null and b/website/public/img/notbad.jpg differ diff --git a/website/public/js/menu.js b/website/public/js/menu.js index 56eab9b..d4471eb 100644 --- a/website/public/js/menu.js +++ b/website/public/js/menu.js @@ -1,5 +1,6 @@ $(document).ready(function() { $(".extra-menu-items").hide(); + $("#menu-back").hide(); // Show more friends $("#more-friends-click").click(function() { diff --git a/website/public/template_sql.php b/website/public/template_sql.php index 3ef5b97..b918f6a 100644 --- a/website/public/template_sql.php +++ b/website/public/template_sql.php @@ -4,7 +4,6 @@ query(" + SELECT + `group_page`.`name`, + `group_page`.`picture` + FROM + `group_page` + INNER JOIN + `group_member` + WHERE + `group_member`.`userID` = $userID AND + `group_member`.`groupID` = `group_page`.`groupID` AND + `group_page`.`status` != 0 + "); +} + + + +?> \ No newline at end of file diff --git a/website/queries/group_page.php b/website/queries/group_page.php new file mode 100644 index 0000000..d8bab8f --- /dev/null +++ b/website/queries/group_page.php @@ -0,0 +1,56 @@ +query(" + SELECT + `group_page`.`name`, + `group_page`.`picture`, + `group_page`.`description`, + `group_page`.`status`, + `group_page`.`creationdate` + FROM + `group_page` + WHERE + `group_page`.`groupID` = $groupID + "); +} + +function select20GroupsFromN($db, $n) { + return $db->query(" + SELECT + `group_page`.`groupID`, + `group_page`.`name`, + `group_page`.`picture`, + `group_page`.`description`, + `group_page`.`status`, + `group_page`.`creationdate` + FROM + `group_page` + ORDER BY + `group_page`.`name` ASC + LIMIT + $n, 20 + "); +} + +function select20GroupsByStatusFromN($db, $n, $status) { + return $db->query(" + SELECT + `group_page`.`groupID`, + `group_page`.`name`, + `group_page`.`picture`, + `group_page`.`description`, + `group_page`.`status`, + `group_page`.`creationdate` + FROM + `group_page` + WHERE + `group_page`.`status` = $status + ORDER BY + `group_page`.`name` ASC + LIMIT + $n, 20 + "); +} + +?> \ No newline at end of file diff --git a/website/views/menu.php b/website/views/menu.php index bf8b1d7..5486cd6 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -4,64 +4,54 @@ Vrienden
@@ -69,44 +59,57 @@ Groepen