diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 723cf1f..790d74d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,8 @@
-
-
-
+
+
@@ -103,33 +102,31 @@
-
-
+
+
-
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -139,7 +136,6 @@
- noggranhet
noggrannhet
transform
"Klicka
@@ -169,6 +165,7 @@
Manual
view.animation
view.
+ draw.on
@@ -183,7 +180,6 @@
@@ -244,7 +242,7 @@
-
+
@@ -258,9 +256,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -721,7 +733,8 @@
-
+
+
1498184037990
@@ -856,11 +869,25 @@
1498950016829
-
+
+ 1498999532552
+
+
+
+ 1498999532552
+
+
+ 1499000264084
+
+
+
+ 1499000264084
+
+
-
+
@@ -877,10 +904,10 @@
-
+
-
+
@@ -923,7 +950,9 @@
-
+
+
+
@@ -1007,7 +1036,6 @@
-
@@ -1101,7 +1129,6 @@
-
@@ -1136,13 +1163,6 @@
-
-
-
-
-
-
-
@@ -1151,16 +1171,16 @@
-
-
-
-
-
+
+
+
+
+
@@ -1174,13 +1194,6 @@
-
-
-
-
-
-
-
@@ -1249,18 +1262,10 @@
-
-
-
-
-
-
-
-
@@ -1268,7 +1273,6 @@
-
@@ -1276,7 +1280,6 @@
-
@@ -1284,7 +1287,6 @@
-
@@ -1292,37 +1294,35 @@
-
-
+
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
@@ -1330,5 +1330,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app.js b/app.js
index b57b04d..ec3099c 100644
--- a/app.js
+++ b/app.js
@@ -4,9 +4,10 @@ var favicon = require('serve-favicon');
var logger = require('morgan');
var cookieParser = require('cookie-parser');
var bodyParser = require('body-parser');
+var fs = require('fs');
var index = require('./routes/index');
-var camera = require('./routes/camera');
+//var camera = require('./routes/camera');
var app = express();
@@ -23,7 +24,15 @@ app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));
app.use('/', index);
-app.use('/camera', camera);
+//app.use('/camera', camera);
+
+app.use('/manifest.json', function(req, res, next){
+ fs.readFile('manifest.json', function(err, data){
+ res.writeHead(200, {'Content-Type': 'application/json'});
+ res.write(data);
+ res.end();
+ });
+});
// catch 404 and forward to error handler
app.use(function(req, res, next) {
@@ -33,14 +42,14 @@ app.use(function(req, res, next) {
});
// error handler
-app.use(function(err, req, res, next) {
+//app.use(function(err, req, res, next) {
// set locals, only providing error in development
- res.locals.message = err.message;
- res.locals.error = req.app.get('env') === 'development' ? err : {};
+// res.locals.message = err.message;
+// res.locals.error = req.app.get('env') === 'development' ? err : {};
// render the error page
- res.status(err.status || 500);
- res.render('error');
-});
+// res.status(err.status || 500);
+// res.render('error');
+//});
module.exports = app;
diff --git a/package.json b/package.json
index 0a2da26..5e37487 100644
--- a/package.json
+++ b/package.json
@@ -15,5 +15,14 @@
"pg": "*",
"postgeo": "*",
"serve-favicon": "~2.4.2"
+ },
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/daGoloubev/duria.git"
+ },
+ "author": "Daniel Rasmussen",
+ "license": "ISC",
+ "bugs": {
+ "url": "https://github.com/daGoloubev/duria/issues"
}
}