n0rdye/puzzle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

object image fixes

Browse Source
This commit is contained in:
N0rdye 2023-10-06 02:09:13 +05:00
parent 55df06fb2e
commit bc4de6510a
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
object.js
View File

@ -55,12 +55,14 @@ module.exports.new = (inp,cook,res)=>{
}) })
}) })
function save_img(data,name,callback) { function save_img(data,name,callback) {
if(data.split("/img/").at(-1) != "placeholder.png"){
let img = imageDataURI.decode(data); let img = imageDataURI.decode(data);
if (!fs.existsSync(`public/img/object/${name}`)){fs.mkdirSync(`public/img/object/${name}`);} 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,()=>{ 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(callback)callback(`/img/object/${name}/main.${img.imageType.split("/").at(-1)}`);
}); });
} }
}
} catch (error) { } catch (error) {
func.log("backend object creating error - "+error); func.log("backend object creating error - "+error);
} }
@ -139,12 +141,14 @@ module.exports.save = (inp,cook,res)=>{
}) })
function save_img(data,name,callback) { function save_img(data,name,callback) {
if(data.split("/img/").at(-1) != "placeholder.png"){
let img = imageDataURI.decode(data); let img = imageDataURI.decode(data);
if (!fs.existsSync(`public/img/object/${name}`)){fs.mkdirSync(`public/img/object/${name}`);} 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,()=>{ 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(callback)callback(`/img/object/${name}/main.${img.imageType.split("/").at(-1)}`);
}); });
} }
}
}) })
}) })

BIN
public/img/object/KeyBoard~g~не$основное/main.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

9
views/admin/objects/object_creation.ejs
View File

@ -165,7 +165,7 @@
name_div.value = name; name_div.value = name;
img_file.value = null; img_file.value = null;
img_prev.src = getBase64Image(img); img_prev.src = img;
img_prev.style.height = `${height* cm_mult}px`; img_prev.style.height = `${height* cm_mult}px`;
img_prev.style.width = `${width* cm_mult}px`; img_prev.style.width = `${width* cm_mult}px`;
cost_text.value = cost; cost_text.value = cost;
@ -194,9 +194,10 @@
} }
function new_obj(cost,name,img,height,width,gid,colors,callback){ function new_obj(cost,name,img,height,width,gid,colors,callback){
let wait_msg = msg("добавление товара",{type:"wait"});
if(gid != null){ if(gid != null){
if(name!=""){ if(name!=""){
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}) $.post( "/admin/objects/new", { cost:cost,name:name,img:img,height:height,width:width,gid:gid,colors:colors})
.done(function( res ) { .done(function( res ) {
// if(res["out"] == "good"){ // if(res["out"] == "good"){
@ -206,6 +207,10 @@
callback(res); callback(res);
}); });
} }
else{
msg("Изображение не выбрано",{type:"warning"})
}
}
else{ else{
msg("название не должно быть пустым",{type:"warning"}) msg("название не должно быть пустым",{type:"warning"})
} }