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 5a14777..0000000 Binary files a/public/img/object/KeyBoard~g~не$основное/main.jpg and /dev/null differ 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"})