diff --git a/db.js b/db.js index 8464580..2e70bae 100644 --- a/db.js +++ b/db.js @@ -37,6 +37,18 @@ module.exports.dl = (table,key,value,callback,prevs = false) => { }) } +module.exports.dl_con = (table,condision,callback,prevs = false) => { + // console.log('SELECT * FROM `'+table+'` WHERE `'+key+'` = '+value); + db(prevs).query(`DELETE FROM ${table} WHERE ${condision}`, (err, rows, fields) => { + if (err) { + console.log("sql err"); + throw err; + }else{ + if(callback)callback(rows); + } + }) +} + // get values where module.exports.gv = (table,key,value,callback,prevs = false) => { // console.log(`SELECT * FROM ${table} WHERE ${key} = ${value}`); diff --git a/func.js b/func.js index a5a4236..edd6bd5 100644 --- a/func.js +++ b/func.js @@ -129,14 +129,26 @@ module.exports.logs_file = (res)=>{ module.exports.get_logs = (res)=>{ db.gav("logs","0",(db_logs)=>{ let logs_str = ""; - for (let i = Object.keys(db_logs).length-1; i >= 0; i--) { - const log = Object.values(db_logs)[i]; - let date = moment(log[`date_time`]).utc().format('YYYY-MM-DD'); - logs_str+=`${date}_${log.time}|${log.log} \n`; - if(i == 0){ - res.send(logs_str); + if(Object.keys(db_logs).length > 0){ + for (let i = Object.keys(db_logs).length-1; i >= 0; i--) { + const log = Object.values(db_logs)[i]; + let date = moment(log[`date_time`]).format('YYYY-MM-DD'); + logs_str+=`${date}_${log.time}|${log.log} \n`; + if(i == 0){ + res.send({out:"good",body:logs_str}); + } } } + else{ + res.send({out:"good",body:logs_str}); + } + },true); +} + +module.exports.del_logs = (inp,res)=>{ + if(inp["date"] == '')inp["date"] = moment().format('YYYY-MM-DD'); + db.dl_con("logs",`date = '${inp["date"]}'`,(db_logs)=>{ + this.get_logs(res); },true); } diff --git a/index.js b/index.js index bc5ddb6..a36ca76 100644 --- a/index.js +++ b/index.js @@ -389,7 +389,7 @@ app.post("/template/loads", (req,res) => {try{ // main routes app.get('/', (req, res) => { - let inp = req.body; + let inp = req.query; let cook = req.cookies; func.sid(cook,res,(include)=>{ if(include){ @@ -401,28 +401,35 @@ app.get('/', (req, res) => { },false) }); app.get("/main", (req,res) =>{try{ - let inp = req.body;let cook = req.cookies; + let inp = req.query;let cook = req.cookies; func.sid(cook,res,()=>{ res.render('main'); }) } catch (error) {route_err({req:req,error:error});} }); -app.get("/logs", (req,res) =>{try{ - let inp = req.body;let cook = req.cookies; +app.get("/logs/get", (req,res) =>{try{ + let inp = req.query;let cook = req.cookies; func.sid(cook,res,()=>{ func.get_logs(res); - }) + },true,true) +} catch (error) {route_err({req:req,error:error});} +}); +app.get("/logs/del", (req,res) =>{try{ + let inp = req.query;let cook = req.cookies; + func.sid(cook,res,()=>{ + func.del_logs(inp,res); + },true,true) } catch (error) {route_err({req:req,error:error});} }); app.get("/help", (req,res) =>{try{ - let inp = req.body;let cook = req.cookies; + let inp = req.query;let cook = req.cookies; func.sid(cook,res,()=>{ res.render('help'); }) } catch (error) {route_err({req:req,error:error});} }); app.get("/temp", (req,res) =>{try{ - let inp = req.body;let cook = req.cookies; + let inp = req.query;let cook = req.cookies; func.sid(cook,res,()=>{ res.render('templates'); }) diff --git a/views/admin.ejs b/views/admin.ejs index aab10d8..cb3f145 100644 --- a/views/admin.ejs +++ b/views/admin.ejs @@ -23,10 +23,10 @@

Логи

- -
- - + + + +
@@ -37,7 +37,7 @@ function log_check(){ if($.cookie("auto_log") != null){ if(JSON.parse($.cookie("auto_log")) == true){ - logs(); + get_logs(); } document.getElementById("logs_check").checked = JSON.parse($.cookie("auto_log")); }else{ @@ -46,16 +46,29 @@ } } - function logs() { + function get_logs() { let wait_msg = msg("Загрузка логов",{type:"wait"}); - $.get("/logs") + $.get("/logs/get") .done(function( res ) { - document.getElementById("logs").innerText = res; + document.getElementById("logs").innerText = res["body"]; msg_del(wait_msg.id); msg("Логи загружены") }) } + function del_logs() { + msg("date",{type:"date",res:(date)=>{if(date != false){ + let wait_msg = msg(`Удаление логов за ${date}`,{type:"wait"}); + $.get("/logs/del",{date:date}) + .done(function( res ) { + document.getElementById("logs").innerText = res["body"]; + msg_del(wait_msg.id); + msg("Логи удалены") + }) + } + }}) + } + function logs_check(event){ let log_inp = event.target; let check = log_inp.checked; diff --git a/views/admin/objects/object_colors.ejs b/views/admin/objects/object_colors.ejs index 20eefc0..621a8e4 100644 --- a/views/admin/objects/object_colors.ejs +++ b/views/admin/objects/object_colors.ejs @@ -1,7 +1,7 @@
-
+
@@ -24,6 +24,7 @@ color_div.classList.add("color_palette"); color_div.id=`color_${value["color"]}`; color_div.setAttribute("color_id",`${value["id"]}`) + color_div.setAttribute("color",`${value["color"]}`) color_div.setAttribute("onclick",`clear_palette();document.getElementById('color_${value["color"]}').style.border = "1px blue solid";cur_color = 'color_${value["color"]}';`) color_div.title = `#${value["color"]}`; div.append(color_div); @@ -48,17 +49,23 @@ }); } function del_color(){ - let color_id = document.getElementById(cur_color).getAttribute("color_id") - msg("Удалить этот цвет?",{type:"ask",res:(out)=>{if(out){ - $.post( "/admin/colors/delete", {id:color_id}) - .done(function( res ) { - if(res["out"] == "good"){ - msg("цвет удалён"); - obj_colors_load(); - console.log(res["body"]); - } - }); - }}}) + if(document.getElementById(cur_color) == null){ + msg("Цвет не выбран",{type:"warning"}); + } + else{ + let color_id = document.getElementById(cur_color).getAttribute("color_id") + let color = document.getElementById(cur_color).getAttribute("color") + msg("Удалить этот цвет?",{type:"ask",res:(out)=>{if(out){ + $.post( "/admin/colors/delete", {id:color_id,color:color}) + .done(function( res ) { + if(res["out"] == "good"){ + msg("цвет удалён"); + obj_colors_load(); + console.log(res["body"]); + } + }); + }}}) + } } \ No newline at end of file diff --git a/views/admin/objects/object_edit.ejs b/views/admin/objects/object_edit.ejs index 3f00b40..a51621f 100644 --- a/views/admin/objects/object_edit.ejs +++ b/views/admin/objects/object_edit.ejs @@ -45,16 +45,16 @@ } -

Изменение объектов

+
+

Изменение объектов

+
+ + +
+
-
-
- - -
-