+
+
+ {this.renderIndentity()}
+
+ );
+ }
+
+ renderIndentity() {
+ return (
+
+
+ Add your name and email that will be used to identify your commits.
+ (this.nameInput = e)} + className="input-text git-Introduction-input" + value={this.state.name} + onChange={this.onNameChange} + tabIndex="1" + /> + (this.emailInput = e)} + className="input-text git-Introduction-input" + value={this.state.email} + onChange={this.onEmailChange} + tabIndex="2" + /> +
+
+
+
+ + This will only modify/overwrite your local (repository) + user.name and + user.email. +
+
+ )
+
+ );
+ }
+
+ confirm = () => {
+ if (this.isInputValid()) {
+ this.props.onSave(
+ new Author(
+ this.state.email || this.props.identity.getEmail(),
+ this.state.name || this.props.identity.getFullName()
+ )
+ );
+ }
+ }
+
+ cancel = () => {
+ this.props.onCancel();
+ }
+
+ onNameChange = e => {
+ this.setState({name: e.target.value}, this.validate);
+ }
+
+ onEmailChange = e => {
+ this.setState({email: e.target.value}, this.validate);
+ }
+
+ validate = () => {
+ this.setState({saveDisabled: !this.isInputValid()});
+ }
+
+ isInputValid = () => {
+ // email validation with regex has a LOT of corner cases, dawg.
+ // https://stackoverflow.com/questions/48055431/can-it-cause-harm-to-validate-email-addresses-with-a-regex
+ // to avoid bugs for users with nonstandard email addresses,
+ // just check to make sure email address contains `@` and move on with our lives.
+ return !!(
+ (this.state.name || this.state.email.includes('@'))
+ && (this.state.name || this.props.identity.getFullName())
+ && (this.state.email.includes('@') || this.props.identity.getEmail())
+ );
+ }
+}
diff --git a/lib/views/git-tab-header-view.js b/lib/views/git-tab-header-view.js
index 78a71a990c..897ccf986f 100644
--- a/lib/views/git-tab-header-view.js
+++ b/lib/views/git-tab-header-view.js
@@ -12,7 +12,8 @@ export default class GitTabHeaderView extends React.Component {
workdirs: PropTypes.shape({[Symbol.iterator]: PropTypes.func.isRequired}).isRequired,
// Event Handlers
- handleWorkDirSelect: PropTypes.func,
+ handleWorkDirSelect: PropTypes.func.isRequired,
+ onDidClickAvatar: PropTypes.func.isRequired,
}
render() {
@@ -21,7 +22,7 @@ export default class GitTabHeaderView extends React.Component {
{this.renderCommitter()}
@@ -46,6 +47,7 @@ export default class GitTabHeaderView extends React.Component {
src={avatarUrl || 'atom://github/img/avatar.svg'}
title={`${name} ${email}`}
alt={`${name}'s avatar`}
+ onClick={this.props.onDidClickAvatar}
/>
);
}
diff --git a/lib/views/git-tab-view.js b/lib/views/git-tab-view.js
index a5f10cc687..553f217f30 100644
--- a/lib/views/git-tab-view.js
+++ b/lib/views/git-tab-view.js
@@ -7,6 +7,7 @@ import StagingView from './staging-view';
import GitTabHeaderController from '../controllers/git-tab-header-controller';
import CommitController from '../controllers/commit-controller';
import RecentCommitsController from '../controllers/recent-commits-controller';
+import GitIntroductionView from './git-introduction-view';
import RefHolder from '../models/ref-holder';
import {isValidWorkdir, autobind} from '../helpers';
import {AuthorPropType, UserStorePropType, RefHolderPropType} from '../prop-types';
@@ -24,9 +25,11 @@ export default class GitTabView extends React.Component {
repository: PropTypes.object.isRequired,
isLoading: PropTypes.bool.isRequired,
+ showIntroduction: PropTypes.bool.isRequired,
lastCommit: PropTypes.object.isRequired,
currentBranch: PropTypes.object,
+ committer: AuthorPropType,
recentCommits: PropTypes.arrayOf(PropTypes.object).isRequired,
isMerging: PropTypes.bool,
isRebasing: PropTypes.bool,
@@ -64,6 +67,8 @@ export default class GitTabView extends React.Component {
changeWorkingDirectory: PropTypes.func.isRequired,
onDidChangeWorkDirs: PropTypes.func.isRequired,
getCurrentWorkDirs: PropTypes.func.isRequired,
+ onDidClickAvatar: PropTypes.func.isRequired,
+ onDidCancelIntroduction: PropTypes.func.isRequired,
};
constructor(props, context) {
@@ -104,6 +109,8 @@ export default class GitTabView extends React.Component {
isEmpty = true;
} else if (this.props.isLoading || this.props.repository.showGitTabLoading()) {
isLoading = true;
+ } else if (this.props.showIntroduction || !this.props.committer.isPresent()) {
+ renderMethod = 'renderIntroduction';
}
return (
@@ -111,17 +118,17 @@ export default class GitTabView extends React.Component {
className={cx('github-Git', {'is-empty': isEmpty, 'is-loading': !isEmpty && isLoading})}
tabIndex="-1"
ref={this.props.refRoot.setter}>
- {this.renderHeader()}
+ {this.renderHeader(isEmpty || isLoading)}
{this[renderMethod]()}
);
}
- renderHeader() {
+ renderHeader(disableOnDidClickAvatar) {
const {repository} = this.props;
return (
Your Current Identity
+{this.props.identity.getFullName()}
+{this.props.identity.getEmail()}
+- -
- -
Log in to GitHub to access pull request informationand more!
+