Sunny Negi / Meteor-projects

Download as
Browse Code ยป

Commit 84e744e348cef2d371a8563dc3299aefe1763511

Authored by Deepak
1 parent e277faafa4
Exists in master

fixed users page

Showing 10 changed files with 53 additions and 36 deletions   Show diff stats
imports/client/app/routes.js
Diff comments   View file @84e744e
... ... @@ -64,7 +64,7 @@ const getOrgAdminRoutes = () => (
64 64 <IndexRoute name="index" component = { DashboardController } />
65 65 <Route name="import" path="/import" component = { importCsvController } />
66 66 <Route name="settings" path="/settings" component = { AdminSettingsController } />
67   - <Route name="users" path = "/users" component = {AdminUsersModule}>
  67 + <Route name="users" exact={true} path = "/users" component = {AdminUsersModule}>
68 68 <IndexRoute component = {AdminUsersListController} />
69 69 <Route name="students" path = "/users/students" component = {StudentDataController} />
70 70 <Route name="staff" path = "/users/staff" component = {staffViewController} />
... ...
imports/client/views/org/admin/app/module/Breadcrumb.js
Diff comments   View file @84e744e
... ... @@ -28,7 +28,6 @@ export class AdminBreadcrumb extends Component {
28 28 layout = this.props.layout;
29 29 var item=[], i=0;
30 30 var length = Object.keys(layout).length;
31   - console.log(length);
32 31 for(breadcrumb in layout){
33 32 if(i==0){
34 33 item.push(
... ...
imports/client/views/org/admin/app/module/Sidebar.js
Diff comments   View file @84e744e
... ... @@ -44,9 +44,26 @@ export class AdminSidebar extends Component {
44 44 <LinkContainer to="/">
45 45 <NavItem className={activeDashboard?"active":""} eventKey={1} ><i className="icon-home4"></i> <span>Dashboard</span></NavItem>
46 46 </LinkContainer>
47   - <NavDropdown eventKey={2} title="Settings" name="Settings" id="setting">
48   - <LinkContainer to="/">
49   - <MenuItem eventKey={2.3}>Users Info</MenuItem>
  47 + <NavDropdown eventKey={2} title="Users Info" name="userinfo" id="academic">
  48 + <LinkContainer to="/users/students" exact="true">
  49 + <MenuItem eventKey={2.1}>Students</MenuItem>
  50 + </LinkContainer>
  51 + <LinkContainer to="/users/staff" exact="true">
  52 + <MenuItem eventKey={2.2}>Staff</MenuItem>
  53 + </LinkContainer>
  54 + <LinkContainer to="/users/parents" exact="true">
  55 + <MenuItem eventKey={2.3}>Parents</MenuItem>
  56 + </LinkContainer>
  57 + </NavDropdown>
  58 + <NavDropdown eventKey={3} title="MailBox" name="userinfo" id="communication">
  59 + <LinkContainer to="/mail/compose" exact="true">
  60 + <MenuItem eventKey={3.1}>Compose</MenuItem>
  61 + </LinkContainer>
  62 + <LinkContainer to="/mail/sent" exact="true">
  63 + <MenuItem eventKey={3.2}>Sent</MenuItem>
  64 + </LinkContainer>
  65 + <LinkContainer to="/mail/important" exact="true">
  66 + <MenuItem eventKey={3.3}>Important</MenuItem>
50 67 </LinkContainer>
51 68 </NavDropdown>
52 69 {/** <NavDropdown eventKey={3} title="Academic" name="Academic" id="academic">
... ...
imports/client/views/org/admin/users/list/AdminUsersList.js
Diff comments   View file @84e744e
... ... @@ -14,17 +14,15 @@ import { Navbar,Modal, Nav, NavItem,
14 14 NavDropdown, MenuItem, Breadcrumb } from 'react-bootstrap';
15 15 import { VerifyModule } from '/imports/client/views/verify/module/index'
16 16  
17   -var Accordion = require('react-bootstrap').Accordion;
18   -var Panel = require('react-bootstrap').Panel;
19 17 export class AdminUsersList extends Component {
20 18 render() {
21 19 return (
22 20 <div className="row">
23 21 <div className="col-lg-3 col-md-6">
24 22 <div className="thumbnail">
25   - <Link to="/students" >
  23 + <Link to="/users/students" >
26 24 <div className="thumb thumb-rounded">
27   - <img src="assets/images/download2.png" alt="" />
  25 + <img src="/assets/images/download2.png" alt="" />
28 26 </div>
29 27 <div className="caption text-center">
30 28 <h6 className="text-semibold no-margin">Students <small className="display-block">Click to view</small></h6>
... ... @@ -34,9 +32,9 @@ export class AdminUsersList extends Component {
34 32 </div>
35 33 <div className="col-lg-3 col-md-6">
36 34 <div className="thumbnail">
37   - <Link to="/staff" >
  35 + <Link to="/users/staff" >
38 36 <div className="thumb thumb-rounded">
39   - <img src="assets/images/download3.png" alt=""/>
  37 + <img src="/assets/images/download3.png" alt=""/>
40 38 </div>
41 39 <div className="caption text-center">
42 40 <h6 className="text-semibold no-margin">Teachers <small className="display-block">Click to view</small></h6>
... ... @@ -46,9 +44,9 @@ export class AdminUsersList extends Component {
46 44 </div>
47 45 <div className="col-lg-3 col-md-6">
48 46 <div className="thumbnail">
49   - <Link to="/parents" >
  47 + <Link to="/users/parents" >
50 48 <div className="thumb thumb-rounded">
51   - <img src="assets/images/download3.png" alt=""/>
  49 + <img src="/assets/images/download3.png" alt=""/>
52 50 </div>
53 51 <div className="caption text-center">
54 52 <h6 className="text-semibold no-margin">Parents <small className="display-block">Click to view</small></h6>
... ...
imports/client/views/org/admin/users/list/index.js
Diff comments   View file @84e744e
... ... @@ -12,21 +12,22 @@ import { Orgs } from &#39;/imports/collections/orgs/index&#39;
12 12  
13 13  
14 14 const meteorTick = (props, onData) => {
15   -
  15 + Shelf.layout.set({
  16 + bulb: 'USERS',
  17 + subbulb: 'LIST',
  18 + });
16 19 const handles = [
17 20 Meteor.subscribe('users.current'),
18 21 Meteor.subscribe('orgs.current'),
19 22 ];
20 23  
21   - const user = Users.current();
22   -
23   - if(_.every(handles, (handle) => (handle.ready()) ) && user) {
  24 + if(_.every(handles, (handle) => (handle.ready()))) {
24 25 onData(null, {
25 26 layout: Shelf.layout.get(),
26 27 data: {
27   - companyId: props.params.companyId,
28   - user: Users.current(),
29   - org: Orgs.current(),
  28 + // companyId: props.params.companyId,
  29 + // user: Users.current(),
  30 + // org: Orgs.current(),
30 31 },
31 32 });
32 33 }
... ...
imports/client/views/org/admin/users/module/AdminUserViewLayout.js
Diff comments   View file @84e744e
... ... @@ -39,7 +39,9 @@ export class AdminUserViewLayout extends Component {
39 39 const user = this.props.data.user;
40 40 return (
41 41 <div className = "tabsLayout-box">
42   - <Header />
  42 + <Header
  43 + layout = {this.props.layout}
  44 + />
43 45 <div className = "tabsLayout-content">
44 46 { this.props.children }
45 47 </div>
... ...
imports/client/views/org/admin/users/module/Header.js
Diff comments   View file @84e744e
... ... @@ -23,16 +23,19 @@ export class Header extends Component {
23 23 };
24 24  
25 25 render() {
  26 + if(this.props.layout.subbulb=='LIST'){
  27 + return null;
  28 + }
26 29 return (
27 30 <div className = "enterPane-box">
28 31 <div className="row">
29 32  
30 33 <div className="col-lg-4 col-md-8">
31   - <Link to="/students" >
  34 + <Link to="/users/students" >
32 35 <div className="panel panel-body">
33 36 <div className="media">
34 37 <div className="media-left">
35   - <img src="assets/images/download2.png" className="img-circle" alt=""/>
  38 + <img src="/assets/images/download2.png" className="img-circle" alt=""/>
36 39 </div>
37 40  
38 41 <div className="media-body">
... ... @@ -44,11 +47,11 @@ export class Header extends Component {
44 47 </Link>
45 48 </div>
46 49 <div className="col-lg-4 col-md-8">
47   - <Link to="/staff" >
  50 + <Link to="/users/staff" >
48 51 <div className="panel panel-body">
49 52 <div className="media">
50 53 <div className="media-left">
51   - <img src="assets/images/download.png" className="img-circle" alt=""/>
  54 + <img src="/assets/images/download.png" className="img-circle" alt=""/>
52 55 </div>
53 56  
54 57 <div className="media-body">
... ... @@ -61,11 +64,11 @@ export class Header extends Component {
61 64 </div>
62 65  
63 66 <div className="col-lg-4 col-md-8">
64   - <Link to="/parents" >
  67 + <Link to="/users/parents" >
65 68 <div className="panel panel-body">
66 69 <div className="media">
67 70 <div className="media-left">
68   - <img src="assets/images/download3.png" className="img-circle" alt=""/>
  71 + <img src="/assets/images/download3.png" className="img-circle" alt=""/>
69 72 </div>
70 73  
71 74 <div className="media-body">
... ...
imports/client/views/org/admin/users/parents/index.js
Diff comments   View file @84e744e
... ... @@ -15,9 +15,8 @@ import { ParentsView } from &#39;./parentsview&#39;;
15 15  
16 16 const meteorTick = (props, onData) => {
17 17 Shelf.layout.set({
18   - bulb: 'SETTINGS',
19   - subbulb: 'USERS',
20   - view: 'PARENTS'
  18 + bulb: 'USERS',
  19 + subbulb: 'PARENTS',
21 20 });
22 21 const handles = [
23 22 Meteor.subscribe('users.current'),
... ...
imports/client/views/org/admin/users/staff/index.js
Diff comments   View file @84e744e
... ... @@ -14,9 +14,8 @@ import { StaffView } from &#39;./StaffView&#39;;
14 14  
15 15 const meteorTick = (props, onData) => {
16 16 Shelf.layout.set({
17   - bulb: 'SETTINGS',
18   - subbulb: 'USERS',
19   - view: 'STAFF'
  17 + bulb: 'USERS',
  18 + subbulb: 'STAFF',
20 19 });
21 20 const handles = [
22 21 Meteor.subscribe('users.current'),
... ...
imports/client/views/org/admin/users/students/index.js
Diff comments   View file @84e744e
... ... @@ -15,9 +15,8 @@ import { Students } from &#39;/imports/collections/students/in
15 15  
16 16 const meteorTick = (props, onData) => {
17 17 Shelf.layout.set({
18   - bulb: 'SETTINGS',
19   - subbulb: 'USERS',
20   - view: 'STUDENTS'
  18 + bulb: 'USERS',
  19 + subbulb: 'STUDENTS',
21 20 });
22 21 const handles = [
23 22 Meteor.subscribe('users.current'),
... ...