Commit968a44e

Filip Hric

committed

refactor image upload

1 parent88153b8 commit968a44eCopy full SHA for 968a44e

File tree

+23

-15

lines changed

+23

-15

lines changed

Lines changed: 20 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,28 +5,39 @@ const socket = require('socket.io-client')('http://localhost:3001');`
`5`	`5`
`6`	`6`	`module.exports=(req,res,next)=>{`
`7`	`7`
`8`		`-const{ db}=req.app;`
`9`		`-`
	`8`	`+const{app:{db}, query}=req;`
	`9`	`+`
`10`	`10`	`// prevent from caching database.json file`
`11`	`11`	`// this is different from nocache(), which prevents 304 status codes`
`12`	`12`	`db.assign(`
`13`	`13`	`require('import-fresh')('./backend/data/database.json')`
`14`		`-).write();`
`15`		`-`
`16`		`-if(req.method==='POST'&&req.path==='/upload'){`
`17`		`-constcardid=req.headers.cardid;`
	`14`	`+).write();`
	`15`	`+`
	`16`	`+if(req.method==='POST'&&req.path==='/upload'){`
	`17`	`+constcardId=req.query.card;`
`18`	`18`
`19`	`19`	`letfstream;`
`20`	`20`	`req.pipe(req.busboy);`
`21`	`21`	`req.busboy.on('file',(fieldname,file,filename)=>{`
`22`	`22`	`fstream=fs.createWriteStream(`
`23`		-`${__dirname}/data/uploaded/${cardid}_${filename}`
	`23`	+`${__dirname}/data/uploaded/${cardId}_${filename}`
`24`	`24`	`);`
`25`	`25`	`file.pipe(fstream);`
`26`	`26`	`fstream.on('close',()=>{`
	`27`	`+`
	`28`	`+constcurrentCard=db`
	`29`	`+.get('cards')`
	`30`	`+.find({id:Number(query.card)})`
	`31`	`+.value();`
	`32`	`+`
	`33`	+currentCard.image=`/data/uploaded/${cardId}_${filename}`
	`34`	`+`
	`35`	`+db.get('cards')`
	`36`	`+.find({id:Number(query.card)}).write(currentCard)`
	`37`	`+`
`27`	`38`	`res`
`28`		`-.status(201)`
`29`		-.jsonp({path:`/data/uploaded/${cardid}_${filename}`});
	`39`	`+.status(200)`
	`40`	`+.jsonp(currentCard);`
`30`	`41`	`});`
`31`	`42`	`});`
`32`	`43`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,14 @@ export const uploadFile = async function (this: any, card: Card, acceptFile?: Fi`
`7`	`7`	`const{ id}=card;`
`8`	`8`	`file&&formData.append('image',file);`
`9`	`9`	`axios`
`10`		`-.post('/api/upload',formData,{`
	`10`	+.post(`/api/upload?card=${id}`,formData,{
`11`	`11`	`headers:{`
`12`		`-'Content-Type':'multipart/form-data',`
`13`		`-cardid:idasunknownasstring,`
	`12`	`+'Content-Type':'multipart/form-data'`
`14`	`13`	`},`
`15`	`14`	`})`
`16`	`15`	`.then((upload)=>{`
`17`	`16`	`this.showNotification('File was sucessfully uploaded',false);`
`18`		`-constuploadedImagePath=upload.data.path;`
`19`		`-`
`20`		`-this.patchCard(card,{image:uploadedImagePath});`
	`17`	`+this.activeCard=upload.data;`
`21`	`18`	`})`
`22`	`19`	`.catch(()=>{`
`23`	`20`	`this.showNotification('There was an error uploading file',true);`

Comments

(0)