From 316564385fd4f2c5c8a600b1919fac18233ca197 Mon Sep 17 00:00:00 2001
From: Deepak <deepak125.dk@gmail.com>
Date: Tue, 11 Apr 2017 20:34:15 +0530
Subject: [PATCH] Added logout button to non org and fixed some css

---
 client/stylesheets/custom.css                      |  7 +++++
 imports/client/layouts/NonOrgApp.js                | 17 ++---------
 .../nonOrg/app/module/navigation/AppNavigation.js  | 23 +++------------
 .../module/navigation/AuthenticatedNavigation.js   | 13 ++++-----
 imports/client/views/verify/EmailPane.js           |  4 +--
 imports/client/views/verify/module/VerifyLayout.js | 34 ++--------------------
 imports/server/accounts/creation.js                | 10 ++-----
 imports/server/emails/verifyEmail.js               |  2 +-
 8 files changed, 27 insertions(+), 83 deletions(-)

diff --git a/client/stylesheets/custom.css b/client/stylesheets/custom.css
index f8887a2..683e04e 100644
--- a/client/stylesheets/custom.css
+++ b/client/stylesheets/custom.css
@@ -44,3 +44,10 @@ button.close span{
   max-height: 550px;
   overflow-y: scroll;
 }
+.verifyEmailBox .wizardPane-title h3, .wizardPane-title span{
+  color: #000000;
+}
+
+.verifyEmailBox .wizardPane-section1{
+  background-color: #ffffff;
+}
diff --git a/imports/client/layouts/NonOrgApp.js b/imports/client/layouts/NonOrgApp.js
index 0f82246..f2a579a 100644
--- a/imports/client/layouts/NonOrgApp.js
+++ b/imports/client/layouts/NonOrgApp.js
@@ -10,6 +10,7 @@ import { Row, Col, FormGroup,
     NavLink, DropdownItem, DropdownToggle, DropdownMenu,
     NavDropdown, MenuItem }                    from 'react-bootstrap';
 import { LinkContainer }                  from 'react-router-bootstrap';
+import {AppNavigation} from '/imports/client/views/nonOrg/app/module/navigation/AppNavigation.js';
 import './NonOrgApp.css';
 /**
  * user based redirection will take place here
@@ -24,21 +25,7 @@ import './NonOrgApp.css';
    render(){
      return (
        <div>
-         <Navbar>
-           <Navbar.Header>
-             <Navbar.Brand className='brand-style'>
-               <Link to="/">YOUNGDESK</Link>
-             </Navbar.Brand>
-             <Navbar.Toggle />
-           </Navbar.Header>
-           <Navbar.Collapse>
-             <Nav pullRight>
-               <LinkContainer to="login" >
-                 <NavItem className='nav-item' eventKey={ 2 } href="/login">Log in</NavItem>
-               </LinkContainer>
-             </Nav>
-           </Navbar.Collapse>
-         </Navbar>
+         <AppNavigation/>
          <Grid>
            { this.props.children }
          </Grid>
diff --git a/imports/client/views/nonOrg/app/module/navigation/AppNavigation.js b/imports/client/views/nonOrg/app/module/navigation/AppNavigation.js
index f4f6254..30721e0 100644
--- a/imports/client/views/nonOrg/app/module/navigation/AppNavigation.js
+++ b/imports/client/views/nonOrg/app/module/navigation/AppNavigation.js
@@ -1,8 +1,7 @@
 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 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';
@@ -22,34 +21,20 @@ export class AppNavigation extends Component {
     this.setState({[key]: value});
   };
   render() {
-    const {user} = this.props.data;
-    console.log(user);
-    if(user){
-      return(
-        <AuthenticatedNavigation
-        data = {this.props.data}
-        />
-      )
-    }else{
       return(
         <Navbar>
           <Navbar.Header>
             <Navbar.Brand>
-              <Link to="/">Application Name</Link>
+              <Link to="/">YoungDesk</Link>
             </Navbar.Brand>
             <Navbar.Toggle />
           </Navbar.Header>
           <Navbar.Collapse>
-            <PublicNavigation />
+          <AuthenticatedNavigation
+          />
           </Navbar.Collapse>
         </Navbar>
-
       )
-    }
-
-    return (
-      <div></div>
-    );
   };
 
 };
diff --git a/imports/client/views/nonOrg/app/module/navigation/AuthenticatedNavigation.js b/imports/client/views/nonOrg/app/module/navigation/AuthenticatedNavigation.js
index 9bf2b52..4e393c5 100644
--- a/imports/client/views/nonOrg/app/module/navigation/AuthenticatedNavigation.js
+++ b/imports/client/views/nonOrg/app/module/navigation/AuthenticatedNavigation.js
@@ -4,20 +4,19 @@ 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 handleLogout = () => Meteor.logout();
 
 const userName = () => {
   const user = Meteor.user();
-  const name = user && user.profile ? user.profile.name : '';
-  return user ? `${name.first} ${name.last}` : '';
+  console.log("user------");
+  console.log(user);
+  return user ? `${user.firstName} ${user.lastName}` : '';
 };
 
 const AuthenticatedNavigation = () => (
   <div>
-    <Nav>
-      <LinkContainer to="/documents">
-        <NavItem eventKey={ 2 } href="/documents">Documents</NavItem>
-      </LinkContainer>
+    <Nav pullRight>
+    <MenuItem eventKey={ 3.1 } onClick={ handleLogout }>Logout</MenuItem>
     </Nav>
   </div>
 );
diff --git a/imports/client/views/verify/EmailPane.js b/imports/client/views/verify/EmailPane.js
index fbb5d44..6e8e2a1 100644
--- a/imports/client/views/verify/EmailPane.js
+++ b/imports/client/views/verify/EmailPane.js
@@ -70,12 +70,12 @@ export class EmailPane extends React.Component {
     const {user} = this.props;
 
     return (
-      <div className = "wizardPane-box">
+      <div className = "wizardPane-box verifyEmailBox">
         <div className = "wizardPane-section1">
 
           <div className = "wizardPane-title">
           {/* <i className="icon-envelope icon"></i> */}
-           <h3>Hi, your email needs verification</h3>
+           <h3>Hi {user.getFullName()}, your email needs verification</h3>
 
             <span>Please check your email – we sent a verification link to &nbsp;
             <span className = "EmailVerify">
diff --git a/imports/client/views/verify/module/VerifyLayout.js b/imports/client/views/verify/module/VerifyLayout.js
index f87a780..dc90fab 100644
--- a/imports/client/views/verify/module/VerifyLayout.js
+++ b/imports/client/views/verify/module/VerifyLayout.js
@@ -19,47 +19,17 @@ export class VerifyLayout extends Component {
 
     return (
       <div className = "wizardLayout-box">
-        <div className = "wizardLayout-top">
-            <div className="container">
-                <div className = "wizardLayout-topSpace logo-space-0">
-                    <ReactSVG
-                          path="/files/images/svg/logo--white.svg"
-                          className="enterPane__logo"
-                      />
-                 </div>
-                  <div className = "wizardLayout-topGroup">
-                    <div className = "wizardLayout-topItem">
-                      <Avatar
-                        user  = {user}
-                        size  = {20}
-                        small = {true}
-                      />
-                      &nbsp;
-                      {user.getFullName()}
-                    </div>
-                    <div
-                      className = "wizardLayout-topItem"
-                      onClick   = {() => logout()}
-                    >
-                      <i className="icon icon-simple icon-power"></i>
-                    </div>
-                  </div>
-            </div>
-        </div>
-
         <div className = "wizardLayout-wrap">
           <div className = "wizardLayout-content">
 
             <EmailPane
               user = {user}
             />
-            
+
           </div>
         </div>
       </div>
     );
   };
-  
-};
-
 
+};
diff --git a/imports/server/accounts/creation.js b/imports/server/accounts/creation.js
index 356036a..63fdac9 100644
--- a/imports/server/accounts/creation.js
+++ b/imports/server/accounts/creation.js
@@ -15,7 +15,7 @@ Accounts.onCreateUser((options, user) => {
 
   if(options.orgSlug){
     orgId = Orgs.insert({
-      slug:   options.orgSlug,
+      slug:   options.orgSlug.replace(" ", "-").toLowerCase(),
       name:   options.orgName,
       setup:  1,
       users:  [{
@@ -24,16 +24,12 @@ Accounts.onCreateUser((options, user) => {
       }],
     });
   }
-  console.log("options");
-  console.log(options);
-  console.log("user");
-  console.log(user);
-    _.assign(user, {
+
+  _.assign(user, {
       role:         Users.roles.ADMIN,
       orgId:        orgId,
       firstName:    options.profile.name.first,
       lastName:     options.profile.name.last,
     });
-    console.log(user);
     return user;
 });
diff --git a/imports/server/emails/verifyEmail.js b/imports/server/emails/verifyEmail.js
index e4ac8fa..590df64 100644
--- a/imports/server/emails/verifyEmail.js
+++ b/imports/server/emails/verifyEmail.js
@@ -14,7 +14,7 @@ Accounts.emailTemplates.verifyEmail = {
     const theUrl = Meteor.absoluteUrl(`back/verifyEmail/${_.last(url.split('/'))}`);
     org = Orgs.findOne({"_id":user.orgId});
 
-    OrgUrl = theUrl.replace("http://","http://"+org.slug+".");
+    OrgUrl = encodeURI(theUrl.replace("http://","http://"+org.slug+"."));
     return (
 `
 Hello, ${user.firstName}!
-- 
2.0.0