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

added groups, stated adding object edit

Browse Source
This commit is contained in:
N0rdye 2023-07-10 11:13:50 +05:00
parent fc4b567c87
commit 387a0d135f
13 changed files with 354 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db.js
View File

@ -1,6 +1,6 @@
const mysql = require('mysql');
const vars = require('./vars');
const db_host = "db";
const db_host = "localhost";
const admin = mysql.createConnection({
host: db_host,
@ -68,6 +68,7 @@ module.exports.gav = (table,limit = "0",callback,prevs = false) => {
module.exports.ggv = (table,ekey,key,value,callback,prevs = false) => {
// console.log('SELECT * FROM `'+table+'` WHERE `'+key+'` = '+value);
db(prevs).query(`SELECT ${ekey} FROM ${table} WHERE ${key} = ${value}`, (err, rows, fields) => {
// console.log(`SELECT ${ekey} FROM ${table} WHERE ${key} = ${value}`);
if (err) {
console.log("sql err");
throw err;
@ -78,8 +79,9 @@ module.exports.ggv = (table,ekey,key,value,callback,prevs = false) => {
}
// set value where
module.exports.sv = (table,key,value,ekey,evalue,callback,prevs = false) => {
db(prevs).query(`UPDATE ${table} SET ${key} = '${value}' WHERE ${ekey} = '${evalue}'`, (err , rows) => {
module.exports.sv = (table,key,value,ekey,evalue,callback,prevs = false,no_srt = false) => {
value = (no_srt)? value:`'${value}'`;
db(prevs).query(`UPDATE ${table} SET ${key} = ${value} WHERE ${ekey} = '${evalue}'`, (err , rows) => {
// console.log("UPDATE `"+table+"` SET `"+key+"` = '"+value+"' WHERE `"+ekey+"` = '"+evalue+"'");
if (err) {
console.log("sql err");
@ -90,13 +92,14 @@ module.exports.sv = (table,key,value,ekey,evalue,callback,prevs = false) => {
})
}
// new record
module.exports.nr = (table,keys,values,prevs = false) =>{
module.exports.nr = (table,keys,values,prevs = false,callback) =>{
// console.log('INSERT INTO `'+table+'`('+keys+') VALUES ('+values+')');
db(prevs).query(`INSERT INTO ${table} (${keys}) VALUES (${values})`,(err,res) =>{
if (err) {
console.log("sql err");
throw err;
}else{
if(callback)callback();
return true;
}
})

4
func.js
View File

@ -120,8 +120,8 @@ module.exports.logs_file = (res)=>{
}
module.exports.get_uuid = (name = "") =>{
name = (name != "")? this.encrypt(name,"name"):"";
module.exports.get_uuid = (name = "/") =>{
if (name != "/") name = this.encrypt(name,"name");
let unid = uuid.v4() + '%%'+name+'#e'+(621);
return unid;
}

34
index.js
View File

@ -166,6 +166,18 @@ app.post("/get_obj", (req,res) => {
func.log("router single object getting error - "+error);
}
})
app.post("/get_groups", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
// func.log(inp["name"]);
func.sid(cook,res,()=>{
obj.load_groups(inp,cook,res);
})
} catch (error) {
func.log("router single object getting error - "+error);
}
})
/// admin
app.get("/admin", (req,res) =>{
try {
@ -211,6 +223,28 @@ app.post("/new_obj", (req,res) => {
func.log("router object creating error - "+error);
}
})
app.post("/admin/new/group", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
func.sid(cook,res,()=>{
obj.new_group(inp,cook,res);
},true,true)
} catch (error) {
func.log("router object creating error - "+error);
}
})
app.post("/admin/delete/group", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
func.sid(cook,res,()=>{
obj.del_group(inp,cook,res);
},true,true)
} catch (error) {
func.log("router object creating error - "+error);
}
})
app.post("/admin/users/get", (req,res) => {
try{
let inp = req.body;

64
object.js
View File

@ -1,10 +1,11 @@
const { name } = require('ejs');
const db = require('./db');
const func = require('./func');
const vars = require('./vars');
module.exports.loads = (inp,cook,res)=>{
try {
db.ggv("objects","`name`,`id`,`height`,`width`,`description`","gid",0,(odata)=>{
db.ggv("objects","`name`,`id`,`height`,`width`,`description`,`gid`","gid",`${inp["gid"]}`,(odata)=>{
// func.log(odata);
res.send({out:"good",body:odata});
})
@ -27,16 +28,63 @@ module.exports.load = (inp,cook,res)=>{
module.exports.new = (inp,cook,res)=>{
try {
db.ggv("objects","id","name",`'${inp["name"]}'`,(db_name)=>{db_name= db_name[0]
if(db_name != null){
db.ggv("object_groups","name","id",`'${inp["gid"]}'`,(gname)=>{gname = gname[0]
db.ggv("objects","name","gid",`'${inp["gid"]}' AND name = '${inp["name"]}/g/${gname["name"]}'`,(db_name)=>{
if(db_name[0] != null){
res.send({out:"bad",err:"name"});
}
else if (db_name == null){
db.nr("objects","`name`,`img`,`height`,`width`,`description`",`'${inp["name"]}','${inp["img"]}','${inp["height"]}','${inp["width"]}','${inp["desc"]}'`,true);
res.send({out:"good"});
}
},true)
else if (db_name[0] == null){
db.nr("objects","`name`,`img`,`height`,`width`,`description`,`gid`",`'${inp["name"]}/g/${gname["name"]}','${inp["img"]}','${inp["height"]}','${inp["width"]}','${inp["desc"]}','${inp["gid"]}'`,true);
db.sv("object_groups","count",`(count + 1)`,"id",inp["gid"],()=>{},true,true)
func.log(`admin object created name:${inp["name"]} group:${gname["name"]}`);
res.send({out:"good"});
}
// console.log(db_name);
// db.ggv("objects","gid","name",`'${inp["name"]}'`,(db_name)=>{
// })
},true)
})
} catch (error) {
func.log("backend object creating error - "+error);
}
}
module.exports.load_groups = (inp,cook,res)=>{
try {
db.gav("object_groups","0",(gdata)=>{
// func.log(odata);
res.send({out:"good",body:gdata});
})
} catch (error) {
func.log("backend object groups loading err0r - "+error);
}
}
module.exports.new_group = (inp,cook,res)=>{
try {
db.ggv("object_groups","id","name",`'${inp["name"]}'`,(gdata)=>{gdata = gdata[0]
// func.log(odata);
if(gdata != null){
res.send({out:"bad"});
}
else if (gdata == null){
db.nr("object_groups","`name`,`count`",`'${inp["name"]}','0'`,true,()=>{
res.send({out:"good"});
})
}
})
} catch (error) {
func.log("backend single object loading err0r - "+error);
}
}
module.exports.del_group = (inp,cook,res)=>{
try {
db.ggv("object_groups",`name`,`id`,`'${inp["gid"]}'`,(gname)=>{gname = gname[0]["name"]
db.dl("object_groups",`id`,`'${inp["gid"]}'`,()=>{
func.log(`admin group deleted ${gname}`);
res.send({out:"good"});
},true);
})
} catch (error) {
func.log("backend single object loading err0r - "+error);
}
}

BIN
public/img/img_placeholder.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 802 B

23
public/lib/fn.js
View File

@ -90,6 +90,29 @@ function get_sid(){
});
}
function load_groups(callback){
let select = document.getElementById("group_select");
// let name = select.options[select.selectedIndex].text;
$.post( "/get_groups")
.done(function( res ) {
if(res["out"] == "good"){
select.innerHTML = "";
res["body"].forEach(group => {
let group_div = document.createElement("option");
group_div.innerText = group["name"].replace("$"," ");
group_div.setAttribute("group_count",group["count"]);
group_div.setAttribute("gid",group["id"]);
group_div.id = `obj_group_${group["id"]}`;
select.append(group_div);
if(group["id"] == res["body"].at(-1)["id"]){
if(callback)callback();
}
});
}
// callback(res);
});
}
// redirect
function goto(url) {
location.href = url;

75
public/lib/inter.js
View File

@ -15,44 +15,47 @@ function create(clas,x,y,body,id,size){
obj.classList.add(cl);
});
get_obj(main_clas,(db_data)=>{
if ($.cookie("cache") == "true"){
if (localStorage.getItem(`${main_clas}`) == null){
// console.log(db_data);
// db_data.forEach(db_data => {
// });
if (db_data == null) {
delete objs[main_clas][id];
if(proj_from == "cloud"){
save(()=>{
goto("/proj/"+proj_name);
},false);
}
else if (proj_from == "local"){
save_local();
load_proj_local();
}
}
else if (db_data != null){
if ($.cookie("cache") == "true"){
if (localStorage.getItem(`${main_clas}`) == null){
load_obj(main_clas,"`img`",(odata)=>{
localStorage.setItem(main_clas,odata["img"]);
make(odata["img"]);
})
}
else{
make(localStorage.getItem(main_clas))
}
}
else{
load_obj(main_clas,"`img`",(odata)=>{
localStorage.setItem(main_clas,odata["img"]);
make(odata["img"]);
})
}
else{
make(localStorage.getItem(main_clas))
}
}
else{
load_obj(main_clas,"`img`",(odata)=>{
localStorage.setItem(main_clas,odata["img"]);
make(odata["img"]);
})
}
function make(img){
if (db_data == null) {
delete objs[main_clas][id];
if(proj_from == "cloud"){
save(()=>{
goto("/proj/"+proj_name);
},false);
}
else if (proj_from == "local"){
save_local();
load_proj_local();
}
}
else if (db_data != null){
obj.src = img;
obj.title = `${db_data["name"]}\n${db_data["description"]}\n${lang("width")}:${db_data["width"]}см ${lang("height")}:${db_data["height"]}см`;
// drag.transform = `translate(${drag.getAttribute("data-y")}px, ${drag.getAttribute("data-y")}px) scale(${db_data["width"] * 2} ${db_data["height"] * 2})`;
if(size){
obj.style.width = `${db_data["width"] * 2}px`;
obj.style.height = `${db_data["height"] * 2}px`;
}
obj.src = img;
obj.title = `${db_data["name"].replace("$"," ").split("/g")[0]}\n${db_data["description"]}\n${lang("width")}:${db_data["width"]}см ${lang("height")}:${db_data["height"]}см`;
// drag.transform = `translate(${drag.getAttribute("data-y")}px, ${drag.getAttribute("data-y")}px) scale(${db_data["width"] * 2} ${db_data["height"] * 2})`;
if(size){
obj.style.width = `${db_data["width"] * 2}px`;
obj.style.height = `${db_data["height"] * 2}px`;
}
}
})
@ -136,7 +139,7 @@ function load_proj_cloud(){
console.log("bad");
save(()=>{
goto("/proj/"+proj_name);
});
},false);
}
})
}
@ -174,9 +177,9 @@ function save(callback,with_pic = true){
});
}
else{
make_save("none");
make_save();
}
function make_save(src = "none"){
function make_save(src = "img/img_placeholder.webp"){
$.post( "/save_proj", {proj:JSON.stringify(objs),name:proj_name,img:src})
.done(function( res ) {
if(res["out"] == "good"){
@ -189,7 +192,8 @@ function save(callback,with_pic = true){
}
function load_objs(callback){
$.post( "/get_objs")
let select = document.getElementById("group_select");
$.post( "/get_objs",{gid:select.options[select.selectedIndex].getAttribute("gid")})
.done(function( res ) {
if(res["out"] == "good"){
// console.log(res["body"]);
@ -333,7 +337,6 @@ function drag_start() {
Object.entries(zones).forEach(([key, zone]) => {
let x = zone.getBoundingClientRect().left - document.getElementById("drags").getBoundingClientRect().left;
let y = zone.getBoundingClientRect().top - document.getElementById("drags").getBoundingClientRect().top;
// console.log(x,y);
create(`${zone.classList[0]} spawn drag`,x,y,`${zone.classList[0]}`,`none`);
});
}

2
views/admin.ejs
View File

@ -10,6 +10,8 @@
<h1 style="text-align: center;"><%= lang("hello admin") %></h1> <br>
<section>
<%- include('./admin/objects/object_creation.ejs') %>
<%- include('./admin/objects/object_groups.ejs') %>
<%- include('./admin/objects/object_edit.ejs') %>
</section>
<section>

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

@ -60,7 +60,7 @@
</div>
<script>
function obj_size_change(type){
function obj_size_change(type){
if(type == "height"){
let img = document.getElementById('img_prev');
let range = document.getElementById('obj_height');
@ -93,7 +93,8 @@
}
function new_obj(name,img,height,width,description,callback){
$.post( "/new_obj", { name:name,img:img,desc:description,height:height,width:width })
let select = document.getElementById("group_select");
$.post( "/new_obj", { name:name,img:img,desc:description,height:height,width:width,gid:select.options[select.selectedIndex].getAttribute("gid")})
.done(function( res ) {
// if(res["out"] == "good"){
// console.log(res["body"]);
@ -108,7 +109,7 @@
let height = document.getElementById("obj_height").value;
let width = document.getElementById("obj_width").value;
var img = document.querySelector('img').src;
name = name.replace(" ","_");
name = name.replace(" ","$");
if (img != "http://n0rsrv2:3002/admin"){
document.getElementById("obj_resp").innerHTML = "creating object";
new_obj(name,img,height,width,description,(res)=>{
@ -117,6 +118,9 @@
}
else if(res["out"] == "good"){
document.getElementById("obj_resp").innerHTML = "object created";
setTimeout(()=>{
edit_get_objs();
},1000)
}
});
}

97
views/admin/objects/object_edit.ejs
View File

@ -0,0 +1,97 @@
<style>
.object{
background-color: #bfe4ff;
border: dashed 4px transparent;
border-radius: 4px;
height: 50px;
width: 50px;
margin: 5px;
margin-top: 0px;
}
img{
width: 100%;
height: 100%;
}
#objs_in_group{
display: flex;
flex-wrap: wrap;
}
</style>
<h1>object edit</h1>
<div>
<div id="objs_in_group"></div>
</div>
<div class="cmenu" id="object_menu">
<button>del object</button>
<button>change name</button>
<button>change size</button>
</div>
<script>
load_groups(()=>{
edit_get_objs();
});
function edit_get_objs(){
document.getElementById("objs_in_group").innerHTML = "";
edit_load_objs((data)=>{
data.forEach(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"]);
make(odata["img"]);
})
}
function make(img){
let czones = document.getElementById("objs_in_group");
let czone = document.createElement('div');
czone.classList.add(value["name"]);
czone.classList.add("object");
czone.innerHTML = `<img src="${img}">`
czones.append(czone)
}
});
})
}
function edit_load_obj(name,key,callback){
$.post( "/get_obj",{name:name,key:key})
.done(function( res ) {
if(res["out"] == "good"){
// console.log(res["body"]);
callback(res["body"]);
}
});
}
function edit_load_objs(callback){
let select = document.getElementById("group_select");
$.post( "/get_objs",{gid:select.options[select.selectedIndex].getAttribute("gid")})
.done(function( res ) {
if(res["out"] == "good"){
// console.log(res["body"]);
// res["body"].forEach(object => {
// // objs_store[`${element["name"]}`] = {description:element["description"],height:element["height"],width:element["width"],id:element["id"],name:element["name"]}
// let obj_main = document.createElement("div");
// });
callback(res["body"]);
}
});
}
</script>

40
views/admin/objects/object_groups.ejs Normal file
View File

@ -0,0 +1,40 @@
<h1>objects group</h1>
<div id="obj_group">
<div style="display: flex;justify-content: space-between;">
<select name="" id="group_select" onchange="edit_get_objs();"></select>
<div style="display: flex;justify-content: space-between;width: 200px;">
<button onclick="create_new_group()">create new group</button>
<button onclick="delete_group()">delete group</button>
</div>
</div>
</div>
<script>
load_groups();
function delete_group() {
let select = document.getElementById("group_select");
let group_id = select.options[select.selectedIndex].getAttribute("gid");
if(confirm(`are you sure you want to delete group ${select.options[select.selectedIndex].text}`) == true){
$.post( "/admin/delete/group", { gid:group_id})
.done(function( res ) {
if(res["out"] == "good"){
// console.log(res["body"]);
load_groups();
}
});
}
}
function create_new_group() {
let group_name = ask("enter group name");
if(group_name != ""){
$.post( "/admin/new/group", { name:group_name.replace(" ","$")})
.done(function( res ) {
if(res["out"] == "good"){
// console.log(res["body"]);
load_groups();
}
});
}
}
</script>

1
views/header.ejs
View File

@ -42,6 +42,7 @@
color: black;
cursor: pointer;
border: 1px black solid;
z-index: 100;
}
</style>
<script>

70
views/project.ejs
View File

@ -23,7 +23,7 @@
transition: background-color 0.3s;
position: absolute;
inset: 0px;
margin: 250px auto;
margin: 5px auto;
width: 400px;
height: 200px;
background-color: #fff;
@ -43,6 +43,7 @@
height: 22px;
width: 22px;
margin: 10px;
margin-top: 0px;
padding: 10px;
transition: background-color 0.3s;
}
@ -51,7 +52,7 @@
background-color: #bfe4ff;
border: dashed 4px transparent;
border-radius: 4px;
margin: 10px auto 30px;
/* margin: 10px auto 30px; */
/* padding: 10px; */
height: 50px;
width: 50px;
@ -61,11 +62,11 @@
}
.czones{
display: flex;
margin: auto;
margin: 0px auto;
/* justify-content: space-around; */
flex-wrap: wrap;
width: 80%;
height: 100px;
width: 75%;
/* height: 100px; */
/* overflow-x: auto; */
}
@ -102,13 +103,24 @@
</style>
<div id="project_menu" class="cmenu"></div>
<div id="project_menu" class="cmenu">
<button id='proj_csave_btn' onclick='save_proj()'><%= lang(`save to cloud`) %></button> <br>
<button id='proj_cload_btn' onclick='load_proj_cloud()'><%=lang('load from cloud')%></button> <br>
<button id='proj_lsave_btn' onclick='save_proj_local()'><%=lang('save to local') %></button> <br>
<button id='proj_lload_btn' onclick='load_proj_local()'><%=lang('load from local')%></button> <br>
</div>
<!-- <div class="dropzone"></div> -->
<div class="inputs">
<div id="wall_input">
<div id="obj_group">
<div style="display: flex;justify-content: space-between;">
<div style="width: 50px;">object group</div>
<select name="" id="group_select" onchange="get_objs()"></select>
</div>
</div><br>
<div>
<div style="display: flex;width: 150px;justify-content: space-between;">
<label for="wall_height"><%= lang("height") %> </label>
@ -128,41 +140,50 @@
<img class="trash" style="height: 100px; width: 100px;" src="/img/shadow-energy.gif" alt="<%= lang('black hole') %>">
</div>
<div id="drags"></div>
<div class="zones" style="position: relative;">
<div id="drags"></div>
<div class="wall dropzone" id="wall"></div>
</div>
<script src="/lib/inter.js"></script>
<script>
load_objs((data)=>{
data.forEach(value => {
// console.log(value);
let czones = document.getElementsByClassName("czones")[0];
let czone = document.createElement('div');
czone.classList.add(value["name"]);
czone.classList.add("createzone");
czones.append(czone)
});
load_groups(()=>{
get_objs();
load_proj_cloud();
})
});
function get_objs(){
document.getElementsByClassName("czones")[0].innerHTML = "";
load_objs((data)=>{
data.forEach(value => {
let czones = document.getElementsByClassName("czones")[0];
let czone = document.createElement('div');
czone.classList.add(value["name"]);
czone.classList.add("createzone");
czones.append(czone)
});
drag_start()
})
}
let proj_name = "<%= proj_name %>";
if($.cookie("cache") ==null)$.cookie("cache","true",{path:"/proj;SameSite=Strict"});
if($.cookie("cache") ==null)$.cookie("cache","true",{path:"/;SameSite=Strict"});
// console.log(proj_name);
let menu = document.getElementById("project_menu");
document.getElementById("top_panel_left").innerHTML = `<div id='proj_menu' class="menu_btn"><%= lang("project settings") %></div>`;
menu.innerHTML += "<button id='proj_csave_btn' onclick='save_proj()'><%= lang(`save to cloud`) %></button> <br>";
menu.innerHTML += "<button id='proj_cload_btn' onclick='load_proj_cloud()'><%=lang('load from cloud')%></button> <br>";
menu.innerHTML += "<button id='proj_lsave_btn' onclick='save_proj_local()'><%=lang('save to local') %></button> <br>";
menu.innerHTML += "<button id='proj_lload_btn' onclick='load_proj_local()'><%=lang('load from local')%></button> <br>";
// menu.innerHTML += "<button id='proj_csave_btn' onclick='save_proj()'><%= lang(`save to cloud`) %></button> <br>";
// menu.innerHTML += "<button id='proj_cload_btn' onclick='load_proj_cloud()'><%=lang('load from cloud')%></button> <br>";
// menu.innerHTML += "<button id='proj_lsave_btn' onclick='save_proj_local()'><%=lang('save to local') %></button> <br>";
// menu.innerHTML += "<button id='proj_lload_btn' onclick='load_proj_local()'><%=lang('load from local')%></button> <br>";
if ($.cookie("cache") == "false") menu.innerHTML += "<div id='cache_switch' title='<%=lang('cache_title')%>'><button onclick='cache_change(true);'><%=lang('cache_off')%></button></div>";
else if ($.cookie("cache") == "true") menu.innerHTML += "<div id='cache_switch' title='<%=lang('cache_title')%>'><button onclick='cache_change(false);'><%=lang('cache_on')%></button></div>";
function cache_change(to){
let cache_switch = document.getElementById("cache_switch");
if(to) {cache_switch.innerHTML = "<button onclick='cache_change(false);' title='<%=lang('cache_title')%>'><%=lang('cache_on')%></button></div>";$.cookie("cache","true",{path:"/proj;SameSite=Strict"});}
else if(!to) {cache_switch.innerHTML = "<button onclick='cache_change(true);' title='<%=lang('cache_title')%>'><%=lang('cache_off')%></button></div>";$.cookie("cache","false",{path:"/proj;SameSite=Strict"});}
if(to) {cache_switch.innerHTML = "<button onclick='cache_change(false);' title='<%=lang('cache_title')%>'><%=lang('cache_on')%></button></div>";$.cookie("cache","true",{path:"/;SameSite=Strict"});}
else if(!to) {cache_switch.innerHTML = "<button onclick='cache_change(true);' title='<%=lang('cache_title')%>'><%=lang('cache_off')%></button></div>";$.cookie("cache","false",{path:"/;SameSite=Strict"});}
}
function save_proj(type){
document.getElementById('top_panel_center').innerHTML=` <%=lang("saving")%> ${proj_name}`;
@ -191,5 +212,6 @@
function isZooming(){
resize_drags();
}
</script>
<%- include('./static/end.ejs') %>