Added logout button to non org and fixed some css

Deepak
1 parent ce82de088e
Showing 8 changed files with 27 additions and 83 deletions Show diff stats
client/stylesheets/custom.css
imports/client/layouts/NonOrgApp.js
imports/client/views/nonOrg/app/module/navigation/AppNavigation.js
imports/client/views/nonOrg/app/module/navigation/AuthenticatedNavigation.js
imports/client/views/verify/EmailPane.js
imports/client/views/verify/module/VerifyLayout.js
imports/server/accounts/creation.js
imports/server/emails/verifyEmail.js
@@ -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;
+}
@@ -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 &#39;./NonOrgApp.css&#39;;
    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>
 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>
-    );
   };
  
 };
@@ -4,20 +4,19 @@ import { LinkContainer } from &#39;react-router-bootstrap&#39;;
 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>
 );
@@ -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">
@@ -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>
     );
   };
-  
-};
-
  
+};
@@ -15,7 +15,7 @@ Accounts.onCreateUser((options, user) =&gt; {
  
   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) =&gt; {
       }],
     });
   }
-  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;
 });
@@ -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}!
...	...	@@ -44,3 +44,10 @@ button.close span{
44	44	max-height: 550px;
45	45	overflow-y: scroll;
46	46	}
	47	+.verifyEmailBox .wizardPane-title h3, .wizardPane-title span{
	48	+ color: #000000;
	49	+}
	50	+
	51	+.verifyEmailBox .wizardPane-section1{
	52	+ background-color: #ffffff;
	53	+}
...	...
...	...	@@ -10,6 +10,7 @@ import { Row, Col, FormGroup,
10	10	NavLink, DropdownItem, DropdownToggle, DropdownMenu,
11	11	NavDropdown, MenuItem } from 'react-bootstrap';
12	12	import { LinkContainer } from 'react-router-bootstrap';
	13	+import {AppNavigation} from '/imports/client/views/nonOrg/app/module/navigation/AppNavigation.js';
13	14	import './NonOrgApp.css';
14	15	/**
15	16	* user based redirection will take place here
...	...	@@ -24,21 +25,7 @@ import './NonOrgApp.css';
24	25	render(){
25	26	return (
26	27	<div>
27		- <Navbar>
28		- <Navbar.Header>
29		- <Navbar.Brand className='brand-style'>
30		- <Link to="/">YOUNGDESK</Link>
31		- </Navbar.Brand>
32		- <Navbar.Toggle />
33		- </Navbar.Header>
34		- <Navbar.Collapse>
35		- <Nav pullRight>
36		- <LinkContainer to="login" >
37		- <NavItem className='nav-item' eventKey={ 2 } href="/login">Log in</NavItem>
38		- </LinkContainer>
39		- </Nav>
40		- </Navbar.Collapse>
41		- </Navbar>
	28	+ <AppNavigation/>
42	29	<Grid>
43	30	{ this.props.children }
44	31	</Grid>
...	...
1	1	import React, { Component } from 'react';
2	2	import { Navbar } from 'react-bootstrap';
3	3	import { Link } from 'react-router';
4		-import {PublicNavigation} from './PublicNavigation.js';
5		-import {AuthenticatedNavigation} from './AuthenticatedNavigation.js';
	4	+import AuthenticatedNavigation from './AuthenticatedNavigation.js';
6	5	// import '/imports/client/assets/css/icons/icomoon/styles.css';
7	6	// import '/imports/client/assets/css/bootstrap.css';
8	7	// import '/imports/client/assets/css/core.css';
...	...	@@ -22,34 +21,20 @@ export class AppNavigation extends Component {
22	21	this.setState({[key]: value});
23	22	};
24	23	render() {
25		- const {user} = this.props.data;
26		- console.log(user);
27		- if(user){
28		- return(
29		- <AuthenticatedNavigation
30		- data = {this.props.data}
31		- />
32		- )
33		- }else{
34	24	return(
35	25	<Navbar>
36	26	<Navbar.Header>
37	27	<Navbar.Brand>
38		- <Link to="/">Application Name</Link>
	28	+ <Link to="/">YoungDesk</Link>
39	29	</Navbar.Brand>
40	30	<Navbar.Toggle />
41	31	</Navbar.Header>
42	32	<Navbar.Collapse>
43		- <PublicNavigation />
	33	+ <AuthenticatedNavigation
	34	+ />
44	35	</Navbar.Collapse>
45	36	</Navbar>
46		-
47	37	)
48		- }
49		-
50		- return (
51		- <div></div>
52		- );
53	38	};
54	39
55	40	};
...	...
...	...	@@ -4,20 +4,19 @@ import { LinkContainer } from 'react-router-bootstrap';
4	4	import { Nav, NavItem, NavDropdown, MenuItem } from 'react-bootstrap';
5	5	import { Meteor } from 'meteor/meteor';
6	6
7		-const handleLogout = () => Meteor.logout(() => browserHistory.push('/login'));
	7	+const handleLogout = () => Meteor.logout();
8	8
9	9	const userName = () => {
10	10	const user = Meteor.user();
11		- const name = user && user.profile ? user.profile.name : '';
12		- return user ? `${name.first} ${name.last}` : '';
	11	+ console.log("user------");
	12	+ console.log(user);
	13	+ return user ? `${user.firstName} ${user.lastName}` : '';
13	14	};
14	15
15	16	const AuthenticatedNavigation = () => (
16	17	<div>
17		- <Nav>
18		- <LinkContainer to="/documents">
19		- <NavItem eventKey={ 2 } href="/documents">Documents</NavItem>
20		- </LinkContainer>
	18	+ <Nav pullRight>
	19	+ <MenuItem eventKey={ 3.1 } onClick={ handleLogout }>Logout</MenuItem>
21	20	</Nav>
22	21	</div>
23	22	);
...	...
...	...	@@ -70,12 +70,12 @@ export class EmailPane extends React.Component {
70	70	const {user} = this.props;
71	71
72	72	return (
73		- <div className = "wizardPane-box">
	73	+ <div className = "wizardPane-box verifyEmailBox">
74	74	<div className = "wizardPane-section1">
75	75
76	76	<div className = "wizardPane-title">
77	77	{/* <i className="icon-envelope icon"></i> */}
78		- <h3>Hi, your email needs verification</h3>
	78	+ <h3>Hi {user.getFullName()}, your email needs verification</h3>
79	79
80	80	<span>Please check your email – we sent a verification link to
81	81	<span className = "EmailVerify">
...	...
...	...	@@ -19,47 +19,17 @@ export class VerifyLayout extends Component {
19	19
20	20	return (
21	21	<div className = "wizardLayout-box">
22		- <div className = "wizardLayout-top">
23		- <div className="container">
24		- <div className = "wizardLayout-topSpace logo-space-0">
25		- <ReactSVG
26		- path="/files/images/svg/logo--white.svg"
27		- className="enterPane__logo"
28		- />
29		- </div>
30		- <div className = "wizardLayout-topGroup">
31		- <div className = "wizardLayout-topItem">
32		- <Avatar
33		- user = {user}
34		- size = {20}
35		- small = {true}
36		- />
37		-
38		- {user.getFullName()}
39		- </div>
40		- <div
41		- className = "wizardLayout-topItem"
42		- onClick = {() => logout()}
43		- >
44		- <i className="icon icon-simple icon-power"></i>
45		- </div>
46		- </div>
47		- </div>
48		- </div>
49		-
50	22	<div className = "wizardLayout-wrap">
51	23	<div className = "wizardLayout-content">
52	24
53	25	<EmailPane
54	26	user = {user}
55	27	/>
56		-
	28	+
57	29	</div>
58	30	</div>
59	31	</div>
60	32	);
61	33	};
62		-
63		-};
64		-
65	34
	35	+};
...	...
...	...	@@ -15,7 +15,7 @@ Accounts.onCreateUser((options, user) => {
15	15
16	16	if(options.orgSlug){
17	17	orgId = Orgs.insert({
18		- slug: options.orgSlug,
	18	+ slug: options.orgSlug.replace(" ", "-").toLowerCase(),
19	19	name: options.orgName,
20	20	setup: 1,
21	21	users: [{
...	...	@@ -24,16 +24,12 @@ Accounts.onCreateUser((options, user) => {
24	24	}],
25	25	});
26	26	}
27		- console.log("options");
28		- console.log(options);
29		- console.log("user");
30		- console.log(user);
31		- _.assign(user, {
	27	+
	28	+ _.assign(user, {
32	29	role: Users.roles.ADMIN,
33	30	orgId: orgId,
34	31	firstName: options.profile.name.first,
35	32	lastName: options.profile.name.last,
36	33	});
37		- console.log(user);
38	34	return user;
39	35	});
...	...
...	...	@@ -14,7 +14,7 @@ Accounts.emailTemplates.verifyEmail = {
14	14	const theUrl = Meteor.absoluteUrl(`back/verifyEmail/${_.last(url.split('/'))}`);
15	15	org = Orgs.findOne({"_id":user.orgId});
16	16
17		- OrgUrl = theUrl.replace("http://","http://"+org.slug+".");
	17	+ OrgUrl = encodeURI(theUrl.replace("http://","http://"+org.slug+"."));
18	18	return (
19	19	`
20	20	Hello, ${user.firstName}!
...	...