Skip to content

Commit

Permalink
Bump jsonwebtoken from 8.1.1 to 9.0.0 (#936)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
dependabot[bot] and alexandremagno authored Feb 6, 2023
1 parent e646f51 commit 7483fe4
Show file tree
Hide file tree
Showing 10 changed files with 14,115 additions and 17,054 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"no-mixed-operators": 0,
"import/first": 0,
"prefer-promise-reject-errors": 0,
"react/prop-types": 0
"react/prop-types": 0,
"react/jsx-no-bind": 0
}
}
53 changes: 41 additions & 12 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"testURL": "http://localhost:3000"
},
"engines": {
"node": "8.6.0",
"npm": "5.5.1"
"node": "17.3.0",
"npm": "8.3.0"
},
"keywords": [],
"author": "",
Expand Down Expand Up @@ -98,10 +98,10 @@
"name-initials": "^0.1.3",
"prop-types": "^15.6.2",
"query-string": "^5.1.0",
"react": "^16.10.2",
"react": "^18.2.0",
"react-country-region-selector": "^2.1.0",
"react-country-region-selector-material-ui-new": "^1.5.2",
"react-dom": "^16.10.2",
"react-dom": "^18.2.0",
"react-ga": "^2.4.1",
"react-intl": "^2.6.0",
"react-intl-redux": "^2.0.2",
Expand Down
19 changes: 10 additions & 9 deletions frontend/src/components/profile/account-details.js
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,16 @@ const AccountDetails = ({
</Grid>
<Grid item xs={ 12 } sm={ 12 } md={ 4 }>
<FormattedMessage id='account.verify.phone_number' defaultMessage='Phone number'>
{ (msg) => (
<Field
name='individual[phone]'
label={ msg }
defaultValue={ accountData['individual[phone]'] || account.data.individual && account.data.individual.phone }
help
inputComponent={ TextMaskCustom }
/>
) }
{
(msg) => (
<Field
name='individual[phone]'
label={ msg }
defaultValue={ accountData['individual[phone]'] || account.data.individual && account.data.individual.phone }
help
inputComponent={ TextMaskCustom }
/>
) }
</FormattedMessage>
</Grid>
<Grid item xs={ 12 } sm={ 12 } md={ 4 }>
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/components/profile/user-organization-tree.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default function UserOrganizationTree ({ createOrganizations, updateOrgan
return (
<div>
<Typography variant='h5' style={ { marginTop: 20, marginBottom: 20 } }>
Organizations you own on Gitpay
Organizations you own on Gitpay
</Typography>
<TreeView
className={ classes.root }
Expand All @@ -106,10 +106,12 @@ export default function UserOrganizationTree ({ createOrganizations, updateOrgan
<React.Fragment>
<span>{ o.name }</span>
{ !o.provider
? (<OrganizationUpdate
updateOrganization={ updateOrganization }
organization={ o }
/>) : (
? (
<OrganizationUpdate
updateOrganization={ updateOrganization }
organization={ o }
/>
) : (
o.provider === 'github'
? <span style={ { display: 'inline-block' } }>
<Avatar style={ { marginLeft: 10, width: 16, height: 16, backgroundColor: 'black' } }>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/task/assignment/AssignActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ const AssignActions = ({ hash, actionAssign, user, loggedUser, isOwner, assign,
>
{ task && task.Offers && task.Offers.map((option) => (
<MenuItem key={ option.id } value={ option.value }>
${ option.value } - { option.comment }
${ option.value } - { option.comment }
</MenuItem>
)) }
</TextField>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/task/task-header.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ class TaskHeader extends React.Component {
</Typography>
</Link>
<Typography variant='subtitle2'>
...
...
</Typography>
</Breadcrumbs>
) }
Expand Down Expand Up @@ -199,7 +199,7 @@ class TaskHeader extends React.Component {
>
{ 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' } } />
</a>
by { ' ' }
by { ' ' }
<a
href={ task.data.metadata && task.data.provider === 'github' ? task.data.metadata.issue.user.html_url : '' }
>
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/task/task-payments.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@ export default function TaskPayments ({ orders }) {
<ListItemAvatar style={ { minWidth: 34 } }>
{ order.User
? <Avatar
className={ classes.small }
alt={
className={ classes.small }
alt={
`${order.User && (order.User.name || order.User.username) || 'Anonymous'}`
}
src={ order.User && order.User.profile_url }
/> : <Avatar className={ classes.small } />
src={ order.User && order.User.profile_url }
/>
: <Avatar className={ classes.small } />
}
</ListItemAvatar>
<ListItemText primary={
Expand Down
Loading

0 comments on commit 7483fe4

Please sign in to comment.