Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Julio César committed Oct 10, 2016
1 parent 8c312ac commit d1f894a
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 12 deletions.
32 changes: 30 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,34 @@ http.listen(3000, function() {
app.get('/', function(req, res) {
res.sendFile(__dirname + '/index.html');
});
app.get('/interstellar.js', function(req, res) {
res.sendFile(__dirname + '/interstellar.js');
});
app.get('/img/logo.png', function(req, res) {
res.sendFile(__dirname + '/img/logo.png');
});

app.get('/status.css', function(req, res) {
res.sendFile(__dirname + '/status.css');
});
app.get('/img/tex.jpg', function(req, res) {
res.sendFile(__dirname + '/img/tex.jpg');
});
app.get('/bootstrap.min.css', function(req, res) {
res.sendFile(__dirname + '/bootstrap.min.css');
});
app.get('/font-awesome.min.css', function(req, res) {
res.sendFile(__dirname + '/font-awesome.min.css');
});
app.get('/jquery.min.js', function(req, res) {
res.sendFile(__dirname + '/jquery.min.js');
});
app.get('/jquery-ui.min.js', function(req, res) {
res.sendFile(__dirname + '/jquery-ui.min.js');
});
app.get('/keypress.js', function(req, res) {
res.sendFile(__dirname + '/keypress.js');
});

var sockets = {};

Expand Down Expand Up @@ -88,13 +116,13 @@ board.on("ready", function() {

io.sockets.on('connection', function (socket) {

var speed = 100;
var speed = 255;

socket.on('vel', function (data) {

console.log("Nueva velocidad: " + data);

speed = data;
speed = data;

});

Expand Down
16 changes: 8 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<html>
<head>
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="http://localhost:8000/status.css" media="screen" title="no title" charset="utf-8">
<link href="https://juliocesar.io/voyager_static/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://juliocesar.io/voyager_static/font-awesome.min.css">
<script src="https://juliocesar.io/voyager_static/jquery.min.js"></script>
<script src="https://juliocesar.io/voyager_static/jquery-ui.min.js"></script>
<script src="https://juliocesar.io/voyager_static/keypress.js"></script>
<link rel="stylesheet" href="/status.css" media="screen" title="no title" charset="utf-8">
<link href="/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="/font-awesome.min.css">
<script src="/jquery.min.js"></script>
<script src="/jquery-ui.min.js"></script>
<script src="/keypress.js"></script>
<script src="/socket.io/socket.io.js"></script>


Expand Down Expand Up @@ -198,7 +198,7 @@

<div class="panel">
<br>
<img style="width:150px" src="http://localhost:8000/img/logo.png" alt="" />
<img style="width:150px" src="/img/logo.png" alt="" />
<br>
<p style="color:#6f6f6f;">Web Controller</p>
<br>
Expand Down Expand Up @@ -362,5 +362,5 @@


</body>
<script src="http://localhost:8000/interstellar.js"></script>
<script src="/interstellar.js"></script>
</html>
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"express": "^4.13.4",
"express-stormpath": "^3.1.2",
"johnny-five": "~0.8.85",
"socket.io": "~1.3.5"
"socket.io": "~1.3.5",
"serialport": "~4.0.3",
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion status.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

body{
padding: 100px 120px 0 120px;
background: url("img/tex.jpg");
background: url("/img/tex.jpg");
background-size: cover;
}

Expand Down

0 comments on commit d1f894a

Please sign in to comment.