diff options
author | Tyler Schicke <tyler_schicke@brown.edu> | 2019-03-16 23:34:44 -0400 |
---|---|---|
committer | Tyler Schicke <tyler_schicke@brown.edu> | 2019-03-16 23:34:44 -0400 |
commit | cfe5c8503e53518e89bd285000c4975a19f2dc13 (patch) | |
tree | 78f4c3d4d2d7abe07339ff15c0bb6d9556f6a883 /src/server/index.ts | |
parent | e9c9d3ea2915ebfd092df77bb49e2fe4f293968b (diff) | |
parent | 63e591552ad6f92b0d36d9fe51338bbfd007c6dc (diff) |
Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into kvp_ui
Diffstat (limited to 'src/server/index.ts')
-rw-r--r-- | src/server/index.ts | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/server/index.ts b/src/server/index.ts index 0d0b65b22..7f1e95964 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -100,9 +100,14 @@ let FieldStore: ObservableMap<FieldId, Field> = new ObservableMap(); // define a route handler for the default home page app.get("/", (req, res) => { - res.sendFile(path.join(__dirname, '../../deploy/index.html')); + res.redirect("/doc/mainDoc"); + // res.sendFile(path.join(__dirname, '../../deploy/index.html')); }); +app.get("/doc/:docId", (req, res) => { + res.sendFile(path.join(__dirname, '../../deploy/index.html')); +}) + app.get("/hello", (req, res) => { res.send("<p>Hello</p>"); }) @@ -173,8 +178,9 @@ function getFields([ids, callback]: [string[], (result: any) => void]) { } function setField(socket: Socket, newValue: Transferable) { - Database.Instance.update(newValue._id, newValue) - socket.broadcast.emit(MessageStore.SetField.Message, newValue) + Database.Instance.update(newValue._id, newValue, () => { + socket.broadcast.emit(MessageStore.SetField.Message, newValue); + }) } server.listen(serverPort); |