MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Lars #135

Merged
11291680 merged 14 commits from lars into master 2017-01-26 14:14:41 +01:00
Conversation 2 Commits 14 Files Changed 15 +69 -67
4 changed files with 69 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3ebacd6251 - Show all commits

62
website/public/js/masonry.js
View File

@@ -1,37 +1,28 @@
margin = 20;
$(window).on("load", function() {
console.log("LOADED");
container = $("div.posts");
posts = container.children();
posts.remove();
column = $('<div class="column"></div>').append(posts);
container.append(column);
mansonry();
mansonry();
});
$(window).resize(function() {
clearTimeout(window.resizedFinished);
window.resizeFinished = setTimeout(function() {
mansonry();
masonry();
}, 250);
});
function mansonry() {
var $container = $(".posts");
function masonry() {
$container.children().remove();
columnCount = Math.floor($(".posts").width() / 250);
console.log("columns: " + columnCount);
/*
* Initialise columns.
*/
var columns = new Array(columnCount);
var $columns = new Array(columnCount);
for (i = 0; i < columnCount; i++) {
columns[i] = [0, []];
console.log(columns[i]);
$column = $("<div class=\"column\">");
$column.width(100/columnCount + "%");
$container.append($column);
columns[i] = [0, $column];
}
/*
@@ -45,32 +36,27 @@ function mansonry() {
column = columns[i];
}
}
return column;
}
/*
* Get the posts from the server.
*/
$.post("API/getPosts.php", { usr : userID })
.done(function(data) {
posts = JSON.parse(data);
/*
* Rearange the objects.
*/
j = 0;
posts.each(function(i) {
post = posts[i];
jQuery.each(posts, function() {
$post = $("<div class=\"post platform\" onclick=\"requestPost(this)\">");
$post.append($("<h2>").text(this["title"]));
$post.append($("<p>").html(this["content"]));
shortestColumn = getShortestColumn(columns);
shortestColumn[0] = shortestColumn[0] + $(post).height() + margin;
shortestColumn[1].push(post);
shortestColumn[1].append($post);
shortestColumn[0] = shortestColumn[0] + $post.height() + margin;
});
});
container.children().remove();
/*
* Display the objects again in the correct order.
*/
for (i = 0; i < columnCount; i++) {
column = $('<div class="column"></div>').append(columns[i][1]);
console.log(column);
container.append(column);
}
$("div.posts div.column").width(100/columnCount + "%");
}

16
website/public/profile.php
View File

@@ -2,7 +2,6 @@
<html>
<head>
<?php include("../views/head.php"); ?>
<script src="/js/masonry.js"></script>
<style>
@import url("styles/profile.css");
</style>
@@ -45,10 +44,25 @@ include("../views/footer.php");
?>
<script src="js/friendButtons.js"></script>
<script src="js/masonry.js"></script>
<script>
var posts;
$(document).ready(function() {
userID = <?= $userID ?>;
placeFriendButtons();
masonry();
// alert("blap");
// $.post("API/getPosts.php", { usr : userID }, "json")
// .done(function(data) {
// posts = JSON.parse(data);
// alert(posts[0]["content"]);
// }).fail(function() {
// alert("failure...");
// });
});
</script>
</body>

4
website/queries/user.php
View File

@@ -126,7 +126,9 @@ function selectAllUserPosts($userID) {
");
$stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
$stmt->execute();
if(!$stmt->execute()) {
return False;
}
return $stmt;
}

48
website/views/profile.php
View File

@@ -43,29 +43,29 @@
</div>
<div class="posts">
<?php
if ($_SESSION["userID"] === $userID) {
?>
<div class="post platform">
<form>
<input type="text" class="newpost" placeholder="Titel">
<textarea class="newpost" placeholder="Schrijf een berichtje..."></textarea>
<input type="submit" value="Plaats!">
</form>
</div>
<?php
}
while($post = $posts->fetch()) {
$nicetime = nicetime($post["creationdate"]);
echo "
<div class='post platform'>
<h2>${post["title"]}</h2>
<p>${post["content"]}</p>
<p class=\"subscript\">${nicetime} geplaatst.</p>
</div>
";
}
?>
<!-- --><?php
// if ($_SESSION["userID"] === $userID) {
// ?>
<!-- <div class="post platform">-->
<!-- <form>-->
<!-- <input type="text" class="newpost" placeholder="Titel">-->
<!-- <textarea class="newpost" placeholder="Schrijf een berichtje..."></textarea>-->
<!-- <input type="submit" value="Plaats!">-->
<!-- </form>-->
<!-- </div>-->
<!-- --><?php
// }
//
// while($post = $posts->fetch()) {
// $nicetime = nicetime($post["creationdate"]);
// echo "
// <div class='post platform'>
// <h2>${post["title"]}</h2>
// <p>${post["content"]}</p>
// <p class=\"subscript\">${nicetime} geplaatst.</p>
// </div>
// ";
// }
// ?>
</div>
</div>