Skip to content

Commit da60ff5

Browse files
author
David Evans
committed
Lint: jsx-one-expression-per-line (where appropriate)
Some occurrences left due to rule making code less readable (see jsx-eslint/eslint-plugin-react#1848) Rule remains globally disabled
1 parent 316b054 commit da60ff5

File tree

6 files changed

+28
-17
lines changed

6 files changed

+28
-17
lines changed

web/src/components/home/google_login_wrapper.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ export default class GoogleLoginWrapper extends React.Component {
7070
className={'button start-retro ' + this.props.className}
7171
hostedDomain={global.Retro.config.google_oauth_hosted_domain}
7272
>
73-
<span><i className="fa fa-google" aria-hidden="true" style={{marginRight: '10px'}}/>Sign in with Google</span>
73+
<span>
74+
<i className="fa fa-google" aria-hidden="true" style={{marginRight: '10px'}}/>
75+
Sign in with Google
76+
</span>
7477
</GoogleLogin>
7578
</div>
7679
);

web/src/components/not-found/not_found_page.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ export default class NotFoundPage extends React.Component {
6060
type="button"
6161
style={{fontSize: '1.1rem'}}
6262
onClick={this.onCreateNewRetroClicked}
63-
>Create a Project
63+
>
64+
Create a Project
6465
</button>
6566
</div>
6667
</div>

web/src/components/retro-create/retro_create_page.jsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,12 @@ export default class RetroCreatePage extends React.Component {
189189
return (
190190
<div className="access-instruction">
191191
{this.state.isPrivate ? accessPrivate : accessPublic}
192-
193192
<br/>
194-
Password is always required to: <br/>
195-
<img className="icon-locked" src={iconLockedSvg} alt="Locked"/> Access archives<br/>
193+
Password is always required to:
194+
<br/>
195+
<img className="icon-locked" src={iconLockedSvg} alt="Locked"/> Access archives
196+
<br/>
196197
<img className="icon-locked" src={iconLockedSvg} alt="Locked"/> Edit settings
197-
198198
</div>
199199
);
200200
}
@@ -228,7 +228,9 @@ export default class RetroCreatePage extends React.Component {
228228
<div className="row">
229229
<label className="label">Choose a team URL</label>
230230
<div className="input-group retro-url">
231-
<span className="input-group-label retro-url-prefix">{this.getCurrentHost()}/retros/</span>
231+
<span className="input-group-label retro-url-prefix">
232+
{`${this.getCurrentHost()}/retros/`}
233+
</span>
232234
<input
233235
id="retro_url"
234236
value={slug}
@@ -255,8 +257,9 @@ export default class RetroCreatePage extends React.Component {
255257
<div className="error-message">{errors.password}</div>
256258
</div>
257259
<div className="row">
258-
<label className="label" htmlFor="retro_is_private">Do people need the password to <strong>access</strong> this retro?</label>
259-
260+
<label className="label" htmlFor="retro_is_private">
261+
Do people need the password to <strong>access</strong> this retro?
262+
</label>
260263
<Toggle
261264
id="retro_is_private"
262265
name="isPrivate"

web/src/components/retro-login/login_to_retro_page.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ export default class LoginToRetroPage extends React.Component {
119119
<div className="small-centered medium-8 small-10 columns">
120120
<div className="field row">
121121
<h1>{this.pageTitle()}</h1>
122-
<label className="label">Enter the password to access {name}.</label>
122+
<label className="label">
123+
Enter the password to access {name}.
124+
</label>
123125
<input
124126
className={`form-input ${inputStyle}`}
125127
placeholder="Password"

web/src/components/retro-settings/show_retro_settings_page.jsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,12 @@ export default class ShowRetroSettingsPage extends React.Component {
251251
return (
252252
<div className="access-instruction">
253253
{this.state.isPrivate ? accessPrivate : accessPublic}
254-
255254
<br/>
256-
Password is always required to: <br/>
257-
<img className="icon-locked" src={iconLockedSvg} alt="Locked"/> Access archives<br/>
255+
Password is always required to:
256+
<br/>
257+
<img className="icon-locked" src={iconLockedSvg} alt="Locked"/> Access archives
258+
<br/>
258259
<img className="icon-locked" src={iconLockedSvg} alt="Locked"/> Edit settings
259-
260260
</div>
261261
);
262262
}
@@ -322,7 +322,9 @@ export default class ShowRetroSettingsPage extends React.Component {
322322
<div className="row">
323323
<label className="label">Project URL</label>
324324
<div className="input-group retro-url">
325-
<span className="input-group-label retro-url-prefix">{this.getCurrentHost()}/retros/</span>
325+
<span className="input-group-label retro-url-prefix">
326+
{`${this.getCurrentHost()}/retros/`}
327+
</span>
326328
<input
327329
id="retro_url"
328330
value={this.state.slug}

web/src/components/terms/new_terms_page.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import React from 'react';
3333
import RetroFooter from '../shared/footer';
3434

35-
/* eslint-disable react/no-unescaped-entities */
35+
/* eslint-disable react/no-unescaped-entities, react/jsx-one-expression-per-line */
3636

3737
export default () => (
3838
<div id="new-terms" className="terms">
@@ -240,4 +240,4 @@ export default () => (
240240
</div>
241241
);
242242

243-
/* eslint-enable react/no-unescaped-entities */
243+
/* eslint-enable react/no-unescaped-entities, react/jsx-one-expression-per-line */

0 commit comments

Comments
 (0)