Merge branch 'main' into 'main'

seperated script to dedicated js file See merge request !1

Merge branch 'main' into 'main'
dfac18f7 · Robin Keskisärkkä · d060da1b · 446cfc61 · dfac18f7 · dfac18f7
Commit dfac18f7 authored 2 years ago by Robin Keskisärkkä
--- a/public/index.html
+++ b/public/index.html
@@ -4,37 +4,8 @@
        <title>Testing websocket</title>
        <link rel="stylesheet" href="style.css" type="text/css">
        <script src="/socket.io/socket.io.js"></script>
-        <script>
-            const socket = io()
-            socket.on('message', (msg) => {
-                let messages = document.getElementById("chat-box")
-                let li = document.createElement('li')
-                li.textContent = msg
-                messages.appendChild(li)
-                messages.scrollTop = messages.scrollHeight
-            });
+        <script src="js/script.js"></script>

-            function publish(e){
-                let msg = document.getElementById("message").value
-                if(!validate(msg)){
-                    return
-                }
-                document.getElementById("message").value = ""
-                socket.emit('message', msg)
-            }
-
-            function validate(msg){
-                return msg.length > 0 && msg.length <= 140
-            }
-            
-
-            window.onload = () => {
-                document.getElementById('submit').addEventListener('click', e => {
-                    e.preventDefault() // stop the submit button from doing itä's usual thing
-                    publish()
-                })
-            }
-        </script>
    </head>

    <body>

--- a/public/js/script.js
+++ b/public/js/script.js
+const socket = io()
+socket.on('message', (msg) => {
+    let messages = document.getElementById("chat-box")
+    let li = document.createElement('li')
+    li.textContent = msg
+    messages.appendChild(li)
+    messages.scrollTop = messages.scrollHeight
+});
+
+function publish(e){
+    let msg = document.getElementById("message").value
+    if(!validate(msg)){
+        return
+    }
+    document.getElementById("message").value = ""
+    socket.emit('message', msg)
+}
+
+function validate(msg){
+    return msg.length > 0 && msg.length <= 140
+}
+
+
+window.onload = () => {
+    document.getElementById('submit').addEventListener('click', e => {
+        e.preventDefault() // stop the submit button from doing itä's usual thing
+        publish()
+    })
+}
\ No newline at end of file