Skip to content

Commit

Permalink
Merge pull request #74 from nielsgl/feature/refactoring
Browse files Browse the repository at this point in the history
Feature/refactoring
  • Loading branch information
nielsgl committed Mar 16, 2019
2 parents f229a3d + 8fc0111 commit a3bd0c6
Show file tree
Hide file tree
Showing 28 changed files with 17,362 additions and 11,632 deletions.
50 changes: 24 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,34 @@
#
version: 2
jobs:
build:
docker:
# specify the version you desire here
- image: circleci/node:7.10

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
# - image: circleci/mongo:3.4.4
build:
docker:
# specify the version you desire here
- image: circleci/node:8.9.4

working_directory: ~/repo
# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
# - image: circleci/mongo:3.4.4

steps:
- checkout
working_directory: ~/repo

# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-
steps:
- checkout

- run: yarn install
# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}

# run tests!
- run: yarn test
- run: npm install

- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}

# run tests!
- run: npm test
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ indent_style = spaces
curly_bracket_next_line = false
spaces_around_operators = true
indent_brace_style = 1TBS
spaces_around_brackets = boths
# spaces_around_brackets = boths
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dist
99 changes: 44 additions & 55 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,57 +1,46 @@
{
"root": true,
// "extends": "airbnb/base",
"plugins": [
"flow-vars",
"flowtype"
],
"env": {
"es6": true,
"node": true,
"mocha": true
},
"globals": {
"expect": false
},
"rules": {
"comma-dangle": "warn",
"eol-last": "warn",
"indent": "warn",
"no-var": "warn",
"dot-notation": "warn",
"no-unused-vars": "warn",
"object-shorthand": "warn",
"object-curly-spacing": "warn",
"no-trailing-spaces": "warn",
"vars-on-top": "warn",
"space-before-function-paren": "warn",
"quotes": [1, "single"],
"curly": 2,
"semi": [1, "always"],
"flow-vars/define-flow-type": 2,
"flow-vars/use-flow-type": 2,
"flowtype/require-parameter-type": 2,
"flowtype/require-return-type": [
"warn",
"always",
{ "annotateUndefined": "always" }
],
"flowtype/space-after-type-colon": [
"warn",
"always"
],
"flowtype/space-before-type-colon": [
"warn",
"never"
],
"flowtype/type-id-match": [
2,
"^([A-Z][a-z0-9]+)+Type$"
]
},
"settings": {
"flowtype": {
"onlyFilesWithFlowAnnotation": false
}
}
"root": true,
"parser": "babel-eslint",
"plugins": ["prettier", "flowtype", "jest"],
"env": {
"es6": true,
"node": true,
"jest/globals": true
},
"extends": ["airbnb", "prettier", "plugin:jest/recommended"],
"rules": {
"prettier/prettier": "error",
"no-console": "off",
"indent": ["error", "tab"],
"operator-linebreak": "off",
"arrow-parens": ["warn", "as-needed"],
"no-underscore-dangle": "off",
"no-param-reassign": "off",
"react/no-this-in-sfc": "off",
"no-tabs": "off",
"eol-last": "warn",
"no-var": "warn",
"dot-notation": "warn",
"no-unused-vars": "warn",
"object-shorthand": "warn",
"no-trailing-spaces": "warn",
"vars-on-top": "warn",
"space-before-function-paren": "warn",
"quotes": [1, "single"],
"semi": [1, "always"],
"flowtype/require-parameter-type": 2,
"flowtype/require-return-type": [
"warn",
"always",
{ "annotateUndefined": "always" }
],
"flowtype/space-after-type-colon": ["warn", "always"],
"flowtype/space-before-type-colon": ["warn", "never"],
"flowtype/type-id-match": [2, "^([A-Z][a-z0-9]+)+Type$"]
},
"settings": {
"flowtype": {
"onlyFilesWithFlowAnnotation": true
}
}
}
46 changes: 0 additions & 46 deletions .eslintstrict

This file was deleted.

6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@ node_modules

# IDE directory
.idea

# Build directory
dist

# SQLite test db
test.db
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11.9.0
13 changes: 12 additions & 1 deletion .npmingore → .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,15 @@ npm-debug.log*
node_modules

# Configurations
.gitignore
.gitignore
.circleci
.vscode

.python-version

# docs
CHANGELOG
CONTRIBUTING.md

# SQLite test db
test.db
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"tabWidth": 4,
"useTabs": true,
"singleQuote": true,
"trailingComma": "all"
}
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.7.14
7 changes: 7 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"editor.formatOnPaste": true,
"editor.formatOnSave": true,
"eslint.autoFixOnSave": true,
"eslint.packageManager": "yarn",
"eslint.enable": true
}
115 changes: 0 additions & 115 deletions 20160826094924-sequelize-paper-trail-migration.js

This file was deleted.

Loading

0 comments on commit a3bd0c6

Please sign in to comment.