Skip to content

Commit

Permalink
Merge branch 'advanced'
Browse files Browse the repository at this point in the history
  • Loading branch information
EliasGcf committed Jun 15, 2020
2 parents f10cc7e + f4fdfb0 commit 10ce3d4
Show file tree
Hide file tree
Showing 100 changed files with 5,876 additions and 2,027 deletions.
16 changes: 16 additions & 0 deletions server/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# APP URL's
APP_API_URL=http://localhost:3333
APP_WEB_URL=http://localhost:3000
NODE_ENV=development

APP_API_PORT=3333

# Auth

APP_SECRET=

# Database
DB_HOST=
DB_USER=
DB_PASS=
DB_NAME=
2 changes: 2 additions & 0 deletions server/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.d.ts
*.js
51 changes: 51 additions & 0 deletions server/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"env": {
"es6": true,
"node": true
},
"extends": [
"airbnb-base",
"plugin:@typescript-eslint/recommended",
"prettier/@typescript-eslint",
"plugin:prettier/recommended"
],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": [
"@typescript-eslint",
"prettier"
],
"rules": {
"prettier/prettier": "error",
"no-useless-constructor": "off",
"@typescript-eslint/interface-name-prefix": ["error", { "prefixWithI": "always" }],
"camelcase": "off",
"import/extensions": [
"error",
"ignorePackages",
{
"ts": "never"
}
],
"class-methods-use-this": "off",
"@typescript-eslint/camelcase": "off",
"@typescript-eslint/no-unused-vars": [
"error",
{
"argsIgnorePattern": "_"
}
]
},
"settings": {
"import/resolver": {
"typescript": {}
}
}
}
3 changes: 2 additions & 1 deletion server/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
src/database/database.sqlite

.env
uploads/*.png
uploads/*.jpg
15 changes: 0 additions & 15 deletions server/knexfile.ts

This file was deleted.

23 changes: 23 additions & 0 deletions server/ormconfig.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
require('dotenv/config');

module.exports = {
type: 'postgres',
host: process.env.DB_HOST,
port: '5432',
username: process.env.DB_USER,
password: process.env.DB_PASS,
database: process.env.DB_NAME,
logging: true,
entities: [
'./src/modules/**/infra/typeorm/entities/*.ts'
],
seeds: [
'./src/shared/infra/typeorm/seeds/*.ts'
],
migrations: [
'./src/shared/infra/typeorm/migrations/*.ts'
],
cli: {
migrationsDir: './src/shared/infra/typeorm/migrations'
}
}
33 changes: 28 additions & 5 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,49 @@
"url": "https://github.com/EliasGcf"
},
"scripts": {
"dev": "ts-node-dev --transpileOnly --ignore-watch node_modules src/server.ts",
"knex:migrate": "knex --knexfile knexfile.ts migrate:latest",
"knex:seed": "knex --knexfile knexfile.ts seed:run"
"build": "tsc --project tsconfig.json && tscpaths -p tsconfig.json -s ./src -o ./dist",
"dev:server": "ts-node-dev --inspect -r tsconfig-paths/register --transpileOnly --ignore-watch node_modules src/shared/infra/http/server.ts",
"typeorm": "ts-node-dev -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
"seed:config": "ts-node-dev -r tsconfig-paths/register ./node_modules/typeorm-seeding/dist/cli.js config",
"seed:run": "ts-node-dev -r tsconfig-paths/register ./node_modules/typeorm-seeding/dist/cli.js seed"
},
"license": "MIT",
"dependencies": {
"bcryptjs": "^2.4.3",
"celebrate": "^12.1.1",
"class-transformer": "^0.2.3",
"cors": "^2.8.5",
"dotenv": "^8.2.0",
"express": "^4.17.1",
"knex": "^0.21.1",
"express-async-errors": "^3.1.1",
"jsonwebtoken": "^8.5.1",
"multer": "^1.4.2",
"sqlite3": "^4.2.0"
"pg": "^8.2.1",
"reflect-metadata": "^0.1.13",
"tsyringe": "^4.3.0",
"typeorm": "^0.2.25",
"typeorm-seeding": "^1.6.1"
},
"devDependencies": {
"@types/bcryptjs": "^2.4.2",
"@types/cors": "^2.8.6",
"@types/express": "^4.17.6",
"@types/hapi__joi": "^17.1.2",
"@types/jsonwebtoken": "^8.5.0",
"@types/multer": "^1.4.3",
"@typescript-eslint/eslint-plugin": "2.28.0",
"@typescript-eslint/parser": "^3.1.0",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.11.0",
"eslint-import-resolver-typescript": "^2.0.0",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-prettier": "^3.1.3",
"prettier": "^2.0.5",
"ts-node": "^8.10.2",
"ts-node-dev": "^1.0.0-pre.44",
"tsconfig-paths": "^3.9.0",
"tscpaths": "^0.0.9",
"typescript": "^3.9.3"
}
}
5 changes: 5 additions & 0 deletions server/prettier.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
singleQuote: true,
trailingComma: 'all',
arrowParens: 'avoid',
};
7 changes: 7 additions & 0 deletions server/src/@types/express.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
declare namespace Express {
export interface Request {
user: {
id: string;
};
}
}
6 changes: 6 additions & 0 deletions server/src/config/auth.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export default {
jwt: {
secret: process.env.APP_SECRET || 'default',
expiresIn: '1d',
},
};
21 changes: 0 additions & 21 deletions server/src/controllers/ItemsController.ts

This file was deleted.

103 changes: 0 additions & 103 deletions server/src/controllers/PointsController.ts

This file was deleted.

12 changes: 0 additions & 12 deletions server/src/database/connection.ts

This file was deleted.

19 changes: 0 additions & 19 deletions server/src/database/migrations/00_create_points.ts

This file was deleted.

13 changes: 0 additions & 13 deletions server/src/database/migrations/01_create_items.ts

This file was deleted.

21 changes: 0 additions & 21 deletions server/src/database/migrations/02_create_point_items.ts

This file was deleted.

Loading

0 comments on commit 10ce3d4

Please sign in to comment.