Skip to content

Commit

Permalink
Merge branch 'release-0.2.20'
Browse files Browse the repository at this point in the history
  • Loading branch information
entrotech committed Apr 15, 2021
2 parents c1434fb + 659b42d commit 042023c
Show file tree
Hide file tree
Showing 88 changed files with 2,287 additions and 2,636 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ tags
[._]*.un~

### VisualStudioCode ###
.vscode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Web API Server",
"program": "${workspaceFolder}\\server\\server.js",
"envFile": "${workspaceFolder}\\server\\.env"
}
]
}
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
}
57 changes: 43 additions & 14 deletions client/package-lock.json

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

8 changes: 4 additions & 4 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "client",
"version": "0.2.19",
"name": "tdm-calculator-client",
"version": "0.2.20",
"private": true,
"proxy": "http://localhost:5000",
"scripts": {
Expand All @@ -10,8 +10,8 @@
"test": "react-scripts test",
"test:ci": "react-scripts test --watchAll=false",
"eject": "react-scripts eject",
"lint": "eslint -c .eslintrc.json --ignore-path .eslintignore **/*.{js,jsx}",
"lint:fix": "eslint -c .eslintrc.json --ignore-path .eslintignore --fix **/*.{js,jsx}"
"lint": "eslint -c .eslintrc.json --ignore-path .eslintignore \"**/*.{js,jsx}\"",
"lint:fix": "eslint -c .eslintrc.json --ignore-path .eslintignore --fix \"**/*.{js,jsx}\""
},
"eslintConfig": {
"extends": "react-app"
Expand Down
Loading

0 comments on commit 042023c

Please sign in to comment.