Skip to content

Routing on navigator #10

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 1 commit into from
Jan 13, 2022
Merged

Routing on navigator #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions client/assets/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,14 @@ button:hover {
display: block;
width: calc(100%/3);
list-style: none;
height: fit-content;
height: 2.3rem;
margin: auto;
}

.nav li a{
text-decoration: none;
}

.nav li button{
display: block;
border-width: 0 1px 3px 1px;
Expand All @@ -147,25 +151,37 @@ button:hover {
width: 100%;
min-width: 200px;
font-size: 1.5rem;
height: 2.3rem;
}

.nav li button:hover{
margin-top: -10px;
border-width: 2px 1px 2px 1px;
border-style: solid;
border-color: rgba(16, 14, 54, 0.9);
}

.nav li button[active]{
transition-duration: 0.2s;
color: rgb(67, 217, 255);
background-color: rgb(15, 53, 124);
padding: 5px;
}


@media screen and (max-width:600px){
.nav li{
width: 100%;
min-width: 100%;
height: fit-content;
}

.nav li button{
height: 3.2rem;
}

.nav li button:hover{
margin-top: 0;
border-width: 0;
}
}

.formFileInput {
Expand Down
4 changes: 0 additions & 4 deletions client/assets/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
$(".nav li button").on('click',function(){
$(".nav li button").removeAttr("active");
$(this).attr("active","");
});
6 changes: 3 additions & 3 deletions client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ <h3 name="profileName" id="profileName"></h3>
</div>
</div>
<nav class="nav">
<li><button>Workspace</button></li>
<li><button>Received</button></li>
<li><button>Sent</button></li>
<li><a href="/"><button active>Workspace</button></a></li>
<li><a href="/received"><button>Received</button></a></li>
<li><a href="/sent"><button>Sent</button></a></li>
</nav>
<div id="form" class="pageBlock">
<form id="form-data" method="post" enctype="multipart/form-data" action="/">
Expand Down
44 changes: 44 additions & 0 deletions client/received.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<!DOCTYPE html>
<html>
<head>
<title>Network file manager</title>
<link rel="stylesheet" type="text/css" href="./assets/css/main.css">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
<div id="header">
<div id="headerContainer">
<h1 id="headerText">Network file manager</h1>
</div>
<div id="register" class="profileField">
<input type="text" name="userName" id="userName" placeholder=" Enter your Name/ID">
<button onclick="registerUser();">Register</button>
</div>

<div id="profile" class="profileField" style="display: none;">
<h3 name="profileName" id="profileName"></h3>
<button onclick="changeUser();">Change</button>
</div>
</div>
<nav class="nav">
<li><a href="/"><button active>Workspace</button></a></li>
<li><a href="/received"><button>Received</button></a></li>
<li><a href="/sent"><button>Sent</button></a></li>
</nav>

<div class="pageBlock" id="received">
<h3>Received files:</h3>
<button class="button">Download all</button>
<h3 id="data">
<ol></ol>
</h3>
</div>

<script type="text/javascript" src="/socket.io/socket.io.js"></script>
<script type="text/javascript" src="./assets/js/jquery.min.js"></script>
<script type="text/javascript" src="./assets/js/jszip.min.js"></script>
<script type="text/javascript" src="./assets/js/FileSaver.min.js"></script>
<script type="text/javascript" src="./assets/js/main.js"></script>
<script type="text/javascript" src="./assets/js/index.js"></script>
</body>
</html>
44 changes: 44 additions & 0 deletions client/sent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<!DOCTYPE html>
<html>
<head>
<title>Network file manager</title>
<link rel="stylesheet" type="text/css" href="./assets/css/main.css">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
<div id="header">
<div id="headerContainer">
<h1 id="headerText">Network file manager</h1>
</div>
<div id="register" class="profileField">
<input type="text" name="userName" id="userName" placeholder=" Enter your Name/ID">
<button onclick="registerUser();">Register</button>
</div>

<div id="profile" class="profileField" style="display: none;">
<h3 name="profileName" id="profileName"></h3>
<button onclick="changeUser();">Change</button>
</div>
</div>
<nav class="nav">
<li><a href="/"><button active>Workspace</button></a></li>
<li><a href="/received"><button>Received</button></a></li>
<li><a href="/sent"><button>Sent</button></a></li>
</nav>

<div class="pageBlock" id="sent">
<h3>Received files:</h3>
<button class="button">Download all</button>
<h3 id="data">
<ol></ol>
</h3>
</div>

<script type="text/javascript" src="/socket.io/socket.io.js"></script>
<script type="text/javascript" src="./assets/js/jquery.min.js"></script>
<script type="text/javascript" src="./assets/js/jszip.min.js"></script>
<script type="text/javascript" src="./assets/js/FileSaver.min.js"></script>
<script type="text/javascript" src="./assets/js/main.js"></script>
<script type="text/javascript" src="./assets/js/index.js"></script>
</body>
</html>
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,2 +1,2 @@
Log [#0] from ***.***.***.***: [./db/FileExample.txt] [FileExample.txt] [15/3/2021, 14:33:17:152]
Log [#0] from ***.***.***.***: [./db/FileExample.txt] [FileExample.txt] [15/3/2021, 14:33:17:152]

10 changes: 10 additions & 0 deletions routing/PathRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ const PathRouter = function(saveFile, saveLogData, rootPath){
console.log(`Sending response to the user [${requestIp.getClientIp(req)}]...`);
res.sendFile(rootPath+'/client/index.html');
});

app.get('/received', function(req, res, next){
console.log(`Sending response to the user [${requestIp.getClientIp(req)}]...`);
res.sendFile(rootPath+'/client/received.html');
});

app.get('/sent', function(req, res, next){
console.log(`Sending response to the user [${requestIp.getClientIp(req)}]...`);
res.sendFile(rootPath+'/client/sent.html');
});

app.post('/', function(req, res){
if(Array.isArray(req.files.file)){
Expand Down