diff --git a/Lab_4/Twidder/__pycache__/database_helper.cpython-38.pyc b/Lab_4/Twidder/__pycache__/database_helper.cpython-38.pyc index 7e4a18eb4153651973e42af292cfa4aab521d882..4a88982239d44f30fb97268db74a884248526f91 100644 Binary files a/Lab_4/Twidder/__pycache__/database_helper.cpython-38.pyc and b/Lab_4/Twidder/__pycache__/database_helper.cpython-38.pyc differ diff --git a/Lab_4/Twidder/static/client.css b/Lab_4/Twidder/static/client.css index ed4d8f6a197114a38324290aac70379ad5f9ce3c..f2a61e49c8063ea72eaa4877c88f822f2793613e 100644 --- a/Lab_4/Twidder/static/client.css +++ b/Lab_4/Twidder/static/client.css @@ -222,7 +222,7 @@ th, td{ .PostedMessagesDiv{ - background-color: white; + background-color: rgb(228, 9, 9); position: absolute; width: calc(50% - 14px); height: 316px; diff --git a/Lab_4/Twidder/static/client.html b/Lab_4/Twidder/static/client.html index 7834b2f76a8137d4b6ef69e7ec94a4a722cdac9b..ecab25fb9d0eaca288b55d33fbaf9b7730cece08 100644 --- a/Lab_4/Twidder/static/client.html +++ b/Lab_4/Twidder/static/client.html @@ -91,10 +91,10 @@ </table> <form id="homeInputTextArea" class="inputTextArea" onsubmit="return updateWall('home')"> <label for="PostMessage">Post a message on your wall:</label> <br> - <textarea id="homeTextarea" name="textarea" rows="6" cols="50"></textarea> + <textarea id="homeTextarea" name="textarea" rows="6" cols="50" ondrop="dropHome(event)" ondragover="allowDrop(event)"></textarea> <button class="textAreaButton" type="submit" value="Submit">Submit</button> </form> - <div id="homePostedMessagesDiv" class="PostedMessagesDiv"></div> + <div id="homePostedMessagesDiv" class="PostedMessagesDiv" draggable="true" ondragstart="dragHome(event)"></div> <form id="homeReloadForm" class="reloadForm" onsubmit="return reloadWall('home')"> <input id="homeReloadButton" class="reloadButton" type="submit" value="Reload"> </form> @@ -133,11 +133,11 @@ <form id="browseInputTextArea" class="inputTextArea" onsubmit="return updateWall('browse')"> <label for="PostMessage">Post a message on your wall:</label> <br> - <textarea id="browseTextarea" name="textarea" rows="6" cols="50"></textarea> + <textarea id="browseTextarea" name="textarea" rows="6" cols="50" ondrop="dropBrowse(event)" ondragover="allowDrop(event)"></textarea> <button class="textAreaButton" type="submit" value="Submit">Submit</button> </form> - <div id="browsePostedMessagesDiv" class="PostedMessagesDiv"></div> + <div id="browsePostedMessagesDiv" class="PostedMessagesDiv" draggable="true" ondragstart="dragBrowse(event)"></div> <form id="browseReloadForm" class="reloadForm" onsubmit="return reloadWall('browse')"> <input id="browseReloadButton" class="reloadButton" type="submit" value="Reload"> </form> diff --git a/Lab_4/Twidder/static/client.js b/Lab_4/Twidder/static/client.js index a4995c8c8e36ea8091923a9d74a35ceb0cb90c13..b7d43c06ca0ad43441e4cfa005202b65cc5eb1d0 100644 --- a/Lab_4/Twidder/static/client.js +++ b/Lab_4/Twidder/static/client.js @@ -10,6 +10,33 @@ var socket; // source "/Users/lorenzo/OneDrive - Linköpings universitet/Skola/DI3B/TDDD97/virtualenv/bin/activate" +function allowDrop(event) { + event.preventDefault(); +} + +function dragHome(event) { + event.dataTransfer.setData("text", homePostedMessagesDiv); // bör va event.target.innerHTML +} + +function dragBrowse(event) { + event.dataTransfer.setData("text", browsePostedMessagesDiv); // bör va event.target.innerHTML +} + +function drop(event) { + event.preventDefault(); + console.log("början av func"); + let data = event.dataTransfer.getData("text"); + let dest = document.getElementById("homeTextarea"); + dest.innerHTML = data; + + console.log("slutet av func"); + event.target.appendChild(document.getElementById(homeTextarea)); + console.log("slutet av func"); +} + + + +// Socket function connectWithSocket() { let token = localStorage.getItem("currentUser");