Skip to content
This repository has been archived by the owner on Sep 2, 2021. It is now read-only.

Commit

Permalink
Merge branch 'release/2.1.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua Abad committed Jun 5, 2021
2 parents 97d23e4 + c2df318 commit 1b4732b
Show file tree
Hide file tree
Showing 24 changed files with 992 additions and 333 deletions.
45 changes: 11 additions & 34 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,40 +1,17 @@
module.exports = {
'env': {
'node': true,
'es2021': true
env: {
node: true,
es2021: true
},
'extends': [
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended'
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended'
],
'parser': '@typescript-eslint/parser',
'parserOptions': {
'ecmaVersion': 12,
'sourceType': 'module'
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 12,
sourceType: 'module'
},
'plugins': [
'@typescript-eslint'
],
'rules': {
'indent': [
'error',
2
],
'linebreak-style': [
'error',
'unix'
],
'quotes': [
'error',
'single'
],
'semi': [
'error',
'never'
],
'eol-last': [
'error',
'always'
]
}
plugins: ['@typescript-eslint']
}
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"endOfLine": "auto",
"trailingComma": "none",
"semi": false,
"singleQuote": true,
"arrowParens": "avoid"
}
144 changes: 130 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "proctor-vue-server",
"version": "2.0.0",
"version": "2.1.0",
"description": "Proctor Vue server using TypeScript, Express, and MongoDB",
"repository": {
"type": "git",
Expand All @@ -19,9 +19,6 @@
"engines": {
"node": "14.5.0"
},
"_moduleAliases": {
"@": "./src"
},
"dependencies": {
"aws-sdk": "^2.830.0",
"bcrypt": "^5.0.0",
Expand Down Expand Up @@ -49,6 +46,7 @@
"@types/express": "^4.17.9",
"@types/jsonwebtoken": "^8.5.0",
"@types/md5": "^2.2.1",
"@types/module-alias": "^2.0.0",
"@types/mongoose": "^5.10.2",
"@types/mongoose-unique-validator": "^1.0.4",
"@types/morgan": "^1.9.2",
Expand All @@ -61,6 +59,9 @@
"cross-env": "^7.0.3",
"dotenv": "^8.2.0",
"eslint": "^7.15.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"prettier": "2.3.0",
"ts-node-dev": "^1.0.0",
"typescript": "^4.2.2"
}
Expand Down
Loading

0 comments on commit 1b4732b

Please sign in to comment.