From 1c5b976ede3cbc0aff07e0423170997e791f2d98 Mon Sep 17 00:00:00 2001
From: Nikola-Mircic <nikola123mircic@gmail.com>
Date: Mon, 9 May 2022 22:00:58 +0200
Subject: [PATCH 1/4] Fix: logging only last file transported

---
 client/assets/js/main.js | 38 +++++++++++++++++++++++++-------------
 logsystem.js             |  3 ---
 routing/IORouter.js      | 22 ++++++++++++++++------
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/client/assets/js/main.js b/client/assets/js/main.js
index fff78cb..da7c145 100644
--- a/client/assets/js/main.js
+++ b/client/assets/js/main.js
@@ -251,6 +251,7 @@ function insertFile(file){
 
 socket.on('request data',async function(data){
 	var fileToSent = null;
+	
 	for(let i=0; i<selectedFiles.length; ++i){
 		if((selectedFiles[i].chunks == 0) || 
 		   (selectedFiles[i].chunks*chunkSize < selectedFiles[i].size())){
@@ -280,17 +281,23 @@ socket.on('request data',async function(data){
 	$(".progress-done").css("opacity", "1");
 	$(".progress-done").html(percent+'%'); 
 
-	socket.emit('data',{
-		from: socket.id,
-		receiver: data.receiver,
-		receiverName: data.receiverName,
-		file: {
+	var fileData = {
 			name: fileToSent.name(),
 			type: fileToSent.type(),
 			size: fileToSent.size(),
 			path: fileToSent.path,
 			data: chunk
 		}
+
+	if(chunkEnd === fileToSent.size()){
+		fileData.finished = true;
+	}
+
+	socket.emit('data',{
+		from: socket.id,
+		receiver: data.receiver,
+		receiverName: data.receiverName,
+		file: fileData
 	});
 
 	updateSendingBar();
@@ -334,28 +341,33 @@ async function sendToUser(name, id){
 
 	var chunk = -1;
 	if(selectedFiles[0].size() < chunkSize){
-		chunk = await selectedFiles[0].data();
+		chunk = await selectedFiles[0].data();	
 	}else{
 		chunk = await selectedFiles[0].dataPart(0,chunkSize);
 	}
 
 	selectedFiles[0].chunks++;
 
-	socket.emit('data',{
-		from: socket.id,
-		receiver: id,
-		receiverName: name,
-		file: {
+	var fileData = {
 			name: selectedFiles[0].name(),
 			type: selectedFiles[0].type(),
 			size: selectedFiles[0].size(),
 			path: selectedFiles[0].path,
 			data: chunk
-		}
+		};
+
+	if(selectedFiles[0].size() < chunkSize){
+		fileData.finished = true;	
+	}
+
+	socket.emit('data',{
+		from: socket.id,
+		receiver: id,
+		receiverName: name,
+		file: fileData
 	});
 
 	sentSize += chunk.byteLength;
-	let percent = Math.round((sentSize*100)/packageSize);
 
 	updateSendingBar();
 };
diff --git a/logsystem.js b/logsystem.js
index cf892a1..9a9b031 100644
--- a/logsystem.js
+++ b/logsystem.js
@@ -44,9 +44,6 @@ class LogSystem{
 
 		logs = logs.substring(0, logs.length-3);
 
-		console.log(logs);
-		console.log(JSON.stringify(logData));
-
 		logData = Buffer.from(logs+JSON.stringify(logData)+",0]}");
 
 		fs.writeFile(path,logData,(err)=>{
diff --git a/routing/IORouter.js b/routing/IORouter.js
index 58467ea..a8e291b 100644
--- a/routing/IORouter.js
+++ b/routing/IORouter.js
@@ -57,15 +57,25 @@ var IORouter = function(){
                         data.from,
                         transport=true);
                 }
+                if(data.file.finished && this.write_log){
+                    var sender = regUser.find((user)=>{
+                        return user.id === data.from;
+                    }).address;
+    
+                    var receiver = regUser.find((user)=>{
+                        return user.id === data.receiver;
+                    }).address;
+
+                    saveLogData(`${sender}-${receiver}`,
+                            data.file,
+                            sender);
+                }
                 io.to(data.receiver).emit('data',data);
             });
         
             socket.on("transfer end",(data)=>{
                 var date = new Date();
                 console.log("Transfer ended! Write log: "+this.write_log);
-                console.log(data);
-
-                console.log(regUser);
 
                 var sender = regUser.find((user)=>{
                     return user.id === data.from;
@@ -74,12 +84,12 @@ var IORouter = function(){
                 var receiver = regUser.find((user)=>{
                     return user.id === data.receiver;
                 }).address;
-
-                if(this.write_log){
+                
+                /*if(this.write_log){
                     saveLogData(`${sender}-${receiver}`,
                             data.file,
                             sender);
-                }
+                }*/
                 
                 console.log(`Transfer [${sender} -> ${receiver}] (${Log.getTime()})[~${date.getTime()-startTime} ms] completed!!`);
         

From dfef19bb27bdeae7663331cce9a65bfa1747bc27 Mon Sep 17 00:00:00 2001
From: Nikola-Mircic <nikola123mircic@gmail.com>
Date: Mon, 9 May 2022 22:09:51 +0200
Subject: [PATCH 2/4] Fix: Not showing folders after transfer

---
 client/assets/js/main.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/client/assets/js/main.js b/client/assets/js/main.js
index da7c145..a2890d3 100644
--- a/client/assets/js/main.js
+++ b/client/assets/js/main.js
@@ -235,7 +235,7 @@ function insertFile(file){
     for(let i=1; i<pathSteps.length-1; ++i){
 		pathPassed += pathSteps[i];
 		if(!dir.directories[pathSteps[i]]){
-			console.log(`Folder "${pathSteps[i]}" doesn't exists`);
+			console.log(`Folder "${pathSteps[i]}" doesn't exists! \n Creating in process...`);
 			var newDir = Object.assign({}, DirectoryStruct);
 			newDir.directories = {};
 			newDir.path = pathPassed;
@@ -251,7 +251,7 @@ function insertFile(file){
 
 socket.on('request data',async function(data){
 	var fileToSent = null;
-	
+
 	for(let i=0; i<selectedFiles.length; ++i){
 		if((selectedFiles[i].chunks == 0) || 
 		   (selectedFiles[i].chunks*chunkSize < selectedFiles[i].size())){
@@ -308,6 +308,15 @@ socket.on("transfer end",function(data){
 	setTimeout(function(){
 		removeProgressBar();
 	}, 1000);
+	if(workspaceFiles && ( Object.keys(workspaceFiles.directories).length>0 || workspaceFiles.files.length>0)){
+		if(!$("#dropField") || !$("#selection_view")){
+			return;
+		}
+
+		$("#dropField").hide();
+		$("#selection_view").show();
+		writeLoadedFiles(workspaceFiles, filesListDiv);
+	}
 });
 
 async function sendToUser(name, id){

From 2f4e15b0071ddf5f2e3b4f4fc57f36af5531b800 Mon Sep 17 00:00:00 2001
From: Nikola-Mircic <nikola123mircic@gmail.com>
Date: Mon, 9 May 2022 22:13:17 +0200
Subject: [PATCH 3/4] Feat: Submit registration using enter button

---
 client/history.html | 4 ++--
 client/index.html   | 4 ++--
 client/sent.html    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/history.html b/client/history.html
index 1f1b9b1..f12ad9d 100644
--- a/client/history.html
+++ b/client/history.html
@@ -25,10 +25,10 @@ <h1 id="headerText">Network file manager</h1>
 		<div id="userIpAddr" class="headerContainer" style="display: none;">
 			<h6>Your IPv4: <span id="ipv4">192.168.1.9</span></h6>
 		</div>
-		<div id="register" class="profileField">
+		<form id="register" class="profileField">
 			<input type="text" name="userName" id="userName" placeholder=" Enter your name / ID">
 			<button onclick="registerUser();">Register</button>
-		</div>
+		</form>
 
 		<div id="profile" class="profileField" style="display: none;">
 			<h3 name="profileName" id="profileName"></h3>
diff --git a/client/index.html b/client/index.html
index 4310a4a..c097e17 100644
--- a/client/index.html
+++ b/client/index.html
@@ -26,10 +26,10 @@ <h1 id="headerText">Network file manager</h1>
 		<div id="userIpAddr" class="headerContainer" style="display: none;">
 			<h6>Your IPv4: <span id="ipv4">192.168.1.9</span></h6>
 		</div>
-		<div id="register" class="profileField">
+		<form id="register" class="profileField">
 			<input type="text" name="userName" id="userName" placeholder=" Enter your name / ID">
 			<button onclick="registerUser();">Register</button>
-		</div>
+		</form>
 
 		<div id="profile" class="profileField" style="display: none;">
 			<h3 name="profileName" id="profileName"></h3>
diff --git a/client/sent.html b/client/sent.html
index 006fc15..af6bb0d 100644
--- a/client/sent.html
+++ b/client/sent.html
@@ -23,10 +23,10 @@ <h1 id="headerText">Network file manager</h1>
 		<div id="userIpAddr" class="headerContainer" style="display: none;">
 			<h6>Your IPv4: <span id="ipv4">undefined</span></h6>
 		</div>
-		<div id="register" class="profileField">
+		<form id="register" class="profileField">
 			<input type="text" name="userName" id="userName" placeholder=" Enter your name / ID">
 			<button onclick="registerUser();">Register</button>
-		</div>
+		</form>
 
 		<div id="profile" class="profileField" style="display: none;">
 			<h3 name="profileName" id="profileName"></h3>

From 9a9f58c976764f07a7a74bed8b291f726afdcab3 Mon Sep 17 00:00:00 2001
From: Nikola-Mircic <nikola123mircic@gmail.com>
Date: Tue, 10 May 2022 07:48:19 +0200
Subject: [PATCH 4/4] start.bat update

---
 start.bat | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/start.bat b/start.bat
index 3e81ce1..bf4cb90 100644
--- a/start.bat
+++ b/start.bat
@@ -1 +1,2 @@
-nodemon -e js,css,html,json server.js
\ No newline at end of file
+nodemon -e js,css,html,json server.js --save-files false --write-log true --default-port 8080
+PAUSE