From 3f11985c5a4305e061db19499d4ee49c30393d26 Mon Sep 17 00:00:00 2001 From: Gabriel Dalseco <55258427+GabrielCoruja@users.noreply.github.com> Date: Tue, 18 Jan 2022 19:42:53 -0300 Subject: [PATCH 01/11] Adicionando process.env.PORT --- src/api/app.js | 2 +- src/api/server.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/app.js b/src/api/app.js index d7e7a62..e1fe587 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -7,6 +7,6 @@ const app = express(); app.get('/users', rescue(UserController)); -app.use(errorMiddleware); +app.use(errorMiddleware); module.exports = app; diff --git a/src/api/server.js b/src/api/server.js index bdcc2b9..b77242c 100644 --- a/src/api/server.js +++ b/src/api/server.js @@ -1,5 +1,5 @@ const app = require('./app'); -const PORT = 3000; +const PORT = process.env.PORT || 3000; app.listen(PORT, () => console.log(`Rodando na porta ${PORT}`)); From 20fb82e28a9e64738e8a9465991f71595d9d0fd7 Mon Sep 17 00:00:00 2001 From: MiguelNS Date: Thu, 2 Jun 2022 17:29:59 -0300 Subject: [PATCH 02/11] Deploy aplicacao back end no heroku --- Dockerfile | 11 +++++++++++ heroku.yml | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 Dockerfile create mode 100644 heroku.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..31eccbf --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM node:alpine + +WORKDIR /app + +COPY package.json . + +RUN npm install + +COPY . . + +CMD ["node", "src/api/server.js"] \ No newline at end of file diff --git a/heroku.yml b/heroku.yml new file mode 100644 index 0000000..07338e9 --- /dev/null +++ b/heroku.yml @@ -0,0 +1,5 @@ +build: + docker: + web: Dockerfile +run: + web: node src/api/server.js \ No newline at end of file From c7fc46cf051e17d67ba438a4cce2b66a5ada4e5f Mon Sep 17 00:00:00 2001 From: MiguelNS Date: Thu, 2 Jun 2022 17:45:57 -0300 Subject: [PATCH 03/11] conexao com banco de dados --- src/api/server.js | 1 + src/sequelize/config/config.js | 31 +++++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/api/server.js b/src/api/server.js index b77242c..d46ac94 100644 --- a/src/api/server.js +++ b/src/api/server.js @@ -1,4 +1,5 @@ const app = require('./app'); +require('dotenv/config'); const PORT = process.env.PORT || 3000; diff --git a/src/sequelize/config/config.js b/src/sequelize/config/config.js index cff33d5..3e5d3c4 100644 --- a/src/sequelize/config/config.js +++ b/src/sequelize/config/config.js @@ -1,23 +1,30 @@ +require('dotenv/config'); + +const { HOST, PASSWORD_POSTGRES, DATABASE, DB_USERNAME, DB_PORT } = process.env; + module.exports = { development: { - username: 'root', - password: null, - database: 'database_development', - host: '127.0.0.1', + username: DB_USERNAME, + password: PASSWORD_POSTGRES, + database: DATABASE, + host: HOST, + port: DB_PORT, dialect: 'postgres', }, test: { - username: 'root', - password: null, - database: 'database_test', - host: '127.0.0.1', + username: DB_USERNAME, + password: PASSWORD_POSTGRES, + database: DATABASE, + host: HOST, + port: DB_PORT, dialect: 'postgres', }, production: { - username: 'root', - password: null, - database: 'database_test', - host: '127.0.0.1', + username: DB_USERNAME, + password: PASSWORD_POSTGRES, + database: DATABASE, + host: HOST, + port: DB_PORT, dialect: 'postgres', }, }; \ No newline at end of file From a8b6c1772c03d67b3121aea3f6eb7c3df96099b0 Mon Sep 17 00:00:00 2001 From: MiguelNS Date: Thu, 2 Jun 2022 17:51:09 -0300 Subject: [PATCH 04/11] adicionando CORS no backend --- package-lock.json | 2 +- src/api/app.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 34ef327..6a163bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5955,7 +5955,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" }, "object-inspect": { "version": "1.11.0", diff --git a/src/api/app.js b/src/api/app.js index e1fe587..78c6ed5 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -1,10 +1,13 @@ const express = require('express'); const rescue = require('express-rescue'); +const cors = require('cors'); const UserController = require('../controllers/user'); const errorMiddleware = require('../middlewares/error'); const app = express(); +app.use(cors()); + app.get('/users', rescue(UserController)); app.use(errorMiddleware); From c6ee86aaac369b2c28a17289dbd32e69bb36dcb3 Mon Sep 17 00:00:00 2001 From: MiguelNS Date: Thu, 2 Jun 2022 18:13:13 -0300 Subject: [PATCH 05/11] adicionamos action para o backend --- .github/workflow/main.yml | 14 ++++++++++++++ package.json | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 .github/workflow/main.yml diff --git a/.github/workflow/main.yml b/.github/workflow/main.yml new file mode 100644 index 0000000..561ac51 --- /dev/null +++ b/.github/workflow/main.yml @@ -0,0 +1,14 @@ +name: heroku-back-end + +on: [push, pull_request] + +jobs: + eslint: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v1 + - name: Instala dependências + run: npm install + - name: Roda ESlint + run: npm run lint \ No newline at end of file diff --git a/package.json b/package.json index a42645a..cd7a62a 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "scripts": { "test": "jest tests", "start": "node src/api/server", - "dev": "nodemon src/api/server" + "dev": "nodemon src/api/server", + "lint": "eslint --no-inline-config --ext .js,.jsx --no-error-on-unmatched-pattern -c .eslintrc.json ." }, "keywords": [], "author": "", From 9c7bfb7faf09c15f7ef59664c34cd4d925cef419 Mon Sep 17 00:00:00 2001 From: MiguelNS Date: Thu, 2 Jun 2022 18:16:08 -0300 Subject: [PATCH 06/11] aaaaaaaaaaaaaaaaaaaaaa --- src/api/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/app.js b/src/api/app.js index 78c6ed5..e4de604 100644 --- a/src/api/app.js +++ b/src/api/app.js @@ -3,7 +3,7 @@ const rescue = require('express-rescue'); const cors = require('cors'); const UserController = require('../controllers/user'); const errorMiddleware = require('../middlewares/error'); - +// miguek const app = express(); app.use(cors()); From d97ac94524e48c5a92ff91a354a877e21f673281 Mon Sep 17 00:00:00 2001 From: Breno Santos Date: Thu, 2 Jun 2022 18:21:15 -0300 Subject: [PATCH 07/11] update --- src/api/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/server.js b/src/api/server.js index d46ac94..bba635a 100644 --- a/src/api/server.js +++ b/src/api/server.js @@ -1,6 +1,6 @@ const app = require('./app'); require('dotenv/config'); - +// hoi const PORT = process.env.PORT || 3000; app.listen(PORT, () => console.log(`Rodando na porta ${PORT}`)); From 10a04cf16c22e09822c5f5ea3de18a8d24949885 Mon Sep 17 00:00:00 2001 From: Breno Santos Date: Thu, 2 Jun 2022 18:27:05 -0300 Subject: [PATCH 08/11] update --- .eslintignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintignore b/.eslintignore index ef1d1bd..9515cb8 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,2 +1,3 @@ */models/index.js -*/migrations/* \ No newline at end of file +*/migrations/* +/tests \ No newline at end of file From 2e522a66a579d70d24985faf283896202125508a Mon Sep 17 00:00:00 2001 From: Breno Santos Date: Thu, 2 Jun 2022 18:30:48 -0300 Subject: [PATCH 09/11] update --- .eslintrc.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 3a6e0b8..452d896 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,3 +1,6 @@ { - "extends": "eslint-config-trybe-backend" -} \ No newline at end of file + "extends": "eslint-config-trybe-backend", + "rules": { + "max-lines": "off" + } +} From 2d5e23d48cecaf405311fa384a84e60bf7af8140 Mon Sep 17 00:00:00 2001 From: Breno Santos Date: Thu, 2 Jun 2022 18:33:22 -0300 Subject: [PATCH 10/11] update --- .eslintrc.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.eslintrc.json b/.eslintrc.json index 452d896..8522969 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,6 +1,13 @@ { "extends": "eslint-config-trybe-backend", "rules": { - "max-lines": "off" + "max-lines-per-function": [ + "error", + { + "max": 2000, + "skipBlankLines": true, + "skipComments": true + } + ] } } From 7c44070c0b374b315e7f8c01cc06c2b2008459e3 Mon Sep 17 00:00:00 2001 From: Breno Santos Date: Thu, 2 Jun 2022 18:35:08 -0300 Subject: [PATCH 11/11] update --- src/sequelize/migrations/20211020194502-create-user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sequelize/migrations/20211020194502-create-user.js b/src/sequelize/migrations/20211020194502-create-user.js index 7c47ebc..d0aec16 100644 --- a/src/sequelize/migrations/20211020194502-create-user.js +++ b/src/sequelize/migrations/20211020194502-create-user.js @@ -26,7 +26,7 @@ module.exports = { }, }); }, - down: async (queryInterface, Sequelize) => { + down: async (queryInterface, _Sequelize) => { await queryInterface.dropTable('Users'); }, -}; \ No newline at end of file +};