From ce48ce33eb0b4939a0fd0b31c481e135c8f4184f Mon Sep 17 00:00:00 2001 From: Tmadkaud Date: Mon, 14 May 2018 11:06:01 +0200 Subject: [PATCH] supprimer dossier et supprimer file --- routes/api.js | 16 ++++++++++++++-- src/app/book/book.component.html | 9 +++++++-- src/app/book/book.component.ts | 27 +++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/routes/api.js b/routes/api.js index 70995f2..b49a154 100644 --- a/routes/api.js +++ b/routes/api.js @@ -9,7 +9,7 @@ var User = require("../models/user"); var FileMongo = require("../models/FileMongo"); var FolderMongo = require("../models/FolderMongo"); var Book = require("../models/book"); - +var fs = require('fs'); var multer = require('multer'); var upload = multer({ dest: './public/' }); @@ -60,15 +60,27 @@ router.post('/createFolder', function(req, res, next) { /* DELETE FILE */ router.post('/deleteFileMongo', function(req, res, next) { - FileMongo.remove(req.body, function (err, post) { if (err){ return next(err); } + //Delete file multer dans Public + fs.unlink('./public/' + req.body._id); res.json(post); + }); }); +/* DELETE FOLDER */ +router.post('/deleteFolderMongo', function(req, res, next) { + FolderMongo.remove({_id : req.body._id, name: req.body.name, owner: req.body.owner}, function (err, post) { + if (err){ + return next(err); + } + res.json(post); + + }); +}); router.post('/getMainFolder', function(req, res) { FolderMongo.findOne({ diff --git a/src/app/book/book.component.html b/src/app/book/book.component.html index 9035259..5e878d6 100644 --- a/src/app/book/book.component.html +++ b/src/app/book/book.component.html @@ -38,7 +38,10 @@ - + + + + {{ folder.name }} {{ folder.taille}} Mo Folder @@ -46,7 +49,9 @@ - {{ i + 1 }} + + + {{ file.name }} {{ file.taille / ( 1024 * 1024 ) | number : '1.2-2'}} Mo {{ file.extention }} diff --git a/src/app/book/book.component.ts b/src/app/book/book.component.ts index 5fd788a..48c5828 100644 --- a/src/app/book/book.component.ts +++ b/src/app/book/book.component.ts @@ -47,6 +47,33 @@ export class BookComponent implements OnInit, OnDestroy { }); } + deleteFile(fileToDelete) { + this.http.post('/api/deleteFileMongo', fileToDelete).subscribe(file => { + console.log('deletteeeee file : ' + JSON.stringify(file)); + console.log('deletteeeee file this.mainFolder.path: ' + this.mainFolder.path.toString()); + + this.openFolder(this.mainFolder.path); + // if (file) { + // this.allUserFile = file; + // } else { + // this.allUserFile = []; + // } + }); + } + + deleteFolder(folderToDelete) { + this.http.post('/api/deleteFolderMongo', folderToDelete).subscribe(folder => { + console.log('deletteeeee folder : ' + JSON.stringify(folder)); + console.log('deletteeeee folder this.mainFolder.path: ' + this.mainFolder.path.toString()); + + this.openFolder(this.mainFolder.path); + // if (file) { + // this.allUserFile = file; + // } else { + // this.allUserFile = []; + // } + }); + } getfiles() { this.http.post('/api/getFileList', {mainPath : this.mainFolder.path, owner: this.currentUser.username.toString()}).subscribe(files => { if (files) {