modified: admin.js
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
							
								
								
									
										10
									
								
								admin.js
									
									
									
									
									
								
							
							
						
						| @ -94,6 +94,7 @@ module.exports.new_user = (inp,cook,res)=>{ | ||||
|         let admin = inp["admin"]; | ||||
|         let pass = inp["pass"]; | ||||
|         let login = inp["login"]; | ||||
|         let rights = inp["rights"]; | ||||
|         check_db(); | ||||
|         function check_db() { | ||||
|             db.ggv("users","id","login",`'${inp["login"]}'`, (ldata)=>{ldata = ldata[0] | ||||
| @ -103,7 +104,7 @@ module.exports.new_user = (inp,cook,res)=>{ | ||||
|                     if(udata==null && ldata==null){ | ||||
|                         good_reg(); | ||||
|                         // func.log("/reg_user good reg"); | ||||
|                         func.log(`good boy ${uuid} registered user ${login} with uuid = ${uuid} admin = ${admin}`); | ||||
|                         func.log(`good boy ${inp["uuid"]} registered user ${login} with uuid = ${uuid} admin = ${admin}`); | ||||
|      | ||||
|                     } | ||||
|                     else if(udata!=null){ | ||||
| @ -112,7 +113,7 @@ module.exports.new_user = (inp,cook,res)=>{ | ||||
|                         // res.send({out:"bad", body:"uuid"}); | ||||
|                     } | ||||
|                     else if (ldata != null){ | ||||
|                         func.log(`bad boy ${uuid} tried to register user ${login} with uuid = ${uuid} admin = ${admin} but login in use`); | ||||
|                         func.log(`bad boy ${inp["uuid"]} tried to register user ${login} with uuid = ${uuid} admin = ${admin} but login in use`); | ||||
|                         res.send({out:"bad", body:"login"}); | ||||
|                         return; | ||||
|                     } | ||||
| @ -121,9 +122,10 @@ module.exports.new_user = (inp,cook,res)=>{ | ||||
|         } | ||||
|         function good_reg(){ | ||||
|             db.nr("users",'`login`,`pass`,`uuid`,`admin`',`'${login}','${pass}','${uuid}',${admin}`,true); | ||||
|             if (admin){ | ||||
|             if (admin == "true"){ | ||||
|                 console.log("admin"); | ||||
|                 db.ggv("users","`id`","uuid",`'${uuid}'`,(udata)=>{ udata = udata[0] | ||||
|                     db.nr("admins",'`login`,`uid`',`'${login}',${udata["id"]}`,true); | ||||
|                     db.nr("admins",'`login`,`uid`,`rights`',`'${login}',${udata["id"]},${rights}`,true); | ||||
|                 },true) | ||||
|             } | ||||
|             res.send({out:"good", body:{uuid:uuid,login:login,admin:admin}}); | ||||
|  | ||||
							
								
								
									
										4
									
								
								func.js
									
									
									
									
									
								
							
							
						
						| @ -36,9 +36,9 @@ module.exports.sid = (cook,res,callback,auto = true,admin_check = false)=>{ | ||||
|                         if (udata != null && udata["id"] == sdata["uid"] && uuid == udata["uuid"]){ | ||||
|                             if (!admin_check) callback(true); | ||||
|                             else if (admin_check && udata["admin"] != false){ | ||||
|                                 db.ggv("admins","`login`,`uid` ","uid",`'${udata["id"]}'`,(adata)=>{ adata = adata[0] | ||||
|                                 db.gv("admins","uid",`'${udata["id"]}'`,(adata)=>{ adata = adata[0] | ||||
|                                     if(adata != null){ | ||||
|                                         callback(true);                                     | ||||
|                                         callback(adata["rights"],true);                                     | ||||
|                                     } | ||||
|                                     else{ | ||||
|                                         db.sv("users","admin","0","id",udata["id"],()=>{},true); | ||||
|  | ||||
							
								
								
									
										71
									
								
								index.js
									
									
									
									
									
								
							
							
						
						| @ -106,7 +106,7 @@ app.post("/get_cr_uuid", (req,res) => { | ||||
|     } | ||||
| }) | ||||
| /// project | ||||
| app.get("/proj/:name" , (req,res) =>{ | ||||
| app.get("/proj/load/:name" , (req,res) =>{ | ||||
|     res.render('project',{proj_name:req.params["name"]}); | ||||
| }) | ||||
| app.post("/save_proj", (req,res) => { | ||||
| @ -142,6 +142,17 @@ app.post("/proj/delete", (req,res) => { | ||||
|         func.log("router project loading error - "+error); | ||||
|     } | ||||
| }) | ||||
| app.post("/proj/download", (req,res) => { | ||||
|     try{ | ||||
|         let inp = req.body; | ||||
|         let cook = req.cookies; | ||||
|         func.sid(cook,res,()=>{ | ||||
|             proj.download(inp,cook,res); | ||||
|         }) | ||||
|     } catch (error) { | ||||
|         func.log("router project loading error - "+error); | ||||
|     } | ||||
| }) | ||||
| app.post("/get_projs", (req,res) => { | ||||
|     try{ | ||||
|         let inp = req.body; | ||||
| @ -189,18 +200,74 @@ app.post("/get_groups", (req,res) => { | ||||
|         func.log("router single object getting error - "+error); | ||||
|     } | ||||
| }) | ||||
| app.post("/object/parts/get", (req,res) => { | ||||
|     try{ | ||||
|         let inp = req.body; | ||||
|         let cook = req.cookies; | ||||
|         // func.log(inp["name"]); | ||||
|         func.sid(cook,res,()=>{ | ||||
|             obj.load_parts(inp,cook,res); | ||||
|         }) | ||||
|     } catch (error) { | ||||
|         func.log("router single object getting error - "+error); | ||||
|     } | ||||
| }) | ||||
| app.post("/object/group/get", (req,res) => { | ||||
|     try{ | ||||
|         let inp = req.body; | ||||
|         let cook = req.cookies; | ||||
|         // func.log(inp["name"]); | ||||
|         func.sid(cook,res,()=>{ | ||||
|             obj.load_group(inp,cook,res); | ||||
|         }) | ||||
|     } catch (error) { | ||||
|         func.log("router single object getting error - "+error); | ||||
|     } | ||||
| }) | ||||
| /// admin | ||||
| app.get("/admin", (req,res) =>{ | ||||
|     try { | ||||
|         let inp = req.body; | ||||
|         let cook = req.cookies; | ||||
|         func.sid(cook,res,()=>{ | ||||
|         func.sid(cook,res,(rights)=>{ | ||||
|             res.render('admin'); | ||||
|         },true,true) | ||||
|     } catch (error) { | ||||
|         func.log("router admin page error - "+error); | ||||
|     } | ||||
| }); | ||||
| app.get("/admin/objects", (req,res) =>{ | ||||
|     try { | ||||
|         let inp = req.body; | ||||
|         let cook = req.cookies; | ||||
|         func.sid(cook,res,(rights)=>{ | ||||
|             if (rights == 1 || rights == 3){ | ||||
|                 res.render('admin/objects'); | ||||
|             } | ||||
|             else{ | ||||
|                 res.redirect('/admin'); | ||||
|             } | ||||
|         },true,true) | ||||
|     } catch (error) { | ||||
|         func.log("router admin page error - "+error); | ||||
|     } | ||||
| }); | ||||
| app.get("/admin/users", (req,res) =>{ | ||||
|     try { | ||||
|         let inp = req.body; | ||||
|         let cook = req.cookies; | ||||
|         func.sid(cook,res,(rights)=>{ | ||||
|             if (rights == 2 || rights == 3){ | ||||
|                 res.render('admin/users'); | ||||
|             } | ||||
|             else{ | ||||
|                 res.redirect('/admin'); | ||||
|             } | ||||
|         },true,true) | ||||
|     } catch (error) { | ||||
|         func.log("router admin page error - "+error); | ||||
|     } | ||||
| }); | ||||
| app.get("/home", (req,res) =>{ | ||||
|     res.render('home'); | ||||
| }); | ||||
|  | ||||
							
								
								
									
										140
									
								
								object.js
									
									
									
									
									
								
							
							
						
						| @ -30,21 +30,24 @@ module.exports.load = (inp,cook,res)=>{ | ||||
|  | ||||
| module.exports.new = (inp,cook,res)=>{ | ||||
|     try { | ||||
|         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[0] == null){ | ||||
|                     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"}); | ||||
|                 } | ||||
|                 // console.log(db_name); | ||||
|                 // db.ggv("objects","gid","name",`'${inp["name"]}'`,(db_name)=>{ | ||||
|                     // }) | ||||
|             },true) | ||||
|          | ||||
|         db.gv("object_groups","id",`'${inp["gid"]}'`,(gname)=>{gname = gname[0] | ||||
|             db.gv("object_partition","id",`'${gname["pid"]}'`,(pname)=>{pname = pname[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[0] == null){ | ||||
|                         db.nr("objects","`cost`,`name`,`img`,`height`,`width`,`description`,`gid`",`'${inp["cost"]}','${inp["name"]}/g/${gname["name"]}/p/${pname["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); | ||||
| @ -92,10 +95,12 @@ module.exports.save = (inp,cook,res)=>{ | ||||
| } | ||||
| module.exports.del = (inp,cook,res)=>{ | ||||
|     try { | ||||
|         let name = inp["name"].split("/")[0]; | ||||
|         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:${name} group:${group}`); | ||||
|         db.gv("objects","id",`'${inp["id"]}'`,(obj_db)=>{obj_db = obj_db[0]; | ||||
|             let gid = obj_db["gid"];  | ||||
|             let name = obj_db["name"];  | ||||
|             db.dl("objects",`id`,`'${inp["id"]}'`,()=>{ | ||||
|                 db.sv("object_groups","count",`(count - 1)`,"id",`${gid}`,()=>{},true,true) | ||||
|                 func.log(`admin object deleted name:${name} group:${gid}`); | ||||
|                 res.send({out:"good"}); | ||||
|             },true); | ||||
|         }) | ||||
| @ -114,6 +119,16 @@ module.exports.load_groups = (inp,cook,res)=>{ | ||||
|         func.log("backend object groups loading err0r - "+error); | ||||
|     } | ||||
| } | ||||
| module.exports.load_group = (inp,cook,res)=>{ | ||||
|     try { | ||||
|         db.gv("object_groups","id",`${inp["gid"]}`,(gdata)=>{ | ||||
|             // func.log(odata); | ||||
|             res.send({out:"good",body:gdata[0]}); | ||||
|         }) | ||||
|     } 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] | ||||
| @ -122,8 +137,19 @@ module.exports.new_group = (inp,cook,res)=>{ | ||||
|                 res.send({out:"bad"}); | ||||
|             } | ||||
|             else if (gdata == null){ | ||||
|                 db.nr("object_groups","`name`,`count`",`'${inp["name"]}','0'`,true,()=>{ | ||||
|                     res.send({out:"good"}); | ||||
|                 db.nr("object_groups","`name`,`count`,`pid`",`'${inp["name"]}','0',${inp["pid"]}`,true,()=>{ | ||||
|                     db.glv("object_groups","id",(new_group)=>{ new_group = new_group[0]; | ||||
|                         db.gv("object_partition","id",`${inp["pid"]}`,(part_db)=>{part_db = part_db[0]; | ||||
|                             if (part_db["groups"].split(",").lenght<2){ | ||||
|                                 db.sv("object_partition","`groups`",`${part_db["groups"]}`,"id",`${inp["pid"]}`,()=>{},true) | ||||
|                             } | ||||
|                             else{ | ||||
|                                 db.sv("object_partition","`groups`",`${part_db["groups"]},${new_group["id"]}`,"id",`${inp["pid"]}`,()=>{},true) | ||||
|                             } | ||||
|                             res.send({out:"good"}); | ||||
|                             func.log(`admin group created ${new_group["name"]}`); | ||||
|                         }) | ||||
|                     }) | ||||
|                 }) | ||||
|             } | ||||
|         }) | ||||
| @ -134,10 +160,32 @@ module.exports.new_group = (inp,cook,res)=>{ | ||||
| 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); | ||||
|             db.ggv("object_partition","`groups`","`id`",`${inp["pid"]}`,(groups)=>{ | ||||
|                 groups = groups[0]["groups"].split(","); | ||||
|                 let new_groups=[]; | ||||
|                 if(groups.includes(`${inp["gid"]}`)){ | ||||
|                     if (groups.length < 2){ | ||||
|                         groups.splice(groups.indexOf(`${inp["gid"]}`),1); | ||||
|                         new_groups = groups; | ||||
|                     } | ||||
|                     else{ | ||||
|                         groups.splice(groups.indexOf(`${inp["gid"]}`),1); | ||||
|                         new_groups = groups.join(","); | ||||
|                     } | ||||
|                 } | ||||
|                 else{ | ||||
|                     new_groups = groups.join(",") | ||||
|                 } | ||||
|                 // console.log(groups.length,"len"); | ||||
|                 // console.log(groups,"group"); | ||||
|                 // console.log(new_groups,"new"); | ||||
|                 db.sv("object_partition","`groups`",`${new_groups}`,"`id`",`${inp["pid"]}`,()=>{ | ||||
|                     db.dl("object_groups",`id`,`'${inp["gid"]}'`,()=>{ | ||||
|                         func.log(`admin group deleted ${gname}`); | ||||
|                         res.send({out:"good"}); | ||||
|                     },true); | ||||
|                 },true) | ||||
|             }) | ||||
|         }) | ||||
|     } catch (error) { | ||||
|         func.log("backend single object loading err0r - "+error); | ||||
| @ -153,3 +201,45 @@ module.exports.find = (inp,cook,res)=>{ | ||||
|         func.log("backend single object loading err0r - "+error); | ||||
|     } | ||||
| } | ||||
|  | ||||
| module.exports.load_parts = (inp,cook,res)=>{ | ||||
|     try { | ||||
|         db.gav("object_partition","0",(gdata)=>{ | ||||
|             // console.log(gdata); | ||||
|             // func.log(odata); | ||||
|             res.send({out:"good",body:gdata}); | ||||
|         }) | ||||
|     } catch (error) { | ||||
|         func.log("backend object part loading err0r - "+error); | ||||
|     } | ||||
| } | ||||
|  | ||||
| module.exports.new_part = (inp,cook,res)=>{ | ||||
|     try { | ||||
|         db.ggv("object_partition","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_partition","`name`,`count`",`'${inp["name"]}','0'`,true,()=>{ | ||||
|                     res.send({out:"good"}); | ||||
|                 }) | ||||
|             } | ||||
|         }) | ||||
|     } catch (error) { | ||||
|         func.log("backend single object loading err0r - "+error); | ||||
|     } | ||||
| } | ||||
| module.exports.del_part = (inp,cook,res)=>{ | ||||
|     try { | ||||
|         db.ggv("object_partition",`name`,`id`,`'${inp["gid"]}'`,(gname)=>{gname = gname[0]["name"] | ||||
|             db.dl("object_partition",`id`,`'${inp["gid"]}'`,()=>{ | ||||
|                 func.log(`admin part deleted ${gname}`); | ||||
|                 res.send({out:"good"}); | ||||
|             },true); | ||||
|         }) | ||||
|     } catch (error) { | ||||
|         func.log("backend single object loading err0r - "+error); | ||||
|     } | ||||
| } | ||||
							
								
								
									
										25
									
								
								project.js
									
									
									
									
									
								
							
							
						
						| @ -40,17 +40,28 @@ module.exports.loads = (inp,cook,res)=>{ | ||||
|     } | ||||
| } | ||||
|  | ||||
| module.exports.download = (inp,cook,res)=>{ | ||||
|     try { | ||||
|         db.ggv("projects","`body`","id",`'${inp["id"]}'`,(proj)=>{ proj = proj[0]; | ||||
|             res.send(JSON.stringify(proj)); | ||||
|         }) | ||||
|     } catch (error) { | ||||
|         func.log("backend projects loading err0r - " - error); | ||||
|     } | ||||
| } | ||||
|  | ||||
| module.exports.del = (inp,cook,res)=>{ | ||||
|     try { | ||||
|         db.ggv("users","`id`","uuid",`'${cook["uuid"]}'`,(udata)=>{ udata = udata[0]; | ||||
|             db.gv("projects","name",`'${inp["name"]}'`,(pdata)=>{pdata=pdata[0] | ||||
|                 // res.send({out:"good",body:pdata}); | ||||
|                 db.dl("projects","id",pdata["id"],()=>{ | ||||
|                     res.send({out:"good"}); | ||||
|                     func.log(`good boy ${udata["uuid"]} deleted project ${inp["name"]} from ${cook["sid"]}`); | ||||
|                 }) | ||||
|         db.gv("projects","name",`'${inp["name"]}'`,(pdata)=>{pdata=pdata[0] | ||||
|             // res.send({out:"good",body:pdata}); | ||||
|             db.dl("projects","id",pdata["id"],()=>{ | ||||
|                 res.send({out:"good"}); | ||||
|                 func.log(`good boy ${cook["uuid"]} deleted project ${inp["name"]} from ${cook["sid"]}`); | ||||
|             }) | ||||
|         }) | ||||
|         // db.ggv("users","`name`,`id`","uuid",`'${cook["uuid"]}'`,(udata)=>{ udata = udata[0]; | ||||
|         //     console.log(udata); | ||||
|         // }) | ||||
|     } catch (error) { | ||||
|         func.log("backend projects delete err0r - " - error); | ||||
|     } | ||||
|  | ||||
							
								
								
									
										
											BIN
										
									
								
								public/img/drop.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 300 B | 
							
								
								
									
										
											BIN
										
									
								
								public/img/icon/back.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 600 B | 
							
								
								
									
										
											BIN
										
									
								
								public/img/icon/copy.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 661 B | 
							
								
								
									
										
											BIN
										
									
								
								public/img/icon/del.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 688 B | 
							
								
								
									
										
											BIN
										
									
								
								public/img/icon/download.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 579 B | 
							
								
								
									
										
											BIN
										
									
								
								public/img/icon/forw.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 603 B | 
							
								
								
									
										
											BIN
										
									
								
								public/img/icon/save.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						| After Width: | Height: | Size: 1.5 KiB | 
							
								
								
									
										128
									
								
								public/lib/fn.js
									
									
									
									
									
								
							
							
						
						| @ -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); | ||||
|     }); | ||||
| } | ||||
|  | ||||
| @ -148,3 +221,26 @@ 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]); | ||||
| }; | ||||
| @ -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'); | ||||
|  | ||||
| @ -8,17 +8,10 @@ | ||||
| </style> | ||||
|  | ||||
| <!-- <h1 style="text-align: center;">привет админ</h1> <br> --> | ||||
|     <section> | ||||
|         <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 class="admin_edits" style="display: flex; justify-content: space-evenly;"> | ||||
|         <button onclick="goto('/admin/objects')">панель управления объектами</button> | ||||
|         <button onclick="goto('/admin/users')">панель управления пользователями</button> | ||||
|     </section> | ||||
|  | ||||
|     <section style="display: flex; justify-content: space-between;"> | ||||
|  | ||||
							
								
								
									
										22
									
								
								views/admin/objects.ejs
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @ -0,0 +1,22 @@ | ||||
| <%- include('../static/start.ejs',{name:"admin/objects",async: true}) %> | ||||
| <%- include('../header.ejs') %> | ||||
| <style> | ||||
|     section{ | ||||
|         width: 80vw; | ||||
|         margin: auto; | ||||
|     } | ||||
| </style> | ||||
|  | ||||
| <section> | ||||
|     <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> | ||||
|  | ||||
| <%- include('../static/end.ejs') %> | ||||
| <script> | ||||
|     setTimeout(()=>{ | ||||
|         loaded() | ||||
|     },1000); | ||||
| </script> | ||||
| @ -61,7 +61,7 @@ | ||||
|             <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"> | ||||
|                     <input style="text-align: right;" id="obj_cost" type="text" oninput="this.value = this.value.replace(/[^0-9.]/g, '0').replace(/(\..*?)\..*/g, '$1').replace(/^0[^.]/, '0');" > | ||||
|                     <div>руб.</div> | ||||
|                 </div> | ||||
|             </div> | ||||
| @ -100,7 +100,8 @@ | ||||
|             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; | ||||
|             // document.getElementById("group_select").selectedIndex = document.getElementById("group_select").options[`obj_group_${gid}`].index; | ||||
|             gids = [parseInt(gid)] | ||||
|             console.log(gid); | ||||
|         } | ||||
|  | ||||
| @ -130,7 +131,7 @@ | ||||
|     } | ||||
|  | ||||
|     function previewFile() { | ||||
|         var preview = document.querySelector('img'); | ||||
|         var preview = document.querySelector('#img_prev'); | ||||
|         var file    = document.querySelector('input[type=file]').files[0]; | ||||
|         var reader  = new FileReader(); | ||||
|  | ||||
| @ -146,9 +147,9 @@ | ||||
|     } | ||||
|  | ||||
|     function new_obj(cost,name,img,height,width,description,callback){ | ||||
|         let select = document.getElementById("group_select"); | ||||
|         let gid = gids[0]; | ||||
|         if(name!=""){ | ||||
|             $.post( "/admin/objects/new", { cost:cost,name,img:img,desc:description,height:height,width:width,gid:select.options[select.selectedIndex].getAttribute("gid")}) | ||||
|             $.post( "/admin/objects/new", { cost:cost,name:name,img:img,desc:description,height:height,width:width,gid:gid}) | ||||
|             .done(function( res ) { | ||||
|                 // if(res["out"] == "good"){ | ||||
|                 //     console.log(res["body"]); | ||||
|  | ||||
| @ -30,8 +30,8 @@ | ||||
| <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> | ||||
|         <button onclick="edit_get_objs(true)">найти по имени</button> | ||||
|         <button onclick='document.getElementById("objs_in_group").innerHTML = "";'>очистить</button> | ||||
|     </div> | ||||
| </div> | ||||
| <div> | ||||
| @ -44,9 +44,9 @@ | ||||
| </div> | ||||
|  | ||||
| <script> | ||||
|     load_groups(()=>{ | ||||
|         edit_get_objs(); | ||||
|     }); | ||||
|     // load_groups(()=>{ | ||||
|     //     edit_get_objs(); | ||||
|     // }); | ||||
|  | ||||
|     function set_edit(){ | ||||
|         let menu = document.getElementById("object_edit_menu"); | ||||
| @ -67,11 +67,18 @@ | ||||
|         },by_name) | ||||
|     } | ||||
|  | ||||
|     function gids_change(){ | ||||
|         let last = gids.at(-1) | ||||
|         gids = [last]; | ||||
|         edit_get_objs(); | ||||
|         hide_menus(); | ||||
|     } | ||||
|  | ||||
|     function obj_del(){ | ||||
|         let select = document.getElementById("group_select"); | ||||
|         // let select = document.getElementById("group_select"); | ||||
|         let menu = document.getElementById("object_edit_menu"); | ||||
|         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")}) | ||||
|             $.post( "/admin/objects/delete", { id:menu.getAttribute(`obj_id`),}) | ||||
|             .done(function( res ) { | ||||
|                 if(res["out"] == "good"){ | ||||
|                     edit_get_objs(); | ||||
| @ -81,7 +88,7 @@ | ||||
|     } | ||||
|  | ||||
|     function save_edited_obj(){ | ||||
|         let select = document.getElementById("group_select"); | ||||
|         let gid = gids[0]; | ||||
|         let menu = document.getElementById("object_edit_menu"); | ||||
|         let attributes = ["name","description","img","height","width","cost"]; | ||||
|         let cur_atts = { | ||||
| @ -117,25 +124,27 @@ | ||||
|             } | ||||
|         } | ||||
|         function make_obj_save(){ | ||||
|             if(changes["name"]) changes["name"] = (changes["name"]+"/g/"+select.options[select.selectedIndex].value).replace(" ","$"); | ||||
|             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 = "товар сохранён"; | ||||
|                     setTimeout(()=>{ | ||||
|                         edit_get_objs(); | ||||
|                         set_obj_edit_params(); | ||||
|                         if(res["name_err"]){ | ||||
|                             document.getElementById("obj_resp").innerHTML = ("название товара не было изменино поскольку оно занято"); | ||||
|                         } | ||||
|                     },1000) | ||||
|                     setTimeout(()=>{ | ||||
|                         document.getElementById("obj_resp").innerHTML = ""; | ||||
|                     },3000) | ||||
|                 } | ||||
|             }); | ||||
|             load_group(gid,(group_db)=>{ | ||||
|                 if(changes["name"]) changes["name"] = (changes["name"]+"/g/"+group_db["name"].replace(" ","$")); | ||||
|                 document.getElementById("obj_resp").innerHTML = "сохранение товара"; | ||||
|                 $.post( "/admin/objects/edit", { id:menu.getAttribute(`obj_id`),changes:JSON.stringify(changes),gid:gid}) | ||||
|                 .done(function( res ) { | ||||
|                     // console.log(res); | ||||
|                     if(res["out"] == "good"){ | ||||
|                         document.getElementById("obj_resp").innerHTML = "товар сохранён"; | ||||
|                         setTimeout(()=>{ | ||||
|                             edit_get_objs(); | ||||
|                             set_obj_edit_params(); | ||||
|                             if(res["name_err"]){ | ||||
|                                 document.getElementById("obj_resp").innerHTML = ("название товара не было изменино поскольку оно занято"); | ||||
|                             } | ||||
|                         },1000) | ||||
|                         setTimeout(()=>{ | ||||
|                             document.getElementById("obj_resp").innerHTML = ""; | ||||
|                         },3000) | ||||
|                     } | ||||
|                 }); | ||||
|             }) | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @ -150,18 +159,20 @@ | ||||
|     } | ||||
|          | ||||
|     function edit_load_objs(callback,by_name = false){ | ||||
|         let select = document.getElementById("group_select"); | ||||
|         // 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"){ | ||||
|                     // 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"]); | ||||
|                 } | ||||
|             gids.forEach(gid => { | ||||
|                 $.post( "/get_objs",{gid: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"]); | ||||
|                     } | ||||
|                 }); | ||||
|             }); | ||||
|         } | ||||
|         else{ | ||||
| @ -200,5 +211,7 @@ | ||||
|             obj.append(img_elm) | ||||
|             obj.append(name_text) | ||||
|             obj_list.append(obj) | ||||
|  | ||||
|             console.log("obj"); | ||||
|         }               | ||||
| </script> | ||||
| @ -1,49 +1,113 @@ | ||||
|  | ||||
| <style> | ||||
|     #obj_group button,#obj_group select{ | ||||
|         height: 50px; | ||||
|         /* height: 5vh; */ | ||||
|         margin: auto 0px; | ||||
|          | ||||
|     } | ||||
|     .obj_group{ | ||||
|         display: flex; | ||||
|     } | ||||
| </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: 350px;"> | ||||
|             <button onclick="create_new_group()">создать группу</button> | ||||
|             <button onclick="delete_group()">удалить группу</button> | ||||
|         <style> | ||||
|             .group_drop{ | ||||
|                 width: 15vw; | ||||
|                 padding: 2px; | ||||
|                 min-width: 15vw; | ||||
|             } | ||||
|             .group_drop *{ | ||||
|                 pointer-events: none; | ||||
|                 overflow: auto; | ||||
|             } | ||||
|             .group_drop img{ | ||||
|                 width: 1vw; | ||||
|                 height: 0.5vw; | ||||
|             } | ||||
|         </style> | ||||
|  | ||||
|         <div id="obj_parts" style="display: flex;justify-content: space-between; overflow: scroll;min-width: 50vw;"> | ||||
|         </div> | ||||
|         <style> | ||||
|             .group_inp{ | ||||
|                 height: 1vw; | ||||
|                 width: 1vw; | ||||
|                 border: 0px; | ||||
|                 border-radius: 0.4vw; | ||||
|                 overflow: auto; | ||||
|             } | ||||
|         </style> | ||||
|         <ul id="group" class="cmenu"></ul> | ||||
|         <!-- <select name="" id="group_select" onchange="edit_get_objs();"></select> | ||||
|         <select name="" id="part_select"></select> --> | ||||
|     </div> | ||||
| </div> | ||||
|  | ||||
| <script> | ||||
|     load_groups(); | ||||
|     function delete_group() { | ||||
|     // load_groups(); | ||||
|     function delete_group(gid,pid) { | ||||
|         let select = document.getElementById("group_select"); | ||||
|         let group_id = select.options[select.selectedIndex].getAttribute("gid"); | ||||
|         if(confirm(`вы уверены вы хотите удалить группу ${select.options[select.selectedIndex].text}`) == true){ | ||||
|             $.post( "/admin/groups/delete", { gid:group_id}) | ||||
|         if(confirm(`вы уверены вы хотите удалить группу ${document.getElementById("obj_group_"+gid).innerText}`) == true){ | ||||
|             $.post( "/admin/groups/delete", { gid:gid,pid:pid}) | ||||
|             .done(function( res ) { | ||||
|                 if(res["out"] == "good"){ | ||||
|                     // console.log(res["body"]); | ||||
|                     load_groups(); | ||||
|                     // load_groups(); | ||||
|                     edit_get_objs(); | ||||
|                     hide_menus(); | ||||
|                     alert(`группа удалена`) | ||||
|                 } | ||||
|             }); | ||||
|         } | ||||
|     } | ||||
|     function create_new_group() { | ||||
|     function create_new_group(pid) { | ||||
|         let group_name = ask("название группы"); | ||||
|         if(group_name != ""){ | ||||
|             $.post( "/admin/groups/new", { name:group_name.replace(" ","$")}) | ||||
|             $.post( "/admin/groups/new", { name:group_name.replace(" ","$"),pid:pid}) | ||||
|             .done(function( res ) { | ||||
|                 if(res["out"] == "good"){ | ||||
|                     // console.log(res["body"]); | ||||
|                     load_groups(); | ||||
|                     // load_groups(); | ||||
|                     edit_get_objs(); | ||||
|                     hide_menus(); | ||||
|                     setTimeout(()=>{ | ||||
|                         parts_load(); | ||||
|                         alert(`группа ${group_name.replace(" ","$")} создана`) | ||||
|                     },200) | ||||
|                 } | ||||
|             }); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     function parts_load(){ | ||||
|         load_parts((db)=>{ | ||||
|             let parts = document.getElementById("obj_parts"); | ||||
|             parts.innerHTML = ""; | ||||
|             Object.values(db).forEach((value)=>{ | ||||
|                 let part = document.createElement("button") | ||||
|                 let part_text = document.createElement("div") | ||||
|                 let part_drop = document.createElement("img") | ||||
|                  | ||||
|                 part_drop.src = "/img/drop.png"; | ||||
|                 part_drop.alt = "\/"; | ||||
|  | ||||
|                 part_text.innerText = `${value["name"]}`; | ||||
|  | ||||
|                 part.id = `group_drop-${value["id"]}`; | ||||
|                 part.classList.add("menu_btn") | ||||
|                 part.classList.add("group_drop") | ||||
|                 part.setAttribute("groups",`${value["groups"]}`) | ||||
|                 part.setAttribute("pid",`${value["id"]}`) | ||||
|  | ||||
|                 part.append(part_text); | ||||
|                 part.append(part_drop); | ||||
|  | ||||
|                 parts.append(part); | ||||
|                 console.log(value); | ||||
|             }) | ||||
|         }) | ||||
|     } | ||||
|     parts_load(); | ||||
|  | ||||
| </script> | ||||
							
								
								
									
										21
									
								
								views/admin/users.ejs
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @ -0,0 +1,21 @@ | ||||
| <%- include('../static/start.ejs',{name:"admin/users",async: true}) %> | ||||
| <%- include('../header.ejs') %> | ||||
| <style> | ||||
|     section{ | ||||
|         width: 80vw; | ||||
|         margin: auto; | ||||
|     } | ||||
| </style> | ||||
|  | ||||
| <section> | ||||
|     <h1 style="text-align: center;">пользователь</h1> | ||||
|     <%- include('../admin/users/user_reg.ejs') %> | ||||
|     <%- include('../admin/users/user_edit.ejs') %> | ||||
| </section> | ||||
|  | ||||
| <%- include('../static/end.ejs') %> | ||||
| <script> | ||||
|     setTimeout(()=>{ | ||||
|         loaded() | ||||
|     },1000); | ||||
| </script> | ||||
| @ -14,12 +14,64 @@ | ||||
|     </div> | ||||
|     <div> | ||||
|         <label for="admin_check">админ. привелегии</label> | ||||
|         <input type="checkbox" name="admin" value='false' id="admin_check"> | ||||
|         <input type="checkbox" name="admin" value='false' id="admin_check" onchange="admin_ch()"> | ||||
|         <div id="right_checks" style="display: none;justify-content: space-evenly;"> | ||||
|             <div> | ||||
|                 <input type="checkbox" name="admin" value='false' id="admin_user_check" onchange="right_calc()"> | ||||
|                 <label for="admin_user_check">право на изменение обьектов</label> | ||||
|             </div> | ||||
|             <div> | ||||
|                 <input type="checkbox" name="admin" value='false' id="admin_obj_check" onchange="right_calc()"> | ||||
|                 <label for="admin_obj_check">право на изменение пользователей</label> | ||||
|             </div> | ||||
|         </div> | ||||
|     </div> | ||||
|     <div id="reg_response"></div> | ||||
| </form> | ||||
|  | ||||
| <script> | ||||
|     let rights = 0; | ||||
|  | ||||
|     clear_checks(); | ||||
|     function clear_checks(){ | ||||
|         let check = document.getElementById("admin_check"); | ||||
|         let obj_right = document.getElementById("admin_obj_check"); | ||||
|         let user_right = document.getElementById("admin_user_check"); | ||||
|         let checks = [check,obj_right,user_right]; | ||||
|         checks.forEach(ch => { | ||||
|             ch.checked = false; | ||||
|             rights = 0; | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|         function admin_ch(){ | ||||
|             let check = document.getElementById("admin_check").checked; | ||||
|             let right_checks = document.getElementById("right_checks"); | ||||
|             let obj_right = document.getElementById("admin_obj_check"); | ||||
|             let user_right = document.getElementById("admin_user_check"); | ||||
|             if (check){ | ||||
|                 right_checks.style.display = "flex"; | ||||
|             } | ||||
|             else{ | ||||
|                 right_checks.style.display = "none"; | ||||
|                 clear_checks(); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         function right_calc(){ | ||||
|             let obj_right = document.getElementById("admin_obj_check").checked; | ||||
|             let user_right = document.getElementById("admin_user_check").checked; | ||||
|             if(obj_right & user_right){ | ||||
|                 rights = 3; | ||||
|             } | ||||
|             else if(obj_right){ | ||||
|                 rights = 1; | ||||
|             } | ||||
|             else if(user_right){ | ||||
|                 rights = 2; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         function reg(){ | ||||
|             console.log("reg"); | ||||
|             let login = document.getElementById("login").value; | ||||
| @ -28,7 +80,7 @@ | ||||
|             // console.log(login,pass,admin); | ||||
|             // console.log("cl reg"); | ||||
|             if(login != ""&&pass!=""){ | ||||
|                 $.post( "/admin/users/new", { login:login,pass:pass,admin:admin }) | ||||
|                 $.post( "/admin/users/new", { login:login,pass:pass,admin:admin,rights:rights }) | ||||
|                 .done(function( res ) { | ||||
|                     // console.log("serv reg"); | ||||
|                     if(res["out"] == "good"){ | ||||
|  | ||||
| @ -13,7 +13,7 @@ | ||||
|         justify-content: space-between; | ||||
|         /* width: 200px; */ | ||||
|         cursor: pointer; | ||||
|         width: 5vw; | ||||
|         width: 9vw; | ||||
|         display: flex; | ||||
|         /* width: 20vw; */ | ||||
|     } | ||||
| @ -26,7 +26,7 @@ | ||||
|         /* width: 20vw; */ | ||||
|     } | ||||
|     #top_panel{ | ||||
|         height: 100px; | ||||
|         height: 10vh; | ||||
|         display: flex; | ||||
|         margin-bottom: 2vh; | ||||
|         margin-top: 1vh; | ||||
| @ -48,9 +48,11 @@ | ||||
|     .menu_btn{ | ||||
|         background: ghostwhite; | ||||
|         cursor: pointer; | ||||
|         border: 1px black dashed; | ||||
|         border: 1px gray solid; | ||||
|         padding: 2px; | ||||
|         width: 220px; | ||||
|         border-radius: 0.5vw; | ||||
|         min-height: 2.5vw; | ||||
|     } | ||||
|     .cmenu{ | ||||
|         position: absolute; | ||||
| @ -58,7 +60,10 @@ | ||||
|         background: ghostwhite; | ||||
|         color: black; | ||||
|         cursor: pointer; | ||||
|         border: 1px black solid; | ||||
|         border: 1px gray solid; | ||||
|         border-radius: 0.5vw; | ||||
|         border-top-left-radius: 0px; | ||||
|         border-top-right-radius: 0px; | ||||
|         border-top: 0px; | ||||
|         z-index: 500; | ||||
|         /* width: 218px; */ | ||||
| @ -85,8 +90,8 @@ | ||||
|         /* height: 60px; */ | ||||
|     } | ||||
|     .top_panel_right img{ | ||||
|         width: 3vw; | ||||
|         height: 3vh; | ||||
|         width: 2.5vw; | ||||
|         /* height: 3vh; */ | ||||
|     } | ||||
|     @media (max-width: 900px) { | ||||
|         #top_panel_right_main{ | ||||
| @ -132,7 +137,7 @@ | ||||
| <div id="user_menu" class="cmenu"></div> | ||||
|  | ||||
|  | ||||
| <div id="top_div" style="background-color: rgba(red, green, blue, 0.5); width: 100%;height: 100%;position: absolute;inset: 0px;z-index: 300; display: none;" onclick="hide_menus()"></div> | ||||
| <div id="top_div" style="background-color: transparent; width: 100%;height: 100%;position: absolute;inset: 0px;z-index: 300;" onclick="hide_menus()"></div> | ||||
|  | ||||
| <script> | ||||
|     get_from_uuid((res)=>{ | ||||
| @ -179,14 +184,16 @@ | ||||
|             // menu.onmouseleave = () => menu.style.display = 'none'; | ||||
|             // menu.innerHTML = "<p>Option1</p><p>Option2</p><p>Option3</p><p>Option4</p>" | ||||
|             // document.body.appendChild(menu) | ||||
|             open_menu(); | ||||
|         }else if(e.target.id == "proj_menu"){ | ||||
|             hide_menus(); | ||||
|             let menu = document.getElementById("project_menu"); | ||||
|             menu.style.display = 'block'; | ||||
|             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) | ||||
|             // menu.onmouseleave = () => menu.style.display = 'none'; | ||||
|             // menu.innerHTML = "<p>Option1</p><p>Option2</p><p>Option3</p><p>Option4</p>" | ||||
|             // document.body.appendChild(menu) | ||||
|             open_menu(); | ||||
|         } | ||||
|         else if(e.target.id == "user_buttons"){ | ||||
|             hide_menus(); | ||||
| @ -196,10 +203,11 @@ | ||||
|             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 + 25}px;left:${e.target.getBoundingClientRect().left - 20}px`; | ||||
|             menu.style = `top:${e.target.getBoundingClientRect().top + 20}px;left:${e.target.getBoundingClientRect().left - 8}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)s | ||||
|             // document.body.appendChild(menu) | ||||
|             open_menu(); | ||||
|          | ||||
|         } | ||||
|         else if(e.target.id == "object_menu"){ | ||||
| @ -220,15 +228,36 @@ | ||||
|             // menu.onmouseleave = () => menu.style.display = 'none'; | ||||
|             // menu.innerHTML = "<p>Option1</p><p>Option2</p><p>Option3</p><p>Option4</p>" | ||||
|             // document.body.appendChild(menu) | ||||
|             open_menu(); | ||||
|          | ||||
|         } | ||||
|         else if(e.target.id == "proj_cost"){ | ||||
|             document.getElementById("cost_list").style = `margin-top:3vw;left:${e.target.getBoundingClientRect().left}px`; | ||||
|             hide_menus(); | ||||
|             document.getElementById("cost_list").style = `margin-top:2.5vw;left:${e.target.getBoundingClientRect().left}px`; | ||||
|             console.log("cost_list"); | ||||
|             open_menu(); | ||||
|         } | ||||
|         else if(e.target.id == "group_drop"){ | ||||
|             document.getElementById("group").style = `margin-top:2vw;left:${e.target.getBoundingClientRect().left}px;width: 14vw;padding: 7.5px;`; | ||||
|         else if(`${e.target.id}`.split("-")[0] == "group_drop"){ | ||||
|             hide_menus(); | ||||
|             document.getElementById("group").innerHTML = ""; | ||||
|  | ||||
|             // console.log(e.target.getAttribute("groups").split(",")); | ||||
|             document.getElementById("group").style = `margin-top:2.5vw;left:${e.target.getBoundingClientRect().left}px;width: 14vw;padding: 0.45vw;display:block;`; | ||||
|             console.log("group"); | ||||
|             open_menu(); | ||||
|  | ||||
|             if (document.URL == "https://puzzle.n0r.su/admin/objects"){ | ||||
|                 load_groups(()=>{},e.target.getAttribute("groups").split(","),true) | ||||
|                 let groups = document.getElementById("group"); | ||||
|                 let new_grp_btn = document.createElement("button"); | ||||
|                 new_grp_btn.setAttribute("onclick",`create_new_group(${e.target.getAttribute("pid")})`); | ||||
|                 new_grp_btn.innerText = "доб. группу"; | ||||
|                 new_grp_btn.style.width = "14vw"; | ||||
|                 groups.append(new_grp_btn) | ||||
|             } | ||||
|             else{ | ||||
|                 load_groups(()=>{},e.target.getAttribute("groups").split(",")) | ||||
|             } | ||||
|             // hide_menus(); | ||||
|             // let menu = document.getElementById("object_edit_menu"); | ||||
|             // let obj = e.target; | ||||
|  | ||||
| @ -1,12 +1,14 @@ | ||||
| <script> | ||||
|     // document.getElementById("load_div").style.height = `${document.getElementsByTagName("body")[0].scrollHeight}px`; | ||||
| </script> | ||||
| <style> | ||||
|     #load_div{ | ||||
|         width: 100vw; | ||||
|         height: 100vh; | ||||
|         height: 99vh; | ||||
|         display: flex; | ||||
|         position: absolute; | ||||
|         z-index: 10000; | ||||
|         background-color: white; | ||||
|         pointer-events: none; | ||||
|         transition: background-color 1s; | ||||
|     } | ||||
|     #load_logo{ | ||||
| @ -19,21 +21,38 @@ | ||||
|         -ms-transform: translateX(-50%) translateY(-50%); | ||||
|         -webkit-transform: translate(-50%,-50%); | ||||
|         transform: translate(-50%,-50%); | ||||
|         pointer-events: none; | ||||
|         pointer-events: all; | ||||
|         transition-duration: 800ms; | ||||
|         cursor: pointer; | ||||
|     } | ||||
|     #load_help{ | ||||
|         width: 12vw; | ||||
|         justify-content: space-between; | ||||
|         position:absolute; | ||||
|         top:50%; | ||||
|         left:50%; | ||||
|         -ms-transform: translateX(-50%) translateY(-50%); | ||||
|         -webkit-transform: translate(-50%,-50%); | ||||
|         transform: translate(-50%,-50%); | ||||
|         display: none; | ||||
|         text-align: center; | ||||
|         pointer-events: all; | ||||
|     } | ||||
| </style> | ||||
|  | ||||
|  | ||||
| <div id="load_div"> | ||||
|     <img id="load_logo" src="/img/Умничка лого с обводкой-02 1.png" alt=""> | ||||
|     <img id="load_logo" src="/img/Умничка лого с обводкой-02 1.png" onclick="goto('/')" alt=""> | ||||
|     <div id="load_help"><a href="">reload</a><br><a href="/main">go to main page</a></div> | ||||
| </div> | ||||
|  | ||||
| <script> | ||||
|     let page_state = ""; | ||||
|     let loaded_pos={ | ||||
|         x:"10%", | ||||
|         // y:"6%", | ||||
|         // x: "55px", | ||||
|         y: "45px", | ||||
|         y: "4vh", | ||||
|         w:"8vw", | ||||
|         h:"8vh" | ||||
|     } | ||||
| @ -48,22 +67,34 @@ | ||||
|         let logo = document.getElementById("load_logo"); | ||||
|         let load_div = document.getElementById("load_div"); | ||||
|         load_div.style.backgroundColor = "transparent"; | ||||
|         load_div.style.pointerEvents = "none"; | ||||
|         document.getElementById("load_help").style.display = "none"; | ||||
|         // load_div.style.transition = "background-color 1s" | ||||
|         // logo.style.transform = `translate(0px,0px)`; | ||||
|         document.getElementsByTagName("body")[0].style.overflow = "auto"; | ||||
|         logo.style.left = loaded_pos.x; | ||||
|         logo.style.top = loaded_pos.y; | ||||
|         logo.style.width = loaded_pos.w | ||||
|         load_div.style.height = `${document.getElementsByTagName("body")[0].scrollHeight}px`; | ||||
|         // load_div.style.height = `${document.getElementsByTagName("body")[0].scrollHeight}px`; | ||||
|         page_state = "loaded"; | ||||
|     } | ||||
|     function loading(){ | ||||
|         let logo = document.getElementById("load_logo"); | ||||
|         let load_div = document.getElementById("load_div"); | ||||
|         load_div.style.backgroundColor = "white"; | ||||
|         document.getElementsByTagName("body")[0].style.overflow = "hidden"; | ||||
|         load_div.style.pointerEvents = "all"; | ||||
|         // load_div.style.transition = "background-color 1s" | ||||
|         // logo.style.transform = `translate(-50%,-50%)`; | ||||
|         logo.style.left = loading_pos.x; | ||||
|         logo.style.top = loading_pos.y; | ||||
|         logo.style.width = loading_pos.w | ||||
|         load_div.style.height = `${document.getElementsByTagName("body")[0].scrollHeight}px`; | ||||
|         // load_div.style.height = `${document.getElementsByTagName("body")[0].scrollHeight}px`; | ||||
|         page_state = "loading"; | ||||
|     } | ||||
|     setTimeout(()=>{ | ||||
|         if(page_state != "loaded"){ | ||||
|             document.getElementById("load_help").style.display = "block"; | ||||
|         } | ||||
|     },2000) | ||||
| </script> | ||||
| @ -8,7 +8,7 @@ | ||||
|         margin: 0%; | ||||
|         background-image: url("/img/background/photo_2023-06-06_08-53-47\ 1.png"); | ||||
|         background-repeat: no-repeat; | ||||
|             background-position: center; | ||||
|         background-position: center; | ||||
|         background-size: cover; | ||||
|     } | ||||
|     #login_form{ | ||||
|  | ||||
| @ -66,7 +66,7 @@ | ||||
|                     // console.log(scr) | ||||
|                     // console.log("good"); | ||||
|                     // if(callback) callback(res); | ||||
|                     goto(`/proj/${name}`); | ||||
|                     goto(`/proj/load/${name}`); | ||||
|                 } | ||||
|             }) | ||||
|         } | ||||
| @ -81,16 +81,16 @@ | ||||
|             console.log(proj); | ||||
|             let div = document.getElementById("projs_div"); | ||||
|             div.innerHTML += `<button id='proj_${proj["name"]}' class='proj'> | ||||
|                 <img src='${proj["img"]}' alt='${proj["name"]}' class="p_img" onclick="goto('/proj/${proj["name"]}')"> | ||||
|                 <img src='${proj["img"]}' alt='${proj["name"]}' class="p_img" onclick="goto('/proj/load/${proj["name"]}')"> | ||||
|                 <div class="p_props"> | ||||
|                     <div class="p_left"  style="text-align:left"> | ||||
|                         <h1>${proj["name"]}</h1> | ||||
|                         <div>${proj["creation_date"].split("T")[0]}</div> | ||||
|                     </div> | ||||
|                     <div class="p_right"> | ||||
|                         <img src="/img/icon/edit.svg" style="width:24px;height:24px" onclick="del_proj('${proj["name"]}')"> | ||||
|                         <img src="/img/icon/copy.svg" style="width:24px;height:24px" onclick="del_proj('${proj["name"]}')"> | ||||
|                         <img src="/img/icon/download.svg" style="width:24px;height:24px" onclick="del_proj('${proj["name"]}')"> | ||||
|                         <img src="/img/icon/edit.svg" style="width:24px;height:24px" onclick=""> | ||||
|                         <img src="/img/icon/copy.svg" style="width:24px;height:24px" onclick=""> | ||||
|                         <img src="/img/icon/download.svg" style="width:24px;height:24px" onclick="download_proj('${proj["id"]}','${proj["name"]}')"> | ||||
|                         <img src="/img/icon/trash.svg" style="width:24px;height:24px" onclick="del_proj('${proj["name"]}')"> | ||||
|                     </div>     | ||||
|                 </div> | ||||
| @ -100,6 +100,13 @@ | ||||
|         } | ||||
|     }); | ||||
|  | ||||
|     function download_proj(id,name){ | ||||
|         $.post( "/proj/download",{id:id}) | ||||
|         .done(function( res ) { | ||||
|             downloadTextFile(res,`${name}.json`) | ||||
|         }) | ||||
|     } | ||||
|  | ||||
|     function del_proj(proj_name){ | ||||
|         let del = confirm(`удалить проект ${proj_name}?`); | ||||
|         if(del == true){ | ||||
|  | ||||
| @ -4,8 +4,8 @@ | ||||
| <script src="/lib/html2canvas.js"></script> | ||||
| <style> | ||||
|     .drag{ | ||||
|         height: 50px; | ||||
|         width: 50px; | ||||
|         height: 5vw; | ||||
|         width: 5vw; | ||||
|         position: absolute; | ||||
|         text-align: center; | ||||
|         margin: auto; | ||||
| @ -46,12 +46,12 @@ | ||||
|     .createzone { | ||||
|         background-color: #bfe4ff; | ||||
|         border: dashed 4px transparent; | ||||
|         border-radius: 4px; | ||||
|         height: 22px; | ||||
|         width: 22px; | ||||
|         border-radius: 0.4vw; | ||||
|         height: 3vw; | ||||
|         width: 3vw; | ||||
|         margin: 10px; | ||||
|         margin-top: 0px; | ||||
|         padding: 10px; | ||||
|         padding: 0.8vw; | ||||
|         transition: background-color 0.3s; | ||||
|     } | ||||
|  | ||||
| @ -70,10 +70,11 @@ | ||||
|     .czones{ | ||||
|         display: flex; | ||||
|         margin: 0px auto; | ||||
|         margin-top: 3vh; | ||||
|         /* justify-content: space-around; */ | ||||
|         flex-wrap: wrap; | ||||
|         width: 75%; | ||||
|         /* height: 100px; */ | ||||
|         height: 40vh; | ||||
|         /* overflow-x: auto; */ | ||||
|     } | ||||
|  | ||||
| @ -129,20 +130,25 @@ | ||||
|  | ||||
| <div class="inputs"> | ||||
|     <div id="wall_input" style="display: flex;justify-content: space-between;width: 95%;margin-left: 20px;"> | ||||
|         <div style="display: flex;width: 150px;justify-content: space-between;"> | ||||
|         <div style="display: flex;width: 16vw;justify-content: space-between;"> | ||||
|             <label for="wall_height" style="margin: auto;">Высота стены</label> | ||||
|             <input type="text" id="wall_height" style="width: 50px; text-align: center;" value="2" oninput="wall_size_change('height');resize_drags();">  | ||||
|             <input type="text" id="wall_height" style="width: 5vw; text-align: center; border-radius: 0.5vw; border: 1px solid gray;" value="2" oninput="this.value = this.value.replace(/[^0-9.]/g, '0').replace(/(\..*?)\..*/g, '$1').replace(/^0[^.]/, '0');wall_size_change('height');resize_drags();">  | ||||
|             <label for="wall_width" style="margin: auto;">М.</label> | ||||
|         </div> | ||||
|         <div style="display: flex;width: 150px;justify-content: space-between;"> | ||||
|         <div style="display: flex;width: 16vw;justify-content: space-between;"> | ||||
|             <label for="wall_width" style="margin: auto;">Длина стены</label> | ||||
|             <input type="text" id="wall_width" style="width: 50px; text-align: center;" value="4" oninput="wall_size_change('width');resize_drags();">  | ||||
|             <input type="text" id="wall_width" style="width: 5vw; text-align: center; border-radius: 0.5vw; border: 1px solid gray;" value="4" oninput="this.value = this.value.replace(/[^0-9.]/g, '0').replace(/(\..*?)\..*/g, '$1').replace(/^0[^.]/, '0');wall_size_change('width');resize_drags();">  | ||||
|             <label for="wall_width" style="margin: auto;">М.</label> | ||||
|         </div> | ||||
|         <div style="display: flex;width: 150px;justify-content: space-between;"> | ||||
|         <div style="display: flex;width: 16vw;justify-content: space-between;"> | ||||
|             <label for="wall_color" style="margin: auto;">цвет стены</label> | ||||
|             <input type="color" id="wall_color" style="width: 50px;" value="#000000" onchange="wall_color_change()">  | ||||
|             <input type="color" id="wall_color" style="width: 5vw; border-radius: 0.5vw; border: 1px solid gray; min-height: 3.9vw;" value="#FFFFFF" onchange="wall_color_change()">  | ||||
|         </div> | ||||
|         <div style="display: flex;width: 15vw;justify-content: space-between; background-color: #aaa;"> | ||||
|             <input type="button" id="proj_cost" class="menu_btn" value="Расчет стоимости" onclick="cost_drop();open_menu();" style="width: 100%;">  | ||||
|         <div style="display: flex;width: 15vw;justify-content: space-between;"> | ||||
|             <button id="proj_cost" class="menu_btn" onclick="cost_drop();" style="width: 100%;"> | ||||
|                 <div id="proj_cost_text" style="pointer-events: none;">Расчет стоимости</div> | ||||
|                 <img src="/img/drop.png" style="width: 1vw;height: 0.5vw;pointer-events: none;" alt="\/"> | ||||
|             </button> | ||||
|             <style> | ||||
|                 #cost_list li{ | ||||
|                     display: flex; | ||||
| @ -177,32 +183,131 @@ | ||||
| <div style="display:flex; justify-content: space-around;"></div> | ||||
|  | ||||
| <div class="inputs" style="display: flex;justify-content: space-between;"> | ||||
|     <style> | ||||
|         .btn_icon{ | ||||
|             border: 1px solid gray; | ||||
|             border-radius: 0.5vw; | ||||
|             padding: 0.5vw; | ||||
|             height: 2vw; | ||||
|             width: 2vw; | ||||
|             cursor: pointer; | ||||
|         } | ||||
|         .btn_icon img{ | ||||
|             height: 2vw; | ||||
|             width: 2vw; | ||||
|         } | ||||
|     </style> | ||||
|     <div style="display: flex;justify-content: space-between; width: 20vw;"> | ||||
|         <div>copy</div> | ||||
|         <div>back</div> | ||||
|         <div>forw</div> | ||||
|         <div>del</div> | ||||
|         <div class="btn_icon"><img src="/img/icon/copy.png" alt="copy"></div> | ||||
|         <div class="btn_icon" onclick="go_back()"><img src="/img/icon/back.png" alt="back"></div> | ||||
|         <div class="btn_icon" onclick="go_forw()"><img src="/img/icon/forw.png" alt="forw"></div> | ||||
|         <div class="btn_icon" onclick="obj_del()"><img src="/img/icon/del.png" alt="del"></div> | ||||
|     </div> | ||||
|     <div style="display: flex;justify-content: space-between; width: 7vw;"> | ||||
|         <div><img src="/img/icon/save.svg" alt="" style="width: 30px;" onclick="save_proj()"></div> | ||||
|         <div>load</div> | ||||
|         <div id="save_btn_icon" class="btn_icon" onclick="save_proj()"><img src="/img/icon/save.png" alt="save"></div> | ||||
|         <div class="btn_icon" onclick="document.getElementById('import_file').click();"><img src="/img/icon/download.png" alt="load"></div> | ||||
|         <input type='file' id="import_file" style="display: none;" accept="application/JSON" onchange='openFile(event,load_file)'> | ||||
|     </div> | ||||
| </div> | ||||
| <div class="inputs" style="display: flex;justify-content: space-between;margin-top: 0px;"> | ||||
|     <div id="obj_group" style="display: flex;justify-content:space-evenly; width: 100vw;"> | ||||
|         <!-- <button name="" id="group_drop" >Помехи на стене</button> --> | ||||
|         <button name="" id="group_drop" class="menu_btn" onclick="group_drop();open_menu();" style="width: 15vw;padding: 2px;">Оборудование</button> | ||||
|         <button name="" id="group_drop" class="menu_btn" onclick="group_drop();open_menu();" style="width: 15vw;padding: 2px;">помехи</button> | ||||
|         <style> | ||||
|             .group_drop{ | ||||
|                 width: 15vw; | ||||
|                 padding: 2px; | ||||
|                 min-width: 15vw; | ||||
|             } | ||||
|             .group_drop *{ | ||||
|                 pointer-events: none; | ||||
|                 overflow: auto; | ||||
|             } | ||||
|             .group_drop img{ | ||||
|                 width: 1vw; | ||||
|                 height: 0.5vw; | ||||
|             } | ||||
|         </style> | ||||
|         <div id="obj_parts" style="min-width: 50vw;display: flex;justify-content: space-evenly;"> | ||||
|         </div> | ||||
|         <style> | ||||
|             .group_inp{ | ||||
|                 height: 1vw; | ||||
|                 width: 1vw; | ||||
|                 border: 0px; | ||||
|                 border-radius: 0.4vw; | ||||
|                 overflow: auto; | ||||
|             } | ||||
|         </style> | ||||
|         <ul id="group" class="cmenu"></ul> | ||||
|     </div> | ||||
| </div> | ||||
| <div class="czones" style="height: 500px;"></div> | ||||
| <div class="czones"></div> | ||||
|  | ||||
|  | ||||
| <script src="/lib/inter.js"></script> | ||||
| <script> | ||||
|     let proj_name = "<%= proj_name %>"; | ||||
|  | ||||
|  | ||||
|     function load_file(text){ | ||||
|         if (proj_state == "loaded"){objs_back.push(JSON.parse(JSON.stringify(objs)));} | ||||
|  | ||||
|         // console.log(text); | ||||
|         // console.log(objs); | ||||
|         try{ | ||||
|             objs = JSON.parse(JSON.parse(text)["body"]); | ||||
|         } | ||||
|         catch{} | ||||
|         // console.log(objs); | ||||
|         reload(); | ||||
|         // save((res)=>{ | ||||
|         //     goto(""); | ||||
|         //     // document.getElementById('top_panel_center').innerHTML=`сохранено ${proj_name} в облако`; | ||||
|         // },false)     | ||||
|     } | ||||
|  | ||||
|     function go_back(){ | ||||
|         if(objs_back.length > 0){ | ||||
|             objs_forw.push(objs); | ||||
|             objs = objs_back.at(-1); | ||||
|             objs_back.pop(); | ||||
|             reload(); | ||||
|             calc_total(); | ||||
|         } | ||||
|     } | ||||
|     function go_forw(){ | ||||
|         if(objs_forw.length > 0){ | ||||
|             objs_back.push(objs); | ||||
|             objs = objs_forw.at(-1); | ||||
|             objs_forw.pop(); | ||||
|             reload(); | ||||
|             calc_total(); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     function obj_del(){ | ||||
|        if (proj_state == "loaded"){objs_back.push(JSON.parse(JSON.stringify(objs)));} | ||||
|  | ||||
|        try{ | ||||
|         let drag = document.getElementById(cur_obj); | ||||
|         if(drag.id != "none"){ | ||||
|             console.log(cur_obj); | ||||
|             // 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() | ||||
|  | ||||
|             drag.remove(); | ||||
|         } | ||||
|        } | ||||
|        catch{alert("объкт не выбран")} | ||||
|     } | ||||
|  | ||||
|     function gids_change(){ | ||||
|         group_drop(); | ||||
|     } | ||||
|  | ||||
|     function group_drop(){ | ||||
|         let e = document.getElementById("group_drop") | ||||
|         setTimeout(()=>{ | ||||
| @ -217,7 +322,7 @@ | ||||
|                     i++; | ||||
|                 } | ||||
|                 if (i==0){ | ||||
|                     document.getElementsByClassName("czones")[0].innerHTML = ""; | ||||
|                     // document.getElementsByClassName("czones")[0].innerHTML = ""; | ||||
|                     drag_start() | ||||
|                     // e.removeChild(e.getElementsByClassName(value)) | ||||
|                 } | ||||
| @ -225,6 +330,31 @@ | ||||
|         },1) | ||||
|     } | ||||
|  | ||||
|     load_parts((db)=>{ | ||||
|         let parts = document.getElementById("obj_parts"); | ||||
|         Object.values(db).forEach((value)=>{ | ||||
|             let part = document.createElement("button") | ||||
|             let part_text = document.createElement("div") | ||||
|             let part_drop = document.createElement("img") | ||||
|              | ||||
|             part_drop.src = "/img/drop.png"; | ||||
|             part_drop.alt = "\/"; | ||||
|  | ||||
|             part_text.innerText = `${value["name"]}`; | ||||
|  | ||||
|             part.id = `group_drop-${value["id"]}`; | ||||
|             part.classList.add("menu_btn") | ||||
|             part.classList.add("group_drop") | ||||
|             part.setAttribute("groups",`${value["groups"]}`) | ||||
|  | ||||
|             part.append(part_text); | ||||
|             part.append(part_drop); | ||||
|  | ||||
|             parts.append(part); | ||||
|             console.log(value); | ||||
|         }) | ||||
|     }) | ||||
|      | ||||
|     function cost_drop(id){ | ||||
|         // let e = document.getElementById("cost") | ||||
|         // setTimeout(()=>{ | ||||
| @ -248,59 +378,79 @@ | ||||
|     } | ||||
|  | ||||
|     function wall_color_change(){ | ||||
|        if (proj_state == "loaded"){objs_back.push(JSON.parse(JSON.stringify(objs)));} | ||||
|  | ||||
|         let wall = document.getElementById("wall") | ||||
|         let color = document.getElementById("wall_color") | ||||
|         wall.style.backgroundColor = color.value; | ||||
|         objs["color"] = color.value; | ||||
|     } | ||||
|  | ||||
|     function gids_change(){ | ||||
|         get_objs(); | ||||
|         drag_start() | ||||
|     } | ||||
|  | ||||
|     function get_groups(callback){ | ||||
|         let select = document.getElementById("group"); | ||||
|         // let select = document.getElementById("group"); | ||||
|         // let name = select.options[select.selectedIndex].text; | ||||
|         $.post( "/get_groups") | ||||
|         .done(function( res ) { | ||||
|             if(res["out"] == "good"){ | ||||
|                 select.innerHTML = ""; | ||||
|                 res["body"].forEach(group => { | ||||
|                     console.log(group); | ||||
|                     let gd = document.createElement("div"); | ||||
|                     let group_div = document.createElement("input"); | ||||
|                     let label = document.createElement("label"); | ||||
|                     group_div.setAttribute("type","checkbox"); | ||||
|                     group_div.setAttribute("onchange","group_drop()"); | ||||
|                     label.setAttribute("for",`obj_group_${group["id"]}`); | ||||
|                     label.innerText = group["name"].replace("$"," "); | ||||
|                     // gd.innerText = group["name"].replace("$"," "); | ||||
|                     group_div.setAttribute("group_count",group["count"]); | ||||
|                     group_div.setAttribute("gid",group["id"]); | ||||
|                     group_div.id = `obj_group_${group["id"]}`; | ||||
|                     gd.append(group_div); | ||||
|                     gd.append(label); | ||||
|                     select.append(gd); | ||||
|                     // select.append(label); | ||||
|                     if(group["id"] == res["body"].at(-1)["id"]){ | ||||
|                         if(callback)callback(); | ||||
|                     } | ||||
|                 }); | ||||
|             } | ||||
|             // callback(res); | ||||
|         }); | ||||
|         load_groups(callback(),gids); | ||||
|         // callback(); | ||||
|         // $.post( "/get_groups") | ||||
|         // .done(function( res ) { | ||||
|         //     if(res["out"] == "good"){ | ||||
|         //         // select.innerHTML = ""; | ||||
|         //         res["body"].forEach(group => { | ||||
|         //             console.log(group); | ||||
|         //             let gd = document.createElement("div"); | ||||
|         //             let group_div = document.createElement("input"); | ||||
|         //             let label = document.createElement("label"); | ||||
|  | ||||
|         //             group_div.style.cursor = "pointer"; | ||||
|         //             label.style.cursor = "pointer"; | ||||
|         //             // group_div.style.pointerEvents = "none"; | ||||
|         //             // label.style.pointerEvents = "none"; | ||||
|  | ||||
|         //             group_div.setAttribute("type","checkbox"); | ||||
|         //             group_div.setAttribute("onchange","group_drop()"); | ||||
|         //             label.setAttribute("for",`obj_group_${group["id"]}`); | ||||
|         //             label.innerText = group["name"].replace("$"," "); | ||||
|         //             // gd.innerText = group["name"].replace("$"," "); | ||||
|         //             group_div.setAttribute("group_count",group["count"]); | ||||
|         //             group_div.setAttribute("gid",group["id"]); | ||||
|         //             group_div.id = `obj_group_${group["id"]}`; | ||||
|         //             group_div.classList.add("group_inp"); | ||||
|         //             gd.append(group_div); | ||||
|         //             gd.append(label); | ||||
|         //             select.append(gd); | ||||
|         //             // select.append(label); | ||||
|         //             if(group["id"] == res["body"].at(-1)["id"]){ | ||||
|         //                 if(callback)callback(); | ||||
|         //             } | ||||
|         //         }); | ||||
|         //     } | ||||
|         //     // callback(res); | ||||
|         // }); | ||||
|     } | ||||
|     get_groups(()=>{ | ||||
|     // get_groups(()=>{ | ||||
|         // get_objs(); | ||||
|         load_proj_cloud(); | ||||
|     }); | ||||
|     function get_objs(group){ | ||||
|     // }); | ||||
|     function get_objs(group_div){ | ||||
|         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() | ||||
|         },group.getAttribute("gid")) | ||||
|         gids.forEach(group => { | ||||
|             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() | ||||
|             },group) | ||||
|         }); | ||||
|         drag_start() | ||||
|     } | ||||
|  | ||||
|     // function del_proj(){ | ||||
| @ -323,12 +473,8 @@ | ||||
|     function save_proj(){ | ||||
|         // document.getElementById('top_panel_center').innerHTML=`сохранение ${proj_name}`; | ||||
|         save((res)=>{ | ||||
|             alert("проект сохранён") | ||||
|             // document.getElementById('top_panel_center').innerHTML=`сохранено ${proj_name} в облако`; | ||||
|             alert("saved") | ||||
|             setTimeout((res)=>{ | ||||
|                 // document.getElementById("top_panel_center").innerText = `${proj_name} (облако)`; | ||||
|  | ||||
|             },3000) | ||||
|         }) | ||||
|     } | ||||
|  | ||||
|  | ||||
| @ -20,9 +20,9 @@ | ||||
|     function open_menu(){ | ||||
|         let menu_screen = document.getElementById("top_div"); | ||||
|         menu_screen.style.display = "block"; | ||||
|         // menu_screen.style.backgroundColor = "red"; | ||||
|         menu_screen.style.height = `${document.getElementsByTagName("body")[0].scrollHeight}px`; | ||||
|     } | ||||
|     hide_menus(); | ||||
|     $('form').on('submit', function(event) { | ||||
|             event.preventDefault(); | ||||
|     }); | ||||
| @ -39,5 +39,7 @@ | ||||
|             // console.log("check"); | ||||
|         }     | ||||
|     }); | ||||
|      | ||||
|     try{ | ||||
|         hide_menus(); | ||||
|     }catch{} | ||||
| </script> | ||||
| @ -32,6 +32,7 @@ | ||||
|             width: 90vw; | ||||
|             margin: auto; | ||||
|             padding-block: 20px; | ||||
|             min-height: 800px; | ||||
|         } | ||||
|         html{ | ||||
|             background-color:aliceblue; | ||||
| @ -43,6 +44,8 @@ | ||||
|             margin: 0px; | ||||
|         } | ||||
|         *{ | ||||
|             touch-action: none; | ||||
|             user-select: none; | ||||
|             font: "Circe Rounded"; | ||||
|             font-size: var(--main-font-size); | ||||
|             font-weight:100; | ||||
|  | ||||