From 1acad8e7654004d840fa6f76fedf214a90cba0e5 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Mon, 30 Jan 2017 15:28:54 +0100 Subject: [PATCH 1/4] modified masonry and posts, masonry is now reusable on group pages. --- website/public/API/getPosts.php | 12 +++-- website/public/API/postComment.php | 2 +- website/public/js/masonry.js | 2 +- website/public/js/post.js | 4 +- website/queries/group_page.php | 3 +- website/queries/post.php | 46 +++++++++++++++++ website/queries/user.php | 82 +++++++++++++++--------------- 7 files changed, 101 insertions(+), 50 deletions(-) diff --git a/website/public/API/getPosts.php b/website/public/API/getPosts.php index eef8261..620a707 100644 --- a/website/public/API/getPosts.php +++ b/website/public/API/getPosts.php @@ -1,13 +1,17 @@ = 150 AND `post`.`content` NOT LIKE 'bindParam(':userID', $userID, PDO::PARAM_INT); + $stmt->bindParam(':groupID', $groupID , PDO::PARAM_INT); + if(!$stmt->execute()) { + return False; + } + return $stmt; + +} + function selectPostById($postID) { $stmt = prepareQuery(" SELECT diff --git a/website/queries/user.php b/website/queries/user.php index ec211c0..e3bf758 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -103,47 +103,47 @@ function selectAllUserGroups($userID) { return $stmt; } -function selectAllUserPosts($userID) { - $stmt = prepareQuery(" - SELECT - `post`.`postID`, - `post`.`author`, - `title`, - CASE LENGTH(`post`.`content`) >= 150 AND `post`.`content` NOT LIKE 'bindParam(':userID', $userID, PDO::PARAM_INT); - if(!$stmt->execute()) { - return False; - } - return $stmt; -} +//function selectAllUserPosts($userID) { +// $stmt = prepareQuery(" +// SELECT +// `post`.`postID`, +// `post`.`author`, +// `title`, +// CASE LENGTH(`post`.`content`) >= 150 AND `post`.`content` NOT LIKE 'bindParam(':userID', $userID, PDO::PARAM_INT); +// if(!$stmt->execute()) { +// return False; +// } +// return $stmt; +//} function select20UsersFromN($n) { $q = prepareQuery(" From aa12e29948a4ae79922c274cfdc489cc9b65b350 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Mon, 30 Jan 2017 15:29:42 +0100 Subject: [PATCH 2/4] Fixed posts on profile page. --- website/public/profile.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/website/public/profile.php b/website/public/profile.php index 95c5b86..83b9d10 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -27,7 +27,6 @@ if(empty($_GET["username"])) { $user = selectUser($_SESSION["userID"], $userID); $profile_friends = selectAllFriends($userID); $profile_groups = selectAllUserGroups($userID); -$posts = selectAllUserPosts($userID); if ($userID == $_SESSION["userID"]) { @@ -54,23 +53,12 @@ include("../views/footer.php"); From 941296802f9d744059264101b403b98d6f337fcb Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Mon, 30 Jan 2017 15:30:08 +0100 Subject: [PATCH 3/4] Added posts to group page. --- website/public/group.php | 16 ++++++++ website/views/group.php | 88 ++++++---------------------------------- 2 files changed, 28 insertions(+), 76 deletions(-) diff --git a/website/public/group.php b/website/public/group.php index fa45090..2ef3493 100644 --- a/website/public/group.php +++ b/website/public/group.php @@ -4,6 +4,8 @@ @@ -30,6 +32,20 @@ include("../views/group.php"); /* This adds the footer. */ include("../views/footer.php"); + +$masonry_mode = 0; ?> + + + + + diff --git a/website/views/group.php b/website/views/group.php index b2098c7..24cf9d5 100644 --- a/website/views/group.php +++ b/website/views/group.php @@ -13,88 +13,24 @@

\"""; + echo "\"""; } ?>

-
-

Lorem

-

Lorem ipsum dolor sit amet, consectetur.

-

Enkele minuten geleden geplaatst

-
-
-

Image

- Olympic Mountains, Washington -

Gisteren geplaatst

-
-
-

Ipsum

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Rem nihil alias amet dolores fuga totam sequi a cupiditate ipsa voluptas id facilis nobis.

-

Maandag geplaatst

-
-
-

Dolor

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit.

-

4 Januari geplaatst

-
-
-

Sit

-

Lorem ipsum dolor sit.

-

4 Januari geplaatst

-
-
-

Image

- Nunobiki Falls, Kobe Japan -

4 Januari geplaatst

-
-
-

Amet

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima asperiores eveniet vero velit eligendi aliquid in.

-

4 Januari geplaatst

-
-
-

Consectetur

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Error aliquid reprehenderit expedita odio beatae est.

-

4 Januari geplaatst

-
-
-

Adipisicing

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quaerat architecto quis tenetur fugiat veniam iste molestiae fuga labore!

-

4 Januari geplaatst

-
-
-

Elit

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Rem ut debitis dolorum earum expedita eveniet voluptatem quibusdam facere eos numquam commodi ad iusto laboriosam rerum aliquam.

-

4 Januari geplaatst

-
-
-

Geen error

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloribus dolorem maxime minima animi cum.

-

4 Januari geplaatst

-
-
-

Image

- Oregon cliffs are no joke. -

4 Januari geplaatst

-
-
-

Aliquid

-

Lorem ipsum dolor sit amet, consectetur.

-

4 Januari geplaatst

-
-
-

Odit

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Odit accusamus tempore at porro officia rerum est impedit ea ipsa tenetur. Labore libero hic error sunt laborum expedita.

-

4 Januari geplaatst

-
-
-

Accusamus

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nobis quaerat suscipit ad.

-

4 Januari geplaatst

-
+
+
+
+
+ × +
+ +
+
\ No newline at end of file From 183a98a339c1f5011ed1e666a46fabbb01d49f4f Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Mon, 30 Jan 2017 15:34:32 +0100 Subject: [PATCH 4/4] Fixed link to groups on profile page. --- website/views/profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/views/profile.php b/website/views/profile.php index bd009e3..036cab4 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -38,7 +38,7 @@

fetch()) { - echo "${group["name"]}s logo"; + echo "${group["name"]}s logo"; } if($profile_groups->rowCount() === 0) {