merged with master, resolved conflicts and reformatted workspace menu

3 files changed, 28 insertions, 19 deletions

diff --git a/src/server/RouteStore.ts b/src/server/RouteStore.ts
index 4842da51a..f12aed85e 100644
--- a/src/server/RouteStore.ts
+++ b/src/server/RouteStore.ts
@@ -2,7 +2,7 @@
 
 export enum RouteStore {
     // GENERAL
-    root = "/root",
+    root = "/",
     home = "/home",
     corsProxy = "/corsProxy",
     delete = "/delete",
diff --git a/src/server/authentication/controllers/WorkspacesMenu.tsx b/src/server/authentication/controllers/WorkspacesMenu.tsx
index ffef2e11c..1533b1e62 100644
--- a/src/server/authentication/controllers/WorkspacesMenu.tsx
+++ b/src/server/authentication/controllers/WorkspacesMenu.tsx
@@ -1,17 +1,13 @@
 import * as React from 'react';
-import * as ReactDOM from 'react-dom';
 import { observable, action, configure, reaction, computed, ObservableMap, runInAction } from 'mobx';
 import { observer } from "mobx-react";
-import * as request from 'request'
 import './WorkspacesMenu.css'
 import { Document } from '../../../fields/Document';
-import { Server } from '../../../client/Server';
-import { Field } from '../../../fields/Field';
 import { EditableView } from '../../../client/views/EditableView';
 import { KeyStore } from '../../../fields/KeyStore';
 
 export interface WorkspaceMenuProps {
-    active: Document;
+    active: Document | undefined;
     open: (workspace: Document) => void;
     new: (init: boolean) => void;
     allWorkspaces: Document[];
@@ -40,15 +36,15 @@ export class WorkspacesMenu extends React.Component<WorkspaceMenuProps> {
     }
 
     render() {
-        let p = this.props;
         return (
             <div
                 style={{
                     width: "auto",
-                    height: "auto",
+                    maxHeight: '200px',
+                    overflow: 'scroll',
                     borderRadius: 5,
                     position: "absolute",
-                    top: 55,
+                    top: 78,
                     left: this.workspacesExposed ? 11 : -500,
                     background: "white",
                     border: "black solid 2px",
@@ -77,7 +73,8 @@ export class WorkspacesMenu extends React.Component<WorkspaceMenuProps> {
                             this.props.open(s);
                         }}
                         style={{
-                            marginTop: 10
+                            marginTop: 10,
+                            color: s === this.props.active ? "red" : "black"
                         }}
                     >
                         <span>{i + 1} - </span>
diff --git a/src/server/index.ts b/src/server/index.ts
index 70b794e35..d0df95ca3 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -145,10 +145,6 @@ addSecureRoute(Method.GET, RouteStore.root, (user, req, res) => {
 
 // YAY! SHOW THEM THEIR WORKSPACES NOW
 addSecureRoute(Method.GET, RouteStore.home, (user, req, res) => {
-    let detector = new MobileDetect(req.headers['user-agent'] || "");
-    console.log("GAAAAAAHHHHH");
-    console.log(detector.mobile());
-    console.log(detector.is("mobile"));
     res.sendFile(path.join(__dirname, '../../deploy/index.html'));
 });
 
@@ -160,14 +156,30 @@ addSecureRoute(Method.GET, RouteStore.getAllWorkspaces, (user, req, res) => {
     res.send(JSON.stringify(user.allWorkspaceIds));
 });
 
-addSecureRoute(Method.POST, RouteStore.setActiveWorkspace, (user, req) => {
-    req
-    user.update({ $set: { activeWorkspaceId: req.body.target } }, () => { });
+addSecureRoute(Method.POST, RouteStore.setActiveWorkspace, (user, req, res) => {
+    user.update({ $set: { activeWorkspaceId: req.body.target } }, (err, raw) => {
+        res.sendStatus(err ? 500 : 200);
+    });
 });
 
-addSecureRoute(Method.POST, RouteStore.addWorkspace, (user, req) => {
-    user.update({ $push: { allWorkspaceIds: req.body.target } }, () => { });
+addSecureRoute(Method.POST, RouteStore.addWorkspace, (user, req, res) => {
+    user.update({ $push: { allWorkspaceIds: req.body.target } }, (err, raw) => {
+        res.sendStatus(err ? 500 : 200);
+    });
 });
+// define a route handler for the default home page
+// app.get("/", (req, res) => {
+//     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>");
+})
 
 // AUTHENTICATION