From 7469a10f1387b01a9ae80dc9cc2e9c63f90e2a89 Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Wed, 18 Jan 2017 15:37:49 +0100
Subject: [PATCH] Fixed Chat!

---
 website/public/js/chat.js           |  2 +-
 website/public/styles/chat.css      |  4 ----
 website/queries/private_message.php |  2 +-
 website/views/chat-view.php         | 28 ++--------------------------
 4 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/website/public/js/chat.js b/website/public/js/chat.js
index dd0b00f..cf33f69 100644
--- a/website/public/js/chat.js
+++ b/website/public/js/chat.js
@@ -34,7 +34,7 @@ function sendMessage() {
 
 function addMessages(messages) {
     for(i in messages) {
-        if (messages[i].origin == 2) {
+        if (messages[i].destination == $(".destinationID").val()) {
             type = "chat-message-self";
         } else {
             type = "chat-message-other";
diff --git a/website/public/styles/chat.css b/website/public/styles/chat.css
index 132c750..8f486bb 100644
--- a/website/public/styles/chat.css
+++ b/website/public/styles/chat.css
@@ -16,10 +16,6 @@
     overflow-y: auto;
 }
 
-.chat-left .friend-item {
-    cursor: pointer;
-}
-
 .chat-right {
     width: calc(100% - 256px - 40px);
     height: calc(100% - 80px);
diff --git a/website/queries/private_message.php b/website/queries/private_message.php
index 6cf8b16..2d953c5 100644
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -49,7 +49,7 @@ function sendMessage($destination, $content) {
     ");
 
     return $stmt->execute(array(
-        "origin" => $_SESSION["userID"],    
+        "origin" => $_SESSION["userID"],
         "destination" => $destination,
         "content" => $content
     ));
diff --git a/website/views/chat-view.php b/website/views/chat-view.php
index 1f9a0d8..a3acd4c 100644
--- a/website/views/chat-view.php
+++ b/website/views/chat-view.php
@@ -47,30 +47,6 @@
         </nav>
         <div class="chat-right right">
             <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"
@@ -81,7 +57,7 @@
                 <input type="hidden"
                        name="destination"
                        class="destinationID"
-                       value="666"
+                       value=""
                 />
             </form>
             <div class="chat-field">
@@ -89,7 +65,7 @@
                     <input type="hidden"
                            name="destination"
                            class="destinationID"
-                           value="666"
+                           value=""
                     />
                     <input type="submit"
                            value="Verstuur"