From bc4de6510af22030acc38d17701bb822ed9cfa5f Mon Sep 17 00:00:00 2001 From: N0rdye Date: Fri, 6 Oct 2023 02:09:13 +0500 Subject: [PATCH] object image fixes --- object.js | 24 ++++++++++------- .../object/KeyBoard~g~не$основное/main.jpg | Bin 17963 -> 0 bytes views/admin/objects/object_creation.ejs | 25 +++++++++++------- 3 files changed, 29 insertions(+), 20 deletions(-) delete mode 100644 public/img/object/KeyBoard~g~не$основное/main.jpg diff --git a/object.js b/object.js index 997eb71..40addae 100644 --- a/object.js +++ b/object.js @@ -55,11 +55,13 @@ module.exports.new = (inp,cook,res)=>{ }) }) function save_img(data,name,callback) { - let img = imageDataURI.decode(data); - if (!fs.existsSync(`public/img/object/${name}`)){fs.mkdirSync(`public/img/object/${name}`);} - fs.writeFile(`public/img/object/${name}/main.${img.imageType.split("/").at(-1)}`, img.dataBuffer,()=>{ - if(callback)callback(`/img/object/${name}/main.${img.imageType.split("/").at(-1)}`); - }); + if(data.split("/img/").at(-1) != "placeholder.png"){ + let img = imageDataURI.decode(data); + if (!fs.existsSync(`public/img/object/${name}`)){fs.mkdirSync(`public/img/object/${name}`);} + fs.writeFile(`public/img/object/${name}/main.${img.imageType.split("/").at(-1)}`, img.dataBuffer,()=>{ + if(callback)callback(`/img/object/${name}/main.${img.imageType.split("/").at(-1)}`); + }); + } } } catch (error) { func.log("backend object creating error - "+error); @@ -139,11 +141,13 @@ module.exports.save = (inp,cook,res)=>{ }) function save_img(data,name,callback) { - let img = imageDataURI.decode(data); - if (!fs.existsSync(`public/img/object/${name}`)){fs.mkdirSync(`public/img/object/${name}`);} - fs.writeFile(`public/img/object/${name}/main.${img.imageType.split("/").at(-1)}`, img.dataBuffer,()=>{ - if(callback)callback(`/img/object/${name}/main.${img.imageType.split("/").at(-1)}`); - }); + if(data.split("/img/").at(-1) != "placeholder.png"){ + let img = imageDataURI.decode(data); + if (!fs.existsSync(`public/img/object/${name}`)){fs.mkdirSync(`public/img/object/${name}`);} + fs.writeFile(`public/img/object/${name}/main.${img.imageType.split("/").at(-1)}`, img.dataBuffer,()=>{ + if(callback)callback(`/img/object/${name}/main.${img.imageType.split("/").at(-1)}`); + }); + } } }) diff --git a/public/img/object/KeyBoard~g~не$основное/main.jpg b/public/img/object/KeyBoard~g~не$основное/main.jpg deleted file mode 100644 index 5a14777b1aae2744cdee525878cdbcbca0cf2953..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17963 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 diff --git a/views/admin/objects/object_creation.ejs b/views/admin/objects/object_creation.ejs index f405097..94c075c 100644 --- a/views/admin/objects/object_creation.ejs +++ b/views/admin/objects/object_creation.ejs @@ -165,7 +165,7 @@ name_div.value = name; img_file.value = null; - img_prev.src = getBase64Image(img); + img_prev.src = img; img_prev.style.height = `${height* cm_mult}px`; img_prev.style.width = `${width* cm_mult}px`; cost_text.value = cost; @@ -194,17 +194,22 @@ } function new_obj(cost,name,img,height,width,gid,colors,callback){ - let wait_msg = msg("добавление товара",{type:"wait"}); if(gid != null){ if(name!=""){ - $.post( "/admin/objects/new", { cost:cost,name:name,img:img,height:height,width:width,gid:gid,colors:colors}) - .done(function( res ) { - // if(res["out"] == "good"){ - // console.log(res["body"]); - // } - msg_del(wait_msg.id); - callback(res); - }); + if(img.split("/img/").at(-1) != "placeholder.png"){ + let wait_msg = msg("добавление товара",{type:"wait"}); + $.post( "/admin/objects/new", { cost:cost,name:name,img:img,height:height,width:width,gid:gid,colors:colors}) + .done(function( res ) { + // if(res["out"] == "good"){ + // console.log(res["body"]); + // } + msg_del(wait_msg.id); + callback(res); + }); + } + else{ + msg("Изображение не выбрано",{type:"warning"}) + } } else{ msg("название не должно быть пустым",{type:"warning"})