added login/reset and forgot password

Deepak
1 parent 39d8f536dc
Showing 49 changed files with 2040 additions and 557 deletions Show diff stats
client/main.js
imports/client/app/index.js
imports/client/app/routes.js
imports/client/app/shelf.js
imports/client/app/utils/changePassword.js
imports/client/app/utils/get-input-value.js
imports/client/app/utils/login.js
imports/client/app/utils/loginMethods.js
imports/client/app/utils/rate-limit.js
imports/client/app/utils/recover-password.js
imports/client/app/utils/reset-password.js
imports/client/app/utils/setQueryParam.js
imports/client/app/utils/signup.js
imports/client/assets/css/icons/icomoon/styles.css
imports/client/layouts/OrgApp.js
imports/client/views/etc/index.js
imports/client/views/org/app/module/AppLayout.js
imports/client/views/org/app/module/navigation/AppNavigation.js
imports/client/views/org/app/module/navigation/AuthenticatedNavigation.js
imports/client/views/org/app/module/navigation/PublicNavigation.js
-import '/imports/startup/client';
+import '/imports/client/app/index';
@@ -0,0 +1,37 @@
+import _                                  from 'lodash';
+import moment                             from 'moment';
+import { Meteor }                         from 'meteor/meteor';
+import { Router, browserHistory }         from 'react-router';
+
+import { Orgs }                           from '/imports/collections/orgs/index';
+import { Users }                          from '/imports/collections/users/index';;
+
+
+import { Bert }                           from 'meteor/themeteorchef:bert';
+import './routes.js';
+import './shelf.js';
+// import 'react-quill/dist/quill.snow.css';
+
+Bert.defaults = {
+  hideDelay: 3500,
+  // Accepts: a number in milliseconds.
+  style: 'fixed-top',
+  // Accepts: fixed-top, fixed-bottom, growl-top-left,   growl-top-right,
+  // growl-bottom-left, growl-bottom-right.
+  type: 'default'
+  // Accepts: default, success, info, warning, danger.
+};
+
+_.assign(window, {
+  _,
+});
+
+if(Meteor.settings.public.environment === 'development') {
+  _.assign(window, {
+    Meteor,
+    Shelf,
+
+    Orgs,
+    Users,
+  });
+}
@@ -0,0 +1,104 @@
+/* eslint-disable max-len */
+
+import React                                from 'react';
+import { render }                           from 'react-dom';
+import { Router, Route,
+  IndexRoute, browserHistory }              from 'react-router';
+import { Meteor }                           from 'meteor/meteor';
+
+/**
+ * General Components
+ */
+import Index                                from '/imports/client/views/app/module/Index';
+
+/**
+ * Org Components
+ */
+
+import { App }                              from '/imports/client/layouts/OrgApp';
+import { AppModule }                        from '/imports/client/views/org/app/module/Index';
+import { Orgs }                             from '/imports/collections/orgs/index';
+import NotFound                             from '/imports/client/views/org/NotFound';
+
+/**
+ * NonOrg Components
+ */
+import Signup                               from '/imports/client/views/nonOrg/enter/SignupView';
+
+/**
+ * Invalid Org Components
+ */
+
+const authenticate = (nextState, replace) => {
+  if (!Meteor.loggingIn() && !Meteor.userId()) {
+    replace({
+      pathname: '/login',
+      state: { nextPathname: nextState.location.pathname },
+    });
+  }
+};
+
+
+const detectOrg = () => {
+  orgSlug = "";
+  var hostnameArray = document.location.hostname.split( "." );
+  if(hostnameArray[1]=='localhost'){
+    orgSlug = hostnameArray[0];
+  }
+  if(orgSlug!=""){
+    Meteor.call('checkExistingOrg', {slug:orgSlug}, function(err, res) {
+      if(res){
+        Session.set('orgId', res._id._str);
+        Session.set('orgSlug', orgSlug);
+        render(getOrgRoutes(),document.getElementById('app'));
+      }else{
+        render(getInvalidOrgRoute(),document.getElementById('app'));
+      }
+    });
+  }else{
+    render(getNonOrgRoutes(),document.getElementById('app'));
+  }
+}
+const checkSlug = (nextState, replace) => {
+  orgId = Session.get('orgId');
+}
+
+/**
+There are three types of routes
+1)getOrgRoutes: all the routes that should be present for a registered org
+2)getInvalidOrgRoute: all the routes where someone tries to enter a subdomain which hasn't been registered yet (404 mostly :D)
+3)getNonOrgRoutes: all routes linked to normal site, ie signing up a new org. CHeking out demo and everything internal
+**/
+const getOrgRoutes = () => (
+  <Router history={ browserHistory }>
+    <Route path="/"                                                           component={ App }>
+      <IndexRoute name="index"                                                component={ AppModule } />
+      <Route path="*"                                                         component={ NotFound } />
+    </Route>
+  </Router>
+)
+
+
+const getInvalidOrgRoute = () => (
+  <Router history={ browserHistory }>
+    <Route path="/"                                                           component={ App }>
+      <IndexRoute name="index"                                                component={ NotFound } />
+      <Route path="*"                                                         component={ NotFound } />
+    </Route>
+  </Router>
+)
+
+const getNonOrgRoutes = () => (
+  <Router history={ browserHistory }>
+    <Route path="/"                                                           component={ App }>
+      <IndexRoute name="index"                                                component={ Index } />
+      <Route name="signup"            path="/signup"                          component={ Signup } />
+      <Route path="*"                                                         component={ NotFound } />
+    </Route>
+  </Router>
+)
+
+
+Meteor.startup(() => {
+  detectOrg();
+});
@@ -0,0 +1,12 @@
+import { ReactiveVar }                    from 'meteor/reactive-var'
+
+
+window.Shelf = {};
+
+Shelf.layout = new ReactiveVar({});
+// {
+//   bulb:     new ReactiveVar(''),          // Active menu tab
+//   subbulb:  new ReactiveVar(''),          // Active submenu tab
+// };
+
+
@@ -0,0 +1,7 @@
+import $ from 'jquery';
+import 'jquery-validation';
+import { Accounts } from 'meteor/accounts-base';
+import { Bert } from 'meteor/themeteorchef:bert';
+import { getInputValue } from './get-input-value';
+
+let component;
@@ -0,0 +1,5 @@
+// TODO WTF: what is this thing? -H
+
+import ReactDOM from 'react-dom';
+
+export const getInputValue = (component) => ReactDOM.findDOMNode(component).value;
@@ -0,0 +1,70 @@
+import $ from 'jquery';
+import 'jquery-validation';
+import { browserHistory } from 'react-router';
+import { Meteor } from 'meteor/meteor';
+import { Bert } from 'meteor/themeteorchef:bert';
+import { getInputValue } from './get-input-value';
+
+let component;
+
+const login = () => {
+  const email = getInputValue(component.refs.emailAddress);
+  const password = getInputValue(component.refs.password);
+
+  Meteor.call('checkEmailVerification', email, ( error, data ) => {
+    if ( error ) {
+      Bert.alert( error.reason, 'danger' );
+    }
+    else {
+      if ( data == "verified" ) {
+        Meteor.loginWithPassword(email, password, (error) => {
+          if ( error ) {
+            Bert.alert(error.reason, 'warning');
+          } else {
+            Bert.alert('Logged in!', 'success');
+
+            const { location } = component.props;
+            if (location.state && location.state.nextPathname) {
+              browserHistory.push(location.state.nextPathname);
+            } else {
+              browserHistory.push('/');
+            }
+          }
+        });
+      } else if ( data == "unverified" ){
+          Bert.alert("Check your email for a verification link");
+      } else {
+          Bert.alert("Either email or password is incorrect");
+      }
+    }
+  });
+};
+
+const validate = () => {
+  $(component.refs.login).validate({
+    rules: {
+      emailAddress: {
+        required: true,
+        email: true,
+      },
+      password: {
+        required: true,
+      },
+    },
+    messages: {
+      emailAddress: {
+        required: 'Need an email address here.',
+        email: 'Is this email address legit?',
+      },
+      password: {
+        required: 'Need a password here.',
+      },
+    },
+    submitHandler() { login(); },
+  });
+};
+
+export const handleLogin = (options) => {
+  component = options.component;
+  validate();
+};
@@ -0,0 +1,10 @@
+import { browserHistory }                 from 'react-router';
+
+
+export const logout = () => {
+  Meteor.logout();
+  browserHistory.push('/');
+};
+
+
+
@@ -0,0 +1,18 @@
+import { _ }                              from 'meteor/underscore';
+import { Meteor }                         from 'meteor/meteor';
+import { DDPRateLimiter }                 from 'meteor/ddp-rate-limiter';
+
+const fetchMethodNames = (methods) => _.pluck(methods, 'name');
+
+const assignLimits = ({ methods, limit, timeRange }) => {
+  const methodNames = fetchMethodNames(methods);
+
+  if (Meteor.isServer) {
+    DDPRateLimiter.addRule({
+      name(name) { return _.contains(methodNames, name); },
+      connectionId() { return true; },
+    }, limit, timeRange);
+  }
+};
+
+export const rateLimit = (options) => assignLimits(options);
@@ -0,0 +1,42 @@
+import $ from 'jquery';
+import 'jquery-validation';
+import { Accounts } from 'meteor/accounts-base';
+import { Bert } from 'meteor/themeteorchef:bert';
+import { getInputValue } from './get-input-value';
+
+let component;
+
+const handleRecovery = () => {
+  Accounts.forgotPassword({
+    email: getInputValue(component.refs.emailAddress),
+  }, (error) => {
+    if (error) {
+      Bert.alert(error.reason, 'warning');
+    } else {
+      Bert.alert('Check your inbox for a reset link!', 'success');
+    }
+  });
+};
+
+const validate = () => {
+  $(component.refs.recoverPassword).validate({
+    rules: {
+      emailAddress: {
+        required: true,
+        email: true,
+      },
+    },
+    messages: {
+      emailAddress: {
+        required: 'Need an email address here.',
+        email: 'Is this email address legit?',
+      },
+    },
+    submitHandler() { handleRecovery(); },
+  });
+};
+
+export const handleRecoverPassword = (options) => {
+  component = options.component;
+  validate();
+};
@@ -0,0 +1,54 @@
+import $ from 'jquery';
+import 'jquery-validation';
+import { browserHistory } from 'react-router';
+import { Accounts } from 'meteor/accounts-base';
+import { Bert } from 'meteor/themeteorchef:bert';
+import { getInputValue } from './get-input-value';
+
+let component;
+let token;
+
+const handleReset = () => {
+  const password = getInputValue(component.refs.newPassword);
+  Accounts.resetPassword(token, password, (error) => {
+    if (error) {
+      Bert.alert(error.reason, 'danger');
+    } else {
+      browserHistory.push('/');
+      Bert.alert('Password reset!', 'success');
+    }
+  });
+};
+
+const validate = () => {
+  $(component.refs.resetPassword).validate({
+    rules: {
+      newPassword: {
+        required: true,
+        minlength: 6,
+      },
+      repeatNewPassword: {
+        required: true,
+        minlength: 6,
+        equalTo: '[name="newPassword"]',
+      },
+    },
+    messages: {
+      newPassword: {
+        required: 'Enter a new password, please.',
+        minlength: 'Use at least six characters, please.',
+      },
+      repeatNewPassword: {
+        required: 'Repeat your new password, please.',
+        equalTo: 'Hmm, your passwords don\'t match. Try again?',
+      },
+    },
+    submitHandler() { handleReset(); },
+  });
+};
+
+export const handleResetPassword = (options) => {
+  component = options.component;
+  token = options.token;
+  validate();
+};
@@ -0,0 +1,9 @@
+import _                                  from 'lodash';
+
+export const setQueryParam = (location, query) => ({
+  pathname: location.pathname,
+  hash:     location.hash,
+  query:    _.assign({}, location.query, query),
+});
+
+
@@ -0,0 +1,76 @@
+import $ from 'jquery';
+import 'jquery-validation';
+import { browserHistory } from 'react-router';
+import { Accounts } from 'meteor/accounts-base';
+import { Bert } from 'meteor/themeteorchef:bert';
+import { getInputValue } from './get-input-value';
+
+let component;
+
+const getUserData = () => ({
+  email: getInputValue(component.refs.emailAddress),
+  password: getInputValue(component.refs.password),
+  profile: {
+    name: {
+      first: getInputValue(component.refs.firstName),
+      last: getInputValue(component.refs.lastName),
+    },
+  },
+});
+
+const signUp = () => {
+  const user = getUserData();
+
+  Accounts.createUser(user, (error) => {
+    if (error) {
+      Bert.alert(error.reason, 'danger');
+    } else {
+      Bert.alert( 'Welcome!', 'success' );
+      Session.set('signedEmail', user.email);
+      browserHistory.push('/users/verify');
+    }
+  });
+};
+
+const validate = () => {
+  $(component.refs.signup).validate({
+    rules: {
+      firstName: {
+        required: true,
+      },
+      lastName: {
+        required: true,
+      },
+      emailAddress: {
+        required: true,
+        email: true,
+      },
+      password: {
+        required: true,
+        minlength: 6,
+      },
+    },
+    messages: {
+      firstName: {
+        required: 'First name?',
+      },
+      lastName: {
+        required: 'Last name?',
+      },
+      emailAddress: {
+        required: 'Need an email address here.',
+        email: 'Is this email address legit?',
+      },
+      password: {
+        required: 'Need a password here.',
+        minlength: 'Use at least six characters, please.',
+      },
+    },
+    submitHandler() { signUp(); },
+  });
+};
+
+export const handleSignup = (options) => {
+  component = options.component;
+  validate();
+};
@@ -2,7 +2,7 @@
 	font-family: 'icomoon';
 	src:url('fonts/icomoon.eot?3p0rtw');
 	src:url('fonts/icomoon.eot?#iefix3p0rtw') format('embedded-opentype'),
-		url('fonts/icomoon.woff?3p0rtw') format('woff'),
+		url('fonts/icomoon.woff?3p0rtw') format('font-woff'),
 		url('fonts/icomoon.ttf?3p0rtw') format('truetype'),
 		url('fonts/icomoon.svg?3p0rtw#icomoon') format('svg');
 	font-weight: normal;
-import React from 'react';
-import { Grid } from 'react-bootstrap';
-import AppNavigation from '/imports/client/views/org/app/module/navigation/AppNavigation';
+import React, { Component }         from 'react';
+import { Grid }                     from 'react-bootstrap';
+import {AppNavigationController}    from '/imports/client/views/org/app/module/navigation/index';
+/**
+ * user based redirection will take place here
+ */
+ export class App extends Component {
+   constructor(props) {
+     super(props);
+     this.state = {
  
-const App = ({ children }) => (
-  <div>
-    <AppNavigation />
-    <Grid>
-      { children }
-    </Grid>
-  </div>
-);
-
-App.propTypes = {
-  children: React.PropTypes.node,
-};
-
-export default App;
+     };
+   };
+   render(){
+     return (
+       <div>
+         <AppNavigationController />
+         <Grid>
+           { this.props.children }
+         </Grid>
+       </div>
+     )
+   }
+ }
@@ -5,22 +5,22 @@ import {
          compose,
          composeAll
        }                                  from 'react-komposer';
-import { InviteSignupView }               from './InviteSignupView';
 import { Loading }                        from '/imports/client/components/Loading';
  
-import { Invitations }                    from '/imports/collections/invitations/index';
 import { Orgs }                           from '/imports/collections/orgs/index';
+import { Users }                          from '/imports/collections/users/index';
  
 const meteorTick = (props, onData) => {
  
   const handles = [
-    Meteor.subscribe('invitations.withToken')
+    Meteor.subscribe('users.current')
   ];
  
   if(_.every(handles, (handle) => (handle.ready()) )) {
-    const invitation = Invitations.findOne({});
+    const user = Users.current();
     onData(null, {
       data: {
+        user: user,
       },
     });
   }
@@ -5,21 +5,22 @@ import { Link }                           from &#39;react-router&#39;;
 import { Avatar }                         from '/imports/client/components/Avatar';
 import { Icon }                           from '/imports/client/components/Icon';
 import classNames                         from 'classnames';
+import { EnterModule }                    from '/imports/client/views/org/enter/module/index';
+// import { VerifyModule }                   from '/imports/client/views/verify/module/index';
  
  
 export class AppLayout extends Component {
  
-
-
-
-
-
   render() {
+    console.log(this.props);
     const {user} = this.props.data;
  
     if(!user) {
       return (
-        <div className="NotLoggedIn"></div>
+        <EnterModule
+          pane      = {this.props.location.query.enter}
+          location  = {this.props.location}
+        />
       );
     }
     return (
-import React                        from 'react';
+import React, { Component }         from 'react';
 import { Navbar }                   from 'react-bootstrap';
 import { Link }                     from 'react-router';
-import PublicNavigation             from './PublicNavigation.js';
-import AuthenticatedNavigation      from './AuthenticatedNavigation.js';
+import {PublicNavigation}             from './PublicNavigation.js';
+import {AuthenticatedNavigation}    from './AuthenticatedNavigation.js';
 import '/imports/client/assets/css/icons/icomoon/styles.css';
 import '/imports/client/assets/css/bootstrap.css';
 import '/imports/client/assets/css/core.css';
 import '/imports/client/assets/css/components.css';
 import '/imports/client/assets/css/colors.css';
-const renderNavigation = hasUser => (hasUser ? <AuthenticatedNavigation /> : <PublicNavigation />);
-const AppNavigation = ({ hasUser }) => (
-  <Navbar className="navbar-inverse bg-crimson">
-    <Navbar.Header>
-      <Navbar.Brand>
-        <Link to="/">Home</Link>
-      </Navbar.Brand>
-      <Navbar.Toggle />
-    </Navbar.Header>
-    <Navbar.Collapse>
-      { renderNavigation(hasUser) }
-    </Navbar.Collapse>
-  </Navbar>
-);
+import '/imports/client/assets/css/colors.css';
+export class AppNavigation extends Component {
  
-AppNavigation.propTypes = {
-  hasUser: React.PropTypes.object,
-};
+  constructor(props) {
+    super(props);
+    this.state = {
+
+    };
+  };
+
+  onUpdate(key, value) {
+    this.setState({[key]: value});
+  };
+  render() {
+    const {user} = this.props.data;
+    if(user){
+      return(
+        <AuthenticatedNavigation
+        data = {this.props.data}
+        />
+      )
+    }else{
+      return(
+        <Navbar>
+          <Navbar.Header>
+            <Navbar.Brand>
+              <Link to="/">Application Name</Link>
+            </Navbar.Brand>
+            <Navbar.Toggle />
+          </Navbar.Header>
+          <Navbar.Collapse>
+            <PublicNavigation />
+          </Navbar.Collapse>
+        </Navbar>
  
-export default AppNavigation;
+      )
+    }
+
+    return (
+      <div></div>
+    );
+  };
+
+};
-import React from 'react';
-import { browserHistory } from 'react-router';
-import { LinkContainer } from 'react-router-bootstrap';
-import { Nav, NavItem, NavDropdown, MenuItem } from 'react-bootstrap';
-import { Meteor } from 'meteor/meteor';
+import React, { Component }         from 'react';
+import { browserHistory }           from 'react-router';
+import { LinkContainer }            from 'react-router-bootstrap';
+import { Nav, NavItem,
+  NavDropdown, MenuItem }           from 'react-bootstrap';
+import { Meteor }                   from 'meteor/meteor';
  
 const handleLogout = () => Meteor.logout(() => browserHistory.push('/login'));
  
-const userName = () => {
-  const user = Meteor.user();
-  const name = user && user.profile ? user.profile.name : '';
-  return user ? `${name.first} ${name.last}` : '';
-};
+export class AuthenticatedNavigation extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
  
-const AuthenticatedNavigation = () => (
+    };
+  };
+render(){
+  const {user} = this.props.data;
+  return(
   <div>
-    <Nav>
-      <LinkContainer to="/documents">
-        <NavItem eventKey={ 2 } href="/documents">Documents</NavItem>
-      </LinkContainer>
-    </Nav>
-    <Nav pullRight>
-      <NavDropdown eventKey={ 3 } title={ userName() } id="basic-nav-dropdown">
-        <MenuItem eventKey={ 3.1 } onClick={ handleLogout }>Logout</MenuItem>
-      </NavDropdown>
-    </Nav>
+  <div className="navbar navbar-inverse bg-crimson">
+    <div className="navbar-header">
+      <a className="navbar-brand" href="index.html"><span className="glyphicon glyphicon-link"></span>
+        <span> YOUNGDESK </span>
+      </a>
+
+      <ul className="nav navbar-nav visible-xs-block">
+        <li><a data-toggle="collapse" data-target="#navbar-mobile"><i className="icon-tree5"></i></a></li>
+        <li><a className="sidebar-mobile-main-toggle"><i className="icon-paragraph-justify3"></i></a></li>
+      </ul>
+    </div>
+
+    <div className="navbar-collapse collapse" id="navbar-mobile">
+      <ul className="nav navbar-nav">
+        <li><a className="sidebar-control sidebar-main-toggle hidden-xs"><i className="icon-paragraph-justify3"></i></a></li>
+
+        <li className="dropdown">
+          <a href="#" className="dropdown-toggle" data-toggle="dropdown">
+            <i className="icon-puzzle3"></i>
+            <span className="visible-xs-inline-block position-right">Git updates</span>
+            <span className="status-mark border-orange-400"></span>
+          </a>
+
+          <div className="dropdown-menu dropdown-content">
+            <div className="dropdown-content-heading">
+              Git updates
+              <ul className="icons-list">
+                <li><a href="#"><i className="icon-sync"></i></a></li>
+              </ul>
+            </div>
+
+            <ul className="media-list dropdown-content-body width-350">
+              <li className="media">
+                <div className="media-left">
+                  <a href="#" className="btn border-primary text-primary btn-flat btn-rounded btn-icon btn-sm"><i className="icon-git-pull-request"></i></a>
+                </div>
+
+                <div className="media-body">
+                  Drop the IE <a href="#">specific hacks</a> for temporal inputs
+                  <div className="media-annotation">4 minutes ago</div>
+                </div>
+              </li>
+
+              <li className="media">
+                <div className="media-left">
+                  <a href="#" className="btn border-warning text-warning btn-flat btn-rounded btn-icon btn-sm"><i className="icon-git-commit"></i></a>
+                </div>
+
+                <div className="media-body">
+                  Add full font overrides for popovers and tooltips
+                  <div className="media-annotation">36 minutes ago</div>
+                </div>
+              </li>
+
+              <li className="media">
+                <div className="media-left">
+                  <a href="#" className="btn border-info text-info btn-flat btn-rounded btn-icon btn-sm"><i className="icon-git-branch"></i></a>
+                </div>
+
+                <div className="media-body">
+                  <a href="#">Chris Arney</a> created a new <span className="text-semibold">Design</span> branch
+                  <div className="media-annotation">2 hours ago</div>
+                </div>
+              </li>
+
+              <li className="media">
+                <div className="media-left">
+                  <a href="#" className="btn border-success text-success btn-flat btn-rounded btn-icon btn-sm"><i className="icon-git-merge"></i></a>
+                </div>
+
+                <div className="media-body">
+                  <a href="#">Eugene Kopyov</a> merged <span className="text-semibold">Master</span> and <span className="text-semibold">Dev</span> branches
+                  <div className="media-annotation">Dec 18, 18:36</div>
+                </div>
+              </li>
+
+              <li className="media">
+                <div className="media-left">
+                  <a href="#" className="btn border-primary text-primary btn-flat btn-rounded btn-icon btn-sm"><i className="icon-git-pull-request"></i></a>
+                </div>
+
+                <div className="media-body">
+                  Have Carousel ignore keyboard events
+                  <div className="media-annotation">Dec 12, 05:46</div>
+                </div>
+              </li>
+            </ul>
+
+            <div className="dropdown-content-footer">
+              <a href="#" data-popup="tooltip" title="All activity"><i className="icon-menu display-block"></i></a>
+            </div>
+          </div>
+        </li>
+      </ul>
+
+      <div className="navbar-right">
+        <p className="navbar-text">Hello {`${user.firstName} ${user.lastName}`}!</p>
+        <p className="navbar-text"><span className="label bg-success-400">Online</span></p>
+
+        <ul className="nav navbar-nav">
+          <li className="dropdown">
+            <a href="#" className="dropdown-toggle" data-toggle="dropdown">
+              <i className="icon-bell2"></i>
+              <span className="visible-xs-inline-block position-right">Activity</span>
+              <span className="status-mark border-orange-400"></span>
+            </a>
+
+            <div className="dropdown-menu dropdown-content">
+              <div className="dropdown-content-heading">
+                Activity
+                <ul className="icons-list">
+                  <li><a href="#"><i className="icon-menu7"></i></a></li>
+                </ul>
+              </div>
+
+              <ul className="media-list dropdown-content-body width-350">
+                <li className="media">
+                  <div className="media-left">
+                    <a href="#" className="btn bg-success-400 btn-rounded btn-icon btn-xs"><i className="icon-mention"></i></a>
+                  </div>
+
+                  <div className="media-body">
+                    <a href="#">Taylor Swift</a> mentioned you in a post "Angular JS. Tips and tricks"
+                    <div className="media-annotation">4 minutes ago</div>
+                  </div>
+                </li>
+
+                <li className="media">
+                  <div className="media-left">
+                    <a href="#" className="btn bg-pink-400 btn-rounded btn-icon btn-xs"><i className="icon-paperplane"></i></a>
+                  </div>
+
+                  <div className="media-body">
+                    Special offers have been sent to subscribed users by <a href="#">Donna Gordon</a>
+                    <div className="media-annotation">36 minutes ago</div>
+                  </div>
+                </li>
+
+                <li className="media">
+                  <div className="media-left">
+                    <a href="#" className="btn bg-blue btn-rounded btn-icon btn-xs"><i className="icon-plus3"></i></a>
+                  </div>
+
+                  <div className="media-body">
+                    <a href="#">Chris Arney</a> created a new <span className="text-semibold">Design</span> branch in <span className="text-semibold">Limitless</span> repository
+                    <div className="media-annotation">2 hours ago</div>
+                  </div>
+                </li>
+
+                <li className="media">
+                  <div className="media-left">
+                    <a href="#" className="btn bg-purple-300 btn-rounded btn-icon btn-xs"><i className="icon-truck"></i></a>
+                  </div>
+
+                  <div className="media-body">
+                    Shipping cost to the Netherlands has been reduced, database updated
+                    <div className="media-annotation">Feb 8, 11:30</div>
+                  </div>
+                </li>
+
+                <li className="media">
+                  <div className="media-left">
+                    <a href="#" className="btn bg-warning-400 btn-rounded btn-icon btn-xs"><i className="icon-bubble8"></i></a>
+                  </div>
+
+                  <div className="media-body">
+                    New review received on <a href="#">Server side integration</a> services
+                    <div className="media-annotation">Feb 2, 10:20</div>
+                  </div>
+                </li>
+
+                <li className="media">
+                  <div className="media-left">
+                    <a href="#" className="btn bg-teal-400 btn-rounded btn-icon btn-xs"><i className="icon-spinner11"></i></a>
+                  </div>
+
+                  <div className="media-body">
+                    <strong>January, 2016</strong> - 1320 new users, 3284 orders, $49,390 revenue
+                    <div className="media-annotation">Feb 1, 05:46</div>
+                  </div>
+                </li>
+              </ul>
+            </div>
+          </li>
+
+          <li className="dropdown">
+            <a href="#" className="dropdown-toggle" data-toggle="dropdown">
+              <i className="icon-bubble8"></i>
+              <span className="visible-xs-inline-block position-right">Messages</span>
+              <span className="status-mark border-orange-400"></span>
+            </a>
+
+            <div className="dropdown-menu dropdown-content width-350">
+              <div className="dropdown-content-heading">
+                Messages
+                <ul className="icons-list">
+                  <li><a href="#"><i className="icon-compose"></i></a></li>
+                </ul>
+              </div>
+
+              <ul className="media-list dropdown-content-body">
+                <li className="media">
+                  <div className="media-left">
+                    <img src="assets/images/placeholder.jpg" className="img-circle img-sm" alt="" />
+                    <span className="badge bg-danger-400 media-badge">5</span>
+                  </div>
+
+                  <div className="media-body">
+                    <a href="#" className="media-heading">
+                      <span className="text-semibold">James Alexander</span>
+                      <span className="media-annotation pull-right">04:58</span>
+                    </a>
+
+                    <span className="text-muted">who knows, maybe that would be the best thing for me...</span>
+                  </div>
+                </li>
+
+                <li className="media">
+                  <div className="media-left">
+                    <img src="assets/images/placeholder.jpg" className="img-circle img-sm" alt="" />
+                    <span className="badge bg-danger-400 media-badge">4</span>
+                  </div>
+
+                  <div className="media-body">
+                    <a href="#" className="media-heading">
+                      <span className="text-semibold">Margo Baker</span>
+                      <span className="media-annotation pull-right">12:16</span>
+                    </a>
+
+                    <span className="text-muted">That was something he was unable to do because...</span>
+                  </div>
+                </li>
+
+                <li className="media">
+                  <div className="media-left"><img src="assets/images/placeholder.jpg" className="img-circle img-sm" alt="" /></div>
+                  <div className="media-body">
+                    <a href="#" className="media-heading">
+                      <span className="text-semibold">Jeremy Victorino</span>
+                      <span className="media-annotation pull-right">22:48</span>
+                    </a>
+
+                    <span className="text-muted">But that would be extremely strained and suspicious...</span>
+                  </div>
+                </li>
+
+                <li className="media">
+                  <div className="media-left"><img src="assets/images/placeholder.jpg" className="img-circle img-sm" alt="" /></div>
+                  <div className="media-body">
+                    <a href="#" className="media-heading">
+                      <span className="text-semibold">Beatrix Diaz</span>
+                      <span className="media-annotation pull-right">Tue</span>
+                    </a>
+
+                    <span className="text-muted">What a strenuous career it is that I have chosen...</span>
+                  </div>
+                </li>
+
+                <li className="media">
+                  <div className="media-left"><img src="assets/images/placeholder.jpg" className="img-circle img-sm" alt="" /></div>
+                  <div className="media-body">
+                    <a href="#" className="media-heading">
+                      <span className="text-semibold">Richard Vango</span>
+                      <span className="media-annotation pull-right">Mon</span>
+                    </a>
+
+                    <span className="text-muted">Other travelling salesmen live a life of luxury...</span>
+                  </div>
+                </li>
+              </ul>
+
+              <div className="dropdown-content-footer">
+                <a href="#" data-popup="tooltip" title="All messages"><i className="icon-menu display-block"></i></a>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
   </div>
 );
-
-export default AuthenticatedNavigation;
+}
+}
-import React from 'react';
-import { LinkContainer } from 'react-router-bootstrap';
-import { Nav, NavItem } from 'react-bootstrap';
+import React, { Component }               from 'react';
+import { LinkContainer }                  from 'react-router-bootstrap';
+import { setQueryParam }                  from '/imports/client/app/utils/setQueryParam';
+import { browserHistory }                 from 'react-router';
+import { Nav, NavItem }                   from 'react-bootstrap';
  
-const PublicNavigation = () => (
-  <Nav pullRight>
-    <LinkContainer to="signup">
-      <NavItem eventKey={ 1 } href="/signup">Sign Up</NavItem>
-    </LinkContainer>
-    <LinkContainer to="login">
-      <NavItem eventKey={ 2 } href="/login">Log In</NavItem>
-    </LinkContainer>
-  </Nav>
-);
  
-export default PublicNavigation;
+export class PublicNavigation extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+
+    };
+  };
+render(){
+  console.log(this.props);
+  var mainSite = document.location.hostname.split( "." )[1];
+  var signup = `http://${mainSite}/signup`;
+  return(
+    <Nav pullRight>
+      <LinkContainer to={ setQueryParam(this.props.location, { enter: 'login' }) }>
+        <NavItem eventKey={ 2 } href="/login">Log In</NavItem>
+      </LinkContainer>
+    </Nav>
+  )
+}
+}
-import { composeWithTracker } from 'react-komposer';
-import { Meteor } from 'meteor/meteor';
-import AppNavigation from '../components/AppNavigation.js';
+// import { InviteSignupController } from '/imports/client/views/invite/signup/index'
+import _                                  from 'lodash';
+import {
+         composeWithTracker,
+         compose,
+         composeAll
+       }                                  from 'react-komposer';
+import { Loading }                        from '/imports/client/components/Loading';
  
-const composer = (props, onData) => onData(null, { hasUser: Meteor.user() });
+import { Orgs }                           from '/imports/collections/orgs/index';
+import { Users }                          from '/imports/collections/users/index';
  
-export default composeWithTracker(composer, {}, {}, { pure: false })(AppNavigation);
+import { AppNavigation }                  from './AppNavigation';
+
+const meteorTick = (props, onData) => {
+
+  const handles = [
+    Meteor.subscribe('users.current')
+  ];
+
+  if(_.every(handles, (handle) => (handle.ready()) )) {
+    const user = Users.current();
+    onData(null, {
+      data: {
+        user: user,
+      },
+    });
+  }
+
+  return () => {
+    _.each(handles, (handle) => handle.stop() );
+  };
+};
+
+
+const reduxTick = (props, onData) => {
+  onData(null, {
+    data: {}
+  });
+};
+
+
+export const AppNavigationController = composeAll(
+  composeWithTracker(meteorTick, Loading),
+  compose(reduxTick, Loading),
+)(AppNavigation);
@@ -0,0 +1,69 @@
+import React                              from 'react';
+import { Link }                           from 'react-router';
+import { ActionButton }                   from '/imports/client/components/ActionButton';
+import { setQueryParam }                  from '/imports/client/app/utils/setQueryParam';
+import { Button, Form, FormGroup, Label, Input, FormText, Col } from 'reactstrap';
+import { Alert }                          from 'reactstrap';
+import 'velocity-animate';
+import 'velocity-animate/velocity.ui';
+import { VelocityComponent, VelocityTransitionGroup, velocityHelpers } from 'velocity-react';
+import ReactSVG                           from 'react-svg'
+
+export class ForgotPane extends React.Component {
+
+  render() {
+    return (
+      <Col lg={{ size: 6, pull: 2, push: 2, offset: 1 }} md={{ size: 9, pull: 1, push: 1 }} sm={{ size: 10, push: 1, pull: 1 }}>
+        <VelocityTransitionGroup enter={{ animation: "transition.slideRightIn"}} leave={{animation: "transition.fadeOut" }} runOnMount={true}>
+          <div className="enterPane__centerVerticallyWrapper">
+            <Link
+              to={ setQueryParam(this.props.location, { enter: 'login' }) }>
+              <ReactSVG
+                path="/files/images/svg/logo2--white.svg"
+                className="enterPane__logo"
+              />
+            </Link>
+            <div className="enterPane__box">
+              <div className="enterPane__header">
+                Reset your password
+              </div>
+              <Alert color="danger" isOpen={ this.props.data.error.length !== 0 }>
+                { this.props.data.error }
+              </Alert>
+              <Alert color="success" isOpen={ this.props.data.message.length !== 0 }>
+                { this.props.data.message }
+              </Alert>
+              <Form onSubmit={ (e) => this.props.onForgot(e) }>
+                <FormGroup>
+                  <Input type="email" size="lg"
+                      value={ this.props.data.email }
+                      onChange={ (e) => this.props.onUpdate('email', e.currentTarget.value) }
+                      name="email"
+                      id="email"
+                      placeholder="Enter your email" />
+                </FormGroup>
+                <FormGroup>
+                  <ActionButton
+                    loading={ this.props.data.loading }>
+                    <Button
+                        color="success" size="lg"
+                        type="submit"
+                        block>
+                      Reset password
+                    </Button>
+                  </ActionButton>
+                </FormGroup>
+                <FormGroup className="enterPane__formGroup--center">
+                  <Link className="enterPane__link"
+                    to={ setQueryParam(this.props.location, { enter: 'login' }) }>
+                    Log In
+                  </Link>
+                </FormGroup>
+              </Form>
+            </div>
+          </div>
+        </VelocityTransitionGroup>
+      </Col>
+    );
+  }
+}
@@ -0,0 +1,78 @@
+import React                              from 'react';
+import { Link }                           from 'react-router';
+import { ActionButton }                   from '/imports/client/components/ActionButton';
+import { setQueryParam }                  from '/imports/client/app/utils/setQueryParam';
+import { Button, Form, FormGroup, Label, Input, FormText, Col } from 'reactstrap';
+import { Alert }                          from 'reactstrap';
+import 'velocity-animate';
+import 'velocity-animate/velocity.ui';
+import { VelocityComponent, VelocityTransitionGroup, velocityHelpers } from 'velocity-react';
+import ReactSVG                           from 'react-svg'
+
+
+export class LoginPane extends React.Component {
+
+  render() {
+    return (
+      <Col lg={{ size: 6, pull: 2, push: 2, offset: 1 }} md={{ size: 9, pull: 1, push: 1 }} sm={{ size: 10, push: 1, pull: 1 }}>
+        <VelocityTransitionGroup enter={{ animation: "transition.slideRightIn"}} leave={{animation: "transition.fadeOut" }} runOnMount={true}>
+          <div className="enterPane__centerVerticallyWrapper">
+            <Link
+              to={ setQueryParam(this.props.location, { enter: 'login' }) }>
+              <ReactSVG
+                path="/files/images/svg/logo2--white.svg"
+                className="enterPane__logo"
+              />
+            </Link>
+            <div className="enterPane__box">
+              <div className="enterPane__header">
+                Login
+              </div>
+              <Alert color="danger" isOpen={ this.props.data.visible || this.props.data.error.length !== 0 }>
+                { this.props.data.error }
+              </Alert>
+              <Alert color="success" isOpen={ this.props.data.visible || this.props.data.message.length !== 0 }>
+                { this.props.data.message }
+              </Alert>
+              <Form onSubmit={ (e) => this.props.onLogin(e) }>
+                <FormGroup>
+                  <Input type="email" size="lg"
+                      value={ this.props.data.email }
+                      onChange={ (e) => this.props.onUpdate('email', e.currentTarget.value) }
+                      name="email"
+                      id="email"
+                      placeholder="Enter your email" />
+                </FormGroup>
+                <FormGroup>
+                  <Input type="password" size="lg"
+                         value={ this.props.data.password }
+                         onChange={ (e) => this.props.onUpdate('password', e.currentTarget.value) }
+                         name="password"
+                         id="password"
+                         placeholder="Enter your password" />
+                </FormGroup>
+                <FormGroup>
+                  <ActionButton
+                    loading={ this.props.data.loading }>
+                    <Button
+                        color="success" size="lg"
+                        type="submit"
+                        block>
+                      Log in
+                    </Button>
+                  </ActionButton>
+                </FormGroup>
+                <FormGroup className="enterPane__formGroupLogin--center">
+                  <Link className="enterPane__link"
+                    to={ setQueryParam(this.props.location, { enter: 'forgot' }) }>
+                    Forgotten password?
+                  </Link>
+                </FormGroup>
+              </Form>
+            </div>
+          </div>
+        </VelocityTransitionGroup>
+      </Col>
+    );
+  }
+}
@@ -1,43 +0,0 @@
-import React from 'react';
-import { Row, Col, Alert, FormGroup, FormControl, Button } from 'react-bootstrap';
-import handleRecoverPassword from './module/recover-password';
-
-export default class RecoverPassword extends React.Component {
-  componentDidMount() {
-    handleRecoverPassword({ component: this });
-  }
-
-  handleSubmit(event) {
-    event.preventDefault();
-  }
-
-  render() {
-    return (
-      <div className="RecoverPassword">
-        <Row>
-          <Col xs={ 12 } sm={ 6 } md={ 4 }>
-            <h4 className="page-header">Recover Password</h4>
-            <Alert bsStyle="info">
-              Enter your email address below to receive a link to reset your password.
-            </Alert>
-            <form
-              ref={ form => (this.recoverPasswordForm = form) }
-              className="recover-password"
-              onSubmit={ this.handleSubmit }
-            >
-              <FormGroup>
-                <FormControl
-                  type="email"
-                  ref="emailAddress"
-                  name="emailAddress"
-                  placeholder="Email Address"
-                />
-              </FormGroup>
-              <Button type="submit" bsStyle="success">Recover Password</Button>
-            </form>
-          </Col>
-        </Row>
-      </div>
-    );
-  }
-}
@@ -0,0 +1,63 @@
+import React                              from 'react';
+import { Link }                           from 'react-router';
+import { ActionButton }                   from '/imports/client/components/ActionButton';
+import { setQueryParam }                  from '/imports/client/app/utils/setQueryParam';
+import { Button, Form, FormGroup, Label, Input, FormText, Col } from 'reactstrap';
+import { Alert }                          from 'reactstrap';
+import 'velocity-animate';
+import 'velocity-animate/velocity.ui';
+import { VelocityComponent, VelocityTransitionGroup, velocityHelpers } from 'velocity-react';
+import ReactSVG                           from 'react-svg'
+
+
+export class ResetPane extends React.Component {
+
+  render() {
+    return (
+      <Col lg={{ size: 6, pull: 2, push: 2, offset: 1 }} md={{ size: 9, pull: 1, push: 1 }} sm={{ size: 10, push: 1, pull: 1 }}>
+        <VelocityTransitionGroup enter={{ animation: "transition.slideRightIn"}} leave={{animation: "transition.fadeOut" }} runOnMount={true}>
+          <div className="enterPane__centerVerticallyWrapper">
+            <Link
+                to={ setQueryParam(this.props.location, { enter: 'login' }) }>
+              <ReactSVG
+                  path="/files/images/svg/logo2--white.svg"
+                  className="enterPane__logo"
+              />
+            </Link>
+            <div className = "enterPane__box">
+              <div className = "enterPane__header">
+                Set new password
+              </div>
+              <Alert color="danger" isOpen={ this.props.data.error.length !== 0 }>
+                { this.props.data.error }
+              </Alert>
+              <Alert color="success" isOpen={ this.props.data.message.length !== 0 }>
+                { this.props.data.message }
+              </Alert>
+              <Form onSubmit={ (e) => this.props.onReset(e) }>
+                <FormGroup>
+                  <Input type="password"
+                      value={ this.props.data.password }
+                      onChange={ (e) => this.props.onUpdate('password', e.currentTarget.value) }
+                      name="password"
+                      id="password"
+                      placeholder="Set new password" />
+                </FormGroup>
+                <FormGroup>
+                  <ActionButton
+                    loading={ this.props.data.loading }>
+                    <Button color="success" size="lg"
+                        type="submit"
+                        block>
+                      Reset password
+                    </Button>
+                  </ActionButton>
+                </FormGroup>
+              </Form>
+            </div>
+          </div>
+        </VelocityTransitionGroup>
+      </Col>
+    );
+  }
+}
@@ -1,58 +0,0 @@
-import React from 'react';
-import { Row, Col, Alert, FormGroup, ControlLabel, FormControl, Button } from 'react-bootstrap';
-import handleResetPassword from './module/reset-password';
-
-export default class ResetPassword extends React.Component {
-  componentDidMount() {
-    handleResetPassword({ component: this, token: this.props.params.token });
-  }
-
-  handleSubmit(event) {
-    event.preventDefault();
-  }
-
-  render() {
-    return (
-      <div className="ResetPassword">
-        <Row>
-          <Col xs={ 12 } sm={ 6 } md={ 4 }>
-            <h4 className="page-header">Reset Password</h4>
-            <Alert bsStyle="info">
-              To reset your password, enter a new one below. You will be logged in
-    with your new password.
-            </Alert>
-            <form
-              ref={ form => (this.resetPasswordForm = form) }
-              className="reset-password"
-              onSubmit={ this.handleSubmit }
-            >
-              <FormGroup>
-                <ControlLabel>New Password</ControlLabel>
-                <FormControl
-                  type="password"
-                  ref="newPassword"
-                  name="newPassword"
-                  placeholder="New Password"
-                />
-              </FormGroup>
-              <FormGroup>
-                <ControlLabel>Repeat New Password</ControlLabel>
-                <FormControl
-                  type="password"
-                  ref="repeatNewPassword"
-                  name="repeatNewPassword"
-                  placeholder="Repeat New Password"
-                />
-              </FormGroup>
-              <Button type="submit" bsStyle="success">Reset Password &amp; Login</Button>
-            </form>
-          </Col>
-        </Row>
-      </div>
-    );
-  }
-}
-
-ResetPassword.propTypes = {
-  params: React.PropTypes.object,
-};
@@ -0,0 +1,91 @@
+import React                              from 'react';
+import { Link }                           from 'react-router';
+import { ActionButton }                   from '/imports/client/components/ActionButton';
+import { setQueryParam }                  from '/imports/client/app/utils/setQueryParam';
+import { Button, Form, FormGroup, Label, Input, FormText, Col } from 'reactstrap';
+import 'velocity-animate';
+import 'velocity-animate/velocity.ui';
+import { VelocityComponent, VelocityTransitionGroup, velocityHelpers } from 'velocity-react';
+import ReactSVG                           from 'react-svg'
+
+
+export class SignupPane extends React.Component {
+
+  render() {
+    return (
+      <Col lg={{ size: 6, pull: 2, push: 2, offset: 1 }} md={{ size: 9, pull: 1, push: 1 }} sm={{ size: 10, push: 1, pull: 1 }}>
+        <VelocityTransitionGroup enter={{animation: "transition.slideRightIn"}} leave={{animation: "transition.fadeOut"}} runOnMount={true}>
+          <div className="enterPane__centerVerticallyWrapper">
+            <Link
+                to={ setQueryParam(this.props.location, { enter: 'login' }) }>
+              <ReactSVG
+                  path="/files/images/svg/logo--white.svg"
+                  className="enterPane__logo"
+              />
+            </Link>
+            <div className = "enterPane__box">
+              <div className = "enterPane__header">
+                Start a free 30-day trial
+              </div>
+              <Form onSubmit={ (e) => this.props.onSignup(e) }>
+                <FormGroup>
+                  <Input type="text" size="lg"
+                        value={ this.props.data.firstName }
+                        onChange={ (e) => this.props.onUpdate('firstName', e.currentTarget.value) }
+                        name="firstname"
+                        id="firstname"
+                        placeholder="Enter your first name" />
+                </FormGroup>
+                <FormGroup>
+                  <Input type="text" size="lg"
+                        value={ this.props.data.lastName }
+                        onChange={ (e) => this.props.onUpdate('lastName', e.currentTarget.value) }
+                        name="lastname"
+                        id="lastname"
+                        placeholder="Enter your last name" />
+                </FormGroup>
+                <FormGroup>
+                  <Input type="text" size="lg"
+                        value={ this.props.data.orgName }
+                        onChange={ (e) => this.props.onUpdate('orgName', e.currentTarget.value) }
+                        name="companyname"
+                        id="companyname"
+                        placeholder="Enter your company name" />
+                </FormGroup>
+                <FormGroup>
+                  <Input type="email" size="lg"
+                        value={ this.props.data.email }
+                        onChange={ (e) => this.props.onUpdate('email', e.currentTarget.value) }
+                        name="email"
+                        id="email"
+                        placeholder="Enter your email address" />
+                </FormGroup>
+                <FormGroup>
+                  <Input type="password" size="lg"
+                        value={ this.props.data.password }
+                        onChange={ (e) => this.props.onUpdate('password', e.currentTarget.value) }
+                        name="password"
+                        id="password"
+                        placeholder="Your password" />
+                </FormGroup>
+                <FormGroup>
+                  <Button color="success" size="lg"
+                      type="submit"
+                      block>
+                    Create Account
+                  </Button>
+                </FormGroup>
+              </Form>
+            </div>
+            <FormGroup className="enterPane__formGroup--center">
+              <Link className="enterPane__login"
+                    to={ setQueryParam(this.props.location, { enter: 'login' }) }>
+                Already have an account? Log in.
+              </Link>
+            </FormGroup>
+          </div>
+        </VelocityTransitionGroup>
+      </Col>
+    );
+  }
+}
@@ -0,0 +1,24 @@
+import React from 'react';
+import { Link } from 'react-router';
+import { Row, Col } from 'react-bootstrap';
+
+export class CheckEmail extends React.Component {
+  handleSubmit(event) {
+    event.preventDefault();
+  }
+
+  render() {
+    const signedEmail = Session.get('signedEmail', '');
+
+    return <Row>
+      <Col xs={ 12 } sm={ 12 } md={ 12 }>
+        <div className="check-email" >
+          <img src="/email_verify.png" width="100" />
+          <h1>Verify Your Email</h1>
+          <h4 className="page-header">We sent a verification email to <b>{signedEmail}</b>. Click the link in the email to get started!</h4>
+          <Link to='/'>Email did not arrive or want to use a different email?</Link>
+        </div>
+      </Col>
+    </Row>;
+  }
+}
@@ -0,0 +1,35 @@
+import React from 'react';
+import { Row, Col, Alert, FormGroup, FormControl, Button } from 'react-bootstrap';
+import { handleRecoverPassword } from '../../modules/recover-password';
+
+export class RecoverPassword extends React.Component {
+  componentDidMount() {
+    handleRecoverPassword({ component: this });
+  }
+
+  handleSubmit(event) {
+    event.preventDefault();
+  }
+
+  render() {
+    return <Row>
+      <Col xs={ 12 } sm={ 6 } md={ 4 }>
+        <h4 className="page-header">Recover Password</h4>
+        <Alert bsStyle="info">
+          Enter your email address below to receive a link to reset your password.
+        </Alert>
+        <form ref="recoverPassword" className="recover-password" onSubmit={ this.handleSubmit }>
+          <FormGroup>
+            <FormControl
+              type="email"
+              ref="emailAddress"
+              name="emailAddress"
+              placeholder="Email Address"
+            />
+          </FormGroup>
+          <Button type="submit" bsStyle="success">Recover Password</Button>
+        </form>
+      </Col>
+    </Row>;
+  }
+}
@@ -0,0 +1,53 @@
+import React from 'react';
+import { Row, Col, Alert, FormGroup, ControlLabel, FormControl, Button } from 'react-bootstrap';
+import { handleResetPassword } from '../../modules/reset-password';
+
+export class ResetPassword extends React.Component {
+  componentDidMount() {
+    handleResetPassword({
+      component: this,
+      token: this.props.params.token,
+    });
+  }
+
+  handleSubmit(event) {
+    event.preventDefault();
+  }
+
+  render() {
+    return <Row>
+      <Col xs={ 12 } sm={ 6 } md={ 4 }>
+        <h4 className="page-header">Reset Password</h4>
+        <Alert bsStyle="info">
+          To reset your password, enter a new one below. You will be logged in
+with your new password.
+        </Alert>
+        <form ref="resetPassword" className="reset-password" onSubmit={ this.handleSubmit }>
+          <FormGroup>
+            <ControlLabel>New Password</ControlLabel>
+            <FormControl
+              type="password"
+              ref="newPassword"
+              name="newPassword"
+              placeholder="New Password"
+            />
+          </FormGroup>
+          <FormGroup>
+            <ControlLabel>Repeat New Password</ControlLabel>
+            <FormControl
+              type="password"
+              ref="repeatNewPassword"
+              name="repeatNewPassword"
+              placeholder="Repeat New Password"
+            />
+          </FormGroup>
+          <Button type="submit" bsStyle="success">Reset Password &amp; Login</Button>
+        </form>
+      </Col>
+    </Row>;
+  }
+}
+
+ResetPassword.propTypes = {
+  params: React.PropTypes.object,
+};
@@ -0,0 +1,68 @@
+import React from 'react';
+import { Link } from 'react-router';
+import { Row, Col, FormGroup, ControlLabel, FormControl, Button } from 'react-bootstrap';
+import { handleSignup } from '../../modules/signup';
+
+export class Signup extends React.Component {
+  componentDidMount() {
+    handleSignup({ component: this });
+  }
+
+  handleSubmit(event) {
+    event.preventDefault();
+  }
+
+  render() {
+    return <Row>
+      <Col xs={ 12 } sm={ 6 } md={ 4 }>
+        <h4 className="page-header">Sign Up</h4>
+        <form ref="signup" className="signup" onSubmit={ this.handleSubmit }>
+          <Row>
+            <Col xs={ 6 } sm={ 6 }>
+              <FormGroup>
+                <ControlLabel>First Name</ControlLabel>
+                <FormControl
+                  type="text"
+                  ref="firstName"
+                  name="firstName"
+                  placeholder="First Name"
+                />
+              </FormGroup>
+            </Col>
+            <Col xs={ 6 } sm={ 6 }>
+              <FormGroup>
+                <ControlLabel>Last Name</ControlLabel>
+                <FormControl
+                  type="text"
+                  ref="lastName"
+                  name="lastName"
+                  placeholder="Last Name"
+                />
+              </FormGroup>
+            </Col>
+          </Row>
+          <FormGroup>
+            <ControlLabel>Email Address</ControlLabel>
+            <FormControl
+              type="text"
+              ref="emailAddress"
+              name="emailAddress"
+              placeholder="Email Address"
+            />
+          </FormGroup>
+          <FormGroup>
+            <ControlLabel>Password</ControlLabel>
+            <FormControl
+              type="password"
+              ref="password"
+              name="password"
+              placeholder="Password"
+            />
+          </FormGroup>
+          <Button type="submit" bsStyle="success">Sign Up</Button>
+        </form>
+        <p>Already have an account? <Link to="/login">Log In</Link>.</p>
+      </Col>
+    </Row>;
+  }
+}
@@ -1,56 +0,0 @@
-import React,{ Component }            from 'react';
-import { Link }                       from 'react-router';
-import { Row, Col, FormGroup,
-  ControlLabel, FormControl,
-  Button }                            from 'react-bootstrap';
-import handleLogin                    from './login';
-
-export  class LoginView extends React.Component {
-  componentDidMount() {
-    handleLogin({ component: this });
-  }
-
-  handleSubmit(event) {
-    event.preventDefault();
-  }
-
-  render() {
-    return (
-      <div className="Login">
-        <Row>
-          <Col xs={ 12 } sm={ 6 } md={ 4 }>
-            <h4 className="page-header">Login</h4>
-            <form
-              ref={ form => (this.loginForm = form) }
-              className="login"
-              onSubmit={ this.handleSubmit }
-            >
-              <FormGroup>
-                <ControlLabel>Email Address</ControlLabel>
-                <FormControl
-                  type="email"
-                  ref="emailAddress"
-                  name="emailAddress"
-                  placeholder="Email Address"
-                />
-              </FormGroup>
-              <FormGroup>
-                <ControlLabel>
-                  <span className="pull-left">Password</span>
-                  <Link className="pull-right" to="/recover-password">Forgot Password?</Link>
-                </ControlLabel>
-                <FormControl
-                  type="password"
-                  ref="password"
-                  name="password"
-                  placeholder="Password"
-                />
-              </FormGroup>
-              <Button type="submit" bsStyle="success">Login</Button>
-            </form>
-          </Col>
-        </Row>
-      </div>
-    );
-  }
-}
@@ -1,40 +0,0 @@
-// import { InviteSignupController } from '/imports/client/views/invite/signup/index'
-import _                                  from 'lodash';
-import {
-         composeWithTracker,
-         compose,
-         composeAll
-       }                                  from 'react-komposer';
-import { Loading }                        from '/imports/client/components/Loading';
-import { Orgs }                           from '/imports/collections/orgs/index';
-import { LoginView }                      from './LoginView'
-
-const meteorTick = (props, onData) => {
-
-  const handles = [
-  ];
-
-  if(_.every(handles, (handle) => (handle.ready()) )) {
-    onData(null, {
-      data: {
-      },
-    });
-  }
-
-  return () => {
-    _.each(handles, (handle) => handle.stop() );
-  };
-};
-
-
-const reduxTick = (props, onData) => {
-  onData(null, {
-    data: {}
-  });
-};
-
-
-export const orgLoginController = composeAll(
-  composeWithTracker(meteorTick, Loading),
-  compose(reduxTick, Loading),
-)(LoginView);
@@ -1,57 +0,0 @@
-/* eslint-disable no-undef */
-
-import { browserHistory } from 'react-router';
-import { Meteor } from 'meteor/meteor';
-import { Bert } from 'meteor/themeteorchef:bert';
-import '/imports/client/components/validation';
-
-let component;
-
-const login = () => {
-  const email = document.querySelector('[name="emailAddress"]').value;
-  const password = document.querySelector('[name="password"]').value;
-
-  Meteor.loginWithPassword(email, password, (error) => {
-    if (error) {
-      Bert.alert(error.reason, 'warning');
-    } else {
-      Bert.alert('Logged in!', 'success');
-
-      const { location } = component.props;
-      if (location.state && location.state.nextPathname) {
-        browserHistory.push(location.state.nextPathname);
-      } else {
-        browserHistory.push('/');
-      }
-    }
-  });
-};
-
-const validate = () => {
-  $(component.loginForm).validate({
-    rules: {
-      emailAddress: {
-        required: true,
-        email: true,
-      },
-      password: {
-        required: true,
-      },
-    },
-    messages: {
-      emailAddress: {
-        required: 'Need an email address here.',
-        email: 'Is this email address legit?',
-      },
-      password: {
-        required: 'Need a password here.',
-      },
-    },
-    submitHandler() { login(); },
-  });
-};
-
-export default function handleLogin(options) {
-  component = options.component;
-  validate();
-}
@@ -0,0 +1,166 @@
+import _                                  from 'lodash';
+import { Meteor }                         from 'meteor/meteor';
+import { SimpleSchema }                   from 'meteor/aldeed:simple-schema';
+import { Bert }                           from 'meteor/themeteorchef:bert';
+
+import React                              from 'react';
+import { Container, Row, Col }            from 'reactstrap';
+import { Link }                           from 'react-router';
+import { If, Case }                       from '/imports/client/components/Logic';
+
+import { LoginPane }                      from '/imports/client/views/org/enter/LoginPane';
+import { ForgotPane }                     from '/imports/client/views/org/enter/ForgotPane';
+import { ResetPane }                      from '/imports/client/views/org/enter/ResetPane';
+import  Validation                        from '/imports/validation/validationMethods';
+
+// const signupSchemaValidator = new SimpleSchema({
+//   email:      { type: String, regEx: SimpleSchema.RegEx.Email},
+//   firstName:  { type: String, },
+//   lastName:   { type: String, },
+//   password:   { type: String, min: 6},
+// }).validator();
+
+let validation = new Validation();
+
+export class EnterLayout extends React.Component {
+
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      email:        '',
+      password:     '',
+      firstName:    '',
+      lastName:     '',
+      orgName:      '',
+      loading:      false,
+      error:        '',
+      message:      '',
+    };
+  };
+
+  componentWillReceiveProps(nextProps) {
+    console.log(this.props.pane);
+    console.log("this.props.pane");
+    if(this.props.pane !== nextProps.pane) {
+      this.onClearState();
+    }
+  };
+
+
+  onClearState(loading) {
+    this.setState({
+      loading: loading || false,
+      error:   '',
+      message: '',
+    });
+  };
+
+  onUpdate(key, value) {
+    this.setState({[key]: value});
+  };
+
+  onForgot(e) {
+    e.preventDefault();
+    this.onClearState(true);
+
+    Accounts.forgotPassword({email: this.state.email || '...'}, (error) => {
+      this.onClearState();
+      if(error) {
+        this.setState({error: 'An error occured.'});
+      } else {
+        this.setState({message: 'Reset email has been sent. Check your inbox.'});
+      }
+    });
+  };
+
+  onReset(e) {
+    e.preventDefault();
+    this.onClearState(true);
+    if(!validation.passwordValidation(this.state.password)){
+      Bert.alert('Password must be a minimum of 6 characters in length.', 'danger');
+      this.onClearState();
+      return false;
+    }else if(!validation.noQwertysAllowed(this.state.password)){
+      Bert.alert('No qwertys allowed!', 'danger');
+      this.onClearState();
+      return false;
+    } else{
+      Accounts.resetPassword(
+        this.props.location.query.token,
+        this.state.password,
+        (error) => {
+          this.onClearState();
+          if(error) {
+            this.setState({error: 'An error occured.'});
+          }
+        }
+      );
+    }
+  };
+
+  onLogin(e) {
+    e.preventDefault();
+    this.onClearState(true);
+    if(this.state.email.trim() == '' || !validation.validateEmail(this.state.email)){
+      this.onClearState();
+      Bert.alert('Please enter a valid email address!', 'danger');
+      return false;
+    }
+    if(this.state.password.trim() == ''){
+      Bert.alert('Please enter your password!', 'danger');
+      this.onClearState();
+      return false;
+    }
+    Meteor.loginWithPassword(
+      this.state.email,
+      this.state.password,
+      (e, r) => {
+        this.onClearState();
+        if(e) {
+          this.setState({error: 'Wrong email or password.'})
+        }
+      }
+    );
+  };
+
+  render() {
+    return (
+      <div className = "enterLayout__content--bg">
+        <Container>
+            <Row>
+            <Case
+                switch = {this.props.pane}
+                case0 = "forgot"
+                then0 = {() => (
+                <ForgotPane
+                    data          = {this.state}
+                    location      = {this.props.location}
+                    onUpdate      = {(...a) => this.onUpdate(...a)}
+                    onForgot      = {(...a) => this.onForgot(...a)}
+                />
+                )}
+                case1 = "reset"
+                then1 = {() => (
+                <ResetPane
+                    data          = {this.state}
+                    location      = {this.props.location}
+                    onUpdate      = {(...a) => this.onUpdate(...a)}
+                    onReset       = {(...a) => this.onReset(...a)}
+                />
+                )}
+                else = {() => (
+                <LoginPane
+                    data          = {this.state}
+                    location      = {this.props.location}
+                    onUpdate      = {(...a) => this.onUpdate(...a)}
+                    onLogin       = {(...a) => this.onLogin(...a)}
+                />
+                )}
+            />
+            </Row>
+        </Container>
+      </div>
+    );
+  };
+};
@@ -0,0 +1,46 @@
+// import { EnterModule } from '/imports/client/views/enter/module/index'
+import {
+         composeWithTracker,
+         compose,
+         composeAll
+       }                                  from 'react-komposer';
+import { EnterLayout }                    from './EnterLayout';
+import { Loading }                        from '/imports/client/components/Loading';
+
+
+const meteorTick = (props, onData) => {
+
+  const handles = [
+  ];
+
+  if(_.every(handles, (handle) => (handle.ready()) )) {
+    onData(null, {
+      location: props.location,
+      data: {
+      },
+    });
+  }
+
+  return () => {
+    _.each(handles, (handle) => handle.stop() );
+  };
+};
+
+
+const reduxTick = (props, onData) => {
+  onData(null, {
+    data: {}
+  });
+};
+
+
+export const EnterModule = composeAll(
+  composeWithTracker(meteorTick, Loading),
+  compose(reduxTick, Loading),
+)(EnterLayout);
+
+
+
+
+
+
@@ -1,42 +0,0 @@
-/* eslint-disable no-undef */
-
-import { Accounts } from 'meteor/accounts-base';
-import { Bert } from 'meteor/themeteorchef:bert';
-import '/imports/client/components/validation';
-
-let component;
-
-const handleRecovery = () => {
-  Accounts.forgotPassword({
-    email: document.querySelector('[name="emailAddress"]').value,
-  }, (error) => {
-    if (error) {
-      Bert.alert(error.reason, 'warning');
-    } else {
-      Bert.alert('Check your inbox for a reset link!', 'success');
-    }
-  });
-};
-
-const validate = () => {
-  $(component.recoverPasswordForm).validate({
-    rules: {
-      emailAddress: {
-        required: true,
-        email: true,
-      },
-    },
-    messages: {
-      emailAddress: {
-        required: 'Need an email address here.',
-        email: 'Is this email address legit?',
-      },
-    },
-    submitHandler() { handleRecovery(); },
-  });
-};
-
-export default function handleRecoverPassword(options) {
-  component = options.component;
-  validate();
-}
@@ -1,54 +0,0 @@
-/* eslint-disable no-undef */
-
-import { browserHistory } from 'react-router';
-import { Accounts } from 'meteor/accounts-base';
-import { Bert } from 'meteor/themeteorchef:bert';
-import '/imports/client/components/validation';
-
-let component;
-let token;
-
-const handleReset = () => {
-  const password = document.querySelector('[name="newPassword"]').value;
-  Accounts.resetPassword(token, password, (error) => {
-    if (error) {
-      Bert.alert(error.reason, 'danger');
-    } else {
-      browserHistory.push('/');
-      Bert.alert('Password reset!', 'success');
-    }
-  });
-};
-
-const validate = () => {
-  $(component.resetPasswordForm).validate({
-    rules: {
-      newPassword: {
-        required: true,
-        minlength: 6,
-      },
-      repeatNewPassword: {
-        required: true,
-        minlength: 6,
-        equalTo: '[name="newPassword"]',
-      },
-    },
-    messages: {
-      newPassword: {
-        required: 'Enter a new password, please.',
-        minlength: 'Use at least six characters, please.',
-      },
-      repeatNewPassword: {
-        required: 'Repeat your new password, please.',
-        equalTo: 'Hmm, your passwords don\'t match. Try again?',
-      },
-    },
-    submitHandler() { handleReset(); },
-  });
-};
-
-export default function handleResetPassword(options) {
-  component = options.component;
-  token = options.token;
-  validate();
-}
@@ -0,0 +1,43 @@
+import React from 'react';
+import { Row, Col, Alert, FormGroup, FormControl, Button } from 'react-bootstrap';
+import handleRecoverPassword from './module/recover-password';
+
+export default class RecoverPassword extends React.Component {
+  componentDidMount() {
+    handleRecoverPassword({ component: this });
+  }
+
+  handleSubmit(event) {
+    event.preventDefault();
+  }
+
+  render() {
+    return (
+      <div className="RecoverPassword">
+        <Row>
+          <Col xs={ 12 } sm={ 6 } md={ 4 }>
+            <h4 className="page-header">Recover Password</h4>
+            <Alert bsStyle="info">
+              Enter your email address below to receive a link to reset your password.
+            </Alert>
+            <form
+              ref={ form => (this.recoverPasswordForm = form) }
+              className="recover-password"
+              onSubmit={ this.handleSubmit }
+            >
+              <FormGroup>
+                <FormControl
+                  type="email"
+                  ref="emailAddress"
+                  name="emailAddress"
+                  placeholder="Email Address"
+                />
+              </FormGroup>
+              <Button type="submit" bsStyle="success">Recover Password</Button>
+            </form>
+          </Col>
+        </Row>
+      </div>
+    );
+  }
+}
@@ -0,0 +1,58 @@
+import React from 'react';
+import { Row, Col, Alert, FormGroup, ControlLabel, FormControl, Button } from 'react-bootstrap';
+import handleResetPassword from './module/reset-password';
+
+export default class ResetPassword extends React.Component {
+  componentDidMount() {
+    handleResetPassword({ component: this, token: this.props.params.token });
+  }
+
+  handleSubmit(event) {
+    event.preventDefault();
+  }
+
+  render() {
+    return (
+      <div className="ResetPassword">
+        <Row>
+          <Col xs={ 12 } sm={ 6 } md={ 4 }>
+            <h4 className="page-header">Reset Password</h4>
+            <Alert bsStyle="info">
+              To reset your password, enter a new one below. You will be logged in
+    with your new password.
+            </Alert>
+            <form
+              ref={ form => (this.resetPasswordForm = form) }
+              className="reset-password"
+              onSubmit={ this.handleSubmit }
+            >
+              <FormGroup>
+                <ControlLabel>New Password</ControlLabel>
+                <FormControl
+                  type="password"
+                  ref="newPassword"
+                  name="newPassword"
+                  placeholder="New Password"
+                />
+              </FormGroup>
+              <FormGroup>
+                <ControlLabel>Repeat New Password</ControlLabel>
+                <FormControl
+                  type="password"
+                  ref="repeatNewPassword"
+                  name="repeatNewPassword"
+                  placeholder="Repeat New Password"
+                />
+              </FormGroup>
+              <Button type="submit" bsStyle="success">Reset Password &amp; Login</Button>
+            </form>
+          </Col>
+        </Row>
+      </div>
+    );
+  }
+}
+
+ResetPassword.propTypes = {
+  params: React.PropTypes.object,
+};
@@ -0,0 +1,56 @@
+import React,{ Component }            from 'react';
+import { Link }                       from 'react-router';
+import { Row, Col, FormGroup,
+  ControlLabel, FormControl,
+  Button }                            from 'react-bootstrap';
+import handleLogin                    from './login';
+
+export  class LoginView extends React.Component {
+  componentDidMount() {
+    handleLogin({ component: this });
+  }
+
+  handleSubmit(event) {
+    event.preventDefault();
+  }
+
+  render() {
+    return (
+      <div className="Login">
+        <Row>
+          <Col xs={ 12 } sm={ 6 } md={ 4 }>
+            <h4 className="page-header">Login</h4>
+            <form
+              ref={ form => (this.loginForm = form) }
+              className="login"
+              onSubmit={ this.handleSubmit }
+            >
+              <FormGroup>
+                <ControlLabel>Email Address</ControlLabel>
+                <FormControl
+                  type="email"
+                  ref="emailAddress"
+                  name="emailAddress"
+                  placeholder="Email Address"
+                />
+              </FormGroup>
+              <FormGroup>
+                <ControlLabel>
+                  <span className="pull-left">Password</span>
+                  <Link className="pull-right" to="/recover-password">Forgot Password?</Link>
+                </ControlLabel>
+                <FormControl
+                  type="password"
+                  ref="password"
+                  name="password"
+                  placeholder="Password"
+                />
+              </FormGroup>
+              <Button type="submit" bsStyle="success">Login</Button>
+            </form>
+          </Col>
+        </Row>
+      </div>
+    );
+  }
+}
@@ -0,0 +1,40 @@
+// import { orgLoginController }               from '/imports/client/views/org/enter/login/index';
+import _                                  from 'lodash';
+import {
+         composeWithTracker,
+         compose,
+         composeAll
+       }                                  from 'react-komposer';
+import { Loading }                        from '/imports/client/components/Loading';
+import { Orgs }                           from '/imports/collections/orgs/index';
+import { LoginView }                      from './LoginView'
+
+const meteorTick = (props, onData) => {
+
+  const handles = [
+  ];
+
+  if(_.every(handles, (handle) => (handle.ready()) )) {
+    onData(null, {
+      data: {
+      },
+    });
+  }
+
+  return () => {
+    _.each(handles, (handle) => handle.stop() );
+  };
+};
+
+
+const reduxTick = (props, onData) => {
+  onData(null, {
+    data: {}
+  });
+};
+
+
+export const orgLoginController = composeAll(
+  composeWithTracker(meteorTick, Loading),
+  compose(reduxTick, Loading),
+)(LoginView);
@@ -0,0 +1,57 @@
+/* eslint-disable no-undef */
+
+import { browserHistory } from 'react-router';
+import { Meteor } from 'meteor/meteor';
+import { Bert } from 'meteor/themeteorchef:bert';
+import '/imports/client/components/validation';
+
+let component;
+
+const login = () => {
+  const email = document.querySelector('[name="emailAddress"]').value;
+  const password = document.querySelector('[name="password"]').value;
+
+  Meteor.loginWithPassword(email, password, (error) => {
+    if (error) {
+      Bert.alert(error.reason, 'warning');
+    } else {
+      Bert.alert('Logged in!', 'success');
+
+      const { location } = component.props;
+      if (location.state && location.state.nextPathname) {
+        browserHistory.push(location.state.nextPathname);
+      } else {
+        browserHistory.push('/');
+      }
+    }
+  });
+};
+
+const validate = () => {
+  $(component.loginForm).validate({
+    rules: {
+      emailAddress: {
+        required: true,
+        email: true,
+      },
+      password: {
+        required: true,
+      },
+    },
+    messages: {
+      emailAddress: {
+        required: 'Need an email address here.',
+        email: 'Is this email address legit?',
+      },
+      password: {
+        required: 'Need a password here.',
+      },
+    },
+    submitHandler() { login(); },
+  });
+};
+
+export default function handleLogin(options) {
+  component = options.component;
+  validate();
+}
@@ -0,0 +1,42 @@
+/* eslint-disable no-undef */
+
+import { Accounts } from 'meteor/accounts-base';
+import { Bert } from 'meteor/themeteorchef:bert';
+import '/imports/client/components/validation';
+
+let component;
+
+const handleRecovery = () => {
+  Accounts.forgotPassword({
+    email: document.querySelector('[name="emailAddress"]').value,
+  }, (error) => {
+    if (error) {
+      Bert.alert(error.reason, 'warning');
+    } else {
+      Bert.alert('Check your inbox for a reset link!', 'success');
+    }
+  });
+};
+
+const validate = () => {
+  $(component.recoverPasswordForm).validate({
+    rules: {
+      emailAddress: {
+        required: true,
+        email: true,
+      },
+    },
+    messages: {
+      emailAddress: {
+        required: 'Need an email address here.',
+        email: 'Is this email address legit?',
+      },
+    },
+    submitHandler() { handleRecovery(); },
+  });
+};
+
+export default function handleRecoverPassword(options) {
+  component = options.component;
+  validate();
+}
@@ -0,0 +1,54 @@
+/* eslint-disable no-undef */
+
+import { browserHistory } from 'react-router';
+import { Accounts } from 'meteor/accounts-base';
+import { Bert } from 'meteor/themeteorchef:bert';
+import '/imports/client/components/validation';
+
+let component;
+let token;
+
+const handleReset = () => {
+  const password = document.querySelector('[name="newPassword"]').value;
+  Accounts.resetPassword(token, password, (error) => {
+    if (error) {
+      Bert.alert(error.reason, 'danger');
+    } else {
+      browserHistory.push('/');
+      Bert.alert('Password reset!', 'success');
+    }
+  });
+};
+
+const validate = () => {
+  $(component.resetPasswordForm).validate({
+    rules: {
+      newPassword: {
+        required: true,
+        minlength: 6,
+      },
+      repeatNewPassword: {
+        required: true,
+        minlength: 6,
+        equalTo: '[name="newPassword"]',
+      },
+    },
+    messages: {
+      newPassword: {
+        required: 'Enter a new password, please.',
+        minlength: 'Use at least six characters, please.',
+      },
+      repeatNewPassword: {
+        required: 'Repeat your new password, please.',
+        equalTo: 'Hmm, your passwords don\'t match. Try again?',
+      },
+    },
+    submitHandler() { handleReset(); },
+  });
+};
+
+export default function handleResetPassword(options) {
+  component = options.component;
+  token = options.token;
+  validate();
+}
@@ -1,5 +0,0 @@
-import { Bert } from 'meteor/themeteorchef:bert';
-import 'bootstrap/dist/css/bootstrap.min.css';
-import './routes.js';
-
-Bert.defaults.style = 'growl-top-right';
@@ -1,109 +0,0 @@
-/* eslint-disable max-len */
-
-import React                                from 'react';
-import { render }                           from 'react-dom';
-import { Router, Route,
-  IndexRoute, browserHistory }              from 'react-router';
-import { Meteor }                           from 'meteor/meteor';
-
-/**
- * General Components
- */
-import Index                                from '/imports/client/views/app/module/Index';
-
-/**
- * Org Components
- */
-
-import App                                  from '/imports/client/layouts/OrgApp';
-import { AppModule }                        from '/imports/client/views/org/app/module/Index';
-import { orgLoginController }               from '/imports/client/views/org/enter/login/index';
-import RecoverPassword                      from '/imports/client/views/org/enter/RecoverPassword';
-import ResetPassword                        from '/imports/client/views/org/enter/ResetPassword';
-import { Orgs }                             from '/imports/collections/orgs/index';
-import NotFound                             from '/imports/client/views/org/NotFound';
-
-/**
- * NonOrg Components
- */
-import Signup                               from '/imports/client/views/nonOrg/enter/SignupView';
-
-/**
- * Invalid Org Components
- */
-
-const authenticate = (nextState, replace) => {
-  if (!Meteor.loggingIn() && !Meteor.userId()) {
-    replace({
-      pathname: '/login',
-      state: { nextPathname: nextState.location.pathname },
-    });
-  }
-};
-
-
-const detectOrg = () => {
-  orgSlug = "";
-  var hostnameArray = document.location.hostname.split( "." );
-  if(hostnameArray[1]=='localhost'){
-    orgSlug = hostnameArray[0];
-  }
-  if(orgSlug!=""){
-    Meteor.call('checkExistingOrg', {slug:orgSlug}, function(err, res) {
-      if(res){
-        Session.set('orgId', res._id._str);
-        render(getOrgRoutes(),document.getElementById('app'));
-      }else{
-        render(getInvalidOrgRoute(),document.getElementById('app'));
-      }
-    });
-  }else{
-    render(getNonOrgRoutes(),document.getElementById('app'));
-  }
-}
-const checkSlug = (nextState, replace) => {
-  orgId = Session.get('orgId');
-}
-
-/**
-There are three types of routes
-1)getOrgRoutes: all the routes that should be present for a registered org
-2)getInvalidOrgRoute: all the routes where someone tries to enter a subdomain which hasn't been registered yet (404 mostly :D)
-3)getNonOrgRoutes: all routes linked to normal site, ie signing up a new org. CHeking out demo and everything internal
-**/
-const getOrgRoutes = () => (
-  <Router history={ browserHistory }>
-    <Route path="/"                                                           component={ App }>
-      <IndexRoute name="index"                                                component={ AppModule } />
-      <Route name="login"             path="/login"                           component={ orgLoginController } />
-      <Route name="recover-password"  path="/recover-password"                component={ RecoverPassword } />
-      <Route name="reset-password"    path="/reset-password/:token"           component={ ResetPassword } />
-      <Route path="*"                                                         component={ NotFound } />
-    </Route>
-  </Router>
-)
-
-
-const getInvalidOrgRoute = () => (
-  <Router history={ browserHistory }>
-    <Route path="/"                                                           component={ App }>
-      <IndexRoute name="index"                                                component={ NotFound } />
-      <Route path="*"                                                         component={ NotFound } />
-    </Route>
-  </Router>
-)
-
-const getNonOrgRoutes = () => (
-  <Router history={ browserHistory }>
-    <Route path="/"                                                           component={ App }>
-      <IndexRoute name="index"                                                component={ Index } />
-      <Route name="signup"            path="/signup"                          component={ Signup } />
-      <Route path="*"                                                         component={ NotFound } />
-    </Route>
-  </Router>
-)
-
-
-Meteor.startup(() => {
-  detectOrg();
-});
@@ -0,0 +1,101 @@
+export default class Validation{
+
+  validateEmail (value) {
+     // regex from http://stackoverflow.com/questions/46155/validate-email-address-in-javascript
+     var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+     return re.test(value);
+  };
+
+  // containsNoSpecialCharacters(str){
+  //  return !/[~`!#$%\^&*+=\-\[\]\\';,/{}|\\":<>\?]/g.test(str);
+  // }
+
+  noSpecialChars(str){
+    str = String(str);
+   return !/[~`!#$%\^&*+=\-\[\]\\';,/{}|\\":<>\?]/g.test(str);
+  }
+
+  noQwertysAllowed (str){
+    str = str.toLowerCase();
+    if(str.toLowerCase().indexOf("qwerty") >-1){
+      return false;
+    } else{
+      return true;
+    }
+  }
+
+  passwordValidation (str){
+    if(str.length <6){
+      return false;
+    } else{
+      return true;
+    }
+  }
+
+  isNumberOnly(str){
+      if(!/^\d+$/.test(str)){
+        return false;
+      }else {
+        return true;
+      }
+  }
+  isPositiveNotZeroNumber(str){
+    str = parseFloat(str);
+      if(str <=0){
+        return false;
+      }else {
+        return true;
+      }
+  }
+  isNumeric(n) {
+    return !isNaN(parseFloat(n)) && isFinite(n);
+  }
+
+  isValidACN(str){
+    str = String(str);
+    //Remove any whitespace.
+    str = str.replace(/\s+/g, '');
+    console.log(str);
+    console.log(str.length);
+    if(/^\d+$/.test(str) && str.length ==9){
+      return true;
+    } else{
+      return false;
+    }
+  }
+  isValidShortCode(str){
+    str = String(str);
+    console.log(str);
+    if(str.length < 5 && str.length >2){
+      return true;
+    } else{
+      return false;
+    }
+  }
+  containsNumbers (str){
+    if(/\d/g.test(str)){
+      return true;
+    }else{
+      return false;
+    }
+  }
+  isInt(n){
+    console.log(typeof Number(n));
+      return Number(n) % 1 === 0;
+  }
+
+  isFloat(n){
+      return Number(n) % 1 !== 0;
+  }
+  decimalPlaces(num) {
+    num = parseFloat(num);
+    var match = (''+num).match(/(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/);
+    if (!match) { return 0; }
+    return Math.max(
+         0,
+         // Number of digits right of decimal point.
+         (match[1] ? match[1].length : 0)
+         // Adjust for scientific notation.
+         - (match[2] ? +match[2] : 0));
+  }
+};
@@ -68,12 +68,17 @@
     "jquery": "^2.2.4",
     "jquery-validation": "^1.15.1",
     "react": "^15.3.2",
+    "react-addons-css-transition-group": "^15.4.2",
     "react-addons-pure-render-mixin": "^15.3.2",
+    "react-addons-transition-group": "^15.4.2",
     "react-bootstrap": "^0.30.5",
     "react-dom": "^15.3.2",
     "react-komposer": "^1.13.1",
     "react-router": "^2.6.1",
     "react-router-bootstrap": "^0.23.1",
-    "react-svg": "^2.1.19"
+    "react-svg": "^2.1.19",
+    "reactstrap": "^4.2.0",
+    "velocity-animate": "^1.4.3",
+    "velocity-react": "^1.2.1"
   }
 }
1		-import '/imports/startup/client';
	1	+import '/imports/client/app/index';
...	...
...	...	@@ -0,0 +1,37 @@
	1	+import _ from 'lodash';
	2	+import moment from 'moment';
	3	+import { Meteor } from 'meteor/meteor';
	4	+import { Router, browserHistory } from 'react-router';
	5	+
	6	+import { Orgs } from '/imports/collections/orgs/index';
	7	+import { Users } from '/imports/collections/users/index';;
	8	+
	9	+
	10	+import { Bert } from 'meteor/themeteorchef:bert';
	11	+import './routes.js';
	12	+import './shelf.js';
	13	+// import 'react-quill/dist/quill.snow.css';
	14	+
	15	+Bert.defaults = {
	16	+ hideDelay: 3500,
	17	+ // Accepts: a number in milliseconds.
	18	+ style: 'fixed-top',
	19	+ // Accepts: fixed-top, fixed-bottom, growl-top-left, growl-top-right,
	20	+ // growl-bottom-left, growl-bottom-right.
	21	+ type: 'default'
	22	+ // Accepts: default, success, info, warning, danger.
	23	+};
	24	+
	25	+_.assign(window, {
	26	+ _,
	27	+});
	28	+
	29	+if(Meteor.settings.public.environment === 'development') {
	30	+ _.assign(window, {
	31	+ Meteor,
	32	+ Shelf,
	33	+
	34	+ Orgs,
	35	+ Users,
	36	+ });
	37	+}
...	...
...	...	@@ -0,0 +1,104 @@
	1	+/* eslint-disable max-len */
	2	+
	3	+import React from 'react';
	4	+import { render } from 'react-dom';
	5	+import { Router, Route,
	6	+ IndexRoute, browserHistory } from 'react-router';
	7	+import { Meteor } from 'meteor/meteor';
	8	+
	9	+/**
	10	+ * General Components
	11	+ */
	12	+import Index from '/imports/client/views/app/module/Index';
	13	+
	14	+/**
	15	+ * Org Components
	16	+ */
	17	+
	18	+import { App } from '/imports/client/layouts/OrgApp';
	19	+import { AppModule } from '/imports/client/views/org/app/module/Index';
	20	+import { Orgs } from '/imports/collections/orgs/index';
	21	+import NotFound from '/imports/client/views/org/NotFound';
	22	+
	23	+/**
	24	+ * NonOrg Components
	25	+ */
	26	+import Signup from '/imports/client/views/nonOrg/enter/SignupView';
	27	+
	28	+/**
	29	+ * Invalid Org Components
	30	+ */
	31	+
	32	+const authenticate = (nextState, replace) => {
	33	+ if (!Meteor.loggingIn() && !Meteor.userId()) {
	34	+ replace({
	35	+ pathname: '/login',
	36	+ state: { nextPathname: nextState.location.pathname },
	37	+ });
	38	+ }
	39	+};
	40	+
	41	+
	42	+const detectOrg = () => {
	43	+ orgSlug = "";
	44	+ var hostnameArray = document.location.hostname.split( "." );
	45	+ if(hostnameArray[1]=='localhost'){
	46	+ orgSlug = hostnameArray[0];
	47	+ }
	48	+ if(orgSlug!=""){
	49	+ Meteor.call('checkExistingOrg', {slug:orgSlug}, function(err, res) {
	50	+ if(res){
	51	+ Session.set('orgId', res._id._str);
	52	+ Session.set('orgSlug', orgSlug);
	53	+ render(getOrgRoutes(),document.getElementById('app'));
	54	+ }else{
	55	+ render(getInvalidOrgRoute(),document.getElementById('app'));
	56	+ }
	57	+ });
	58	+ }else{
	59	+ render(getNonOrgRoutes(),document.getElementById('app'));
	60	+ }
	61	+}
	62	+const checkSlug = (nextState, replace) => {
	63	+ orgId = Session.get('orgId');
	64	+}
	65	+
	66	+/**
	67	+There are three types of routes
	68	+1)getOrgRoutes: all the routes that should be present for a registered org
	69	+2)getInvalidOrgRoute: all the routes where someone tries to enter a subdomain which hasn't been registered yet (404 mostly :D)
	70	+3)getNonOrgRoutes: all routes linked to normal site, ie signing up a new org. CHeking out demo and everything internal
	71	+**/
	72	+const getOrgRoutes = () => (
	73	+ <Router history={ browserHistory }>
	74	+ <Route path="/" component={ App }>
	75	+ <IndexRoute name="index" component={ AppModule } />
	76	+ <Route path="*" component={ NotFound } />
	77	+ </Route>
	78	+ </Router>
	79	+)
	80	+
	81	+
	82	+const getInvalidOrgRoute = () => (
	83	+ <Router history={ browserHistory }>
	84	+ <Route path="/" component={ App }>
	85	+ <IndexRoute name="index" component={ NotFound } />
	86	+ <Route path="*" component={ NotFound } />
	87	+ </Route>
	88	+ </Router>
	89	+)
	90	+
	91	+const getNonOrgRoutes = () => (
	92	+ <Router history={ browserHistory }>
	93	+ <Route path="/" component={ App }>
	94	+ <IndexRoute name="index" component={ Index } />
	95	+ <Route name="signup" path="/signup" component={ Signup } />
	96	+ <Route path="*" component={ NotFound } />
	97	+ </Route>
	98	+ </Router>
	99	+)
	100	+
	101	+
	102	+Meteor.startup(() => {
	103	+ detectOrg();
	104	+});
...	...
...	...	@@ -0,0 +1,12 @@
	1	+import { ReactiveVar } from 'meteor/reactive-var'
	2	+
	3	+
	4	+window.Shelf = {};
	5	+
	6	+Shelf.layout = new ReactiveVar({});
	7	+// {
	8	+// bulb: new ReactiveVar(''), // Active menu tab
	9	+// subbulb: new ReactiveVar(''), // Active submenu tab
	10	+// };
	11	+
	12	+
...	...
...	...	@@ -0,0 +1,7 @@
	1	+import $ from 'jquery';
	2	+import 'jquery-validation';
	3	+import { Accounts } from 'meteor/accounts-base';
	4	+import { Bert } from 'meteor/themeteorchef:bert';
	5	+import { getInputValue } from './get-input-value';
	6	+
	7	+let component;
...	...
...	...	@@ -0,0 +1,5 @@
	1	+// TODO WTF: what is this thing? -H
	2	+
	3	+import ReactDOM from 'react-dom';
	4	+
	5	+export const getInputValue = (component) => ReactDOM.findDOMNode(component).value;
...	...
...	...	@@ -0,0 +1,70 @@
	1	+import $ from 'jquery';
	2	+import 'jquery-validation';
	3	+import { browserHistory } from 'react-router';
	4	+import { Meteor } from 'meteor/meteor';
	5	+import { Bert } from 'meteor/themeteorchef:bert';
	6	+import { getInputValue } from './get-input-value';
	7	+
	8	+let component;
	9	+
	10	+const login = () => {
	11	+ const email = getInputValue(component.refs.emailAddress);
	12	+ const password = getInputValue(component.refs.password);
	13	+
	14	+ Meteor.call('checkEmailVerification', email, ( error, data ) => {
	15	+ if ( error ) {
	16	+ Bert.alert( error.reason, 'danger' );
	17	+ }
	18	+ else {
	19	+ if ( data == "verified" ) {
	20	+ Meteor.loginWithPassword(email, password, (error) => {
	21	+ if ( error ) {
	22	+ Bert.alert(error.reason, 'warning');
	23	+ } else {
	24	+ Bert.alert('Logged in!', 'success');
	25	+
	26	+ const { location } = component.props;
	27	+ if (location.state && location.state.nextPathname) {
	28	+ browserHistory.push(location.state.nextPathname);
	29	+ } else {
	30	+ browserHistory.push('/');
	31	+ }
	32	+ }
	33	+ });
	34	+ } else if ( data == "unverified" ){
	35	+ Bert.alert("Check your email for a verification link");
	36	+ } else {
	37	+ Bert.alert("Either email or password is incorrect");
	38	+ }
	39	+ }
	40	+ });
	41	+};
	42	+
	43	+const validate = () => {
	44	+ $(component.refs.login).validate({
	45	+ rules: {
	46	+ emailAddress: {
	47	+ required: true,
	48	+ email: true,
	49	+ },
	50	+ password: {
	51	+ required: true,
	52	+ },
	53	+ },
	54	+ messages: {
	55	+ emailAddress: {
	56	+ required: 'Need an email address here.',
	57	+ email: 'Is this email address legit?',
	58	+ },
	59	+ password: {
	60	+ required: 'Need a password here.',
	61	+ },
	62	+ },
	63	+ submitHandler() { login(); },
	64	+ });
	65	+};
	66	+
	67	+export const handleLogin = (options) => {
	68	+ component = options.component;
	69	+ validate();
	70	+};
...	...
...	...	@@ -0,0 +1,10 @@
	1	+import { browserHistory } from 'react-router';
	2	+
	3	+
	4	+export const logout = () => {
	5	+ Meteor.logout();
	6	+ browserHistory.push('/');
	7	+};
	8	+
	9	+
	10	+
...	...
...	...	@@ -0,0 +1,18 @@
	1	+import { _ } from 'meteor/underscore';
	2	+import { Meteor } from 'meteor/meteor';
	3	+import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
	4	+
	5	+const fetchMethodNames = (methods) => _.pluck(methods, 'name');
	6	+
	7	+const assignLimits = ({ methods, limit, timeRange }) => {
	8	+ const methodNames = fetchMethodNames(methods);
	9	+
	10	+ if (Meteor.isServer) {
	11	+ DDPRateLimiter.addRule({
	12	+ name(name) { return _.contains(methodNames, name); },
	13	+ connectionId() { return true; },
	14	+ }, limit, timeRange);
	15	+ }
	16	+};
	17	+
	18	+export const rateLimit = (options) => assignLimits(options);
...	...
...	...	@@ -0,0 +1,42 @@
	1	+import $ from 'jquery';
	2	+import 'jquery-validation';
	3	+import { Accounts } from 'meteor/accounts-base';
	4	+import { Bert } from 'meteor/themeteorchef:bert';
	5	+import { getInputValue } from './get-input-value';
	6	+
	7	+let component;
	8	+
	9	+const handleRecovery = () => {
	10	+ Accounts.forgotPassword({
	11	+ email: getInputValue(component.refs.emailAddress),
	12	+ }, (error) => {
	13	+ if (error) {
	14	+ Bert.alert(error.reason, 'warning');
	15	+ } else {
	16	+ Bert.alert('Check your inbox for a reset link!', 'success');
	17	+ }
	18	+ });
	19	+};
	20	+
	21	+const validate = () => {
	22	+ $(component.refs.recoverPassword).validate({
	23	+ rules: {
	24	+ emailAddress: {
	25	+ required: true,
	26	+ email: true,
	27	+ },
	28	+ },
	29	+ messages: {
	30	+ emailAddress: {
	31	+ required: 'Need an email address here.',
	32	+ email: 'Is this email address legit?',
	33	+ },
	34	+ },
	35	+ submitHandler() { handleRecovery(); },
	36	+ });
	37	+};
	38	+
	39	+export const handleRecoverPassword = (options) => {
	40	+ component = options.component;
	41	+ validate();
	42	+};
...	...