Add PermissionRequestDialog for when the app doesn't show the TabBar

This commit is contained in:
Yuya Ochiai 2017-11-08 01:37:39 +09:00
parent 4137df4098
commit 08b1058694
3 changed files with 15 additions and 4 deletions

View file

@ -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 }

View file

@ -7,3 +7,7 @@
position: absolute; position: absolute;
bottom: 0px; bottom: 0px;
} }
div[id*="-permissionDialog"] {
max-width: 350px;
}

View file

@ -37,7 +37,3 @@
margin-top: 5px; margin-top: 5px;
border-radius: 50%; border-radius: 50%;
} }
div[id*="-permissionDialog"] {
max-width: 350px;
}