diff --git a/imports/client/views/org/admin/Breadcrumb.js b/imports/client/views/org/admin/Breadcrumb.js deleted file mode 100644 index 5a6b84a..0000000 --- a/imports/client/views/org/admin/Breadcrumb.js +++ /dev/null @@ -1,56 +0,0 @@ -import _ from 'lodash'; -import { Meteor } from 'meteor/meteor'; - -import React, { Component } from 'react'; -import { Link,browserHistory } from 'react-router'; -import { Navbar,Modal, Nav, NavItem, - Glyphicon, Collapse, FormGroup, FormControl, Panel, - NavbarToggler, NavbarBrand, Table, ButtonToolbar, - NavLink, DropdownItem, DropdownToggle, DropdownMenu, - NavDropdown, MenuItem, Breadcrumb, Button } from 'react-bootstrap'; - - -export class AdminBreadcrumb extends Component { - - constructor(props) { - super(props); - this.state = { - - }; - this.onUpdate = this.onUpdate.bind(this); - }; - - onUpdate(key, value) { - this.setState({[key]: value}); - }; - - render() { - return ( -
-
- - - Users - - - Setup - - - - -
-
- ); - }; - -}; diff --git a/imports/client/views/org/admin/Sidebar.js b/imports/client/views/org/admin/Sidebar.js deleted file mode 100644 index 1e1fea4..0000000 --- a/imports/client/views/org/admin/Sidebar.js +++ /dev/null @@ -1,85 +0,0 @@ -import _ from 'lodash'; -import { Meteor } from 'meteor/meteor'; - -import React, { Component } from 'react'; -import { Link,browserHistory } from 'react-router'; -import { Navbar,Modal, Nav, NavItem, - Glyphicon, Collapse, FormGroup, FormControl, Panel, - NavbarToggler, NavbarBrand, Table, ButtonToolbar, - NavLink, DropdownItem, DropdownToggle, DropdownMenu, - NavDropdown, MenuItem, Breadcrumb, Button } from 'react-bootstrap'; - - -export class AdminSidebar extends Component { - - constructor(props) { - super(props); - this.state = { - - }; - this.onUpdate = this.onUpdate.bind(this); - }; - - onUpdate(key, value) { - this.setState({[key]: value}); - }; - - render() { - const {user, org} = this.props; - return ( -
-
-
-
- -
-
-
-
- ); - }; - -}; diff --git a/imports/client/views/org/admin/app/AdminLayout.js b/imports/client/views/org/admin/app/AdminLayout.js index caea8e1..95bdf81 100644 --- a/imports/client/views/org/admin/app/AdminLayout.js +++ b/imports/client/views/org/admin/app/AdminLayout.js @@ -6,8 +6,6 @@ import { Avatar } from '/imports/client/components/Avata import { Icon } from '/imports/client/components/Icon'; import classNames from 'classnames'; import { EnterModule } from '/imports/client/views/org/enter/module/index'; -import { AdminSidebar } from '../Sidebar' -import { AdminBreadcrumb } from '../Breadcrumb' // import { VerifyModule } from '/imports/client/views/verify/module/index'; import { Navbar,Modal, Nav, NavItem, Glyphicon, Collapse, @@ -22,62 +20,44 @@ export class AdminAppLayout extends Component { render() { const {user, org} = this.props; return ( -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
Students Click to view
-
- -
-
-
-
- -
- -
-
-
Teachers Click to view
-
- -
-
-
-
- -
- -
-
-
Parents Click to view
-
- -
-
-
-
+
+
+
+ +
+
-
+
+
Students Click to view
+
+ +
+
+
+
+ +
+ +
+
+
Teachers Click to view
+
+ +
+
+
+
+ +
+ +
+
+
Parents Click to view
+
+
- ); }; diff --git a/imports/client/views/org/admin/app/module/AdminAppLayout.js b/imports/client/views/org/admin/app/module/AdminAppLayout.js index 7458ef9..66f0142 100644 --- a/imports/client/views/org/admin/app/module/AdminAppLayout.js +++ b/imports/client/views/org/admin/app/module/AdminAppLayout.js @@ -7,8 +7,8 @@ import { Icon } from '/imports/client/components/Icon' import classNames from 'classnames'; import { EnterModule } from '/imports/client/views/org/enter/module/index'; import {AppNavigationController} from '/imports/client/views/org/admin/app/module/navigation/index'; -import { AdminSidebar } from '../../Sidebar' -import { AdminBreadcrumb } from '../../Breadcrumb' +import { AdminSidebar } from './Sidebar' +import { AdminBreadcrumb } from './Breadcrumb' // import { VerifyModule } from '/imports/client/views/verify/module/index'; import { Navbar,Modal, Nav, NavItem, Glyphicon, Collapse, diff --git a/imports/client/views/org/admin/app/module/Breadcrumb.js b/imports/client/views/org/admin/app/module/Breadcrumb.js new file mode 100644 index 0000000..5a6b84a --- /dev/null +++ b/imports/client/views/org/admin/app/module/Breadcrumb.js @@ -0,0 +1,56 @@ +import _ from 'lodash'; +import { Meteor } from 'meteor/meteor'; + +import React, { Component } from 'react'; +import { Link,browserHistory } from 'react-router'; +import { Navbar,Modal, Nav, NavItem, + Glyphicon, Collapse, FormGroup, FormControl, Panel, + NavbarToggler, NavbarBrand, Table, ButtonToolbar, + NavLink, DropdownItem, DropdownToggle, DropdownMenu, + NavDropdown, MenuItem, Breadcrumb, Button } from 'react-bootstrap'; + + +export class AdminBreadcrumb extends Component { + + constructor(props) { + super(props); + this.state = { + + }; + this.onUpdate = this.onUpdate.bind(this); + }; + + onUpdate(key, value) { + this.setState({[key]: value}); + }; + + render() { + return ( +
+
+ + + Users + + + Setup + + + +
    + Support + + Account security + Analytics + Accessibility + + All settings + + +
+
+
+ ); + }; + +}; diff --git a/imports/client/views/org/admin/app/module/Sidebar.js b/imports/client/views/org/admin/app/module/Sidebar.js new file mode 100644 index 0000000..1e1fea4 --- /dev/null +++ b/imports/client/views/org/admin/app/module/Sidebar.js @@ -0,0 +1,85 @@ +import _ from 'lodash'; +import { Meteor } from 'meteor/meteor'; + +import React, { Component } from 'react'; +import { Link,browserHistory } from 'react-router'; +import { Navbar,Modal, Nav, NavItem, + Glyphicon, Collapse, FormGroup, FormControl, Panel, + NavbarToggler, NavbarBrand, Table, ButtonToolbar, + NavLink, DropdownItem, DropdownToggle, DropdownMenu, + NavDropdown, MenuItem, Breadcrumb, Button } from 'react-bootstrap'; + + +export class AdminSidebar extends Component { + + constructor(props) { + super(props); + this.state = { + + }; + this.onUpdate = this.onUpdate.bind(this); + }; + + onUpdate(key, value) { + this.setState({[key]: value}); + }; + + render() { + const {user, org} = this.props; + return ( +
+
+
+
+ +
+
+
+
+ ); + }; + +}; diff --git a/imports/client/views/org/admin/app/module/navigation/AuthenticatedNavigation.js b/imports/client/views/org/admin/app/module/navigation/AuthenticatedNavigation.js index d56a171..2ea71d7 100644 --- a/imports/client/views/org/admin/app/module/navigation/AuthenticatedNavigation.js +++ b/imports/client/views/org/admin/app/module/navigation/AuthenticatedNavigation.js @@ -20,7 +20,6 @@ export class AuthenticatedNavigation extends Component { this.changeBodyClass = this.changeBodyClass.bind(this); this.state = { dropdownOpen: false, - burgerMenu: false }; } toggle() { @@ -29,12 +28,10 @@ export class AuthenticatedNavigation extends Component { }); } changeBodyClass(){ - if(this.state.burgerMenu){ - $('body').addClass('sidebar-xs'); - this.setState({burgerMenu: false}); - }else{ + if($('body').hasClass('sidebar-xs')){ $('body').removeClass('sidebar-xs'); - this.setState({burgerMenu: true}); + }else{ + $('body').addClass('sidebar-xs'); } } render(){ @@ -62,7 +59,7 @@ export class AuthenticatedNavigation extends Component { onClick = {this.changeBodyClass} /> - + {/**
@@ -133,32 +130,38 @@ export class AuthenticatedNavigation extends Component {
+ **/}

Hello {user.getFullName()}

logout()} > - logout -

+ + logout + +

+ {/** + **/}
diff --git a/imports/client/views/org/admin/parents/parentsview.js b/imports/client/views/org/admin/parents/parentsview.js index e025340..432c86f 100644 --- a/imports/client/views/org/admin/parents/parentsview.js +++ b/imports/client/views/org/admin/parents/parentsview.js @@ -6,8 +6,6 @@ import { Link,browserHistory } from 'react-router'; import { FormGroup, FormControl,Glyphicon,Button } from 'react-bootstrap'; import { Header } from '../Header'; -import { AdminSidebar } from '../Sidebar' -import { AdminBreadcrumb } from '../Breadcrumb' import { ParentTable } from './view/ParentTable'