/api/computers and /api/printers added

server/controller/api/computers.js

@@ -1,22 +1,32 @@
-const activoFijo = require('../../models/tablas/ActivoFijo');
-const DescripcionAdicional = require('../../models/tablas/DescripcionAdicional');
-const Equipo = require('../../models/tablas/Equipo');
-const Inventario = require('../../models/tablas/Inventario');
-const Marca = require('../../models/tablas/Marca');
-const OS = require('../../models/tablas/OS');
-const Printers = require('../../models/tablas/Printers');
-const Tipo = require('../../models/tablas/Tipo');
-const Ubicacion = require('../../models/tablas/Ubicacion');
-const UResponsable = require('../../models/tablas/UResponsable');
-const Uso = require('../../models/tablas/Uso');
+const sequelize = require('../../config/sequelize.conf');
 
-const jwt = require('jsonwebtoken');
+const { QueryTypes } = require('sequelize');
 
-const computers = (req, res) => {
+
+const computers = async(req, res) => {
     // res.json({
     //     message: "Listo"
     // });
 
+    await sequelize.query(`
+        SELECT I.noInventario, AF.activoFijo, E.modelo, M.marca, E.noSerie, E.procesador, E.hdd, E.memoriasz, E.memoria, E.vMemoria, E.graficos, OS.osname, UR.uResponsable, UR.nombreResponsable, Ub.ubicacion, U.uso, I.noResguardo
+        FROM inventario I
+        INNER JOIN activoFijo AF ON AF.idActivoFijo = I.idActivoFijo
+        INNER JOIN equipo E ON E.noInventario = I.noInventario
+        INNER JOIN marca M ON M.idMarca = E.idMarca
+        INNER JOIN OS ON OS.idOS = E.idOS
+        INNER JOIN uResponsable UR ON UR.idUnidadResponsable = I.idUnidadResponsable
+        INNER JOIN ubicacion Ub ON Ub.idUbicacion = I.idUbicacion
+        INNER JOIN  uso U ON U.idUso = I.idUso
+        ORDER BY AF.activoFijo`, { type: QueryTypes.SELECT })
+        .then(equipo => {
+            return res.json({
+                equipo
+            })
+        })
+        .catch(error => res.status(500).json({
+            error
+        }));
 
 }
 

server/controller/api/printers.js

@@ -0,0 +1,26 @@
+const sequelize = require('../../config/sequelize.conf');
+
+const { QueryTypes } = require('sequelize');
+
+const printers = async(req, res) => {
+
+    await sequelize.query(`
+            SELECT I.noInventario, T.tipo, P.modelo, M.marca, P.noSerie, P. descripcion
+            FROM inventario I
+            INNER JOIN printers P ON P.noInventario = I.noInventario
+            INNER JOIN marca M ON M.idMarca = P.idMarca
+            INNER JOIN tipo T ON T.idTipo = P.idTipo
+            ORDER BY T.tipo
+        `, { type: QueryTypes.SELECT })
+        .then(printers => {
+            return res.json({
+                printers
+            });
+        })
+        .catch(error => res.status(500).json({
+            error
+        }));
+
+}
+
+module.exports = printers;

server/controller/login/post.js

@@ -8,45 +8,47 @@ const post = async(req, res) => {
 
     const body = req.body;
 
-    const user = await Admin.findOne({
-        where: {
-            name: body.name,
-        },
-    });
-
-    if (user == null) {
-        console.log("Invalid user or password");
-        return res.status(500).json({
-            err: {
-                message: "Invalid user or password"
-            }
+    await Admin.findOne({
+            where: {
+                name: body.name,
+            },
         })
-    }
-
-    if (!bcrypt.compareSync(body.password, user.password)) {
-        console.log('Invalid user or password');
-        return res.json({
-            err: {
-                message: 'Invalid user or password'
+        .then((user) => {
+            if (!bcrypt.compareSync(body.password, user.password)) {
+                console.log('Invalid user or password');
+                return res.json({
+                    err: {
+                        message: 'Invalid user or password'
+                    }
+                })
             }
+
+            let token = jwt.sign({
+                user
+            }, process.env.TOKEN_SEED, { expiresIn: process.env.TOKEN_EXP });
+
+            res.json({
+                user,
+                token
+            })
         })
-    }
+        .catch(() => {
+            console.log("Invalid user or password");
+            return res.status(500).json({
+                err: {
+                    message: "Invalid user or password"
+                }
+            });
 
-    let token = jwt.sign({
-        user
-    }, process.env.TOKEN_SEED, { expiresIn: process.env.TOKEN_EXP });
+        });;
 
-    if (typeof localStorage === "undefined" || localStorage === null) {
-        var LocalStorage = require('node-localstorage').LocalStorage;
-        localStorage = new LocalStorage('./scratch');
-    }
-    localStorage.setItem('token', token);
+    // if (typeof localStorage === "undefined" || localStorage === null) {
+    // var LocalStorage = require('node-localstorage').LocalStorage;
+    // localStorage = new LocalStorage('./scratch');
+    // }
+    // localStorage.setItem('token', token);
 
 
-    res.json({
-        user,
-        token
-    })
 
 
 }