Prevent dom element flickering on load

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

diff --git a/server.js b/server.js
index eaeed179bbd954ad60a4d9524bd51448e0aeee3d..4a67585cf42b71c17a832bee53c18ae526fafe5f 100755 (executable)
--- a/server.js
+++ b/server.js
@@ -15,6 +15,7 @@ var express = require('express'),
     multipart = require('./src/multipart'),
     mkdirp = require('mkdirp'),
     auth = require('./src/auth.js'),
+    serveIndex = require('serve-index'),
     files = require('./src/files.js')(path.resolve(__dirname, process.argv[2] || 'files'));
 
 var app = express();
@@ -28,12 +29,15 @@ 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, '/app/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');
 
 app.use(morgan('dev'));
 app.use(compression());
-app.use('/_admin', express.static(__dirname + '/app'));
-app.use(express.static(path.resolve(__dirname, process.argv[2] || 'files')));
+app.use('/_admin', express.static(__dirname + '/frontend'));
+app.use(express.static(rootFolder));
+app.use(serveIndex(rootFolder, { icons: true }));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false, limit: '100mb' }));
 app.use(cookieParser());