Show upload progress

[perso/Immae/Projets/Nodejs/Surfer.git] / server.js

diff --git a/server.js b/server.js
index 67cbd915851c530659e4ed7f0e6d881f2b6ed8ba..5814539384bb327e11f82e802630e505fe79f511 100755 (executable)
--- a/server.js
+++ b/server.js
@@ -23,6 +23,9 @@ var router = new express.Router();
 
 var multipart = multipart({ maxFieldsSize: 2 * 1024, limit: '512mb', timeout: 3 * 60 * 1000 });
 
+router.post  ('/api/login', auth.login);
+router.post  ('/api/logout', auth.verify, auth.logout);
+router.get   ('/api/profile', auth.verify, auth.getProfile);
 router.get   ('/api/files/*', auth.verify, files.get);
 router.post  ('/api/files/*', auth.verify, multipart, files.post);
 router.put   ('/api/files/*', auth.verify, files.put);
@@ -30,7 +33,12 @@ router.delete('/api/files/*', auth.verify, files.del);
 router.get   ('/api/healthcheck', function (req, res) { res.status(200).send(); });
 
 // welcome screen in case / does not serve up any file yet
-router.get('/', function (req, res) { res.status(200).sendFile(path.join(__dirname, '/frontend/welcome.html')); });
+function welcomePage(req, res, next) {
+    if (req.path !== '/') return next();
+
+    res.status(200).sendFile(path.join(__dirname, '/frontend/welcome.html'));
+}
+// router.get('/', function (req, res) { res.status(200).sendFile(path.join(__dirname, '/frontend/welcome.html')); });
 
 var rootFolder = path.resolve(__dirname, process.argv[2] || 'files');
 
@@ -45,6 +53,7 @@ app.use('/api', passport.session());
 app.use(router);
 app.use('/_admin', express.static(__dirname + '/frontend'));
 app.use('/', express.static(rootFolder));
+app.use('/', welcomePage);
 app.use('/', serveIndex(rootFolder, { icons: true }));
 app.use(lastMile());