Skip to content

Commit

Permalink
Updates to Node 12 (major)
Browse files Browse the repository at this point in the history
  • Loading branch information
zrrrzzt committed Jan 18, 2020
1 parent f309f23 commit 138b7b0
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js:
- "10"
- "12"
after_success:
- npm run coveralls
16 changes: 2 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
###########################################################
#
# Dockerfile for bigfive-web
#
###########################################################

# Setting the base to nodejs 10
FROM mhart/alpine-node:10@sha256:1ac930aaade19bde55e81d74eab7cab09229e33926f42ffd235b5dab10fe99ad

# Maintainer
MAINTAINER Jonas Enge

#### Begin setup ####
FROM mhart/alpine-node:12

# Extra tools for native dependencies
RUN apk add --no-cache make gcc g++ python git
Expand All @@ -19,7 +7,7 @@ RUN apk add --no-cache make gcc g++ python git
COPY . /src

# Change working directory
WORKDIR "/src"
WORKDIR /src

# Install dependencies
RUN npm install --production
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"main": "server.js",
"engines": {
"node": ">=10.18.1"
"node": ">=12.14.1"
},
"scripts": {
"test": "standard && npm audit && ava",
Expand Down
4 changes: 2 additions & 2 deletions pages/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default class extends Component {
}
}

clearAnswers () {
handleClearAnswers () {
clearItems()
window.location.reload(true)
}
Expand Down Expand Up @@ -144,7 +144,7 @@ export default class extends Component {
</div>
<ProgressBar progress={progress} />
{
restore && <p onClick={this.clearAnswers} style={{ color: '#FF0080', marginTop: '10px', cursor: 'pointer' }}><FaInfoCircle /> Your state is restored from LocalStorage. Click here to start over again.</p>
restore && <p onClick={this.handleClearAnswers} style={{ color: '#FF0080', marginTop: '10px', cursor: 'pointer' }}><FaInfoCircle /> Your state is restored from LocalStorage. Click here to start over again.</p>
}
{items.map(item =>
<div key={item.id} className={lang === 'ur' ? 'item inverted-text' : 'item'}>
Expand Down

0 comments on commit 138b7b0

Please sign in to comment.