Skip to content

Feat/UI design #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nikola-Mircic merged 2 commits into from
May 4, 2022
Merged

Feat/UI design #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d703684
Fixed user registration system
Nikola-Mircic May 3, 2022
11b5da3
using IPv4 instead of socket id in logs
Nikola-Mircic May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions client/assets/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//const socket = require("socket.io-client/lib/socket");

var activeUsers = [];
var receivedFiles = {};
var selectedFiles = [];
Expand Down Expand Up @@ -82,6 +80,18 @@ function getBody(page){
return page.substring(page.indexOf("<body>"),page.indexOf("</body>"));
}

window.onload = ()=>{
var username = window.sessionStorage.getItem('username');
if(username && username !== 'null'){
if(socket.disconnected)
socket.connect();

socket.emit('register',{
'name':username
});
}
};

function writeLoadedFiles(directory, list){
list.empty();
if(Object.keys(directory.directories)>0 || directory.files.length>0){
Expand Down Expand Up @@ -381,7 +391,7 @@ function registerUser(){
function changeUser(){
socket.disconnect();

let name = $("#register input").val();
window.sessionStorage.clear();

$("#register").show();
$("#register input").val("");
Expand Down
2 changes: 1 addition & 1 deletion db/logs/log_history.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"logs":[{"id":"s4eyB5GyBBYwCA58AAAF-vTqMGiumRyawjALSAAAD","from":"s4eyB5GyBBYwCA58AAAF","path":"./db/github-recovery-codes.txt","filename":"github-recovery-codes.txt","time":"10/4/2022, 23:46:54:28"},{"id":"s4eyB5GyBBYwCA58AAAF-vTqMGiumRyawjALSAAAD","from":"s4eyB5GyBBYwCA58AAAF","path":"./db/github-recovery-codes.txt","filename":"github-recovery-codes.txt","time":"10/4/2022, 23:47:0:275"},{"id":"s4eyB5GyBBYwCA58AAAF-vTqMGiumRyawjALSAAAD","from":"s4eyB5GyBBYwCA58AAAF","path":"./db/vs_code_inst.deb","filename":"vs_code_inst.deb","time":"10/4/2022, 23:48:5:335"},0]}
{"logs":[0]}
42 changes: 29 additions & 13 deletions routing/IORouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ var IORouter = function(){

this.getRouter = (setup)=>{
var newRouter = new IORouter();
console.log(setup);
newRouter.save_files = setup.save_files;
newRouter.write_log = setup.write_log;
console.log(newRouter.save_files +" "+ setup.save_files);
console.log(newRouter.write_log +" "+ setup.write_log);
return newRouter;
};

Expand All @@ -21,18 +18,25 @@ var IORouter = function(){
const LOG_PATH = __dirname+"/db/logs/log_history.dat";

io.on('connection', (socket)=>{
console.log("Sending data to new user");
var user = {
'id': socket.id,
'address': socket.client.conn.remoteAddress
};

regUser[regUser.length] = user;

regUser.forEach((item, index)=>{
socket.emit('newUser', item);
if(item.name)
socket.emit('newUser', item);
});

socket.on('register',(data)=>{
var user = {
'name': data.name,
'id': socket.id
};
var user = regUser.find((user)=>{
return user.id === socket.id;
});

user.name = data.name;

regUser[regUser.length] = user;
socket.broadcast.emit('newUser', user);
});

Expand All @@ -59,13 +63,25 @@ var IORouter = function(){
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;
}).address;

var receiver = regUser.find((user)=>{
return user.id === data.receiver;
}).address;

if(this.write_log){
saveLogData(`${data.from}-${data.receiver}`,
saveLogData(`${sender}-${receiver}`,
data.file,
data.from);
sender);
}

console.log(`Transfer [${data.from} -> ${data.receiver}] (${Log.getTime()})[~${date.getTime()-startTime} ms] completed!!`);
console.log(`Transfer [${sender} -> ${receiver}] (${Log.getTime()})[~${date.getTime()-startTime} ms] completed!!`);

io.to(data.receiver).emit("transfer end",data);
});
Expand Down