Skip to content

Commit 4d03623

Browse files
author
Ryan Kotzen
committed
Merge branch 'develop'
2 parents 7b97871 + 2186f18 commit 4d03623

109 files changed

Lines changed: 11621 additions & 2713 deletions

File tree

Some content is hidden

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

.eslintrc

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
{
2+
"env": {
3+
"browser": false,
4+
"node": true,
5+
"es6": true,
6+
"mocha": true
7+
},
8+
"parserOptions": {
9+
"ecmaVersion": 6,
10+
"sourceType": "script",
11+
"ecmaFeatures": {
12+
"globalReturn": true,
13+
"impliedStrict": false,
14+
"jsx": false
15+
}
16+
},
17+
"plugins": ["node","prettier"],
218
"extends": [
3-
"./.eslintrc.js"
4-
]
19+
"eslint:recommended",
20+
"plugin:node/recommended",
21+
"prettier"
22+
],
23+
"rules": {
24+
"indent": ["error", 4, {"SwitchCase": 1}],
25+
"linebreak-style": ["error", "unix"],
26+
"quotes": ["error", "single", { "avoidEscape": true }],
27+
"semi": ["error", "always"],
28+
"no-console": ["off"],
29+
"node/exports-style": ["error", "module.exports"],
30+
"strict": ["error", "global"],
31+
"prettier/prettier": ["error", {"singleQuote": true, "tabWidth":4, "printWidth":100}]
32+
}
533
}

.eslintrc.js

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

.gitignore

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
1-
# Logs
2-
logs
3-
*.log
4-
npm-debug.log*
5-
6-
# Runtime data
7-
pids
8-
*.pid
9-
*.seed
10-
11-
# Directory for instrumented libs generated by jscoverage/JSCover
12-
lib-cov
13-
14-
# Coverage directory used by tools like istanbul
15-
coverage
16-
17-
# nyc test coverage
18-
.nyc_output
19-
20-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
21-
.grunt
22-
23-
# node-waf configuration
24-
.lock-wscript
25-
26-
# Compiled binary addons (http://nodejs.org/api/addons.html)
27-
build/Release
28-
29-
# Dependency directories
30-
node_modules
31-
jspm_packages
32-
33-
# Optional npm cache directory
34-
.npm
35-
36-
# Optional REPL history
37-
.node_repl_history
38-
.idea
39-
report
40-
src/swagger/swagger.json
41-
yarn.lock
42-
43-
# VS Code Editor files
44-
.vscode
45-
*.orig
1+
# Logs
2+
logs/**/*.log
3+
logs/**/*.gz
4+
*.log
5+
npm-debug.log*
6+
7+
# Runtime data
8+
pids
9+
*.pid
10+
*.seed
11+
12+
# Directory for instrumented libs generated by jscoverage/JSCover
13+
lib-cov
14+
15+
# Coverage directory used by tools like istanbul
16+
coverage
17+
18+
# nyc test coverage
19+
.nyc_output
20+
21+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
22+
.grunt
23+
24+
# node-waf configuration
25+
.lock-wscript
26+
27+
# Compiled binary addons (http://nodejs.org/api/addons.html)
28+
build/Release
29+
30+
# Dependency directories
31+
node_modules
32+
jspm_packages
33+
34+
# Optional npm cache directory
35+
.npm
36+
37+
# Optional REPL history
38+
.node_repl_history
39+
.idea
40+
report
41+
src/swagger/swagger.json
42+
yarn.lock
43+
44+
# VS Code Editor files
45+
.vscode
46+
*.orig

.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
save=true
2+
save-exact=true

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ before_script:
2323
- sleep 15
2424
script:
2525
- npm run lint-ci
26-
- npm run mocha
26+
- npm t
27+
- npm run ensureNoWildcards

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ The seed for pretty much any api I write in node.js
1313
# Todo's
1414
- Set your app info in the package.json file
1515
- Go through the todo's in the seed api and make decisions based on your needs.
16+
- metadata fields to move to their own file, update the hydrate to use this file instead
17+
- Adding the role to a newly created user.
1618

1719
# Config
1820
[The Twelve-Factor App](https://12factor.net/config) Recommends **not** storing your config in files, there are some pretty good reasons for and against this which can be read [here.](https://gist.github.com/telent/9742059) In my personal experience and based on how my projects run, I find that the advantages of file-based far outweigh the downsides, feel free to disagree. If you would prefer pure env config, check out [dotenv](https://www.npmjs.com/package/dotenv) or simply update the config code here to not load from file.

0 commit comments

Comments
 (0)