Add PermissionRequestDialog for when the app doesn't show the TabBar
This commit is contained in:
parent
4137df4098
commit
08b1058694
|
@ -11,6 +11,7 @@ const LoginModal = require('./LoginModal.jsx');
|
||||||
const MattermostView = require('./MattermostView.jsx');
|
const MattermostView = require('./MattermostView.jsx');
|
||||||
const TabBar = require('./TabBar.jsx');
|
const TabBar = require('./TabBar.jsx');
|
||||||
const HoveringURL = require('./HoveringURL.jsx');
|
const HoveringURL = require('./HoveringURL.jsx');
|
||||||
|
const PermissionRequestDialog = require('./PermissionRequestDialog.jsx');
|
||||||
|
|
||||||
const NewTeamModal = require('./NewTeamModal.jsx');
|
const NewTeamModal = require('./NewTeamModal.jsx');
|
||||||
|
|
||||||
|
@ -347,6 +348,16 @@ const MainPage = createReactClass({
|
||||||
onLogin={this.handleLogin}
|
onLogin={this.handleLogin}
|
||||||
onCancel={this.handleLoginCancel}
|
onCancel={this.handleLoginCancel}
|
||||||
/>
|
/>
|
||||||
|
{this.props.teams.length === 1 && this.props.requestingPermission[0] ? // eslint-disable-line multiline-ternary
|
||||||
|
<PermissionRequestDialog
|
||||||
|
id='MainPage-permissionDialog'
|
||||||
|
placement='bottom'
|
||||||
|
{...this.props.requestingPermission[0]}
|
||||||
|
onClickAllow={this.props.onClickPermissionDialog.bind(null, 0, 'allow')}
|
||||||
|
onClickBlock={this.props.onClickPermissionDialog.bind(null, 0, 'block')}
|
||||||
|
onClickClose={this.props.onClickPermissionDialog.bind(null, 0, 'close')}
|
||||||
|
/> : null
|
||||||
|
}
|
||||||
<Grid fluid={true}>
|
<Grid fluid={true}>
|
||||||
{ tabsRow }
|
{ tabsRow }
|
||||||
{ viewsRow }
|
{ viewsRow }
|
||||||
|
|
|
@ -7,3 +7,7 @@
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
div[id*="-permissionDialog"] {
|
||||||
|
max-width: 350px;
|
||||||
|
}
|
||||||
|
|
|
@ -37,7 +37,3 @@
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
div[id*="-permissionDialog"] {
|
|
||||||
max-width: 350px;
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue