From d8c540d15199900ef8e0e0c7d3811fc356044fba Mon Sep 17 00:00:00 2001 From: Tmadkaud Date: Fri, 18 May 2018 12:38:26 +0200 Subject: [PATCH] preview all files --- models/FileMongo.js | 4 ++ routes/api.js | 16 ++++++++ src/app/book/book.component.html | 43 ++++++++++++------- src/app/book/book.component.ts | 66 +++++++++++------------------- src/app/login/login.component.html | 4 +- 5 files changed, 76 insertions(+), 57 deletions(-) diff --git a/models/FileMongo.js b/models/FileMongo.js index 5f7d091..5dd9fd9 100644 --- a/models/FileMongo.js +++ b/models/FileMongo.js @@ -33,6 +33,10 @@ var FileMongoShema = new Schema({ lastDate: { type: String, unique: false + }, + url: { + type: String, + unique: false } }); diff --git a/routes/api.js b/routes/api.js index 9cb3e0b..53cdeed 100644 --- a/routes/api.js +++ b/routes/api.js @@ -80,6 +80,22 @@ router.post('/uploadFileMongo', function(req, res, next) { }); }); +/* SAVE URL FILE */ +router.post('/saveURLFileMongo', function(req, res, next) { + console.log("New File data req.body", JSON.stringify(req.body)); + + FileMongo.findOneAndUpdate({_id : req.body._id, owner: req.body.owner}, {url: req.body.url},{new: true}).then((data) =>{ + if(data === null){ + throw new Error('File Not Found'); + } + res.json({ message: 'File updated!' }); + }).catch( (error) => { + //Deal with all your errors here with your preferred error handle middleware / method + res.status(500).json({ message: 'Some Error!' }); + console.log(error); + }); +}); + /* SAVE FOLDER */ router.post('/createFolder', function(req, res, next) { FolderMongo.create(req.body, function (err, post) { diff --git a/src/app/book/book.component.html b/src/app/book/book.component.html index cb0841f..3a79fed 100644 --- a/src/app/book/book.component.html +++ b/src/app/book/book.component.html @@ -62,7 +62,7 @@ - + @@ -80,31 +80,46 @@ {{ file.type }} {{ file.lastDate }}
- +
- +
- + + + +
- + - --> +
- + show me--> + +
-
+
+ + + +
+
- + @@ -123,11 +138,11 @@
- + \ No newline at end of file diff --git a/src/app/book/book.component.ts b/src/app/book/book.component.ts index 6d77d79..ae9837c 100644 --- a/src/app/book/book.component.ts +++ b/src/app/book/book.component.ts @@ -9,6 +9,7 @@ import {Form} from "@angular/forms"; import * as formData from 'form-data'; import {forEach} from '@angular/router/src/utils/collection'; import {type} from 'os'; +import { DomSanitizer } from '@angular/platform-browser'; @Component({ selector: 'app-book', @@ -28,7 +29,7 @@ export class BookComponent implements OnInit, OnDestroy { inputCreateFolder: String; reader: FileReader; test: String; - constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute) { + constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public sanitizer: DomSanitizer) { this.isClickCreateFolder = false; this.fileChooseName = 'None'; this.filesToUpload = []; @@ -77,6 +78,14 @@ export class BookComponent implements OnInit, OnDestroy { console.log('data : ' + data); }); } + saveURLFileMongo(fileToCreateURL){ + fileToCreateURL.url = '../../../public/' + fileToCreateURL._id.toString() + this.getStringExtention(fileToCreateURL); + + this.http.post('/api/saveURLFileMongo', fileToCreateURL).subscribe(data => { + console.log('data : ' + data); + }); + } + getfiles() { //var preview = document.querySelector('img'); @@ -86,46 +95,13 @@ export class BookComponent implements OnInit, OnDestroy { this.http.post('/api/getFileList', {mainPath : this.mainFolder.path, owner: this.currentUser.username.toString()}).subscribe(files => { if (files) { - // this.allUserFile = files; + this.allUserFile = files; - - - // for (let f of this.allUserFile) { - // - // console.log('f.type : ' + f.type); - // - // - // /* - // var textFileAsBlob = new Blob([f.blob], { - // type: 'text/plain' - // });*/ - // - // if (f.type === ('text/plain')) { - // JSON.stringify(f); - // //f.function( fii => { - // this.reader = new FileReader(); - // var ff = new Blob([JSON.stringify(f, null, 2)], {type: 'text/plain'}) - // var me = this; - // this.reader.onload = function(e:any) { - // me.test = e.target.result; - // console.log('meee.test : ' + JSON.stringify(e.target.result)); - // }; - // //ff.type = f.type; - // //ff.size = f.taille; - // //ff.slice(f); - // var gugu = new File(('../../../public/' + f._id)[], f.name); - // this.reader.readAsText('../../../public/' + f._id.toString(), f.name); - // - // //console.log('couilles : ' + meee.reader.readAsText(fii)); - // - // //console.log('couilles : ' + JSON.stringify(f)); - // //}); - // - // - // } - // } - + for (let f of this.allUserFile) { + f.data = f.url; + f.url = this.sanitizer.bypassSecurityTrustResourceUrl(f.url); + } } else { this.allUserFile = []; } @@ -157,6 +133,7 @@ export class BookComponent implements OnInit, OnDestroy { this.mainFolder = folder; this.getfolders(); this.getfiles(); + } else { if (path === 'Home'){ this.http.post('api/createFolder', { name: 'Home', parent: '', path: 'Home', taille: 'taiile', idUser: this.currentUser._id.toString(), fileList: [], folderList: [], owner: this.currentUser.username.toString() }).subscribe(resp => { @@ -192,7 +169,8 @@ export class BookComponent implements OnInit, OnDestroy { upload() { if(this.mainFolder !== undefined){ - this.http.post('api/uploadFileMongo', { name: this.fileChooseName.toString(), path: this.mainFolder.path.toString(), type: this.filesToUpload[0].type.toString(), taille: this.filesToUpload[0].size.toString(), idUser: this.currentUser._id.toString(), owner: this.currentUser.username.toString(), lastDate: Date.now().toString(), data: ''}).subscribe(resp => { + this.http.post('api/uploadFileMongo', { name: this.fileChooseName.toString(), path: this.mainFolder.path.toString(), type: this.filesToUpload[0].type.toString(), taille: this.filesToUpload[0].size.toString(), idUser: this.currentUser._id.toString(), owner: this.currentUser.username.toString(), lastDate: Date.now().toString(), url: ''}).subscribe(resp => { + this.saveURLFileMongo(resp); this.makeFileRequest('http://localhost:3000/api/upload', [], this.filesToUpload, resp).then((result) => { this.getfiles(); this.filesToUpload = null; @@ -216,7 +194,7 @@ export class BookComponent implements OnInit, OnDestroy { var formData: any = new FormData(); var xhr = new XMLHttpRequest(); - formData.append("public[]", files[0], monFile._id); + formData.append("public[]", files[0], monFile._id + this.getStringExtention(monFile)); xhr.onreadystatechange = function () { if (xhr.readyState == 4) { if (xhr.status == 200) { @@ -232,4 +210,10 @@ export class BookComponent implements OnInit, OnDestroy { }); } + + getStringExtention(monFile: any){ + return ( monFile.name.indexOf('.') > 0 ) ? '.' + monFile.name.split('.').pop().toLowerCase() : ''; + } } + + diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index c1d94f5..80de6d0 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -19,5 +19,5 @@ - - \ No newline at end of file + + \ No newline at end of file