Merge branch 'lars-chat' into 'master'

Lars chat See merge request !59
2017-01-18 15:55:41 +01:00
parent b95705df29 df9f782809
commit 32ff271b5e
9 changed files with 254 additions and 44 deletions
--- a/website/public/chat.php
+++ b/website/public/chat.php
@@ -5,6 +5,7 @@
    <style>
        @import url("styles/chat.css");
    </style>
+    <script src="js/chat.js"></script>
 </head>
 <body>
 <?php
--- a/website/public/js/chat.js
+++ b/website/public/js/chat.js
@@ -0,0 +1,57 @@
+$(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);
+            $("#chat-history").scrollTop($("#chat-history")[0].scrollHeight);
+        }
+    });
+
+    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].destination == $(".destinationID").val()) {
+            type = "chat-message-self";
+        } else {
+            type = "chat-message-other";
+        }
+
+        $("#chat-history").append('\
+            <div class="chat-message"> \
+                <div class="' + type + '">\
+                ' + messages[i].content + '\
+                </div> \
+            </div>\
+        ');
+    }
+}
+
+function switchUser(userID) {
+    $(".destinationID").val(userID);
+    $("#chat-history").html("");
+    $("#lastID").val("");
+}
--- a/website/public/sendMessage.php
+++ b/website/public/sendMessage.php
@@ -0,0 +1,16 @@
+<?php
+
+include_once("../queries/private_message.php");
+
+if (isset($_POST["destination"]) &&
+    isset($_POST["content"])) {
+
+    if (sendMessage($_POST["destination"], $_POST["content"])) {
+        echo $_POST["content"] . " is naar " . $_POST["destination"] . " gestuurd";
+    } else {
+        echo "YOU FAILED!!!";
+    }
+
+} else {
+    echo "maybe dont try to hax the system?";
+}
--- a/website/public/styles/menu.css
+++ b/website/public/styles/menu.css
@@ -25,3 +25,16 @@
    font-size: 14px;
    cursor: pointer;
 }
+
+.friend-item {
+    cursor: pointer;
+}
+
+.menu button {
+    background: none;
+    color: #333;
+    width: 100%;
+    height: 100%;
+    padding: 0;
+    text-align: left;
+}