Skip to content

Commit

Permalink
Merge pull request #15 from snurby7/create-user-9
Browse files Browse the repository at this point in the history
an overnightJs server now at least runs, more to come #9
  • Loading branch information
snurby7 authored Feb 7, 2019
2 parents 6bbfa1f + a71775f commit 5b3927a
Show file tree
Hide file tree
Showing 39 changed files with 5,003 additions and 7,766 deletions.
1 change: 0 additions & 1 deletion .env

This file was deleted.

33 changes: 14 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# GitIgnore file, prevent files/folders
# from being committed.
# remove all cached files git rm -r --cached .

# dependencies
/node_modules
client/node_modules/
/.pnp
.pnp.js

# testing
/coverage
# IntelliJ project files
*.iml
.idea/

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
# Built/Transpiled files
**/build/
**/src/**/*.js
**/src/**/*.js.map

npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Misc
**/node_modules/
**/package-lock.json
9 changes: 9 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,16 @@
"label": "yarn client",
"type": "shell",
"command": "yarn client",
"problemMatcher": []
},
{
"type": "npm",
"script": "server-test",
"problemMatcher": [],
"group": {
"kind": "test",
"isDefault": true
}
}
]
}
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 Sean Maxwell

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
25 changes: 0 additions & 25 deletions backend/index.js

This file was deleted.

1 change: 0 additions & 1 deletion client/.env

This file was deleted.

18 changes: 0 additions & 18 deletions client/.eslintrc

This file was deleted.

5 changes: 0 additions & 5 deletions client/.prettierrc

This file was deleted.

48 changes: 0 additions & 48 deletions client/package.json

This file was deleted.

14 changes: 0 additions & 14 deletions client/src/index.css

This file was deleted.

17 changes: 0 additions & 17 deletions client/tslint.json

This file was deleted.

14 changes: 7 additions & 7 deletions coffee-rates.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
"typescript.updateImportsOnFileMove.enabled": "always",
"typescriptHero.imports.disableImportRemovalOnOrganize": false,
"typescriptHero.imports.insertSemicolons": true,
"jshint.enable": false
},
"extensions": {
"recommendations": [
"hookyqr.beautify",
"exodiusstudios.comment-anchors",
"dbaeumer.vscode-eslint",
"eamodio.gitlens",
"heaths.vscode-guid",
"aaron-bond.better-comments",
"christian-kohler.npm-intellisense",
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"eg2.tslint",
"chakrounanas.turbo-console-log",
"esbenp.prettier-vscode",
"heaths.vscode-guid",
"hookyqr.beautify",
"kisstkondoros.vscode-codemetrics",
"rbbit.typescript-hero",
"visualstudioexptteam.vscodeintellicode"
]
Expand Down
2 changes: 2 additions & 0 deletions env/info
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Put your environment files in this folder, make sure to encrypt them
# first if you use git or some other file sharing tool.
67 changes: 30 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,50 +1,43 @@
{
"name": "coffee-rates",
"version": "0.1.0",
"private": true,
"dependencies": {
"apollo-server": "^2.3.1",
"graphql": "^14.0.2",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-scripts": "2.1.3"
},
"version": "1.0.0",
"description": "Application for rating coffee",
"main": "start.js",
"scripts": {
"start": "yarn install --only=prod && node start.js prod",
"dev": "concurrently --kill-others-on-fail \"yarn server\" \"yarn client\"",
"client": "cd client/src && yarn start",
"server": "cd backend/ && node index.js",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"lint-js": "eslint 'src/**/*.{js,jsx}'",
"lint-ts": "tslint -c tslint.json 'src/**/*.{ts,tsx}'"
"server": "tsc-watch --onSuccess \"node start.js dev\" --onFailure \"echo Beep! Compilation Failed\" ",
"client": "cd ./src/client && yarn start",
"test": "tsc && node start.js test",
"build": "sh ./util/buildForProd.sh"
},
"eslintConfig": {
"extends": "react-app"
"dependencies": {
"@overnightjs/core": "1.3.10",
"express": "4.16.4"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"devDependencies": {
"babel-eslint": "^10.0.1",
"@types/body-parser": "^1.17.0",
"@types/express": "4.16.1",
"@types/jasmine": "3.3.8",
"@types/node": "10.12.21",
"@types/supertest": "2.0.7",
"concurrently": "^4.1.0",
"eslint": "^5.12.0",
"eslint": "5.6.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^3.3.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^22.1.3",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-jest": "^22.2.2",
"eslint-plugin-jsx": "^0.0.2",
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-react": "^7.12.3",
"eslint-plugin-react": "^7.12.4",
"jasmine": "3.3.1",
"nodemon": "^1.18.9",
"prettier": "^1.15.3",
"tslint": "^5.12.1",
"tslint-config-prettier": "^1.17.0",
"tslint-plugin-prettier": "^2.0.1",
"tslint-react": "^3.6.0"
"supertest": "3.4.2",
"tsc": "1.20150623.0",
"tsc-watch": "1.1.36",
"tslint": "5.12.1",
"typescript": "3.3.1",
"webpack": "4.19.1",
"webpack-cli": "3.2.1",
"webpack-node-externals": "1.7.2"
}
}
Loading

0 comments on commit 5b3927a

Please sign in to comment.