aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Wilkins <samwilkins333@gmail.com>2019-02-27 17:30:10 -0500
committerSam Wilkins <samwilkins333@gmail.com>2019-02-27 17:30:10 -0500
commit45d9a5bc32aa5d5aa7695c4e6576f3c42f24c5c9 (patch)
tree524239185abfa5f857e7360d416c73c60a17112c
parent58858f2f4158e3de3e4d1dddbc85bad8e7edb7f9 (diff)
clean up
-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
-rw-r--r--views/workspace.pug13
4 files changed, 5 insertions, 25 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
diff --git a/views/workspace.pug b/views/workspace.pug
deleted file mode 100644
index 8bbc3e02c..000000000
--- a/views/workspace.pug
+++ /dev/null
@@ -1,13 +0,0 @@
-
-extends ./layout
-
-block content
- style
- include ./stylesheets/authentication.css
- form.form-horizontal(id='workspace-form', method='POST', action='/home')
- input(type='hidden', name='_csrf', value=_csrf)
- .overlay(id='overlay_workspaces')
- h3.workspace-header Select A Workspace
- ul.workspaceList
- each val, index in ids
- li.workspaceId(onclick='console.log("' + val + '")')= (index + 1) + ') ' + val \ No newline at end of file