diff --git a/db.js b/db.js index 1cfcaa3..b64e727 100644 --- a/db.js +++ b/db.js @@ -1,6 +1,6 @@ const mysql = require('mysql'); const vars = require('./vars'); -const db_host = "localhost"; +const db_host = "db"; const admin = mysql.createConnection({ host: db_host, diff --git a/public/lib/inter.js b/public/lib/inter.js index bd18017..df5d971 100644 --- a/public/lib/inter.js +++ b/public/lib/inter.js @@ -2,6 +2,7 @@ window.dragMoveListener = dragMoveListener; let root = document.getElementById("drags"); let objs = { height:"2",width:"4"}; let objs_store = {}; +let objs_imgs = {}; let proj_from = "cloud"; function create(clas,x,y,body,id,size){ @@ -32,19 +33,19 @@ function create(clas,x,y,body,id,size){ } else if (db_data != null){ if ($.cookie("cache") == "true"){ - if (localStorage.getItem(`${main_clas}`) == null){ + if (objs_imgs[main_clas] == null){ load_obj(main_clas,"`img`",(odata)=>{ - localStorage.setItem(main_clas,odata["img"]); + objs_imgs[main_clas] = odata["img"]; make(odata["img"]); }) } else{ - make(localStorage.getItem(main_clas)) + make(objs_imgs[main_clas]) } } else{ load_obj(main_clas,"`img`",(odata)=>{ - localStorage.setItem(main_clas,odata["img"]); + objs_imgs[main_clas] = odata["img"]; make(odata["img"]); }) } diff --git a/views/admin/objects/object_creation.ejs b/views/admin/objects/object_creation.ejs index 3e14080..d3860a7 100644 --- a/views/admin/objects/object_creation.ejs +++ b/views/admin/objects/object_creation.ejs @@ -49,14 +49,14 @@
100см
- +
100см
- +
@@ -162,6 +162,9 @@ setTimeout(()=>{ edit_get_objs(); },1000) + setTimeout(()=>{ + document.getElementById("obj_resp").innerHTML = ""; + },3000) } }); } diff --git a/views/admin/objects/object_edit.ejs b/views/admin/objects/object_edit.ejs index b6860de..2f4c577 100644 --- a/views/admin/objects/object_edit.ejs +++ b/views/admin/objects/object_edit.ejs @@ -42,27 +42,11 @@ document.getElementById("objs_in_group").innerHTML = ""; edit_load_objs((data)=>{ data.forEach(value => { - console.log(value); + // console.log(value); // // console.log($.cookie("cache")); - // console.log(localStorage.getItem(`${value["name"]}`)); - if ($.cookie("cache") == "true"){ - if (localStorage.getItem(`${value["name"]}`) == null){ - edit_load_obj(value["name"],"`img`",(odata)=>{ - localStorage.setItem(value["name"],odata["img"]); - make(odata["img"]); - }) - } - else{ - make(localStorage.getItem(value["name"])) - } - } - else{ - $.cookie("cache","true",{path:"/;SameSite=Strict"}) - edit_load_obj(value["name"],"`img`",(odata)=>{ - localStorage.setItem(value["name"],odata["img"]); + edit_load_obj(value["name"],"`img`",(odata)=>{ make(odata["img"]); - }) - } + }) function make(img){ let obj_list = document.getElementById("objs_in_group"); let obj = document.createElement('div'); @@ -107,7 +91,6 @@ img : document.querySelector('#img_prev').src } let changes = {} - localStorage.removeItem((cur_atts["name"]+"/g/"+select.options[select.selectedIndex].value).replace(" ","$")); attributes.forEach(element => { // console.log(cur_atts[element],menu.getAttribute(`obj_${element}`)); if(element != attributes.at(-1)){ @@ -145,6 +128,9 @@ document.getElementById("obj_resp").innerHTML = ("name was not changed because its taken"); } },1000) + setTimeout(()=>{ + document.getElementById("obj_resp").innerHTML = ""; + },3000) } }); }