merger conflicts removed

app/main/routes.py

@@ -20,4 +20,3 @@ def home():
     form.email.data = current_user.email
     image_file = url_for('static', filename='/profile_pics/' + current_user.image_file)
     return render_template('home.html' , image_file=image_file ,form = form , friends = friends)
-

app/templates/layouts/layout.html

@@ -6,6 +6,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/minty/bootstrap.min.css" integrity="sha384-H4X+4tKc7b8s4GoMrylmy2ssQYpDHoqzPa9aKXbDwPoPUA3Ra8PA5dGzijN+ePnH" crossorigin="anonymous">
+    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js " integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN " crossorigin="anonymous "></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js " integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q " crossorigin="anonymous "></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js " integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl " crossorigin="anonymous "></script>
+    <script src="../../static/main.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
     <title>Hodge Podge</title>
 </head>
 {% include "includes/navbar.html" %}
@@ -18,10 +23,7 @@
         <footer class="blockquote-footer "><i>Made with ❤️ by Divya Rao and Yogesh Upadhyay</i></footer>
     </blockquote>
 
-    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js " integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN " crossorigin="anonymous "></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js " integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q " crossorigin="anonymous "></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js " integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl " crossorigin="anonymous "></script>
-    <script src="../../static/main.js"></script>
+
 </body>
 
 </html>

app/templates/test.html

@@ -0,0 +1,27 @@
+{% extends "layouts/layout.html" %}
+
+{% block content %}
+    <h1>Message</h1>
+    <input id="msg" type="text"/>
+    <button onclick="sendMessage()">submit</button>
+    <ul id="messages">
+
+    </ul>
+    <script type="text/javascript" charset="utf-8">
+        var socket = io();
+        function sendMessage () {
+            var data = {
+                "to": "user2",
+                "from": "user1",
+                "msg": document.getElementById("msg").value
+            }
+            console.log(data);
+            socket.emit("message", data)
+        }
+
+        socket.on("message", (data) => {
+            console.log(data);
+        });
+
+    </script>
+{% endblock content %}