diff options
| author | okalintu <ilkka.oksanen@aalto.fi> | 2015-03-03 15:46:01 +0200 |
|---|---|---|
| committer | okalintu <ilkka.oksanen@aalto.fi> | 2015-03-03 15:46:01 +0200 |
| commit | 10eb4471ab820bb2323077cb7be8029a2e9b0759 (patch) | |
| tree | 0d3b77b065d46bd9657359d7e33f7e4c2881c323 | |
| parent | 6cb2891f117e29ea7adc68f62fe422285fc8364b (diff) | |
sanitized routes
| l--------- | f/scripts/angular | 1 | ||||
| -rw-r--r-- | f/scripts/client.js (renamed from client.js) | 0 | ||||
| -rw-r--r-- | f/styles/style.css | 0 | ||||
| -rw-r--r-- | f/templates/adm.html (renamed from adm.html) | 4 | ||||
| -rw-r--r-- | f/templates/index.html (renamed from index.html) | 4 | ||||
| -rw-r--r-- | index.js | 14 |
6 files changed, 14 insertions, 9 deletions
diff --git a/f/scripts/angular b/f/scripts/angular new file mode 120000 index 0000000..aaffc07 --- /dev/null +++ b/f/scripts/angular @@ -0,0 +1 @@ +../../node_modules/angular
\ No newline at end of file diff --git a/client.js b/f/scripts/client.js index fb612ed..fb612ed 100644 --- a/client.js +++ b/f/scripts/client.js diff --git a/f/styles/style.css b/f/styles/style.css new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/f/styles/style.css diff --git a/adm.html b/f/templates/adm.html index a602da9..bbc4209 100644 --- a/adm.html +++ b/f/templates/adm.html @@ -1,9 +1,9 @@ <!doctype HTML> <html > <head> -<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.0.8/angular.min.js"></script> +<script src="f/scripts/angular/angular.min.js"></script> <script src="/socket.io/socket.io.js"></script> -<script src="/client.js"></script> +<script src="/f/scripts/client.js"></script> <title>Jono</title> </head> <body ng-app="ioc" > diff --git a/index.html b/f/templates/index.html index 536f644..822c162 100644 --- a/index.html +++ b/f/templates/index.html @@ -1,9 +1,9 @@ <!doctype HTML> <html > <head> -<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.0.8/angular.min.js"></script> +<script src="/f/scripts/angular/angular.min.js"></script> <script src="/socket.io/socket.io.js"></script> -<script src="/client.js"></script> +<script src="/f/scripts/client.js"></script> <title>Jono</title> </head> <body ng-app="ioc" > @@ -5,15 +5,18 @@ var io = require('socket.io')(http); var que = [] app.get('/', function(req, res){ - res.sendFile(__dirname + '/index.html'); -}); -app.get('/client.js', function(req, res){ - res.sendFile(__dirname + '/client.js'); + res.sendFile(__dirname + '/f/templates/index.html'); }); app.get('/adm', function(req, res){ - res.sendFile(__dirname + '/adm.html'); + res.sendFile(__dirname + '/f/templates/adm.html'); +}); + +//route all paths beginning with /f/ to real files +app.get('/f/*', function(req, res){ + res.sendFile(__dirname + req.path); }); + io.on('connection', function(socket){ socket.emit("quedata",que); @@ -29,6 +32,7 @@ io.on('connection', function(socket){ }); + }); http.listen(3000, function(){ |