aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/authentication/controllers/WorkspacesMenu.tsx5
-rw-r--r--src/server/authentication/controllers/user_controller.ts10
-rw-r--r--src/server/index.ts2
3 files changed, 5 insertions, 12 deletions
diff --git a/src/server/authentication/controllers/WorkspacesMenu.tsx b/src/server/authentication/controllers/WorkspacesMenu.tsx
index 284a8ec66..94d168a05 100644
--- a/src/server/authentication/controllers/WorkspacesMenu.tsx
+++ b/src/server/authentication/controllers/WorkspacesMenu.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
-import { observable, action, configure, reaction, computed, ObservableMap } from 'mobx';
+import { observable, action, configure, reaction, computed, ObservableMap, runInAction } from 'mobx';
import { observer } from "mobx-react";
import * as request from 'request'
import './WorkspacesMenu.css'
@@ -32,6 +32,9 @@ export class WorkspacesMenu extends React.Component<WorkspaceMenuProps> {
this.selectedWorkspaceId = newId;
this.props.load(newId);
this.toggle();
+ // setTimeout(action(() => {
+
+ // }), 100);
}
@action
diff --git a/src/server/authentication/controllers/user_controller.ts b/src/server/authentication/controllers/user_controller.ts
index 1f1f43684..7b89b5152 100644
--- a/src/server/authentication/controllers/user_controller.ts
+++ b/src/server/authentication/controllers/user_controller.ts
@@ -130,16 +130,6 @@ export let postLogin = (req: Request, res: Response, next: NextFunction) => {
})(req, res, next);
};
-export let getWorkspaces = (req: Request, res: Response) => {
- const user: DashUserModel = req.user;
- if (!user) {
- return res.redirect("/login");
- }
- res.render("workspace.pug", {
- ids: user.allWorkspaceIds
- });
-}
-
/**
* GET /logout
* Invokes the logout function on the request
diff --git a/src/server/index.ts b/src/server/index.ts
index c707f12a0..5115142b8 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -17,7 +17,7 @@ import * as bcrypt from "bcrypt-nodejs";
import { Document } from '../fields/Document';
import * as io from 'socket.io'
import * as passportConfig from './authentication/config/passport';
-import { getLogin, postLogin, getSignup, postSignup, getLogout, getEntry, postReset, getForgot, postForgot, getReset, getWorkspaces } from './authentication/controllers/user_controller';
+import { getLogin, postLogin, getSignup, postSignup, getLogout, getEntry, postReset, getForgot, postForgot, getReset } from './authentication/controllers/user_controller';
const config = require('../../webpack.config');
const compiler = webpack(config);
const port = 1050; // default port to listen