From 84e744e348cef2d371a8563dc3299aefe1763511 Mon Sep 17 00:00:00 2001
From: Deepak <deepak125.dk@gmail.com>
Date: Fri, 21 Apr 2017 13:13:57 +0530
Subject: [PATCH] fixed users page

---
 imports/client/app/routes.js                       |  2 +-
 .../views/org/admin/app/module/Breadcrumb.js       |  1 -
 .../client/views/org/admin/app/module/Sidebar.js   | 23 +++++++++++++++++++---
 .../views/org/admin/users/list/AdminUsersList.js   | 14 ++++++-------
 imports/client/views/org/admin/users/list/index.js | 15 +++++++-------
 .../org/admin/users/module/AdminUserViewLayout.js  |  4 +++-
 .../client/views/org/admin/users/module/Header.js  | 15 ++++++++------
 .../client/views/org/admin/users/parents/index.js  |  5 ++---
 .../client/views/org/admin/users/staff/index.js    |  5 ++---
 .../client/views/org/admin/users/students/index.js |  5 ++---
 10 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/imports/client/app/routes.js b/imports/client/app/routes.js
index 53b217a..dab82de 100644
--- a/imports/client/app/routes.js
+++ b/imports/client/app/routes.js
@@ -64,7 +64,7 @@ const getOrgAdminRoutes = () => (
       <IndexRoute name="index"                                                component = { DashboardController } />
       <Route name="import"            path="/import"                          component = { importCsvController } />
       <Route name="settings"          path="/settings"                        component = { AdminSettingsController } />
-      <Route name="users"             path = "/users"                         component = {AdminUsersModule}>
+      <Route name="users"            exact={true} path = "/users"                         component = {AdminUsersModule}>
         <IndexRoute                                                           component = {AdminUsersListController} />
         <Route name="students"        path = "/users/students"                component = {StudentDataController} />
         <Route name="staff"           path = "/users/staff"                   component = {staffViewController} />
diff --git a/imports/client/views/org/admin/app/module/Breadcrumb.js b/imports/client/views/org/admin/app/module/Breadcrumb.js
index 36ed211..e413247 100644
--- a/imports/client/views/org/admin/app/module/Breadcrumb.js
+++ b/imports/client/views/org/admin/app/module/Breadcrumb.js
@@ -28,7 +28,6 @@ export class AdminBreadcrumb extends Component {
     layout = this.props.layout;
     var item=[], i=0;
     var length = Object.keys(layout).length;
-    console.log(length);
     for(breadcrumb in layout){
       if(i==0){
         item.push(
diff --git a/imports/client/views/org/admin/app/module/Sidebar.js b/imports/client/views/org/admin/app/module/Sidebar.js
index 6662cac..3949efb 100644
--- a/imports/client/views/org/admin/app/module/Sidebar.js
+++ b/imports/client/views/org/admin/app/module/Sidebar.js
@@ -44,9 +44,26 @@ export class AdminSidebar extends Component {
                           <LinkContainer to="/">
                             <NavItem className={activeDashboard?"active":""} eventKey={1} ><i className="icon-home4"></i> <span>Dashboard</span></NavItem>
                           </LinkContainer>
-                          <NavDropdown eventKey={2} title="Settings" name="Settings" id="setting">
-                              <LinkContainer to="/">
-                                <MenuItem eventKey={2.3}>Users Info</MenuItem>
+                          <NavDropdown eventKey={2} title="Users Info" name="userinfo" id="academic">
+                              <LinkContainer to="/users/students" exact="true">
+                                <MenuItem eventKey={2.1}>Students</MenuItem>
+                              </LinkContainer>
+                              <LinkContainer to="/users/staff" exact="true">
+                                <MenuItem eventKey={2.2}>Staff</MenuItem>
+                              </LinkContainer>
+                              <LinkContainer to="/users/parents" exact="true">
+                                <MenuItem eventKey={2.3}>Parents</MenuItem>
+                              </LinkContainer>
+                          </NavDropdown>
+                          <NavDropdown eventKey={3} title="MailBox" name="userinfo" id="communication">
+                              <LinkContainer to="/mail/compose" exact="true">
+                                <MenuItem eventKey={3.1}>Compose</MenuItem>
+                              </LinkContainer>
+                              <LinkContainer to="/mail/sent" exact="true">
+                                <MenuItem eventKey={3.2}>Sent</MenuItem>
+                              </LinkContainer>
+                              <LinkContainer to="/mail/important" exact="true">
+                                <MenuItem eventKey={3.3}>Important</MenuItem>
                               </LinkContainer>
                           </NavDropdown>
               {/**            <NavDropdown eventKey={3} title="Academic" name="Academic" id="academic">
diff --git a/imports/client/views/org/admin/users/list/AdminUsersList.js b/imports/client/views/org/admin/users/list/AdminUsersList.js
index 8f08686..4641819 100644
--- a/imports/client/views/org/admin/users/list/AdminUsersList.js
+++ b/imports/client/views/org/admin/users/list/AdminUsersList.js
@@ -14,17 +14,15 @@ import { Navbar,Modal, Nav, NavItem,
   NavDropdown, MenuItem, Breadcrumb }     from 'react-bootstrap';
   import { VerifyModule }                 from '/imports/client/views/verify/module/index'
 
-var Accordion = require('react-bootstrap').Accordion;
-var Panel = require('react-bootstrap').Panel;
 export class AdminUsersList extends Component {
   render() {
     return (
       <div className="row">
         <div className="col-lg-3 col-md-6">
           <div className="thumbnail">
-            <Link to="/students" >
+            <Link to="/users/students" >
               <div className="thumb thumb-rounded">
-                <img src="assets/images/download2.png" alt="" />
+                <img src="/assets/images/download2.png" alt="" />
               </div>
               <div className="caption text-center">
                 <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 {
         </div>
         <div className="col-lg-3 col-md-6">
           <div className="thumbnail">
-            <Link to="/staff" >
+            <Link to="/users/staff" >
               <div className="thumb thumb-rounded">
-                <img src="assets/images/download3.png" alt=""/>
+                <img src="/assets/images/download3.png" alt=""/>
               </div>
               <div className="caption text-center">
                 <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 {
         </div>
         <div className="col-lg-3 col-md-6">
           <div className="thumbnail">
-            <Link to="/parents" >
+            <Link to="/users/parents" >
               <div className="thumb thumb-rounded">
-                <img src="assets/images/download3.png" alt=""/>
+                <img src="/assets/images/download3.png" alt=""/>
               </div>
               <div className="caption text-center">
                 <h6 className="text-semibold no-margin">Parents <small className="display-block">Click to view</small></h6>
diff --git a/imports/client/views/org/admin/users/list/index.js b/imports/client/views/org/admin/users/list/index.js
index 24a8d7e..10c1286 100644
--- a/imports/client/views/org/admin/users/list/index.js
+++ b/imports/client/views/org/admin/users/list/index.js
@@ -12,21 +12,22 @@ import { Orgs }                           from '/imports/collections/orgs/index'
 
 
 const meteorTick = (props, onData) => {
-
+  Shelf.layout.set({
+    bulb:     'USERS',
+    subbulb:  'LIST',
+  });
   const handles = [
     Meteor.subscribe('users.current'),
     Meteor.subscribe('orgs.current'),
   ];
 
-  const user = Users.current();
-
-  if(_.every(handles, (handle) => (handle.ready()) ) && user) {
+  if(_.every(handles, (handle) => (handle.ready()))) {
     onData(null, {
       layout: Shelf.layout.get(),
       data: {
-        companyId: props.params.companyId,
-        user: Users.current(),
-        org:  Orgs.current(),
+        // companyId: props.params.companyId,
+        // user: Users.current(),
+        // org:  Orgs.current(),
       },
     });
   }
diff --git a/imports/client/views/org/admin/users/module/AdminUserViewLayout.js b/imports/client/views/org/admin/users/module/AdminUserViewLayout.js
index 897f3ac..8657df3 100644
--- a/imports/client/views/org/admin/users/module/AdminUserViewLayout.js
+++ b/imports/client/views/org/admin/users/module/AdminUserViewLayout.js
@@ -39,7 +39,9 @@ export class AdminUserViewLayout extends Component {
     const user = this.props.data.user;
     return (
       <div className = "tabsLayout-box">
-        <Header />
+        <Header
+          layout = {this.props.layout}
+        />
         <div className = "tabsLayout-content">
           { this.props.children }
          </div>
diff --git a/imports/client/views/org/admin/users/module/Header.js b/imports/client/views/org/admin/users/module/Header.js
index 5659f97..4a94f2c 100644
--- a/imports/client/views/org/admin/users/module/Header.js
+++ b/imports/client/views/org/admin/users/module/Header.js
@@ -23,16 +23,19 @@ export class Header extends Component {
   };
 
   render() {
+    if(this.props.layout.subbulb=='LIST'){
+      return null;
+    }
     return (
       <div className = "enterPane-box">
         <div className="row">
 
           <div className="col-lg-4 col-md-8">
-            <Link to="/students" >
+            <Link to="/users/students" >
             <div className="panel panel-body">
               <div className="media">
                 <div className="media-left">
-                    <img src="assets/images/download2.png" className="img-circle" alt=""/>
+                    <img src="/assets/images/download2.png" className="img-circle" alt=""/>
                 </div>
 
                 <div className="media-body">
@@ -44,11 +47,11 @@ export class Header extends Component {
             </Link>
           </div>
           <div className="col-lg-4 col-md-8">
-            <Link to="/staff" >
+            <Link to="/users/staff" >
             <div className="panel panel-body">
               <div className="media">
                 <div className="media-left">
-                    <img src="assets/images/download.png" className="img-circle" alt=""/>
+                    <img src="/assets/images/download.png" className="img-circle" alt=""/>
                 </div>
 
                 <div className="media-body">
@@ -61,11 +64,11 @@ export class Header extends Component {
           </div>
 
           <div className="col-lg-4 col-md-8">
-            <Link to="/parents" >
+            <Link to="/users/parents" >
             <div className="panel panel-body">
               <div className="media">
                 <div className="media-left">
-                    <img src="assets/images/download3.png" className="img-circle" alt=""/>
+                    <img src="/assets/images/download3.png" className="img-circle" alt=""/>
                 </div>
 
                 <div className="media-body">
diff --git a/imports/client/views/org/admin/users/parents/index.js b/imports/client/views/org/admin/users/parents/index.js
index a765b86..c239dab 100644
--- a/imports/client/views/org/admin/users/parents/index.js
+++ b/imports/client/views/org/admin/users/parents/index.js
@@ -15,9 +15,8 @@ import { ParentsView }                      from './parentsview';
 
 const meteorTick = (props, onData) => {
   Shelf.layout.set({
-    bulb:     'SETTINGS',
-    subbulb:  'USERS',
-    view:     'PARENTS'
+    bulb:     'USERS',
+    subbulb:  'PARENTS',
   });
   const handles = [
     Meteor.subscribe('users.current'),
diff --git a/imports/client/views/org/admin/users/staff/index.js b/imports/client/views/org/admin/users/staff/index.js
index 75b547a..39e76f5 100644
--- a/imports/client/views/org/admin/users/staff/index.js
+++ b/imports/client/views/org/admin/users/staff/index.js
@@ -14,9 +14,8 @@ import { StaffView }                      from './StaffView';
 
 const meteorTick = (props, onData) => {
   Shelf.layout.set({
-    bulb:     'SETTINGS',
-    subbulb:  'USERS',
-    view:     'STAFF'
+    bulb:     'USERS',
+    subbulb:  'STAFF',
   });
   const handles = [
     Meteor.subscribe('users.current'),
diff --git a/imports/client/views/org/admin/users/students/index.js b/imports/client/views/org/admin/users/students/index.js
index 016dcde..6565810 100644
--- a/imports/client/views/org/admin/users/students/index.js
+++ b/imports/client/views/org/admin/users/students/index.js
@@ -15,9 +15,8 @@ import { Students }                       from '/imports/collections/students/in
 
 const meteorTick = (props, onData) => {
   Shelf.layout.set({
-    bulb:     'SETTINGS',
-    subbulb:  'USERS',
-    view:     'STUDENTS'
+    bulb:     'USERS',
+    subbulb:  'STUDENTS',
   });
   const handles = [
     Meteor.subscribe('users.current'),
-- 
2.0.0