Merge branch 'marijn-chat' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-chat

.idea/WebDB.iml

@@ -14,5 +14,15 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="PHP" type="php">
+        <CLASSES>
+          <root url="file:///usr/share/php" />
+        </CLASSES>
+        <SOURCES>
+          <root url="file:///usr/share/php" />
+        </SOURCES>
+      </library>
+    </orderEntry>
   </component>
 </module>

website/styles/chat.css

@@ -1,16 +1,21 @@
 /* Overall chat-screen */
 .chat {
+    position: fixed;
+    top: 80px;
+    left: 256px;
     text-align: center;
     padding: 15px 0;
-    width: 100%
+    width: calc(100% - 256px);
+    height: calc(100% - 120px);
+    display: inline-flex;
 }
 
 .chat-left {
-    float: left;
+    width: 256px;
-    width: 20%;
     height: 100%;
     margin-left: 10px;
     margin-right: 10px;
+    display: inline-flex;
 
 }
 .chat-recent, .chat-history {
@@ -32,16 +37,16 @@
 }
 
 .chat-right {
-    width: 75%;
+    width: calc(100% - 256px - 40px);
+    height: calc(100% - 80px);
     vertical-align: bottom;
-    float: right;
     margin-right: 10px;
 }
 
 /* Chat history. */
 .chat-history {
-    height: 600px;
     overflow-y: auto;
+    height: 100%;
     padding-bottom: 10px;
 }
 

website/views/chat-view.php

@@ -34,6 +34,24 @@
                 <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 class="chat-field">
+                <form  method="post">
+                    <input type="text"
+                           name="message"
+                           placeholder="Typ een chatbericht om te verzenden"
+                           required
+                    >
+                    <input type="submit"
+                           value="Verstuur"
+                    >
+                </form>
             </div>
 
             <form class="chat-field" method="post">