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

Fixed Chat!

Browse Source
This commit is contained in:
Lars van Hijfte
2017-01-18 15:37:49 +01:00
parent cd954a8c4c
commit 7469a10f13
4 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/public/js/chat.js
View File

@@ -34,7 +34,7 @@ function sendMessage() {
function addMessages(messages) { function addMessages(messages) {
for(i in messages) { for(i in messages) {
if (messages[i].origin == 2) { if (messages[i].destination == $(".destinationID").val()) {
type = "chat-message-self"; type = "chat-message-self";
} else { } else {
type = "chat-message-other"; type = "chat-message-other";

4
website/public/styles/chat.css
View File

@@ -16,10 +16,6 @@
overflow-y: auto; overflow-y: auto;
} }
.chat-left .friend-item {
cursor: pointer;
}
.chat-right { .chat-right {
width: calc(100% - 256px - 40px); width: calc(100% - 256px - 40px);
height: calc(100% - 80px); height: calc(100% - 80px);

2
website/queries/private_message.php
View File

@@ -49,7 +49,7 @@ function sendMessage($destination, $content) {
"); ");
return $stmt->execute(array( return $stmt->execute(array(
"origin" => $_SESSION["userID"], "origin" => $_SESSION["userID"],
"destination" => $destination, "destination" => $destination,
"content" => $content "content" => $content
)); ));

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

@@ -47,30 +47,6 @@
</nav> </nav>
<div class="chat-right right"> <div class="chat-right right">
<div id="chat-history" class="chat-history platform"> <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> </div>
<form id="lastIDForm"> <form id="lastIDForm">
<input type="hidden" <input type="hidden"
@@ -81,7 +57,7 @@
<input type="hidden" <input type="hidden"
name="destination" name="destination"
class="destinationID" class="destinationID"
value="666" value=""
/> />
</form> </form>
<div class="chat-field"> <div class="chat-field">
@@ -89,7 +65,7 @@
<input type="hidden" <input type="hidden"
name="destination" name="destination"
class="destinationID" class="destinationID"
value="666" value=""
/> />
<input type="submit" <input type="submit"
value="Verstuur" value="Verstuur"