Skip to content

Commit cb06e28

Browse files
author
alexandremagno
committed
Revert "fix node version (#962)"
This reverts commit c0d8dba.
1 parent ae8f7e5 commit cb06e28

File tree

10 files changed

+31
-21
lines changed

10 files changed

+31
-21
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ before_script:
1010
- psql -c 'create database gitpay_test;' -U postgres
1111
- npm run migrate-test
1212
node_js:
13-
- "17.3.0"
13+
- "8.6.0"
1414

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Join the Github team to be assigned to tasks and to be part of the core.
3434

3535
## Requirements
3636

37-
* Node.js (currently at v17.3.0)
37+
* Node.js (currently at v8.6.0)
3838
* React with webpack
3939

4040

config/passport.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,9 @@ passport.use(
406406
return done(null, false)
407407
}
408408
catch (err) {
409-
// eslint-disable-next-line no-console
410409
console.log('err', err)
411410
return done(err)
412-
}
411+
};
413412
})
414413
)
415414

docker-compose-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.7'
22

33
services:
44
frontend:
5-
image: node:17.3
5+
image: node:8.6
66
command: sh -c "npm install && npm run dev"
77
working_dir: /gitpay/frontend
88
volumes:
@@ -13,7 +13,7 @@ services:
1313
backend:
1414
env_file:
1515
- .env
16-
image: node:17.3
16+
image: node:8.6
1717
command: sh -c "npm install && npm run migrate && npm run start"
1818
working_dir: /gitpay
1919
volumes:

docker-compose.test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.7'
22

33
services:
44
backend_test:
5-
image: node:17.3
5+
image: node:8.6
66
command: sh -c "npm install && npm run migrate-test && npm run test"
77
working_dir: /gitpay
88
volumes:

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.7'
22

33
services:
44
frontend:
5-
image: node:17.3
5+
image: node:8.6
66
command: sh -c "npm install && npm run dev"
77
working_dir: /gitpay/frontend
88
volumes:
@@ -15,7 +15,7 @@ services:
1515
backend:
1616
env_file:
1717
- .env
18-
image: node:17.3
18+
image: node:8.6
1919
command: sh -c "npm install && npm run migrate && npm run start"
2020
working_dir: /gitpay
2121
volumes:

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@ export default function TaskPayments ({ orders }) {
3434
<ListItem key={ order.id }>
3535
<ListItemAvatar style={ { minWidth: 34 } }>
3636
{ order.User
37-
? <Avatar className={ classes.small } alt={ `${order.User && (order.User.name || order.User.username) || 'Anonymous'}` } src={ order.User && order.User.profile_url } />
37+
? <Avatar
38+
className={ classes.small }
39+
alt={
40+
`${order.User && (order.User.name || order.User.username) || 'Anonymous'}`
41+
}
42+
src={ order.User && order.User.profile_url }
43+
/>
3844
: <Avatar className={ classes.small } />
3945
}
4046
</ListItemAvatar>

frontend/src/components/topbar/topbar.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,10 @@ class TopBar extends Component {
512512
>
513513
<Chip
514514
avatar={ user.picture_url
515-
? <StyledAvatar alt={ user.username || '' } src={ user.picture_url } />
515+
? <StyledAvatar
516+
alt={ user.username || '' }
517+
src={ user.picture_url }
518+
/>
516519
: <StyledAvatar alt={ user.username || '' } src=''>
517520
{ user.username ? nameInitials(user.username) : <Person /> }
518521
</StyledAvatar>
@@ -629,7 +632,10 @@ class TopBar extends Component {
629632
<ListItemText>
630633
<Chip
631634
avatar={ user.picture_url
632-
? <StyledAvatar alt={ user.username || '' } src={ user.picture_url } />
635+
? <StyledAvatar
636+
alt={ user.username || '' }
637+
src={ user.picture_url }
638+
/>
633639
: <StyledAvatar alt={ user.username || '' } src=''>
634640
{ user.username ? nameInitials(user.username) : <Person /> }
635641
</StyledAvatar>

models/index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ let sequelize = {}
1616

1717
if (env === 'production') {
1818
const databaseUrl = process.env.DATABASE_URL
19-
// const databaseSettings = databaseUrl.split(':')
20-
// const port = databaseSettings[4]
21-
// const host = databaseSettings[3]
19+
const databaseSettings = databaseUrl.split(':')
20+
const port = databaseSettings[4]
21+
const host = databaseSettings[3]
2222
sequelize = new Sequelize(databaseUrl, {
23-
// dialect: 'postgres',
24-
// protocol: 'postgres',
25-
// port: port,
26-
// host: host,
27-
// logging: true,
23+
//dialect: 'postgres',
24+
//protocol: 'postgres',
25+
//port: port,
26+
//host: host,
27+
//logging: true,
2828
dialectOptions: {
2929
ssl: {
3030
require: true,

modules/users/userExists.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ const userExists = async userAttributes => {
4242
return user
4343
}
4444
catch (error) {
45-
// eslint-disable-next-line no-console
4645
console.log('userExists error', error)
4746
}
4847
}

0 commit comments

Comments
 (0)