From 6385324b13860641a7b9010e89dd8a79e31df06c Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Tue, 17 Jan 2017 14:16:17 +0100 Subject: [PATCH] The menu now backend supported It loads the friends and groups of userID 2 by default (only if there is no session userID set --- website/public/js/menu.js | 1 + website/public/template_sql.php | 1 - website/queries/friendship.php | 5 +- website/queries/group_member.php | 21 ++++ website/views/head.php | 2 +- website/views/menu.php | 185 ++++++++++++++++--------------- 6 files changed, 120 insertions(+), 95 deletions(-) create mode 100644 website/queries/group_member.php 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/views/head.php b/website/views/head.php index 94ad215..da8929a 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -14,6 +14,6 @@ \ No newline at end of file diff --git a/website/views/menu.php b/website/views/menu.php index bf8b1d7..3506aad 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -4,64 +4,54 @@ Vrienden
@@ -69,44 +59,57 @@ Groepen