diff --git a/package-lock.json b/package-lock.json index 4d58eb9..2ef9197 100644 --- a/package-lock.json +++ b/package-lock.json @@ -456,6 +456,15 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "crypto-random-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", diff --git a/package.json b/package.json index eed180f..72ea56b 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "bcrypt": "^5.0.0", "body-parser": "^1.19.0", "colors": "^1.4.0", + "cors": "^2.8.5", "csv-parser": "^2.3.3", "dotenv": "^8.2.0", "express": "^4.17.1", diff --git a/src/app.js b/src/app.js index 5594c44..1b2e486 100644 --- a/src/app.js +++ b/src/app.js @@ -7,10 +7,6 @@ const bodyParser = require('body-parser') app.use(cors()) -app.get('/', function (req, res) { - res.send('API PCPUMA') -}) - app.use( bodyParser.urlencoded({ extended: false, @@ -18,8 +14,11 @@ app.use( ) app.use(bodyParser.json()) + +app.get('/', (req, res) => res.send('API PCPUMA')) + app.use(require('./routes/index')) -app.listen(process.env.PORT, function () { +app.listen(process.env.PORT, () => console.log(`API PCPUMA corriendo en el puerto: ${process.env.PORT}`.rainbow) -}) +) diff --git a/src/config/config.js b/src/config/config.js index ef37bdf..1096e48 100644 --- a/src/config/config.js +++ b/src/config/config.js @@ -10,16 +10,16 @@ try { console.log('El archivo .env no se cargo.'.underline.bold.red) } -process.env.TYPEDB = process.env.TYPEDB +// process.env.TYPEDB = process.env.TYPEDB -process.env.DB = process.env.DB +// process.env.DB = process.env.DB -process.env.USERDB = process.env.USERDB +// process.env.USERDB = process.env.USERDB -process.env.PASSWORDDB = process.env.PASSWORDDB +// process.env.PASSWORDDB = process.env.PASSWORDDB -process.env.HOSTDB = process.env.HOSTDB +// process.env.HOSTDB = process.env.HOSTDB -process.env.PORT = process.env.PORT +// process.env.PORT = process.env.PORT -process.env.PORT = process.env.SALT_ROUNDS +// process.env.SALT_ROUNDS = process.env.SALT_ROUNDS diff --git a/src/controller/equipo/get.js b/src/controller/equipo/get.js new file mode 100644 index 0000000..8684547 --- /dev/null +++ b/src/controller/equipo/get.js @@ -0,0 +1,11 @@ +const Equipo = require('../../db/tables/Equipo') + +const get = async (body) => { + return Equipo.findOne({ where: { idEquipo: body.idEquipo } }) + .then((res) => { + return res + }) + .catch((err) => {}) +} + +module.exports = get diff --git a/src/controller/usuario/create.js b/src/controller/usuario/create.js index 7000636..5bca1b4 100644 --- a/src/controller/usuario/create.js +++ b/src/controller/usuario/create.js @@ -26,7 +26,7 @@ const create = (body) => { module.exports = create // create({ -// idUsuario: '316313528', +// idUsuario: 316313528, // password: 'hola', // nombre: 'Lemuel Helon', // apPaterno: 'Márquez', diff --git a/src/controller/usuario/get.js b/src/controller/usuario/get.js index 57d1fb5..b8fdcfb 100644 --- a/src/controller/usuario/get.js +++ b/src/controller/usuario/get.js @@ -1,6 +1,7 @@ const Usuario = require('../../db/tables/Usuario') const get = async (body) => { + console.log(body) return Usuario.findAll({ where: { idUsuario: body.idUsuario } }) .then((res) => { return res diff --git a/src/controller/usuario/login.js b/src/controller/usuario/login.js index a94192c..8071385 100644 --- a/src/controller/usuario/login.js +++ b/src/controller/usuario/login.js @@ -2,16 +2,19 @@ const bcrypt = require('bcrypt') const Usuario = require('../../db/tables/Usuario') const login = (body) => { - return Usuario.findOne({ where: { idUsuario: body.idUsuario } }) - .then((res) => { + return Usuario.findOne({ where: { idUsuario: body.idUsuario } }).then( + (res) => { if (res) { if (!bcrypt.compareSync(body.password, res.password)) throw new Error('El usuario o contraseña son incorrectos.') return { res } } throw new Error('El usuario o contraseña son incorrectos.') - }) - .catch((err) => {}) + } + ) + // .catch((err) => { + // console.log(err) + // }) } module.exports = login diff --git a/src/routes/carrera.js b/src/routes/carrera.js new file mode 100644 index 0000000..e69de29 diff --git a/src/routes/equipo.js b/src/routes/equipo.js new file mode 100644 index 0000000..e69de29 diff --git a/src/routes/horario.js b/src/routes/horario.js new file mode 100644 index 0000000..e69de29 diff --git a/src/routes/index.js b/src/routes/index.js index 593c07a..e9c52e5 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -2,6 +2,6 @@ const express = require('express') const app = express() // app.use(require('./')) -// app.use(require('./usuario')) +app.use(require('./usuario')) module.exports = app diff --git a/src/routes/operador.js b/src/routes/operador.js new file mode 100644 index 0000000..e69de29 diff --git a/src/routes/plantel.js b/src/routes/plantel.js new file mode 100644 index 0000000..e69de29 diff --git a/src/routes/prestamo.js b/src/routes/prestamo.js new file mode 100644 index 0000000..e69de29 diff --git a/src/routes/usuario.js b/src/routes/usuario.js new file mode 100644 index 0000000..e7f7c1d --- /dev/null +++ b/src/routes/usuario.js @@ -0,0 +1,39 @@ +const express = require('express') +const app = express() +const get = require('../controller/usuario/get') +const create = require('../controller/usuario/create') +const login = require('../controller/usuario/login') +const route = '/usuario' + +app.get(`${route}`, (req, res) => { + return get(req.query) + .then((data) => { + res.status(200).json(data) + }) + .catch((err) => { + res.status(400).json({ err: err.message }) + }) +}) + +app.post(`${route}/create`, (req, res) => { + return create(req.body) + .then((data) => { + res.status(200).json(data) + }) + .catch((err) => { + res.status(400).json({ err: err.message }) + }) +}) + +app.post(`${route}/login`, (req, res) => { + return login(req.body) + .then((data) => { + res.status(200).json(data) + }) + .catch((err) => { + console.log(err.message) + res.status(400).json({ err: err.message }) + }) +}) + +module.exports = app