summaryrefslogtreecommitdiffstats
path: root/webapp/components/logged_in.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-03-17 10:30:49 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-03-29 15:18:26 -0400
commitc417fdc152e953982d9c9af2c04ca2c04ced41b3 (patch)
tree6bf1f8618474d3e60bbe844876de665407f80095 /webapp/components/logged_in.jsx
parent9c36210edd7cae4026e3a2ee472cf2fa751a0f77 (diff)
downloadchat-c417fdc152e953982d9c9af2c04ca2c04ced41b3.tar.gz
chat-c417fdc152e953982d9c9af2c04ca2c04ced41b3.tar.bz2
chat-c417fdc152e953982d9c9af2c04ca2c04ced41b3.zip
Added initial backstage components and InstalledIntegrations page
Diffstat (limited to 'webapp/components/logged_in.jsx')
-rw-r--r--webapp/components/logged_in.jsx10
1 files changed, 7 insertions, 3 deletions
diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx
index 53db501bf..fd09aac9e 100644
--- a/webapp/components/logged_in.jsx
+++ b/webapp/components/logged_in.jsx
@@ -200,6 +200,9 @@ export default class LoggedIn extends React.Component {
content = this.props.children;
} else {
content.push(
+ this.props.navbar
+ );
+ content.push(
this.props.sidebar
);
content.push(
@@ -247,8 +250,9 @@ LoggedIn.defaultProps = {
};
LoggedIn.propTypes = {
- children: React.PropTypes.object,
- sidebar: React.PropTypes.object,
- center: React.PropTypes.object,
+ children: React.PropTypes.arrayOf(React.PropTypes.element),
+ navbar: React.PropTypes.element,
+ sidebar: React.PropTypes.element,
+ center: React.PropTypes.element,
params: React.PropTypes.object
};