Merge remote-tracking branch 'origin/julius-dev' into julius-dev

src/app.ts

@@ -87,8 +87,12 @@ class App {
             };
         }));
         this.app.use((req: any, res: Response) => {
-            res.status(httpStatus.NOT_FOUND);
+            if (globals.config.frontend.angularIndex) {
-            res.render("errors/404.pug", {url: req.url});
+                res.sendFile(path.join(__dirname, globals.config.frontend.angularIndex));
+            } else {
+                res.status(httpStatus.NOT_FOUND);
+                res.render("errors/404.pug", {url: req.url});
+            }
         });
         this.app.use((err, req: Request, res: Response) => {
             res.status(httpStatus.INTERNAL_SERVER_ERROR);

src/default-config.yaml

@@ -20,3 +20,6 @@ markdown:
 # configuration for logging
 logging:
   level: info
+
+frontend:
+  angularIndex: