Skip to content
This repository was archived by the owner on Feb 25, 2023. It is now read-only.

Commit 5bd8386

Browse files
authored
Merge pull request #87 from CoinAlpha/development
release / sync dev -> master
2 parents 8100a1d + eecf4a4 commit 5bd8386

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+18939
-11265
lines changed

.babelrc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
{
2-
"presets": [
3-
"@babel/preset-env"
4-
]
5-
}
2+
"presets": ["@babel/preset-env"]
3+
}

.dockerignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
node_modules
33
npm-debug.log
44
.git
5-
# Environment files
6-
*.env
7-
*.env.*
8-
# except the example .env.example
9-
!.env.example
5+
6+
# Configuration files
7+
conf/*
8+
# except the example conf/global_conf.yml.example
9+
!conf/global_conf.yml.example
1010

1111
# Gateway API files
1212
*.pem

.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Editor configuration, see http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
max_line_length = off
13+
trim_trailing_whitespace = false

.env.example

Lines changed: 0 additions & 83 deletions
This file was deleted.

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# turn off specific file for eslint
2-
/*.js
2+
/node_modules

.eslintrc.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
module.exports = {
2-
extends: 'standard',
2+
extends: ['eslint:recommended', 'prettier'],
3+
parser: 'babel-eslint',
4+
plugins: ['prettier'],
5+
env: {
6+
node: true,
7+
es6: true
8+
},
39
rules: {
4-
// disable semicolon check
5-
semi: 'off',
6-
7-
// override default options for rules from base configurations
8-
'comma-dangle': 'off',
9-
10-
// disable rules from base configurations
11-
'no-console': 'off',
10+
'comma-dangle': ['error', 'never'],
1211
'no-multi-spaces': 'off',
12+
'no-underscore-dangle': 'off',
13+
'no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
14+
'prettier/prettier': 'error',
15+
semi: [2, 'always']
1316
}
1417
};

.gitignore

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ Desktop.ini
55
# IDEA files
66
.idea
77

8-
# Environment files
9-
*.env
10-
*.env.*
11-
# except the example .env.example
12-
!.env.example
8+
# Configuration files
9+
conf/*
10+
# except the example conf/global_conf.yml.example
11+
!conf/global_conf.yml.example
1312

1413
# node installs
1514
node_modules/
@@ -22,9 +21,12 @@ dist/
2221

2322
# misc
2423
logs/
24+
package-lock.json
2525

2626
# cert
2727
*.pem
2828
*.srl
2929
*.key
30-
*.crt
30+
*.crt
31+
*.log
32+
*.lock

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
certs
2+
*.md
3+
*.yml

.prettierrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"trailingComma": "none",
3+
"semi": true,
4+
"singleQuote": true,
5+
"tabWidth": 2
6+
}

Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:10.22.0-alpine
1+
FROM node:12.13.0-alpine
22

33
# Add timezone database
44
RUN apk add --no-cache tzdata
@@ -26,9 +26,6 @@ RUN yarn install
2626
# copy pwd file to container
2727
COPY . .
2828

29-
# create empty env file
30-
RUN touch .env
31-
3229
EXPOSE 5000
3330

34-
CMD ["yarn", "run", "start"]
31+
CMD ["yarn", "run", "start"]

0 commit comments

Comments
 (0)