Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/global-message

Browse source 
# Conflicts:
#	back/src/App.ts
This commit is contained in:
Gregoire Parant 2020-09-23 17:26:00 +02:00
commit bcb126a146
7 changed files with 90 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
back/src/App.ts
View file

@ -8,6 +8,7 @@ import * as http from "http";
import {MapController} from "./Controller/MapController";
import {PrometheusController} from "./Controller/PrometheusController";
import {FileController} from "./Controller/FileController";
import {AdminController} from "./Controller/AdminController";
class App {
public app: Application;
@ -17,6 +18,7 @@ class App {
public fileController: FileController;
public mapController: MapController;
public prometheusController: PrometheusController;
private adminController: AdminController;
constructor() {
this.app = express();
@ -35,6 +37,7 @@ class App {
this.fileController = new FileController(this.app);
this.mapController = new MapController(this.app);
this.prometheusController = new PrometheusController(this.app, this.ioSocketController);
this.adminController = new AdminController(this.app);
}
// TODO add session user