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

modified: admin.js

Browse Source 
modified:   func.js
	modified:   index.js
	modified:   object.js
	modified:   project.js
	new file:   public/img/drop.png
	new file:   public/img/icon/back.png
	new file:   public/img/icon/copy.png
	new file:   public/img/icon/del.png
	new file:   public/img/icon/download.png
	new file:   public/img/icon/forw.png
	new file:   public/img/icon/save.png
	modified:   public/lib/fn.js
	modified:   public/lib/inter.js
	modified:   views/admin.ejs
	new file:   views/admin/objects.ejs
	modified:   views/admin/objects/object_creation.ejs
	modified:   views/admin/objects/object_edit.ejs
	modified:   views/admin/objects/object_groups.ejs
	new file:   views/admin/users.ejs
	modified:   views/admin/users/user_reg.ejs
	modified:   views/header.ejs
	modified:   views/load.ejs
	modified:   views/login.ejs
	modified:   views/main.ejs
	modified:   views/project.ejs
	modified:   views/static/end.ejs
	modified:   views/static/start.ejs
This commit is contained in:
n0rdye
2023-08-15 23:59:02 +05:00
parent b511d033f5
commit f2bbded81b
28 changed files with 942 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/img/drop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 300 B

BIN
public/img/icon/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 600 B

BIN
public/img/icon/copy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 661 B

BIN
public/img/icon/del.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 688 B

BIN
public/img/icon/download.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 579 B

BIN
public/img/icon/forw.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 603 B

BIN
public/img/icon/save.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

130
public/lib/fn.js
View File

@ -1,3 +1,5 @@
let gids = [];
function get_from_uuid(callback){
const uid = $.cookie("uuid");
const sid = $.cookie("sid");
@ -96,26 +98,97 @@ function get_sid(){
});
}
function load_groups(callback){
let select = document.getElementById("group_select");
function load_groups(callback,groups,admin = false){
let select = document.getElementById("group");
// let name = select.options[select.selectedIndex].text;
$.post( "/get_groups")
groups.forEach(gid => {
$.post("/object/group/get",{gid:gid})
.done(function( res ) {
if(res["out"] == "good"){
console.log(res["body"]);
let group = res["body"]
let group_div = document.createElement("div");
group_div.classList.add(`obj_group`);
let group_label = document.createElement("label");
group_label.innerText = group["name"].replace("$"," ");
group_label.setAttribute("for",`obj_group_${group["id"]}`)
let group_inp = document.createElement("input");
group_inp.setAttribute("type","checkbox");
group_inp.setAttribute("onchange",`group_check(${group["id"]})`)
// group_inp.innerText = group["name"].replace("$"," ");
group_inp.setAttribute("group_count",group["count"]);
group_inp.setAttribute("gid",group["id"]);
group_inp.id = `obj_group_${group["id"]}`;
group_inp.setAttribute("pid",`${group["pid"]}`);
if (gids.includes(group["id"])){
group_inp.setAttribute("checked","true");
}
// console.log(document.url);
if(admin){
let group_del_btn = document.createElement("button");
group_del_btn.setAttribute("onclick",`delete_group(${group["id"]},${group["pid"]})`)
group_del_btn.innerText = "удалить";
group_del_btn.style = "font-size: 1vw;width: 70px;";
group_div.append(group_del_btn)
}
group_div.append(group_inp);
group_div.append(group_label);
select.append(group_div)
}
// callback(res);
});
if(gid == gids.at(-1)){
if(callback)callback();
}
});
}
function group_check(gid){
let gid_el = document.getElementById(`obj_group_${gid}`);
if(gid_el.checked){
gids[gids.indexOf(gids.at(-1))+1] = gid;
}
else if (!gid_el.checked){
gids.splice(gids.indexOf(gid),1);
}
// if (!gids.includes(gid)){
// gids[gids.indexOf(gids.at(-1))+1] = gid;
// }
// else{
// gids.pop(gid);
// }
console.log(gids);
if (typeof gids_change != 'undefined'){
gids_change();
}
}
function load_parts(callback){
let parts_div = document.getElementById("part_select");
$.post( "/object/parts/get", {})
.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();
}
});
// console.log(res["body"]);
callback(res["body"]);
}
});
}
function load_group(gid,callback){
$.post( "/object/group/get", {gid:gid})
.done(function( res ) {
if(res["out"] == "good"){
// console.log(res["body"]);
callback(res["body"]);
// Object.values(res["body"]).forEach(part => {
// console.log(part);
// });
}
// callback(res);
});
}
@ -147,4 +220,27 @@ function postForm(path, params, method) {
document.body.appendChild(form);
form.submit();
}
}
function downloadTextFile(text, name) {
const a = document.createElement('a');
const type = name.split(".").pop();
a.href = URL.createObjectURL( new Blob([text], { type:`text/${type === "txt" ? "plain" : type}` }) );
a.download = name;
a.click();
}
var openFile = function(event,callback) {
var input = event.target;
console.log(input.files[0]);
var reader = new FileReader();
reader.onload = function() {
var text = reader.result;
// var node = document.getElementById('import_file');
// node.innerText = text;
console.log(reader.result.substring(0, 200));
callback(text)
};
reader.readAsText(input.files[0]);
};

104
public/lib/inter.js
View File

@ -1,9 +1,13 @@
window.dragMoveListener = dragMoveListener;
let root = document.getElementById("drags");
let objs = { height:"2",width:"4"};
let objs = { height:"2",width:"4",color:"#FFFFFF"};
let objs_store = {};
let objs_imgs = {};
let proj_from = "cloud";
let cur_obj;
let objs_back = [];
let objs_forw = [];
let proj_state = "loading";
function create(clas,x,y,body,id,size){
let main_clas = clas.split(" ")[0];
@ -20,16 +24,17 @@ function create(clas,x,y,body,id,size){
// 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();
}
delete objs[main_clas];
reload();
// if(proj_from == "cloud"){
// // save(()=>{
// // // goto("/proj/load/"+proj_name);
// // },false);
// }
// else if (proj_from == "local"){
// save_local();
// load_proj_local();
// }
}
else if (db_data != null){
if (objs_imgs[main_clas] == null){
@ -54,6 +59,7 @@ function create(clas,x,y,body,id,size){
}
calc_total();
})
obj.setAttribute("onclick",`cur_obj = "${id}"`);
root.append(obj);
set_pos(obj,x,y);
}
@ -67,6 +73,8 @@ function resize_drags(){
}
function wall_size_change(type,value = null){
if (proj_state == "loaded"){objs_back.push(JSON.parse(JSON.stringify(objs)));}
let wall = document.getElementsByClassName("wall")[0];
let scroll;
if(type != null && type == "width") {
@ -94,7 +102,7 @@ function wall_size_change(type,value = null){
function calc_total(start = false){
document.getElementById("cost_list").innerHTML = ""
if (start) {
document.getElementById("proj_cost").setAttribute("value",`стоимость: ${objs["total"]} руб.`);
document.getElementById("proj_cost_text").innerText = `стоимость: ${objs["total"]} руб.`;
return;
}
let total=0;
@ -119,16 +127,17 @@ function calc_total(start = false){
// return total;
objs["total"] = total;
document.getElementById("proj_cost").setAttribute("value",`стоимость: ${total} руб.`);
document.getElementById("proj_cost_text").innerText = `стоимость: ${total} руб.`;
}
function load(objss){
proj_state = "loading";
// objs = JSON.parse($.cookie("objs"));
// console.log(objs);
objs = objss;
Object.entries(objs).forEach(([keys, values]) => {
// console.log(keys,values);
if (keys != "width" && keys != "height"){
console.log(keys,values);
if (keys != "width" && keys != "height" && keys != "color"){
Object.entries(values).forEach(([key, value]) => {
if(key != "class"){
// console.log(key,keys);
@ -145,12 +154,23 @@ function load(objss){
// document.getElementById("drags").style.left = $(".dropzone")[0].getBoundingClientRect().x;
}
if (keys == "color"){
document.getElementById("wall").style.backgroundColor = values;
}
if (keys == Object.keys(objs).at(-1)){
loaded();
proj_state = "loaded";
}
});
resize_drags();
}
function reload(save = false){
// objs = JSON.parse($.cookie("objs"));
// console.log(objs);
document.getElementById("drags").innerHTML = "";
load(objs);
if(save){save(()=>{},false)}
}
function load_proj_cloud(){
proj_from = "cloud";
@ -169,7 +189,7 @@ function load_proj_cloud(){
else if(res["out"] == "bad proj"){
console.log("bad");
save(()=>{
goto("/proj/"+proj_name);
goto("/proj/load/"+proj_name);
},false);
}
})
@ -264,40 +284,40 @@ function dragMoveListener (event) {
var y = (parseFloat(drag.getAttribute('data-y')) || 0) + event.dy
set_pos(drag,x,y);
}
let dragzone = document.getElementsByClassName('wall')[0];
let dragzone = document.getElementsByClassName('wall')[0];
interact('.drag').draggable({
inertia: true,
modifiers: [
interact.modifiers.restrictRect({restriction: dragzone,endOnly: true}),
interact.modifiers.restrictRect({restriction: dragzone,endOnly: true,elementRect:{ left: 0.15, right: 0.85, top: 0, bottom: 1 }}),
interact.modifiers.snap({targets: [interact.snappers.grid({ x: 2, y: 2 })],range: Infinity,relativePoints: [ { x: 0, y: 0 } ]}),
],
autoScroll: true,
listeners: {move: dragMoveListener, end (event) {}}
})
interact('.trash').dropzone({
accept: '.drag',
overlap: 0.2,
// interact('.trash').dropzone({
// accept: '.drag',
// overlap: 0.2,
ondragenter: function (event) {var drag = event.relatedTarget;var zone = event.target;
// ondragenter: function (event) {var drag = event.relatedTarget;var zone = event.target;
// console.log(drag.classList);
if(objs[drag.classList[0]] != null&&objs[drag.classList[0]][drag.id] != null) {
delete objs[drag.classList[0]][drag.id];
}
calc_total()
// // console.log(drag.classList);
// if(objs[drag.classList[0]] != null&&objs[drag.classList[0]][drag.id] != null) {
// delete objs[drag.classList[0]][drag.id];
// }
// calc_total()
zone.classList.add('drop-target');drag.classList.add('can-drop');
drag.remove();
},
ondragleave: function (event) {var drag = event.relatedTarget;var zone = event.target;zone.classList.remove('drop-target');drag.classList.remove('in_zone');drag.classList.remove('can-drop');},
ondrop: function (event) {var drag = event.relatedTarget;
// console.log(drag.id);
// console.log(objs);
drag.classList.add('in_zone');drag.classList.remove('can-drop');
},
ondropdeactivate: function (event) {var zone = event.target;zone.classList.remove('drop-active');zone.classList.remove('drop-target');}
})
// zone.classList.add('drop-target');drag.classList.add('can-drop');
// drag.remove();
// },
// ondragleave: function (event) {var drag = event.relatedTarget;var zone = event.target;zone.classList.remove('drop-target');drag.classList.remove('in_zone');drag.classList.remove('can-drop');},
// ondrop: function (event) {var drag = event.relatedTarget;
// // console.log(drag.id);
// // console.log(objs);
// drag.classList.add('in_zone');drag.classList.remove('can-drop');
// },
// ondropdeactivate: function (event) {var zone = event.target;zone.classList.remove('drop-active');zone.classList.remove('drop-target');}
// })
interact('.dropzone').dropzone({
accept: '.drag',
@ -313,15 +333,17 @@ interact('.dropzone').dropzone({
objs[drag.classList[0]][drag.id] = {};
calc_total()
}
drag.setAttribute("onclick",`cur_obj = "${drag.id}"`);
zone.classList.add('drop-target');drag.classList.add('can-drop');
},
ondragleave: function (event) {var drag = event.relatedTarget;var zone = event.target;zone.classList.remove('drop-target');drag.classList.remove('in_zone');drag.classList.remove('can-drop');},
ondrop: function (event) {var drag = event.relatedTarget
if (proj_state == "loaded"){objs_back.push(JSON.parse(JSON.stringify(objs)));}
objs[drag.classList[0]][drag.id] = {y:drag.getAttribute('data-y'),x:drag.getAttribute('data-x'),body:drag.innerHTML};
drag.classList.add('in_zone');drag.classList.remove('can-drop');
// console.log(objs["KeyBoard/g/не$основное"]["KeyBoard/g/не$основное_1"]);
},
ondropdeactivate: function (event) {var zone = event.target;zone.classList.remove('drop-active');zone.classList.remove('drop-target');}
})
@ -345,7 +367,7 @@ interact('.createzone').dropzone({
let x = zone.getBoundingClientRect().left - document.getElementById("drags").getBoundingClientRect().left;
let y = zone.getBoundingClientRect().top - document.getElementById("drags").getBoundingClientRect().top;
create(`${zone.classList[0]} spawn drag`,x,y,`${zone.classList[0]}`,`none`);
if (proj_state == "loaded"){objs_back.push(JSON.parse(JSON.stringify(objs)));}
drag.classList.remove('spawn');
}
zone.classList.remove('drop-target');