diff --git a/src/app.js b/src/app.js index 88de483..878933a 100644 --- a/src/app.js +++ b/src/app.js @@ -6,6 +6,7 @@ const cloud_file = require('express-fileupload'); const myConecction = require('express-myconnection'); var puerto = 3001; +global.config = require('./config.js'); const app = express(); //importando rutas @@ -18,18 +19,20 @@ const cloud_rutas = require('./rutas/rt_cloud'); app.set('port',process.env.PORT||puerto); app.set('view engine','ejs'); app.set('views',path.join(__dirname, 'views')); +app.locals = global.config; +//app.locals.pretty;//true minificado//false minificado //app.set('vistas',path.join(__dirname, 'vistas')); //middlewares app.use(express.static(__dirname+'/public'));//para usar la carpeta public *js*css*img app.use(morgan('dev')); app.use(myConecction(mysql,{ - //host:'192.168.10.50', - host:'172.17.0.2', - user:'admin', - password:'Dx.1706%', - port:3306, - database:'TELCOTRONICS' + host:global.config.db.host, + //host:'172.17.0.2', + user: global.config.db.user, + password:global.config.db.pswd, + port:global.config.db.port, + database:global.config.db.db_a },'single')); //cuando reciba dato desde req body app.use(express.json({limit: '25mb'})); diff --git a/src/config.js b/src/config.js new file mode 100644 index 0000000..78b4ea4 --- /dev/null +++ b/src/config.js @@ -0,0 +1,16 @@ +const config = { + db:{ + host: '192.168.10.150', + port: 3306, + user: 'admin', + pswd: 'Dx.1706%', + db_a: 'TELCOTRONICS', + debg: false, + sock: '/' + }, + dir:{ + root_dir: '/home/pablinux/Projects/Node/APP-SIGMA-WEB/src/public/files/', + path_dir: __dirname, + }, +} +module.exports = config; \ No newline at end of file diff --git a/src/controladores/controlador_cloud.js b/src/controladores/controlador_cloud.js index 542c8ab..676897e 100644 --- a/src/controladores/controlador_cloud.js +++ b/src/controladores/controlador_cloud.js @@ -1,12 +1,13 @@ const controlador={}; -const dirPath = "/home/pablinux/Projects/Node/APP-SIGMA-WEB/src/public/files/"; +//const dirPath = "/home/pablinux/Projects/Node/APP-SIGMA-WEB/src/public/files/"; +//const var_locals = ; //********* APP-panel control ********// controlador.upload = (req, res) => { if(!req.files||Object.keys(req.files).lenght===0){ return res.status(400).send({message:'archivos no cargados'}); }else{ const file = req.files.file_toUpload; - const path = dirPath + file.name; + const path = req.app.locals.dir.path_dir+'/public/files/' + file.name; console.log(path); file.mv(path, (err) => { if (err) { @@ -25,18 +26,21 @@ const procesarPath = (path) => { const fs = require('fs'); function leer_dir(dir){ var json = []; - var files = fs.readdirSync(dirPath,{ withFileTypes: true }); + var files = fs.readdirSync(dir+'/public/files/',{ withFileTypes: true }); files.forEach(function(arch,idx){ json.push({"indice": idx, "archivo": arch.name,"link":"files/"+arch}); //console.log(arch.name); + //console.log(req); }); return json; } +//ojo la var locals esta en req +//ejmp: req.app.locals controlador.ver_dirActual = (req, res) => { let dir = procesarPath(req.params.path); - var files = leer_dir("files"); - //res.render('cloud'); + var files = leer_dir(req.app.locals.dir.path_dir); + console.log(req.app.locals.dir); res.render('cloud',{ data:files }); diff --git a/src/rutas/rt_cloud.js b/src/rutas/rt_cloud.js index 41cdcaa..a381049 100644 --- a/src/rutas/rt_cloud.js +++ b/src/rutas/rt_cloud.js @@ -4,6 +4,5 @@ const rutas = express.Router(); const controlador_cloud = require('../controladores/controlador_cloud'); //para cargar archivos rutas.post('/upload', controlador_cloud.upload);//ver productos en modo json/get -rutas.get('/cloud/', controlador_cloud.ver_dirActual);//ver productos en modo json/get - +rutas.get('/cloud/', controlador_cloud.ver_dirActual);//ver direcctorio actual module.exports = rutas;