diff --git a/server/controller/api/tipo.js b/server/controller/api/tipo.js
new file mode 100644
index 0000000..240185e
--- /dev/null
+++ b/server/controller/api/tipo.js
@@ -0,0 +1,25 @@
+const sequelize = require('../../config/sequelize.conf');
+
+const { QueryTypes } = require('sequelize');
+
+
+const tipo = async(req, res) => {
+    // res.json({
+    //     message: "Listo"
+    // });
+
+    await sequelize.query(`
+        SELECT idActivoFijo, activoFijo
+        FROM activoFijo`, { type: QueryTypes.SELECT })
+        .then(tipo => {
+            return res.json({
+                tipo
+            })
+        })
+        .catch(error => res.status(500).json({
+            error
+        }));
+
+}
+
+module.exports = tipo;
\ No newline at end of file
diff --git a/server/controller/user/computers/get.js b/server/controller/user/computers/get.js
index f50a288..38b9695 100644
--- a/server/controller/user/computers/get.js
+++ b/server/controller/user/computers/get.js
@@ -7,7 +7,7 @@ const get = async(req, res) => {
     // res.json({
     //     message: "Listo"
     // });
-
+    //console.log(req["tipo"].value);
     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
diff --git a/server/routes/user.js b/server/routes/user.js
index 2e08a86..7b3411a 100644
--- a/server/routes/user.js
+++ b/server/routes/user.js
@@ -5,6 +5,12 @@ let app = express();
 // const printers = require('../controller/user/printers/get');
 const computers = require('../controller/user/computers/get');
 const printers = require('../controller/user/printers/get');
+
+// const computers = require('../controller/api/computers');
+// const printers = require('../controller/api/printers');
+
+const tipo = require('../controller/api/tipo');
+
 const { verifyToken, verifyAdmin } = require('../middlewares/authentication');
 
 const computersRoute = '/api/computers';
@@ -26,6 +32,11 @@ app.get(printersRoute, verifyToken, (req, res) => {
 
 });
 
+app.get('/api/tipo', verifyToken, (req, res) => {
+
+    return tipo(req, res);
+
+});
 
 
 module.exports = app;
\ No newline at end of file