Skip to content

[IMPROVEMENT] Honor Accounts_ShowFormLogin setting #1308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Caiocbeleza wants to merge 5 commits into from
Closed

[IMPROVEMENT] Honor Accounts_ShowFormLogin setting #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37be439
Resolving issue #1123
Caiocbeleza Oct 14, 2019
3128649
Merge branch 'develop' into Accounts_ShowFormLogin
Caiocbeleza Oct 15, 2019
5da0794
Merge remote-tracking branch 'upstream/develop' into Accounts_ShowFor…
Caiocbeleza Oct 15, 2019
044a706
Merge branch 'Accounts_ShowFormLogin' of https://github.com/djorkaeff…
Caiocbeleza Oct 15, 2019
ee91f14
resolving identation errors
Caiocbeleza Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/constants/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ export default {
Accounts_PasswordReset: {
type: 'valueAsBoolean'
},
Accounts_ShowFormLogin: {
type: 'valueAsBoolean'
},
CROWD_Enable: {
type: 'valueAsBoolean'
},
Expand Down
39 changes: 26 additions & 13 deletions app/views/LoginSignupView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ class LoginSignupView extends React.Component {
Site_Name: PropTypes.string,
Gitlab_URL: PropTypes.string,
CAS_enabled: PropTypes.bool,
Accounts_ShowFormLogin: PropTypes.bool,
CAS_login_url: PropTypes.string
}

Expand Down Expand Up @@ -405,25 +406,36 @@ class LoginSignupView extends React.Component {
);
}

renderFormLogin = () => (
<>
<Button
title={<Text>{I18n.t('Login_with')} <Text style={{ ...sharedStyles.textBold }}>{I18n.t('email')}</Text></Text>}
type='primary'
onPress={() => this.login()}
testID='welcome-view-login'
/>
<Button
title={I18n.t('Create_account')}
type='secondary'
onPress={() => this.register()}
testID='welcome-view-register'
/>
</>
)

render() {
const { Accounts_ShowFormLogin } = this.props;
return (
<ScrollView style={[sharedStyles.containerScrollView, sharedStyles.container, styles.container]} {...scrollPersistTaps}>
<StatusBar />
<SafeAreaView testID='welcome-view' forceInset={{ vertical: 'never' }} style={styles.safeArea}>
{this.renderServices()}
{this.renderServicesSeparator()}
<Button
title={<Text>{I18n.t('Login_with')} <Text style={{ ...sharedStyles.textBold }}>{I18n.t('email')}</Text></Text>}
type='primary'
onPress={() => this.login()}
testID='welcome-view-login'
/>
<Button
title={I18n.t('Create_account')}
type='secondary'
onPress={() => this.register()}
testID='welcome-view-register'
/>
{ Accounts_ShowFormLogin ? (
<>
{this.renderServicesSeparator()}
{this.renderFormLogin()}
</>
) : null }
</SafeAreaView>
</ScrollView>
);
Expand All @@ -436,6 +448,7 @@ const mapStateToProps = state => ({
Gitlab_URL: state.settings.API_Gitlab_URL,
CAS_enabled: state.settings.CAS_enabled,
CAS_login_url: state.settings.CAS_login_url,
Accounts_ShowFormLogin: state.settings.Accounts_ShowFormLogin,
services: state.login.services
});

Expand Down