Sunny Negi / Meteor-projects

Browse Code »

Commit a8c5a7fb6d807c52c4d119ddb806d2c99e347edb

Authored by Deepak 2017-03-19 03:38:49 -0400

1 parent 0d80eac236

Exists in master

added teachers view

Showing 8 changed files with 184 additions and 31 deletions Show diff stats

imports/client/app/routes.js

Diff comments View file @a8c5a7f

 /* 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';
 /**
  * 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="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 } />
       <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 @a8c5a7f

1	import React, { Component } from 'react';	1	import React, { Component } from 'react';
2	import { Grid } from 'react-bootstrap';	2	import { Grid } from 'react-bootstrap';
3	import {AppNavigationController} from '/imports/client/views/org/app/module/navigation/index';	3	import {AppNavigationController} from '/imports/client/views/nonOrg/app/module/navigation/index';
4	/**	4	/**
5	* user based redirection will take place here	5	* user based redirection will take place here
6	*/	6	*/
7	export class App extends Component {	7	export class App extends Component {
8	constructor(props) {	8	constructor(props) {
9	super(props);	9	super(props);
10	this.state = {	10	this.state = {
11		11
12	};	12	};
13	};	13	};
14	render(){	14	render(){
15	return (	15	return (
16	<div>	16	<div>
17	<AppNavigationController />	17	<AppNavigationController />
18	<Grid>	18	<Grid>
19	{ this.props.children }	19	{ this.props.children }
20	</Grid>	20	</Grid>
21	</div>	21	</div>
22	)	22	)
23	}	23	}
24	}	24	}
25		25

imports/client/views/etc/index.js

Diff comments View file @a8c5a7f

 // 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 { Users }                          from '/imports/collections/users/index';
+import { teachersView }                   from './teachersView';
 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();
     onData(null, {
       data: {
         user: user,
         org: org
       },
     });
   }
   return () => {
     _.each(handles, (handle) => handle.stop() );
   };
 };
 const reduxTick = (props, onData) => {
   onData(null, {
     data: {}
   });
 };
 export const InviteSignupController = composeAll(
   composeWithTracker(meteorTick, Loading),
   compose(reduxTick, Loading),
 )(InviteSignupView);

imports/client/views/etc/signup.js

Diff comments View file @a8c5a7f

1	import _ from 'lodash';	1	import _ from 'lodash';
2	import { Meteor } from 'meteor/meteor';	2	import { Meteor } from 'meteor/meteor';
3		3
4	import React, { Component } from 'react';	4	import React, { Component } from 'react';
5	import { Link,browserHistory } from 'react-router';	5	import { Link,browserHistory } from 'react-router';
6	import { FormGroup,,	6	import { FormGroup,
7	FormControl,Glyphicon,Button } from 'react-bootstrap';	7	FormControl,Glyphicon,Button } from 'react-bootstrap';
8		8
9		9
10	export class InviteSignupView extends Component {	10	export class InviteSignupView extends Component {
11		11
12	constructor(props) {	12	constructor(props) {
13	super(props);	13	super(props);
14	this.state = {	14	this.state = {
15		15
16	};	16	};
17	this.onUpdate = this.onUpdate.bind(this);	17	this.onUpdate = this.onUpdate.bind(this);
18	};	18	};
19		19
20	onUpdate(key, value) {	20	onUpdate(key, value) {
21	this.setState({[key]: value});	21	this.setState({[key]: value});
22	};	22	};
23		23
24	render() {	24	render() {
25	const {user, org} = this.props.data;	25	const {user, org} = this.props.data;
26	return (	26	return (
27	<div className = "enterPane-box">	27	<div className = "enterPane-box">
28		28
29	</div>	29	</div>
30	);	30	);
31	};	31	};
32		32
33	};	33	};
34		34

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

Diff comments View file @a8c5a7f

1	import React from 'react';	1	import React, { Component } from 'react';
2	import { Navbar } from 'react-bootstrap';	2	import { Navbar } from 'react-bootstrap';
3	import { Link } from 'react-router';	3	import { Link } from 'react-router';
4	import PublicNavigation from './PublicNavigation.js';	4	import {PublicNavigation} from './PublicNavigation.js';
5	import AuthenticatedNavigation from './AuthenticatedNavigation.js';	5	import {AuthenticatedNavigation} from './AuthenticatedNavigation.js';
		6	// import '/imports/client/assets/css/icons/icomoon/styles.css';
		7	// import '/imports/client/assets/css/bootstrap.css';
		8	// import '/imports/client/assets/css/core.css';
		9	// import '/imports/client/assets/css/components.css';
		10	// import '/imports/client/assets/css/colors.css';
		11	// import '/imports/client/assets/css/colors.css';
		12	export class AppNavigation extends Component {
6		13
7	const renderNavigation = hasUser => (hasUser ? <AuthenticatedNavigation /> : <PublicNavigation />);	14	constructor(props) {
		15	super(props);
		16	this.state = {
8		17
9	const AppNavigation = ({ hasUser }) => (	18	};
10	<Navbar>	19	};
11	<Navbar.Header>
12	<Navbar.Brand>
13	<Link to="/">Application Name</Link>
14	</Navbar.Brand>
15	<Navbar.Toggle />
16	</Navbar.Header>
17	<Navbar.Collapse>
18	{ renderNavigation(hasUser) }
19	</Navbar.Collapse>
20	</Navbar>
21	);
22		20
23	AppNavigation.propTypes = {	21	onUpdate(key, value) {
24	hasUser: React.PropTypes.object,	22	this.setState({[key]: value});
25	};	23	};
		24	render() {
		25	const {user} = this.props.data;
		26	if(user){
		27	return(
		28	<AuthenticatedNavigation
		29	data = {this.props.data}
		30	/>
		31	)
		32	}else{
		33	return(
		34	<Navbar>
		35	<Navbar.Header>
		36	<Navbar.Brand>
		37	<Link to="/">Application Name</Link>
		38	</Navbar.Brand>
		39	<Navbar.Toggle />
		40	</Navbar.Header>
		41	<Navbar.Collapse>
		42	<PublicNavigation />
		43	</Navbar.Collapse>
		44	</Navbar>

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

Diff comments View file @a8c5a7f

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

imports/client/views/org/admin/teachers/index.js

Diff comments View file @a8c5a7f

File was created	1	// import { InviteSignupController } from '/imports/client/views/invite/signup/index'
	2	import _ from 'lodash';
	3	import {
	4	composeWithTracker,
	5	compose,
	6	composeAll
	7	} from 'react-komposer';
	8	import { Loading } from '/imports/client/components/Loading';
	9
	10	import { Orgs } from '/imports/collections/orgs/index';
	11	import { Users } from '/imports/collections/users/index';
	12	import { teachersView } from './teachersView';
	13
	14	const meteorTick = (props, onData) => {
	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	const org = Orgs.current();
	24	onData(null, {
	25	data: {
	26	user: user,
	27	org: org
	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	data: {}
	41	});
	42	};
	43
	44
	45	export const teachersViewController = composeAll(
	46	composeWithTracker(meteorTick, Loading),
	47	compose(reduxTick, Loading),
	48	)(teachersView);
	49

imports/client/views/org/admin/teachers/teachersView.js

Diff comments View file @a8c5a7f

File was created	1	import _ from 'lodash';
	2	import { Meteor } from 'meteor/meteor';
	3
	4	import React, { Component } from 'react';
	5	import { Link,browserHistory } from 'react-router';
	6	import { FormGroup,
	7	FormControl,Glyphicon,Button } from 'react-bootstrap';
	8
	9
	10	export class teachersView extends Component {
	11
	12	constructor(props) {
	13	super(props);
	14	this.state = {
	15
	16	};
	17	this.onUpdate = this.onUpdate.bind(this);
	18	};
	19
	20	onUpdate(key, value) {
	21	this.setState({[key]: value});
	22	};
	23
	24	render() {
	25	const {user, org} = this.props.data;
	26	return (
	27	<div className = "enterPane-box">
	28
	29	</div>
	30	);
	31	};
	32
	33	};
	34