Skip to content

Commit 7483fe4

Browse files
dependabot[bot]alexandremagno
dependabot[bot]
and
alexandremagno
authored
Bump jsonwebtoken from 8.1.1 to 9.0.0 (#936)
* Bump jsonwebtoken from 8.1.1 to 9.0.0 Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) from 8.1.1 to 9.0.0. - [Release notes](https://github.com/auth0/node-jsonwebtoken/releases) - [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md) - [Commits](auth0/node-jsonwebtoken@v8.1.1...v9.0.0) --- updated-dependencies: - dependency-name: jsonwebtoken dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * lint fixes * lint fixes * lint fixes * lint fixes * lint fixes * lint fixes * lint fixes * Bump moment-timezone from 0.5.14 to 0.5.40 (#948) Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.14 to 0.5.40. - [Release notes](https://github.com/moment/moment-timezone/releases) - [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md) - [Commits](moment/moment-timezone@0.5.14...0.5.40) --- updated-dependencies: - dependency-name: moment-timezone dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: alexandremagno <[email protected]> * Bump minimatch and sequelize-cli (#947) Bumps [minimatch](https://github.com/isaacs/minimatch) to 3.0.8 and updates ancestor dependency [sequelize-cli](https://github.com/sequelize/cli). These dependencies need to be updated together. Updates `minimatch` from 3.0.4 to 3.0.8 - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.0.8) Updates `sequelize-cli` from 2.8.0 to 6.6.0 - [Release notes](https://github.com/sequelize/cli/releases) - [Changelog](https://github.com/sequelize/cli/blob/main/CHANGELOG.md) - [Commits](sequelize/cli@v2.8.0...v6.6.0) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect - dependency-name: sequelize-cli dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: alexandremagno <[email protected]> * Bump ua-parser-js from 0.7.32 to 0.7.33 (#946) Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.32 to 0.7.33. - [Release notes](https://github.com/faisalman/ua-parser-js/releases) - [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md) - [Commits](faisalman/ua-parser-js@0.7.32...0.7.33) --- updated-dependencies: - dependency-name: ua-parser-js dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump json5, babel-core, loader-utils and karma-webpack (#945) Bumps [json5](https://github.com/json5/json5) to 2.2.3 and updates ancestor dependencies [json5](https://github.com/json5/json5), [babel-core](https://github.com/babel/babel), [loader-utils](https://github.com/webpack/loader-utils) and [karma-webpack](https://github.com/webpack-contrib/karma-webpack). These dependencies need to be updated together. Updates `json5` from 1.0.1 to 2.2.3 - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](json5/json5@v1.0.1...v2.2.3) Updates `babel-core` from 6.26.3 to 7.0.0-bridge.0 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits) Updates `loader-utils` from 1.1.0 to 1.4.2 - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](webpack/loader-utils@v1.1.0...v1.4.2) Updates `karma-webpack` from 2.0.6 to 2.0.13 - [Release notes](https://github.com/webpack-contrib/karma-webpack/releases) - [Changelog](https://github.com/ryanclark/karma-webpack/blob/master/CHANGELOG.md) - [Commits](codymikol/karma-webpack@v2.0.6...v2.0.13) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect - dependency-name: babel-core dependency-type: indirect - dependency-name: loader-utils dependency-type: indirect - dependency-name: karma-webpack dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: alexandremagno <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: alexandremagno <[email protected]>
1 parent e646f51 commit 7483fe4

File tree

10 files changed

+14115
-17054
lines changed

10 files changed

+14115
-17054
lines changed

‎.eslintrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"no-mixed-operators": 0,
1212
"import/first": 0,
1313
"prefer-promise-reject-errors": 0,
14-
"react/prop-types": 0
14+
"react/prop-types": 0,
15+
"react/jsx-no-bind": 0
1516
}
1617
}

‎frontend/package-lock.json‎

Lines changed: 41 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"testURL": "http://localhost:3000"
3333
},
3434
"engines": {
35-
"node": "8.6.0",
36-
"npm": "5.5.1"
35+
"node": "17.3.0",
36+
"npm": "8.3.0"
3737
},
3838
"keywords": [],
3939
"author": "",
@@ -98,10 +98,10 @@
9898
"name-initials": "^0.1.3",
9999
"prop-types": "^15.6.2",
100100
"query-string": "^5.1.0",
101-
"react": "^16.10.2",
101+
"react": "^18.2.0",
102102
"react-country-region-selector": "^2.1.0",
103103
"react-country-region-selector-material-ui-new": "^1.5.2",
104-
"react-dom": "^16.10.2",
104+
"react-dom": "^18.2.0",
105105
"react-ga": "^2.4.1",
106106
"react-intl": "^2.6.0",
107107
"react-intl-redux": "^2.0.2",

‎frontend/src/components/profile/account-details.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,16 @@ const AccountDetails = ({
285285
</Grid>
286286
<Grid item xs={ 12 } sm={ 12 } md={ 4 }>
287287
<FormattedMessage id='account.verify.phone_number' defaultMessage='Phone number'>
288-
{ (msg) => (
289-
<Field
290-
name='individual[phone]'
291-
label={ msg }
292-
defaultValue={ accountData['individual[phone]'] || account.data.individual && account.data.individual.phone }
293-
help
294-
inputComponent={ TextMaskCustom }
295-
/>
296-
) }
288+
{
289+
(msg) => (
290+
<Field
291+
name='individual[phone]'
292+
label={ msg }
293+
defaultValue={ accountData['individual[phone]'] || account.data.individual && account.data.individual.phone }
294+
help
295+
inputComponent={ TextMaskCustom }
296+
/>
297+
) }
297298
</FormattedMessage>
298299
</Grid>
299300
<Grid item xs={ 12 } sm={ 12 } md={ 4 }>

‎frontend/src/components/profile/user-organization-tree.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export default function UserOrganizationTree ({ createOrganizations, updateOrgan
9393
return (
9494
<div>
9595
<Typography variant='h5' style={ { marginTop: 20, marginBottom: 20 } }>
96-
Organizations you own on Gitpay
96+
Organizations you own on Gitpay
9797
</Typography>
9898
<TreeView
9999
className={ classes.root }
@@ -106,10 +106,12 @@ export default function UserOrganizationTree ({ createOrganizations, updateOrgan
106106
<React.Fragment>
107107
<span>{ o.name }</span>
108108
{ !o.provider
109-
? (<OrganizationUpdate
110-
updateOrganization={ updateOrganization }
111-
organization={ o }
112-
/>) : (
109+
? (
110+
<OrganizationUpdate
111+
updateOrganization={ updateOrganization }
112+
organization={ o }
113+
/>
114+
) : (
113115
o.provider === 'github'
114116
? <span style={ { display: 'inline-block' } }>
115117
<Avatar style={ { marginLeft: 10, width: 16, height: 16, backgroundColor: 'black' } }>

‎frontend/src/components/task/assignment/AssignActions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ const AssignActions = ({ hash, actionAssign, user, loggedUser, isOwner, assign,
159159
>
160160
{ task && task.Offers && task.Offers.map((option) => (
161161
<MenuItem key={ option.id } value={ option.value }>
162-
${ option.value } - { option.comment }
162+
${ option.value } - { option.comment }
163163
</MenuItem>
164164
)) }
165165
</TextField>

‎frontend/src/components/task/task-header.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class TaskHeader extends React.Component {
167167
</Typography>
168168
</Link>
169169
<Typography variant='subtitle2'>
170-
...
170+
...
171171
</Typography>
172172
</Breadcrumbs>
173173
) }
@@ -199,7 +199,7 @@ class TaskHeader extends React.Component {
199199
>
200200
{ task.data.provider } <img width='12' src={ task.data.provider === 'github' ? logoGithub : logoBitbucket } style={ { marginRight: 5, marginLeft: 5, borderRadius: '50%', padding: 3, backgroundColor: 'black', borderColor: 'black', borderWidth: 1, verticalAlign: 'bottom' } } />
201201
</a>
202-
by { ' ' }
202+
by { ' ' }
203203
<a
204204
href={ task.data.metadata && task.data.provider === 'github' ? task.data.metadata.issue.user.html_url : '' }
205205
>

‎frontend/src/components/task/task-payments.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@ export default function TaskPayments ({ orders }) {
3535
<ListItemAvatar style={ { minWidth: 34 } }>
3636
{ order.User
3737
? <Avatar
38-
className={ classes.small }
39-
alt={
38+
className={ classes.small }
39+
alt={
4040
`${order.User && (order.User.name || order.User.username) || 'Anonymous'}`
4141
}
42-
src={ order.User && order.User.profile_url }
43-
/> : <Avatar className={ classes.small } />
42+
src={ order.User && order.User.profile_url }
43+
/>
44+
: <Avatar className={ classes.small } />
4445
}
4546
</ListItemAvatar>
4647
<ListItemText primary={

0 commit comments

Comments
 (0)