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

fixes

Browse Source
This commit is contained in:
N0rdye 2023-07-14 10:24:06 +05:00
parent 6dc312d156
commit 1a88b8bb64
17 changed files with 492 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin.js
View File

@ -88,7 +88,7 @@ module.exports.set_obj=(inp,cook,res)=>{
}
}
module.exports.reg = (inp,cook,res)=>{
module.exports.new_user = (inp,cook,res)=>{
try {
let uuid = func.get_uuid(inp["login"]);
let admin = inp["admin"];
@ -132,3 +132,18 @@ module.exports.reg = (inp,cook,res)=>{
func.log("backend user registration error - "+error);
}
}
module.exports.find_user = (inp,cook,res)=>{
try {
db.fva("users","login",inp["login"],`${inp["from"]},${inp["load_interval"]}`,(data)=>{
if(data["length"] > 0){
res.send({body:data,out:"good"});
}
else{
res.send({out:"bad"});
}
},true)
} catch (error) {
func.log("backend single object loading err0r - "+error);
}
}

31
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,
@ -39,7 +39,7 @@ module.exports.dl = (table,key,value,callback,prevs = false) => {
// get values where
module.exports.gv = (table,key,value,callback,prevs = false) => {
// console.log('SELECT * FROM `'+table+'` WHERE `'+key+'` = '+value);
// console.log(`SELECT * FROM ${table} WHERE ${key} = ${value}`);
db(prevs).query(`SELECT * FROM ${table} WHERE ${key} = ${value}`, (err, rows, fields) => {
if (err) {
console.log("sql err");
@ -52,7 +52,7 @@ module.exports.gv = (table,key,value,callback,prevs = false) => {
// get all from table
module.exports.gav = (table,limit = "0",callback,prevs = false) => {
// console.log('SELECT * FROM `'+table+'` WHERE `'+key+'` = '+value);
// console.log(`SELECT * FROM ${table} WHERE 1 ${limit}`);
limit = (limit != "0")? `LIMIT ${limit}`:"";
db(prevs).query(`SELECT * FROM ${table} WHERE 1 ${limit}`, (err, rows, fields) => {
if (err) {
@ -92,6 +92,31 @@ module.exports.sv = (table,key,value,ekey,evalue,callback,prevs = false,no_srt =
})
}
module.exports.fv = (table,key,value,callback,prevs = false) => {
// console.log(`UPDATE ${table} SET ${key} = ${value} WHERE ${ekey} = '${evalue}'`);
db(prevs).query(`SELECT * FROM ${table} WHERE ${key} LIKE '%${value}%'`, (err , rows) => {
if (err) {
console.log("sql err");
throw err;
}else{
if(callback)callback(rows);
}
})
}
module.exports.fva = (table,key,value,limit = "0",callback,prevs = false) => {
// console.log(`UPDATE ${table} SET ${key} = ${value} WHERE ${ekey} = '${evalue}'`);
limit = (limit != "0")? `LIMIT ${limit}`:"";
db(prevs).query(`SELECT * FROM ${table} WHERE ${key} LIKE '%${value}%' ${limit}`, (err , rows) => {
if (err) {
console.log("sql err");
throw err;
}else{
if(callback)callback(rows);
}
})
}
module.exports.uv = (table,keys,values,ekey,evalue,callback,prevs = false,no_srt = false) => {
values = values.split(".");
keys = keys.split(".");

49
index.js
View File

@ -212,7 +212,7 @@ app.get("/get_logs", (req,res) => {
try{let cook = req.cookies;func.sid(cook,res,()=>{func.logs_file(res);})}
catch (error) {func.log("router logs download error - "+error);}
})
app.post("/admin/obj/new", (req,res) => {
app.post("/admin/objects/new", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
@ -223,7 +223,7 @@ app.post("/admin/obj/new", (req,res) => {
func.log("router object creating error - "+error);
}
})
app.post("/admin/obj/edit", (req,res) => {
app.post("/admin/objects/edit", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
@ -234,7 +234,7 @@ app.post("/admin/obj/edit", (req,res) => {
func.log("router object creating error - "+error);
}
})
app.post("/admin/obj/del", (req,res) => {
app.post("/admin/objects/delete", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
@ -245,7 +245,18 @@ app.post("/admin/obj/del", (req,res) => {
func.log("router object creating error - "+error);
}
})
app.post("/admin/new/group", (req,res) => {
app.post("/admin/objects/find", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
func.sid(cook,res,()=>{
obj.find(inp,cook,res);
},true,true)
} catch (error) {
func.log("router object creating error - "+error);
}
})
app.post("/admin/groups/new", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
@ -256,7 +267,7 @@ app.post("/admin/new/group", (req,res) => {
func.log("router object creating error - "+error);
}
})
app.post("/admin/delete/group", (req,res) => {
app.post("/admin/groups/delete", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
@ -278,12 +289,12 @@ app.post("/admin/users/get", (req,res) => {
func.log("router object creating error - "+error);
}
})
app.post('/admin/users/reg', (req, res) => {
app.post('/admin/users/new', (req, res) => {
try{
let inp = req.body;
let cook = req.cookies;
func.sid(cook,res,()=>{
admin.reg(inp,cook,res);
admin.new_user(inp,cook,res);
},true,true)
} catch (error) {
func.log("router registration error - "+error);
@ -300,18 +311,7 @@ app.post("/admin/users/edit", (req,res) => {
func.log("router object creating error - "+error);
}
})
app.post("/admin/users/get/user", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
func.sid(cook,res,()=>{
admin.get_users(inp,cook,res);
},true,true)
} catch (error) {
func.log("router object creating error - "+error);
}
})
app.post("/admin/users/del/user", (req,res) => {
app.post("/admin/users/delete", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
@ -322,6 +322,17 @@ app.post("/admin/users/del/user", (req,res) => {
func.log("router object creating error - "+error);
}
})
app.post("/admin/users/find", (req,res) => {
try{
let inp = req.body;
let cook = req.cookies;
func.sid(cook,res,()=>{
admin.find_user(inp,cook,res);
},true,true)
} catch (error) {
func.log("router object creating error - "+error);
}
})

20
object.js
View File

@ -1,11 +1,10 @@
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`","gid",`${inp["gid"]}`,(odata)=>{
db.ggv("objects","`name`,`id`,`height`,`width`,`description`,`cost`,`gid`","gid",`${inp["gid"]}`,(odata)=>{
// func.log(odata);
res.send({out:"good",body:odata});
})
@ -34,7 +33,7 @@ module.exports.new = (inp,cook,res)=>{
res.send({out:"bad",err:"name"});
}
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.nr("objects","`cost`,`name`,`img`,`height`,`width`,`description`,`gid`",`'${inp["cost"]}','${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"});
@ -91,11 +90,12 @@ module.exports.save = (inp,cook,res)=>{
module.exports.del = (inp,cook,res)=>{
try {
let name = inp["name"].split("/")[0];
let group = inp["name"].split("/").at(-1);
db.ggv("object_groups","name","id",inp["gid"],(gname)=>{let group = gname[0]["name"]
db.dl("objects",`id`,`'${inp["id"]}' AND gid = '${inp["gid"]}'`,()=>{
func.log(`admin group deleted ${name} from ${group}`);
func.log(`admin group deleted name:${name} group:${group}`);
res.send({out:"good"});
},true);
})
} catch (error) {
func.log("backend single object loading err0r - "+error);
}
@ -140,3 +140,13 @@ module.exports.del_group = (inp,cook,res)=>{
func.log("backend single object loading err0r - "+error);
}
}
module.exports.find = (inp,cook,res)=>{
try {
db.fv("objects",`SUBSTRING_INDEX(name,'/',1)`,inp["name"],(db_res)=>{
res.send({out:"good",body:db_res});
},true);
} catch (error) {
func.log("backend single object loading err0r - "+error);
}
}

2
public/lib/fn.js
View File

@ -67,7 +67,7 @@ function check_sid(redirect = true){
}
function logout(redirect = true) {
let dialog = confirm(`${lang("logout")}?`);
let dialog = confirm(`выйти?`);
if(dialog){
clear_ck(redirect);
}

106
public/lib/inter.js
View File

@ -32,7 +32,6 @@ function create(clas,x,y,body,id,size){
}
}
else if (db_data != null){
if ($.cookie("cache") == "true"){
if (objs_imgs[main_clas] == null){
load_obj(main_clas,"`img`",(odata)=>{
objs_imgs[main_clas] = odata["img"];
@ -43,16 +42,10 @@ function create(clas,x,y,body,id,size){
make(objs_imgs[main_clas])
}
}
else{
load_obj(main_clas,"`img`",(odata)=>{
objs_imgs[main_clas] = odata["img"];
make(odata["img"]);
})
}
}
function make(img){
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"]}см`;
obj.title = `${db_data["name"].replace("$"," ").split("/g")[0]}\nцена:${db_data["cost"]}\n${db_data["description"]}\nширина:${db_data["width"]}см высота:${db_data["height"]}см`;
obj.setAttribute("cost",db_data["cost"])
// 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`;
@ -68,6 +61,7 @@ function resize_drags(){
document.getElementById('drags').setAttribute("data-x",document.getElementsByClassName("wall")[0].getBoundingClientRect().left.toString()+"px");
document.getElementById('drags').style.left = document.getElementsByClassName("wall")[0].getBoundingClientRect().left.toString()+"px";
document.getElementById('drags').style.width = document.getElementsByClassName("wall")[0].style.width;
document.getElementsByClassName("zones")[0].style.height = document.getElementsByClassName("wall")[0].style.height;
drag_start();
}
@ -96,6 +90,23 @@ function wall_size_change(type,value){
}
}
function calc_total(){
let total=0;
Object.entries(objs).forEach(([key,value]) => {
if(key != "height"&&key!="width"&key!="total"){
// console.log(key,value);
// console.log(Object.keys(value).length);
// console.log(objs_store[key]);
if(objs_store[key] != null){
total += parseInt(parseInt(objs_store[key]["cost"]) * Object.keys(value).length);
}
}
// console.log(Object.keys(objs).at(-1));
});
// return total;
document.getElementById("proj_cost").innerText = total;
}
function load(objss){
// objs = JSON.parse($.cookie("objs"));
// console.log(objs);
@ -120,12 +131,13 @@ function load(objss){
}
});
resize_drags();
calc_total()
}
function load_proj_cloud(){
proj_from = "cloud";
document.getElementById("drags").innerHTML = "";
document.getElementById("top_panel_center").innerText = `${lang("loading")} ${proj_name} ${lang("from")} ${lang("cloud")}`;
document.getElementById("top_panel_center").innerText = `загрузка ${proj_name} из облака`;
$.post( "/load_proj",{name:proj_name})
.done(function( res ) {
if(res["out"] == "good"){
@ -134,7 +146,7 @@ function load_proj_cloud(){
// console.log(JSON.parse(res["body"]));
// $.cookie("objs",res["body"]);
load(JSON.parse(res["body"]));
document.getElementById("top_panel_center").innerText = `${proj_name} (${lang("cloud")})`;
document.getElementById("top_panel_center").innerText = `${proj_name} (облако)`;
}
else if(res["out"] == "bad proj"){
console.log("bad");
@ -151,7 +163,7 @@ function load_proj_local(){
if(localStorage.getItem(proj_name) == null){
save_local()
}
document.getElementById("top_panel_center").innerText = `${proj_name} (${lang("local")})`;
document.getElementById("top_panel_center").innerText = `${proj_name} (локальное хранилище)`;
document.getElementById("drags").innerHTML = "";
load(JSON.parse(localStorage.getItem(proj_name)));
}
@ -199,7 +211,7 @@ function load_objs(callback){
if(res["out"] == "good"){
// console.log(res["body"]);
res["body"].forEach(element => {
objs_store[`${element["name"]}`] = {description:element["description"],height:element["height"],width:element["width"],id:element["id"],name:element["name"]}
objs_store[`${element["name"]}`] = {description:element["description"],height:element["height"],width:element["width"],id:element["id"],name:element["name"],cost:element["cost"]}
});
callback(res["body"]);
}
@ -254,22 +266,22 @@ interact('.trash').dropzone({
accept: '.drag',
overlap: 0.2,
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];
zone.classList.add('drop-target');
drag.classList.add('can-drop');
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()
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;
ondrop: function (event) {var drag = event.relatedTarget;
// console.log(drag.id);
// console.log(objs);
drag.classList.add('in_zone')
drag.classList.remove('can-drop')
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');}
})
@ -278,23 +290,25 @@ interact('.dropzone').dropzone({
accept: '.drag',
overlap: 0.5,
ondragenter: function (event) {
var drag = event.relatedTarget;
var zone = event.target;
ondragenter: function (event) {var drag = event.relatedTarget;var zone = event.target;
if (objs[drag.classList[0]] == null){
objs[drag.classList[0]] = {};
}
if(drag.id == "none") drag.id = get_id(drag.classList[0]);
zone.classList.add('drop-target');
drag.classList.add('can-drop');
if (objs[drag.classList[0]][drag.id] == null){
objs[drag.classList[0]][drag.id] = {};
calc_total()
}
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
// console.log(drag.classList[0]);
if (objs[drag.classList[0]] == null) objs[drag.classList[0]] = {};
ondrop: function (event) {var drag = event.relatedTarget
objs[drag.classList[0]][drag.id] = {y:drag.getAttribute('data-y'),x:drag.getAttribute('data-x'),body:drag.innerHTML};
// console.log(objs);
// $.cookie("objs",JSON.stringify(objs));
drag.classList.add('in_zone')
drag.classList.remove('can-drop')
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');}
})
@ -303,14 +317,11 @@ interact('.createzone').dropzone({
accept: '.spawn',
overlap: 0.2,
ondragenter: function (event) {
var drag = event.relatedTarget;
var zone = event.target;zone.classList.add('drop-target');
drag.classList.add('can-drop');
ondragenter: function (event) {var drag = event.relatedTarget;var zone = event.target;
zone.classList.add('drop-target');drag.classList.add('can-drop');
},
ondragleave: function (event) {
var drag = event.relatedTarget;
var zone = event.target;
ondragleave: function (event) {var drag = event.relatedTarget;var zone = event.target;
if(drag.classList[1] == "spawn" && drag.classList[0] == zone.classList[0]){
get_obj(drag.classList[0],(db_data)=>{
// drag.transform = `translate(${drag.getAttribute("data-y")}px, ${drag.getAttribute("data-y")}px) scale(${db_data["width"] * 2} ${db_data["height"] * 2})`;
@ -321,12 +332,15 @@ 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`);
drag.classList.remove('spawn');
}
zone.classList.remove('drop-target');
},
ondrop: function (event) {var drag = event.relatedTargetdrag.classList.remove('in_zone');drag.classList.remove('can-drop');},
ondropdeactivate: function (event) {var zone = event.target;zone.classList.remove('drop-active');zone.classList.remove('drop-target');}
ondrop: function (event) {var drag = event.relatedTarget;
drag.classList.remove('in_zone');drag.classList.remove('can-drop');},
ondropdeactivate: function (event) {var zone = event.target;
zone.classList.remove('drop-active');zone.classList.remove('drop-target');}
})
function drag_start() {

10
views/admin.ejs
View File

@ -7,22 +7,24 @@
}
</style>
<h1 style="text-align: center;"><%= lang("hello admin") %></h1> <br>
<!-- <h1 style="text-align: center;">привет админ</h1> <br> -->
<section>
<%- include('./admin/objects/object_creation.ejs') %>
<h1 style="text-align: center;">объект</h1>
<%- include('./admin/objects/object_groups.ejs') %>
<%- include('./admin/objects/object_creation.ejs') %>
<%- include('./admin/objects/object_edit.ejs') %>
</section>
<section>
<h1 style="text-align: center;">пользователь</h1>
<%- include('./admin/users/user_reg.ejs') %>
<%- include('./admin/users/user_edit.ejs') %>
</section>
<section style="display: flex; justify-content: space-between;">
<h1><%= lang("logs") %></h1> <br>
<h1>логи</h1> <br>
<div class="logs_div" style="margin: auto 0px;display: flex;">
<button onclick="goto('/get_logs');"><%= lang("download logs") %></button>
<button onclick="goto('/get_logs');">скачать логи</button>
</div>
</section>

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

@ -16,56 +16,64 @@
display: flex;
}
#img_prev{
object-fit: fill;
height: 200px;
width: 200px;
}
</style>
<div style="display: flex;justify-content: space-between;">
<h1>object</h1>
<h1 id="object_edit_type">creation</h1>
</div>
<div class="nobj">
<form action="#" class="nobj">
<div>
<div class="img_preview">
<label for="img_file"><%= lang("img max size") %></label><br>
<label for="img_file">макс. размер 2мб</label><br>
<input type="file" id="img_file" onchange="previewFile()" accept="image/*" value="" maxlength="1"><br>
</div>
<div style="width: 200px; height: 200px;">
<img src="" id="img_prev" height="100" alt="<%= lang('Image preview') %>">
<img src="" id="img_prev" height="100" alt="предпросмотр картинки">
</div>
</div>
<textarea id="nobj_description" cols="30" rows="5" placeholder="<%= lang("object description") %>"></textarea>
<textarea id="nobj_description" cols="30" rows="5" placeholder="описание товара"></textarea>
<div>
<div id="object_edit_type" style="text-align: right;">creation</div>
<div class="nobj_options">
<input type="text" id="nobj_name" placeholder="<%= lang("object name") %>">
<button onclick="create_obj()" id="obj_apply_btn"><%= lang("create object")%></button>
<input type="text" id="nobj_name" placeholder="название товара">
<input type="submit" onclick="create_obj()" id="obj_apply_btn" value="создать товар">
<div id="obj_resp"></div>
</div>
<div id="obj_input">
<div>
<div style="display: flex;width: 100%;justify-content: space-between;">
<label for="obj_height"><%= lang("height") %> </label>
<label for="obj_height">высота</label>
<div id="obj_height_value">100см</div>
</div>
<input style="width: 100%;" type="range" step="1" min="1" max="100" id="obj_height" value="100" oninput="obj_size_change('height')">
</div>
<div>
<div style="display: flex;width: 100%;justify-content: space-between;">
<label for="obj_width"><%= lang("width") %></label>
<label for="obj_width">ширина</label>
<div id="obj_width_value">100см</div>
</div>
<input style="width: 100%;" type="range" step="1" min="1" max="100" id="obj_width" value="100" oninput="obj_size_change('width')">
</div>
</div>
<div>
<button onclick="set_obj_edit_params()">clear parameters</button>
<div style="display: flex;width: 100%;justify-content: space-between;">
<label for="obj_width">цена</label>
<div style="display: flex;">
<input style="text-align: right;" id="obj_cost" type="text">
<div>руб.</div>
</div>
</div>
</div>
</div>
<div>
<button onclick="set_obj_edit_params()" style="width: 100%;margin-block:10px;">очистить параметры</button>
</div>
</div>
</form>
<script>
set_obj_edit_params();
function obj_size_change(type){
if(type == "height"){
let img = document.getElementById('img_prev');
@ -83,15 +91,17 @@
}
}
function set_obj_edit_params(img = "",name = "",description="",height = 100,width = 100){
function set_obj_edit_params(img = "",name = "",description="",height = 100,width = 100,cost = 0,gid = 0){
if(img ==""&&name ==""&&description == ""){
document.getElementById("object_edit_type").innerText = "creation";
document.getElementById("obj_apply_btn").innerText = "create object";
document.getElementById("object_edit_type").innerText = "добавление";
document.getElementById("obj_apply_btn").value = "добавить товар";
document.getElementById("obj_apply_btn").setAttribute("onclick","create_obj()");
}else {
document.getElementById("object_edit_type").innerText = "edit";
document.getElementById("obj_apply_btn").innerText = "save edited object";
document.getElementById("object_edit_type").innerText = "редактирование";
document.getElementById("obj_apply_btn").value = "сохранить";
document.getElementById("obj_apply_btn").setAttribute("onclick","save_edited_obj()");
document.getElementById("group_select").selectedIndex = document.getElementById("group_select").options[`obj_group_${gid}`].index;
console.log(gid);
}
let img_file = document.getElementById("img_file");
@ -103,6 +113,7 @@
let height_text = document.getElementById("obj_height_value");
let width_slider = document.getElementById("obj_width");
let width_text = document.getElementById("obj_width_value");
let cost_text = document.getElementById("obj_cost");
name_div.value = name;
img_file.value = null;
@ -110,6 +121,7 @@
img_prev.style.height = `${height*2}px`;
img_prev.style.width = `${width*2}px`;
description_div.value = description;
cost_text.value = cost;
height_slider.value = height;
width_slider.value = width;
@ -133,9 +145,10 @@
}
}
function new_obj(name,img,height,width,description,callback){
function new_obj(cost,name,img,height,width,description,callback){
let select = document.getElementById("group_select");
$.post( "/admin/obj/new", { name:name,img:img,desc:description,height:height,width:width,gid:select.options[select.selectedIndex].getAttribute("gid")})
if(name!=""){
$.post( "/admin/objects/new", { cost:cost,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"]);
@ -143,6 +156,7 @@
callback(res);
});
}
}
function create_obj(){
let name = document.getElementById("nobj_name").value;
@ -150,15 +164,17 @@
let height = document.getElementById("obj_height").value;
let width = document.getElementById("obj_width").value;
var img = document.querySelector('#img_prev').src;
var cost = document.getElementById("obj_cost").value;
name = name.replace(" ","$");
if(name != ""){
if (img != "http://n0rsrv2:3002/admin"){
document.getElementById("obj_resp").innerHTML = "creating object";
new_obj(name,img,height,width,description,(res)=>{
document.getElementById("obj_resp").innerHTML = "добавление товара";
new_obj(cost,name,img,height,width,description,(res)=>{
if(res["out"] == "bad" && res["err"] == "name"){
document.getElementById("obj_resp").innerHTML = "object already exist";
document.getElementById("obj_resp").innerHTML = "товар уже существует";
}
else if(res["out"] == "good"){
document.getElementById("obj_resp").innerHTML = "object created";
document.getElementById("obj_resp").innerHTML = "товар добавлен";
setTimeout(()=>{
edit_get_objs();
},1000)
@ -169,7 +185,8 @@
});
}
else{
document.getElementById("obj_resp").innerHTML = "image not selected";
document.getElementById("obj_resp").innerHTML = "картинка не выбрана";
}
}
}
</script>

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

@ -3,29 +3,44 @@
background-color: #bfe4ff;
border: dashed 4px transparent;
border-radius: 4px;
height: 50px;
width: 50px;
height: 55px;
width: 55px;
margin: 5px;
margin-top: 0px;
margin-bottom: 20px;
}
img{
width: 100%;
height: 100%;
object-fit: contain;
pointer-events: none;
}
#objs_in_group{
#objs_in_group,#founded_objs_list{
display: flex;
flex-wrap: wrap;
padding: 0px;
}
#find_obj_btns{
/* display: flex; */
margin: auto 0px;
/* height: 25px; */
}
</style>
<h1>object edit</h1>
<div style="display: flex;justify-content: space-between;">
<h1>изменение объектов</h1>
<div id="find_obj_btns">
<button onclick="load_groups(()=>{edit_get_objs(true);});">найти по имени</button>
<button onclick="load_groups(()=>{edit_get_objs();});">очистить</button>
</div>
</div>
<div>
<div id="objs_in_group"></div>
</div>
<div class="cmenu" id="object_edit_menu">
<button onclick="obj_del()">del object</button>
<button onclick="set_edit()">edit object</button>
<button onclick="obj_del()">удалить объект</button>
<button onclick="set_edit()">редактирование объекта</button>
</div>
<script>
@ -35,42 +50,28 @@
function set_edit(){
let menu = document.getElementById("object_edit_menu");
set_obj_edit_params(menu.getAttribute("obj_img"),menu.getAttribute("obj_name").split("/")[0],menu.getAttribute("obj_description"),menu.getAttribute("obj_height"),menu.getAttribute("obj_width"));
set_obj_edit_params(menu.getAttribute("obj_img"),menu.getAttribute("obj_name").split("/")[0],menu.getAttribute("obj_description"),menu.getAttribute("obj_height"),menu.getAttribute("obj_width"),menu.getAttribute("obj_cost"),menu.getAttribute("obj_gid"));
}
function edit_get_objs(){
function edit_get_objs(by_name){
document.getElementById("objs_in_group").innerHTML = "";
set_obj_edit_params();
edit_load_objs((data)=>{
data.forEach(value => {
// console.log(value);
// // console.log($.cookie("cache"));
edit_load_obj(value["name"],"`img`",(odata)=>{
make(odata["img"]);
make_obj(odata["img"],value,"objs_in_group");
})
function make(img){
let obj_list = document.getElementById("objs_in_group");
let obj = document.createElement('div');
obj.id = "object_menu";
obj.classList.add(value["name"]);
obj.classList.add("object");
obj.setAttribute("name",value["name"])
obj.setAttribute("description",value["description"])
obj.setAttribute("src",img)
obj.setAttribute("height",value["height"])
obj.setAttribute("width",value["width"])
obj.setAttribute("obj_id",value["id"])
obj.innerHTML = `<img src="${img}">`
obj_list.append(obj)
}
});
})
},by_name)
}
function obj_del(){
let select = document.getElementById("group_select");
let menu = document.getElementById("object_edit_menu");
if (confirm(`are you sure you want to delete object ${menu.getAttribute("obj_name").split("/")[0]}`)){
$.post( "/admin/obj/del", { id:menu.getAttribute(`obj_id`),gid:select.options[select.selectedIndex].getAttribute("gid"),name:menu.getAttribute("obj_name")})
if (confirm(`вы точно хотите удалить ${menu.getAttribute("obj_name").split("/")[0]}?`)){
$.post( "/admin/objects/delete", { id:menu.getAttribute(`obj_id`),gid:select.options[select.selectedIndex].getAttribute("gid"),name:menu.getAttribute("obj_name")})
.done(function( res ) {
if(res["out"] == "good"){
edit_get_objs();
@ -82,13 +83,14 @@
function save_edited_obj(){
let select = document.getElementById("group_select");
let menu = document.getElementById("object_edit_menu");
let attributes = ["name","description","img","height","width"];
let attributes = ["name","description","img","height","width","cost"];
let cur_atts = {
name : document.getElementById("nobj_name").value,
description : document.getElementById("nobj_description").value,
height : document.getElementById("obj_height").value,
width : document.getElementById("obj_width").value,
img : document.querySelector('#img_prev').src
img : document.querySelector('#img_prev').src,
cost : document.getElementById("obj_cost").value
}
let changes = {}
attributes.forEach(element => {
@ -102,6 +104,7 @@
// console.log(changes);
if(Object.keys(changes).length > 0){
make_obj_save(changes);
// console.log(changes);
}
}
});
@ -115,17 +118,17 @@
}
function make_obj_save(){
if(changes["name"]) changes["name"] = (changes["name"]+"/g/"+select.options[select.selectedIndex].value).replace(" ","$");
document.getElementById("obj_resp").innerHTML = "saving object";
$.post( "/admin/obj/edit", { id:menu.getAttribute(`obj_id`),changes:JSON.stringify(changes),gid:select.options[select.selectedIndex].getAttribute("gid")})
document.getElementById("obj_resp").innerHTML = "сохранение товара";
$.post( "/admin/objects/edit", { id:menu.getAttribute(`obj_id`),changes:JSON.stringify(changes),gid:select.options[select.selectedIndex].getAttribute("gid")})
.done(function( res ) {
// console.log(res);
if(res["out"] == "good"){
document.getElementById("obj_resp").innerHTML = "object saved";
document.getElementById("obj_resp").innerHTML = "товар сохранён";
setTimeout(()=>{
edit_get_objs();
set_obj_edit_params();
if(res["name_err"]){
document.getElementById("obj_resp").innerHTML = ("name was not changed because its taken");
document.getElementById("obj_resp").innerHTML = ("название товара не было изменино поскольку оно занято");
}
},1000)
setTimeout(()=>{
@ -146,8 +149,9 @@
});
}
function edit_load_objs(callback){
function edit_load_objs(callback,by_name = false){
let select = document.getElementById("group_select");
if(!by_name){
$.post( "/get_objs",{gid:select.options[select.selectedIndex].getAttribute("gid")})
.done(function( res ) {
if(res["out"] == "good"){
@ -160,4 +164,41 @@
}
});
}
else{
let name = ask("название");
if(name != "")[
$.post( "/admin/objects/find", { name:name.replace(" ","$")})
.done(function( res ) {
if(res["out"] == "good"){
// console.log(res["body"]);
callback(res["body"])
}
})
]
}
}
function make_obj(img,value,list_id){
let obj_list = document.getElementById(list_id);
let obj = document.createElement('div');
let name_text = document.createElement('div');
let img_elm = document.createElement('img');
obj.title = `название:${value["name"].split("/")[0].replace("$"," ")}\nцена:${value["cost"]}\nширена:${value["width"]}\nвысота${value["height"]}\nописание:${value["description"]}`;
obj.id = "object_menu";
obj.classList.add(value["name"]);
obj.classList.add("object");
obj.setAttribute("name",value["name"].split("/")[0].replace("$"," "))
obj.setAttribute("description",value["description"])
obj.setAttribute("src",img)
obj.setAttribute("height",value["height"])
obj.setAttribute("width",value["width"])
obj.setAttribute("obj_id",value["id"])
obj.setAttribute("cost",value["cost"])
obj.setAttribute("gid",value["gid"])
name_text.innerText = value["name"].split("/")[0].replace("$"," ");
img_elm.src = img;
obj.append(img_elm)
obj.append(name_text)
obj_list.append(obj)
}
</script>

22
views/admin/objects/object_groups.ejs
View File

@ -1,11 +1,17 @@
<h1>objects group</h1>
<style>
#obj_group button,#obj_group select{
height: 25px;
margin: auto 0px;
}
</style>
<div id="obj_group">
<div style="display: flex;justify-content: space-between;">
<h1>группы товаров</h1>
<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 style="display: flex;justify-content: space-between;width: 220px;">
<button onclick="create_new_group()">создать группу</button>
<button onclick="delete_group()">удалить группу</button>
</div>
</div>
</div>
@ -15,8 +21,8 @@
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})
if(confirm(`вы уверены вы хотите удалить группу ${select.options[select.selectedIndex].text}`) == true){
$.post( "/admin/groups/delete", { gid:group_id})
.done(function( res ) {
if(res["out"] == "good"){
// console.log(res["body"]);
@ -27,9 +33,9 @@
}
}
function create_new_group() {
let group_name = ask("enter group name");
let group_name = ask("название группы");
if(group_name != ""){
$.post( "/admin/new/group", { name:group_name.replace(" ","$")})
$.post( "/admin/groups/new", { name:group_name.replace(" ","$")})
.done(function( res ) {
if(res["out"] == "good"){
// console.log(res["body"]);

124
views/admin/users/user_edit.ejs
View File

@ -7,7 +7,7 @@
display: flex;
justify-content: space-between;
text-align: center;
margin: 20px auto;
margin: 0px auto;
padding: 10px;
background-color:cornsilk;
}
@ -27,20 +27,30 @@
list-style: none;
height: 320px;
}
#find_user_btns{
/* display: flex; */
margin: auto 0px;
/* height: 25px; */
}
</style>
<h1><%=lang("users")%></h1>
<div style="display: flex;justify-content: space-between;">
<h1>пользователи</h1>
<div id="find_user_btns">
<button onclick="load_users_data(users_from,true);">найти по имени</button>
<button onclick="load_users_data(users_from)">очистить</button>
</div>
</div>
<section id="users_section">
<div style="display: flex;justify-content: space-between;margin: auto;">
<div style="display: flex;"><h1><%= lang("total") %>:&nbsp;</h1> <h1 id="users_count">0</h1></div>
<div style="display: flex;margin: auto 0px;"><%=lang("from")%>&nbsp;<div id="users_from">0</div>&nbsp;<%=lang("to")%>&nbsp;<div id="users_to">10</div></div>
<div style="margin: auto 0px;"><button onclick="if(users_from-load_interval>=0){users_from-=load_interval;load_users_data(users_from);}">< 10 <%= lang("back") %></button></div>
<div style="margin: auto 0px;"><button onclick="users_from+=load_interval;load_users_data(users_from);"><%= lang("next") %> 10 ></button></div>
<div style="display: flex;"><h1>всего:&nbsp;</h1> <h1 id="users_count">0</h1></div>
<div style="display: flex;margin: auto 0px;">с&nbsp;<div id="users_from">0</div>&nbsp;по&nbsp;<div id="users_to">10</div></div>
<div style="margin: auto 0px;"><button onclick="if(users_from-load_interval>=0){users_from-=load_interval;load_users_data(users_from);}">< 10 назад</button></div>
<div style="margin: auto 0px;"><button onclick="users_from+=load_interval;load_users_data(users_from);">даллее ></button></div>
</div>
<div>
<li id="first_user"><div><%= lang("login") %></div><div><%= lang("privileges") %></div><div><%= lang("edit") %></div></li>
<ul id="user_list">
</ul>
<li id="first_user"><div>логин</div><div>превилегии</div><div>функции</div></li>
<ul id="user_list"></ul>
</div>
</section>
@ -49,55 +59,54 @@
let users_from = 0;
let load_interval = 5;
load_users_data(users_from);
function load_users_data(from,to){
function load_users_data(from,by_name=false){
// if(to == "forward") {users_from+=load_interval;}
// else if(to == "back") {users_from-=load_interval;}
document.getElementById("user_list").innerHTML = "";
document.getElementById("users_from").innerText = from;
document.getElementById("users_to").innerText = from+load_interval;
if(!by_name){
$.post( "/admin/users/get",{from:from,load_interval:load_interval})
.done(function( res ) {
// console.log("serv reg");
if(res["out"] == "good"){
// console.log(res["body"]);
document.getElementById("users_count").innerText = res["count"];
res["body"].forEach(user => {
let user_sec = document.createElement("li");
user_sec.id = `user_${user["id"]}`;
let user_name = document.createElement("div");
user_name.id = `login_${user["id"]}`;
user_name.innerText = user["login"];
let user_pass = document.createElement("div");
user_pass.id = `pass_${user["id"]}`;
user_pass.innerText = user["pass"];
user_pass.style.display = "none";
let user_prevs = document.createElement("div");
user_prevs.id = `admin_${user["id"]}`;
user_prevs.innerText = Boolean(user["admin"]);
let user_buttons = document.createElement("button");
user_buttons.id = "user_buttons";
user_buttons.innerText = "<%=lang('edit')%>";
user_buttons.classList.add(user["id"]);
user_buttons.classList.add("menu_btn");
user_sec.append(user_pass);
user_sec.append(user_name);
user_sec.append(user_prevs);
user_sec.append(user_buttons);
let user_sec = document.createElement("li");user_sec.id = `user_${user["id"]}`;
let user_name = document.createElement("div");user_name.id = `login_${user["id"]}`;user_name.innerText = user["login"];
let user_pass = document.createElement("div");user_pass.id = `pass_${user["id"]}`;user_pass.innerText = user["pass"];user_pass.style.display = "none";
let user_prevs = document.createElement("div");user_prevs.id = `admin_${user["id"]}`;user_prevs.innerText = Boolean(user["admin"]);
let user_buttons = document.createElement("button");user_buttons.id = "user_buttons"; user_buttons.innerText = "изменить"; user_buttons.classList.add(user["id"]); user_buttons.classList.add("menu_btn");
user_sec.append(user_pass);user_sec.append(user_name);user_sec.append(user_prevs);user_sec.append(user_buttons);
document.getElementById("user_list").append(user_sec);
});
// document.getElementById("reg_response").innerHTML = `user ${login} successfully registered `;
}
else if (res["out"] == "bad"){
}
});
}
else{
let login = ask("имя");
if (login != ""){
$.post( "/admin/users/find",{login:login,from:from,load_interval:load_interval})
.done(function( res ) {
if(res["out"] == "good"){
res["body"].forEach(user => {
let user_sec = document.createElement("li");user_sec.id = `user_${user["id"]}`;
let user_name = document.createElement("div");user_name.id = `login_${user["id"]}`;user_name.innerText = user["login"];
let user_pass = document.createElement("div");user_pass.id = `pass_${user["id"]}`;user_pass.innerText = user["pass"];user_pass.style.display = "none";
let user_prevs = document.createElement("div");user_prevs.id = `admin_${user["id"]}`;user_prevs.innerText = Boolean(user["admin"]);
let user_buttons = document.createElement("button");user_buttons.id = "user_buttons"; user_buttons.innerText = "изменить"; user_buttons.classList.add(user["id"]); user_buttons.classList.add("menu_btn");
user_sec.append(user_pass);user_sec.append(user_name);user_sec.append(user_prevs);user_sec.append(user_buttons);
document.getElementById("user_list").append(user_sec);
});
}
});
}
}
}
function user_edit(key){
let user = document.getElementById("user_edit_menu");
let id = user.getAttribute("login_id");
@ -107,7 +116,7 @@
let value = null;
if(key!="admin") {value = ask(key,document.getElementById(`${key}_${id}`).innerText)}
else if (confirm(`<%=lang('are you sure you want to change')%> <%=lang('admin privileges')%> <%=lang('for')%> ${login} <%=lang("to the")%> ${!admin}?`) == true){value = (!admin)};
else if (confirm(`вы точно хотите изменить привелегии пользователя ${login} на ${!admin}?`) == true){value = (!admin)};
if(value != null){
$.post( "/admin/users/edit",{key:key,value:value,id:id,login:login})
.done(function( res ) {
@ -125,8 +134,8 @@
let user = document.getElementById("user_edit_menu");
let id = user.getAttribute("login_id");
let login = user.getAttribute("login_name");
if(confirm(`<%= lang("are you sure you want to delete user") %> ${login}?`) == true){
$.post( "/admin/users/del/user",{login:login,id:id})
if(confirm(`вы точно хотите удалить пользователя ${login}?`) == true){
$.post( "/admin/users/delete",{login:login,id:id})
.done(function( res ) {
if(res["out"] == "good"){
load_users_data(users_from);
@ -135,29 +144,10 @@
}
}
let user_edit_menu = document.createElement("div");
user_edit_menu.id = "user_edit_menu";
user_edit_menu.classList.add("cmenu");
let user_chenge_name = document.createElement("button");
user_chenge_name.innerHTML = "<%= lang('change login') %>";
user_chenge_name.setAttribute("onclick","user_edit('login')");
let user_chenge_pass = document.createElement("button");
user_chenge_pass.innerHTML = "<%= lang('change password') %>";
user_chenge_pass.setAttribute("onclick","user_edit('pass')");
let user_chenge_prevs = document.createElement("button");
user_chenge_prevs.innerHTML = "<%= lang('change privileges') %>";
user_chenge_prevs.setAttribute("onclick","user_edit('admin')");
let user_delete = document.createElement("button");
user_delete.innerHTML = "<%= lang('delete user') %>";
user_delete.setAttribute("onclick","user_del()");
user_edit_menu.append(user_chenge_name);
user_edit_menu.append(user_chenge_pass);
user_edit_menu.append(user_chenge_prevs);
user_edit_menu.append(user_delete);
document.body.append(user_edit_menu);
let user_edit_menu = document.createElement("div");user_edit_menu.id = "user_edit_menu"; user_edit_menu.classList.add("cmenu");
let user_chenge_name = document.createElement("button");user_chenge_name.innerHTML = "именить логин"; user_chenge_name.setAttribute("onclick","user_edit('login')");
let user_chenge_pass = document.createElement("button");user_chenge_pass.innerHTML = "изменить пароль"; user_chenge_pass.setAttribute("onclick","user_edit('pass')");
let user_chenge_prevs = document.createElement("button");user_chenge_prevs.innerHTML = "сменить привелегии";user_chenge_prevs.setAttribute("onclick","user_edit('admin')");
let user_delete = document.createElement("button");user_delete.innerHTML = "удалить пользователя";user_delete.setAttribute("onclick","user_del()");
user_edit_menu.append(user_chenge_name);user_edit_menu.append(user_chenge_pass);user_edit_menu.append(user_chenge_prevs);user_edit_menu.append(user_delete);document.body.append(user_edit_menu);
</script>

20
views/admin/users/user_reg.ejs
View File

@ -1,23 +1,23 @@
<style>
.main_sec{
.user_reg_form{
margin: auto;
/* display: flex; */
text-align: center;
}
</style>
<h1><%= lang("user registration") %></h1>
<div class="main_sec">
<h1>регистрация пользователя</h1>
<form action="#" class="user_reg_form">
<div>
<input type="text" id="login" name="login" value="" placeholder="<%= lang("login") %>">
<input type="password" id="pass" name="pass" value="" placeholder="<%= lang("password") %>">
<button onclick='reg();'><%= lang("register") %></button>
<input type="text" id="login" name="login" value="" placeholder="логин">
<input type="password" id="pass" name="pass" value="" placeholder="пароль">
<input type="submit" onclick='reg();' value="зарегистрировать">
</div>
<div>
<label for="admin_check"><%= lang("admin") %></label>
<label for="admin_check">админ. привелегии</label>
<input type="checkbox" name="admin" value='false' id="admin_check">
</div>
<div id="reg_response"></div>
</div>
</form>
<script>
function reg(){
@ -27,7 +27,8 @@
let admin = document.getElementById("admin_check").checked;
// console.log(login,pass,admin);
// console.log("cl reg");
$.post( "/admin/users/reg", { login:login,pass:pass,admin:admin })
if(login != ""&&pass!=""){
$.post( "/admin/users/new", { login:login,pass:pass,admin:admin })
.done(function( res ) {
// console.log("serv reg");
if(res["out"] == "good"){
@ -41,4 +42,5 @@
}
});
}
}
</script>

27
views/header.ejs
View File

@ -45,11 +45,6 @@
z-index: 100;
}
</style>
<script>
"<%- include('./static/language.ejs') %>"
let language = JSON.parse('<%= lang_json() %>'.replaceAll("&#34;",'"'));
lang = (text)=>{return language["<%= cur_lang %>"][text]}
</script>
<header id="top_panel">
<!-- <div id="user_name"></div> -->
@ -70,15 +65,18 @@
let right = document.getElementById("top_panel_right");
let left = document.getElementById("top_panel_left");
if(document.title != "main") menu.innerHTML += `<button onclick="goto('/');"><%= lang("main page") %></button> <br>`;
if(document.title != "main") menu.innerHTML += `<button onclick="goto('/');">проекты</button> <br>`;
right.innerHTML += `<div id="user_name" class="menu_btn">${res["login"]}</div>`;
if (res["admin"] == true){
menu.innerHTML += `<button onclick='goto("/admin")'><%= lang("admin panel") %></button><br>`;
menu.innerHTML += `<button onclick='goto("/admin")'>админ. панель</button><br>`;
}
menu.innerHTML += "<button onclick='logout();'><%= lang('logout') %></button><br>";
menu.innerHTML += "<button onclick='logout();'>выйти</button><br>";
});
onscroll = (e)=>{
hide_menus();
}
onclick = (e) => {
// e.preventDefault()
// console.log(e);
@ -96,7 +94,7 @@
hide_menus();
let menu = document.getElementById("user_menu");
menu.style.display = 'block';
menu.style = `top:${e.target.getBoundingClientRect().top+30}px;left:${e.target.getBoundingClientRect().left}px`;
menu.style = `top:${e.target.getBoundingClientRect().top + 25}px;left:${e.target.getBoundingClientRect().left - 20}px`;
// menu.onmouseleave = () => menu.style.display = 'none';
// menu.innerHTML = "<p>Option1</p><p>Option2</p><p>Option3</p><p>Option4</p>"
// document.body.appendChild(menu)
@ -104,7 +102,7 @@
hide_menus();
let menu = document.getElementById("project_menu");
menu.style.display = 'block';
menu.style = `top:${e.target.getBoundingClientRect().top+30}px;left:${e.target.getBoundingClientRect().left}px`;
menu.style = `top:${e.target.getBoundingClientRect().top + 25}px;left:${e.target.getBoundingClientRect().left - 20}px`;
// menu.onmouseleave = () => menu.style.display = 'none';
// menu.innerHTML = "<p>Option1</p><p>Option2</p><p>Option3</p><p>Option4</p>"
// document.body.appendChild(menu)
@ -117,10 +115,10 @@
menu.setAttribute("login_pass",document.getElementById(`pass_${e.target.classList[0]}`).innerText);
menu.setAttribute("login_admin",document.getElementById(`admin_${e.target.classList[0]}`).innerText);
menu.style.display = 'block';
menu.style = `top:${e.target.getBoundingClientRect().top+30}px;left:${e.target.getBoundingClientRect().left-40}px`;
menu.style = `top:${e.target.getBoundingClientRect().top + 25}px;left:${e.target.getBoundingClientRect().left - 20}px`;
// menu.onmouseleave = () => menu.style.display = 'none';
// menu.innerHTML = "<p>Option1</p><p>Option2</p><p>Option3</p><p>Option4</p>"
// document.body.appendChild(menu)
// document.body.appendChild(menu)s
}
else if(e.target.id == "object_menu"){
@ -133,8 +131,11 @@
menu.setAttribute("obj_height",obj.getAttribute("height"));
menu.setAttribute("obj_width",obj.getAttribute("width"));
menu.setAttribute("obj_id",obj.getAttribute("obj_id"));
menu.setAttribute("obj_cost",obj.getAttribute("cost"))
menu.setAttribute("obj_gid",obj.getAttribute("gid"))
menu.style.display = 'block';
menu.style = `top:${e.target.getBoundingClientRect().top+30}px;left:${e.target.getBoundingClientRect().left-40}px`;
// menu.style = `top:${e.target.getBoundingClientRect().top+27}px;left:${e.target.getBoundingClientRect().left-13}px`;
menu.style = `top:${e.target.getBoundingClientRect().top + 40}px;left:${e.target.getBoundingClientRect().left - 5}px`;
// menu.onmouseleave = () => menu.style.display = 'none';
// menu.innerHTML = "<p>Option1</p><p>Option2</p><p>Option3</p><p>Option4</p>"
// document.body.appendChild(menu)

28
views/login.ejs
View File

@ -10,16 +10,18 @@
</style>
<div class="login-page">
<input name="login" type="text" id="login" required>
<label for="login">login</label>
</div>
<div class="pass-page">
<input name="pass" type="password" id="pass" value="" required>
<label for="pass">password</label>
</div>
<form action="#" id="login_form">
<div class="login-page">
<input name="login" type="text" id="login">
<label for="login">логин</label>
</div>
<div class="pass-page">
<input name="pass" type="password" id="pass">
<label for="pass">пароль</label>
</div>
<input type="submit" id="log_btn" onclick="log()" value="login">
</form>
<button type="button" id="log_btn" onclick="log(document.getElementById('login').value,document.getElementById('pass').value);">login</button>
<!-- <input type="submit" value="" hidden> -->
<div id="res"></div>
@ -31,6 +33,7 @@
const login = CryptoJS.AES.encrypt(document.getElementById('login').value,$.cookie("sid")).toString();
const pass = CryptoJS.AES.encrypt(document.getElementById('pass').value,$.cookie("sid")).toString();
const sid = $.cookie("sid");
if(login!=""&&pass!=""){
$.post( "/back_login", { login:login,pass:pass,sid:sid })
.done(function( res ) {
if (res["out"] == "bad"){
@ -51,13 +54,6 @@
}
});
}
var input = document.getElementById("pass");
input.addEventListener("keypress", function(event) {
if (event.key === "Enter") {
event.preventDefault();
document.getElementById("log_btn").click();
}
});
</script>
<%- include('./static/end.ejs') %>

2
views/main.ejs
View File

@ -46,7 +46,7 @@
<!-- <script src="/lib/interact.min.js"></script> -->
<section class="main">
<button onclick="new_proj()"><%= lang("new project") %></button>
<button onclick="new_proj()">создать новый проект</button>
<div id="projs_div"></div>
</section>

50
views/project.ejs
View File

@ -16,6 +16,13 @@
position: absolute;
margin: auto;
}
#drags img{
object-fit: contain;
}
.zones{
margin-block: 10px;
}
.wall {
/* border: dashed 4px transparent; */
@ -104,10 +111,10 @@
<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>
<button id='proj_csave_btn' onclick='save_proj()'>сохранить в облако</button> <br>
<button id='proj_cload_btn' onclick='load_proj_cloud()'>загрузить из облака</button> <br>
<button id='proj_lsave_btn' onclick='save_proj_local()'>сохранить на локальное хранилище</button> <br>
<button id='proj_lload_btn' onclick='load_proj_local()'>загрузить из локальное хранилище</button> <br>
</div>
@ -117,27 +124,27 @@
<div id="wall_input">
<div id="obj_group">
<div style="display: flex;justify-content: space-between;">
<div style="width: 50px;">object group</div>
<div style="width: 50px;">группа товаров</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>
<label for="wall_height">высота </label>
<div id="wall_height_value">0</div>
</div>
<input type="range" step="0.1" min="0" max="5" id="wall_height" value="2" oninput="wall_size_change('height')" onchange="resize_drags()">
</div>
<div>
<div style="display: flex;width: 150px;justify-content: space-between;">
<label for="wall_width"><%= lang("width") %></label>
<label for="wall_width">ширина</label>
<div id="wall_width_value">0</div>
</div>
<input type="range" step="0.1" min="0" max="7" id="wall_width" value="4" oninput="wall_size_change('width')" onchange="resize_drags()">
</div>
</div>
<div class="czones"></div>
<img class="trash" style="height: 100px; width: 100px;" src="/img/shadow-energy.gif" alt="<%= lang('black hole') %>">
<img class="trash" style="height: 100px; width: 100px;" src="/img/shadow-energy.gif" alt="чёрная дыра">
</div>
<div class="zones" style="position: relative;">
@ -145,6 +152,7 @@
<div class="wall dropzone" id="wall"></div>
</div>
<div style="display:flex; justify-content: space-around;">цена проекта: <div style="display: flex;"><div id="proj_cost"></div>&nbsp;руб.</div></div>
<script src="/lib/inter.js"></script>
<script>
@ -170,38 +178,26 @@
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>";
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>";
document.getElementById("top_panel_left").innerHTML = `<div id='proj_menu' class="menu_btn">настройки проекта</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:"/;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}`;
document.getElementById('top_panel_center').innerHTML=`сохранение ${proj_name}`;
save((res)=>{
document.getElementById('top_panel_center').innerHTML=`<%=lang("saved")%> ${proj_name} <%=lang("to cloud")%>`;
document.getElementById('top_panel_center').innerHTML=`сохранено ${proj_name} в облако`;
setTimeout((res)=>{
document.getElementById("top_panel_center").innerText = `${proj_name} (<%=lang("cloud")%>)`;
document.getElementById("top_panel_center").innerText = `${proj_name} (облако)`;
},3000)
})
}
function save_proj_local(type){
document.getElementById('top_panel_center').innerHTML=` <%=lang("saving")%> ${proj_name}`;
document.getElementById('top_panel_center').innerHTML=`сохранение ${proj_name}`;
save_local();
document.getElementById('top_panel_center').innerHTML=`<%=lang("saved")%> ${proj_name} <%=lang("to local")%>`;
document.getElementById('top_panel_center').innerHTML=`сохранено ${proj_name} в локальное хранилище`;
setTimeout((res)=>{
document.getElementById("top_panel_center").innerText = `${proj_name} (<%=lang("local")%>)`;
document.getElementById("top_panel_center").innerText = `${proj_name} (локальное хранилище)`;
},3000)
}

6
views/static/end.ejs
View File

@ -11,6 +11,12 @@
oncontextmenu = (e) => {
e.preventDefault()
}
$('form').on('submit', function(event) {
event.preventDefault();
});
// $('form').unbind('click').click(function (e) {
// e.preventDefault(); //This could also be return false as I'm using jQuery.
// })
$(window).focus(function(){
if(document.title == "login"){
// console.log(document.title);