Sunny Negi / Meteor-projects

Browse Code »

Commit 878ca8a152800bbb889f6aa5a106a87f8867cf95

Authored by Deepak 2017-03-19 09:57:49 -0400

1 parent a8c5a7fb6d

Exists in master

added signup form on index route for main site

Showing 12 changed files with 345 additions and 34 deletions Show diff stats

imports/client/app/routes.js

Diff comments View file @878ca8a

 /* 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';
 import NotFound                             from '/imports/client/views/org/NotFound';
 /**
  * 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 { importCsvController }              from '/imports/client/views/org/importCsv/index'
 //admin
 import { StudentDataController }            from '/imports/client/views/org/admin/students/index'
 import { teachersViewController }           from '/imports/client/views/org/admin/teachers/index'
 //students
 //teachers
 //parents
 /**
  * NonOrg Components
  */
 import Signup                               from '/imports/client/views/nonOrg/enter/SignupView';
 import { NonOrgApp }                        from '/imports/client/layouts/NonOrgApp';
+import {NonOrgAppModule}                    from '/imports/client/views/nonOrg/app/module/Index';
 /**
  * Invalid Org Components
  */
 /**
 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="import"            path="/import"                          component={ importCsvController } />
       <Route name="student"           path="/students"                        component={ StudentDataController } />
       <Route name="teachers"          path="/teachers"                        component={ teachersViewController } />
       <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={ NonOrgApp }>
-      <IndexRoute name="index"                                                component={ Index } />
+      <IndexRoute name="index"                                                component={ NonOrgAppModule } />
       <Route name="signup"            path="/signup"                          component={ Signup } />
       <Route path="*"                                                         component={ NotFound } />
     </Route>
   </Router>
 )
 //Authenticate function to give access to users only
 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);
         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');
 }
 Meteor.startup(() => {
   detectOrg();
 });

imports/client/layouts/NonOrgApp.js

Diff comments View file @878ca8a

 import React, { Component }         from 'react';
 import { Grid }                     from 'react-bootstrap';
-import {AppNavigationController}    from '/imports/client/views/nonOrg/app/module/navigation/index';
 /**
  * user based redirection will take place here
  */
- export class App extends Component {
+ export class NonOrgApp extends Component {
    constructor(props) {
      super(props);
      this.state = {
      };
    };
    render(){
      return (
        <div>
-         <AppNavigationController />
          <Grid>
            { this.props.children }
          </Grid>
        </div>
      )
    }
  }

imports/client/views/nonOrg/app/module/AppLayout.js

Diff comments View file @878ca8a

File was created	1	import _ from 'lodash';
	2	import { Meteor } from 'meteor/meteor';
	3	import React, { Component } from 'react';
	4	import { Link } from 'react-router';
	5	import { Avatar } from '/imports/client/components/Avatar';
	6	import { Icon } from '/imports/client/components/Icon';
	7	import classNames from 'classnames';
	8
	9	import { logout } from '/imports/client/app/utils/loginMethods';
	10
	11	import Signup from '/imports/client/views/nonOrg/enter/SignupView';
	12	import { VerifyModule } from '/imports/client/views/verify/module/index';
	13	import ReactSVG from 'react-svg'
	14
	15	export class AppLayout extends Component {
	16	render() {
	17	const {user, org} = this.props.data;
	18	console.log(user);
	19	if(!user) {
	20	return (
	21	<Signup
	22	/>
	23	);
	24	}
	25
	26	if(!user.isEmailVerified()) {
	27	return (
	28	<VerifyModule
	29	pane = {this.props.location.query.verify}
	30	location = {this.props.location}
	31	/>
	32	);
	33	}
	34
	35
	36	return (
	37	<div className = "appLayout-box">
	38	<div className = "appLayout-wrapOuter">
	39	<div className = "appLayout-wrapInner">
	40	<div className = "appLayout-menuWrap">
	41	</div>
	42	<div className = "appLayout-contentWrap">
	43	<div className = "appLayout-content">
	44
	45	</div>
	46	</div>
	47	</div>
	48	</div>
	49	</div>
	50	);
	51	};
	52
	53	};
	54

imports/client/views/nonOrg/app/module/Index.js

Diff comments View file @878ca8a

1	import React from 'react';	1	// import { AppModule } from '/imports/client/views/app/module/index'
2	import { Jumbotron } from 'react-bootstrap';	2	import {
3		3	composeWithTracker,
4	const Index = () => (	4	compose,
5	<div className="Index">	5	composeAll
6	<Jumbotron className="text-center">	6	} from 'react-komposer';
7	<h2>Base</h2>	7	import { AppLayout } from './AppLayout';
8	<p>A starting point for Meteor applications.</p>	8	import { Loading } from '/imports/client/components/Loading';
9	<p><a className="btn btn-success" href="https://themeteorchef.com/base" role="button">Read the Documentation</a></p>	9
10	<p style={ { fontSize: '16px', color: '#aaa' } }>Currently at v4.11.1</p>	10	import { Users } from '/imports/collections/users/index';
11	</Jumbotron>	11	import { Orgs } from '/imports/collections/orgs/index';
12	</div>	12
13	);	13
14		14	const meteorTick = (props, onData) => {
15	export default Index;	15
		16	const handles = [
		17	Meteor.subscribe('users.current'),
		18	Meteor.subscribe('orgs.current'),
		19	];
		20
		21	if(_.every(handles, (handle) => (handle.ready()) )) {
		22	const user = Users.current();
		23	console.log(user);
		24	onData(null, {
		25	data: {
		26	user: user,
		27	org: Orgs.current(),
		28	},
		29	});
		30	}
		31
		32	return () => {
		33	_.each(handles, (handle) => handle.stop() );
		34	};
		35	};
		36
		37
		38	const reduxTick = (props, onData) => {
		39	onData(null, {
		40	location: props.location,
		41	data: {}
		42	});
		43	};
		44
		45
		46	export const NonOrgAppModule = composeAll(
		47	composeWithTracker(meteorTick, Loading),
		48	compose(reduxTick, Loading),
		49	)(AppLayout);
16		50

imports/client/views/nonOrg/app/module/navigation/AppNavigation.js

Diff comments View file @878ca8a

 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 '/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';
 // import '/imports/client/assets/css/colors.css';
 export class AppNavigation extends Component {
   constructor(props) {
     super(props);
     this.state = {
     };
   };
   onUpdate(key, value) {
     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>
             </Navbar.Brand>
             <Navbar.Toggle />
           </Navbar.Header>
           <Navbar.Collapse>
             <PublicNavigation />
           </Navbar.Collapse>
         </Navbar>
       )
     }
     return (
       <div></div>
     );
   };
 };

imports/client/views/nonOrg/app/module/navigation/AuthenticatedNavigation.js

Diff comments View file @878ca8a

 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';
 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}` : '';
 };
 const AuthenticatedNavigation = () => (
   <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>
 );
 export default AuthenticatedNavigation;

imports/client/views/nonOrg/app/module/navigation/index.js

Diff comments View file @878ca8a

 // import { AppNavigation } from '/imports/client/views/nonOrg/app/module/navigation/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 { Users }                          from '/imports/collections/users/index';
 import { AppNavigation }                  from './AppNavigation';
 const meteorTick = (props, onData) => {
   const handles = [
     Meteor.subscribe('users.current'),
     Meteor.subscribe('orgs.current')
   ];
   if(_.every(handles, (handle) => (handle.ready()) )) {
     const user = Users.current();
     const org = Orgs.current();
+    console.log(user);
     onData(null, {
       data: {
         user: user,
         org: org
       },
     });
   }
   return () => {
     _.each(handles, (handle) => handle.stop() );
   };
 };
 const reduxTick = (props, onData) => {
   onData(null, {
     data: {}
   });
 };
 export const AppNavigationController = composeAll(
   composeWithTracker(meteorTick, Loading),
   compose(reduxTick, Loading),
 )(AppNavigation);

imports/client/views/verify/EmailPane.js

Diff comments View file @878ca8a

File was created	1	import React from 'react';
	2	import { Link } from 'react-router';
	3	import { If, Case } from '/imports/client/components/Logic';
	4	import { Bert } from 'meteor/themeteorchef:bert';
	5
	6	import { Row, Col, Alert,ControlLabel,
	7	FormGroup, FormControl, Button } from 'react-bootstrap';
	8
	9
	10	export class EmailPane extends React.Component {
	11
	12	constructor(props) {
	13	super(props);
	14
	15	this.state = {
	16	email: props.user.emails[0].address,
	17	form: false,
	18	};
	19	};
	20
	21	onUpdate(key, val) {
	22	this.setState({[key]: val});
	23	};
	24
	25	onSetEmail() {
	26	startEmailVerification.call({email: this.state.email}, (err, res)=>{
	27	Bert.alert('New verification email sent!', 'success');
	28
	29	});
	30	this.setState({form: false});
	31	};
	32
	33	onShowForm() {
	34	this.setState({form: true});
	35	};
	36
	37	renderForm() {
	38	const {user} = this.props;
	39
	40	return (
	41	<div className = "wizardPane-box">
	42	<div className = "wizardPane-section">
	43	<div className="icon-circle icon-lg">
	44	<i className="icon icon-simple icon-envelope"></i>
	45	</div>
	46	<div className = "wizardPane-title">
	47	Set your email address
	48	</div>
	49	<div className = "col-xs-8 horizontalform verifyEmail wizardPane-text">
	50	<div className="form-row">
	51	<Col sm={4}>
	52	Enter email
	53	</Col>
	54	<Col sm={8}>
	55	<input
	56	type = "text"
	57	value = {this.state.email}
	58	onChange = {(evt) => this.onUpdate('email', evt.currentTarget.value)}
	59	placeholder = "Email"
	60	/>
	61	</Col>
	62	</div>
	63
	64	</div>
	65	</div>
	66	<div className = "wizardPane-section wizardPane-footer">
	67	<div
	68	className = "wizardPane-button btn btn-blue"
	69	onClick = {() => this.onSetEmail()}
	70	>
	71	Send verification email
	72	</div>
	73	</div>
	74	</div>
	75	);
	76	};
	77
	78	renderMessage() {
	79	const {user} = this.props;
	80
	81	return (
	82	<div className = "wizardPane-box">
	83	<div className = "wizardPane-section">
	84
	85	<div className = "wizardPane-title">
	86	<i className="icon-envelope icon"></i>
	87	<h3>Verify your email</h3>
	88	</div>
	89	<div className = "wizardPane-text">
	90	Check your email – we sent a verification link to<br/>
	91	{user.emails[0].address}
	92	</div>
	93	</div>
	94	<div className = "wizardPane-section wizardPane-footer">
	95	<div className="btn"
	96	className = "wizardPane-link"
	97	onClick = {() => this.onShowForm()}
	98	>
	99	Email did not arrive or want to use a different email?
	100	</div>
	101	</div>
	102	</div>
	103	);
	104	};
	105
	106	render() {
	107	return this.state.form ? this.renderForm() : this.renderMessage();
	108	};
	109
	110	};
	111

imports/client/views/verify/module/VerifyLayout.js

Diff comments View file @878ca8a

File was created	1	import _ from 'lodash';
	2	import { Meteor } from 'meteor/meteor';
	3
	4	import React, { Component } from 'react';
	5	import { Link } from 'react-router';
	6	import { If, Case } from '/imports/client/components/Logic';
	7	import { Avatar } from '/imports/client/components/Avatar';
	8
	9	import { logout } from '/imports/client/app/utils/loginMethods';
	10
	11	import { EmailPane } from '/imports/client/views/verify/EmailPane';
	12	import ReactSVG from 'react-svg'
	13
	14
	15	export class VerifyLayout extends Component {
	16
	17	render() {
	18	const user = this.props.data.user;
	19
	20	return (
	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	<div className = "wizardLayout-wrap">
	51	<div className = "wizardLayout-content">
	52
	53	<EmailPane
	54	user = {user}
	55	/>
	56
	57	</div>
	58	</div>
	59	</div>
	60	);
	61	};
	62
	63	};
	64
	65
	66

imports/client/views/verify/module/index.js

Diff comments View file @878ca8a

File was created	1	// import { VerifyModule } from '/imports/client/views/verify/module/index'
	2	import {
	3	composeWithTracker,
	4	compose,
	5	composeAll
	6	} from 'react-komposer';
	7	import { VerifyLayout } from './VerifyLayout';
	8	import { Loading } from '/imports/client/components/Loading';
	9
	10	import { Users } from '/imports/collections/users/index';
	11
	12
	13	const meteorTick = (props, onData) => {
	14
	15	const handles = [
	16	Meteor.subscribe('users.current'),
	17	];
	18
	19	if(_.every(handles, (handle) => (handle.ready()) )) {
	20	const user = Users.current();
	21	onData(null, {
	22	data: {
	23	user: user,
	24	},
	25	});
	26	}
	27
	28	return () => {
	29	_.each(handles, (handle) => handle.stop() );
	30	};
	31	};
	32
	33
	34	const reduxTick = (props, onData) => {
	35	onData(null, {
	36	data: {}
	37	});
	38	};
	39
	40
	41	export const VerifyModule = composeAll(
	42	composeWithTracker(meteorTick, Loading),
	43	compose(reduxTick, Loading),
	44	)(VerifyLayout);
	45
	46
	47
	48
	49
	50
	51

imports/server/accounts/creation.js

Diff comments View file @878ca8a

 import _                                  from 'lodash';
 import { Accounts }                       from 'meteor/accounts-base';
 import { SimpleSchema }                   from 'meteor/aldeed:simple-schema';
 import { ValidatedMethod }                from 'meteor/mdg:validated-method';
 import { Orgs }                           from '/imports/collections/orgs/index';
 import { Users }                          from '/imports/collections/users/index';
 Accounts.validateNewUser((user) => {
   return !!user;
 });
 Accounts.onCreateUser((options, user) => {
   if(options.orgSlug){
     orgId = Orgs.insert({
       slug:   options.orgSlug,
       name:   options.orgName,
       setup:  1,
       users:  [{
         userId:     user._id,
         role:       Users.roles.ADMIN,
       }],
     });
   }
+  console.log("options");
+  console.log(options);
+  console.log("user");
+  console.log(user);
     _.assign(user, {
       role:         Users.roles.ADMIN,
       orgId:        orgId,
-      firstName:    options.profile.firstName,
+      firstName:    options.profile.name.first,
-      lastName:     options.profile.lastName,
+      lastName:     options.profile.name.last,
     });
+    console.log(user);
     return user;
 });

imports/server/emails/verifyEmail.js

Diff comments View file @878ca8a

 import _                                  from 'lodash';
 import { Accounts }                       from 'meteor/accounts-base';
+import { Orgs }                           from '/imports/collections/orgs/index';
 Accounts.config({
   sendVerificationEmail: true
 });
 Accounts.emailTemplates.verifyEmail = {
   subject() {
     return '[YoungDesk] Verify Your Email Address';
   },
   text(user, url) {
-    console.log(user);
-    if(user.firstName){
-      const name = user.firstName;
-    }else{
-      const name = user.profile.firstName;
-    }
     const theUrl = Meteor.absoluteUrl(`back/verifyEmail/${_.last(url.split('/'))}`);
+    org = Orgs.findOne({"_id":user.orgId});
+    OrgUrl = theUrl.replace("http://","http://"+org.slug+".");
     return (
 `
-Hello, ${name}!
+Hello, ${user.firstName}!
 To verify your email address, visit the following link:
-${theUrl}
+${OrgUrl}
 If you did not request this verification, please ignore this email.
 `
     );