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

Marijn button #99

Merged
11166932 merged 152 commits from marijn-button into master 2017-01-23 13:25:08 +01:00
Conversation 2 Commits 152 Files Changed 52 +132 -47
7 changed files with 132 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 19f525d168 - Show all commits

2
website/public/chat.php
View File

@@ -5,7 +5,7 @@
<style>
@import url("styles/chat.css");
</style>
<script src="js/sendMessage.js"></script>
<script src="js/chat.js"></script>
</head>
<body>
<?php

50
website/public/js/chat.js Normal file
View File

@@ -0,0 +1,50 @@
$(document).ready(function() {
loadMessages();
});
function loadMessages() {
$.post(
"loadMessages.php",
$("#lastIDForm").serialize()
).done(function(data) {
if (data && data != "[]") {
console.log(data);
messages = JSON.parse(data);
addMessages(messages);
$("#lastID").val(messages[messages.length - 1].messageID);
}
});
setTimeout(loadMessages, 1000);
}
function sendMessage() {
console.log($("#sendMessageForm").serialize());
$.post(
"sendMessage.php",
$("#sendMessageForm").serialize()
).done(function( data ) {
console.log(data);
});
$("#newContent").val("");
}
function addMessages(messages) {
for(i in messages) {
if (messages[i].origin == 2) {
type = "chat-message-self";
} else {
type = "chat-message-other";
}
$("#chat-history").append('\
<div class="chat-message"> \
<div class="' + type + '">\
' + messages[i].content + '\
</div> \
</div>\
');
}
}

14
website/public/js/sendMessage.js
View File

@@ -1,14 +0,0 @@
// $("#sendMessageForm").submit(function(e) {
function sendMessage() {
console.log($("#sendMessageForm").serialize());
$.post(
"sendMessage.php",
$("#sendMessageForm").serialize()
).done(function( data ) {
alert( "Data Loaded: " + data );
});
}
function loadMessages() {
}

2
website/public/sendMessage.php
View File

@@ -5,7 +5,7 @@ include_once("../queries/private_message.php");
if (isset($_POST["destination"]) &&
isset($_POST["content"])) {
if (sendMessage($db, $_POST["destination"], $_POST["content"])) {
if (sendMessage($_POST["destination"], $_POST["content"])) {
echo $_POST["content"] . " is naar " . $_POST["destination"] . " gestuurd";
} else {
echo "YOU FAILED!!!";

46
website/queries/private_message.php
View File

@@ -1,7 +1,13 @@
<?php
function get100ChatMessagesFromN($n, $user1ID, $user2ID) {
include_once("connect.php");
session_start();
function getOldChatMessages($user2ID) {
$db = $GLOBALS["db"];
$user1ID = 2;
$stmt = $db->prepare("
SELECT
*
@@ -13,16 +19,15 @@ function get100ChatMessagesFromN($n, $user1ID, $user2ID) {
`origin` = :user2 AND
`destination` = :user1
ORDER BY
`creationdate` DESC
LIMIT
:n, 100
`messageID` ASC
");
$stmt->bindParam(":user1", $user1ID);
$stmt->bindParam(":user2", $user2ID);
$stmt->bindParam(":n", $n);
return $stmt->execute();
$stmt->execute();
return json_encode($stmt->fetchAll());
}
function sendMessage($destination, $content) {
@@ -48,4 +53,33 @@ function sendMessage($destination, $content) {
"destination" => $destination,
"content" => $content
));
}
function getNewChatMessages($lastID, $destination) {
$db = $GLOBALS["db"];
$origin = 2;
$stmt = $db->prepare("
SELECT
*
FROM
`private_message`
WHERE
(
`origin` = :user1 AND
`destination` = :user2 OR
`origin` = :user2 AND
`destination` = :user1) AND
`messageID` > :lastID
ORDER BY
`messageID` ASC
");
$stmt->bindParam(':user1', $origin);
$stmt->bindParam(':user2', $destination);
$stmt->bindParam(':lastID', $lastID);
$stmt->execute();
return json_encode($stmt->fetchAll());
}

63
website/views/chat-view.php
View File

@@ -10,32 +10,43 @@
</a>
</nav>
<div class="chat-right right">
<div class="chat-history platform">
<div class="chat-message">
<div class="chat-message-self">Hi!</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Hi!</div>
</div>
<div class="chat-message">
<div class="chat-message-self">How it's going?</div>
</div>
<div class="chat-message">
<div class="chat-message-self">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Hi!</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
<div class="chat-message">
<div class="chat-message-self">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
<div id="chat-history" class="chat-history platform">
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-self">Hi!</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-other">Hi!</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-self">How it's going?</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-self">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-other">Hi!</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-other">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-other">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>-->
<!-- </div>-->
<!-- <div class="chat-message">-->
<!-- <div class="chat-message-self">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>-->
<!-- </div>-->
</div>
<form id="lastIDForm">
<input type="hidden"
id="lastID"
name="lastID"
value=""
/>
<input type="hidden"
name="destination"
value="666"
/>
</form>
<div class="chat-field">
<form id="sendMessageForm" action="javascript:sendMessage();">
<input type="hidden"
@@ -48,7 +59,9 @@
<span>
<input type="text"
name="content"
id="newContent"
placeholder="Reageer..."
autofocus
required
/>
</span>

2
website/views/head.php
View File

@@ -17,4 +17,6 @@
include_once("../queries/connect.php");
session_start();
?>