update

added:
db users
admin user edit
cleared router
cleared sql
new sid creation
new log creation
cleaned code (a bit) (
removed db check value function and replaced with get one value.

admin.js

@@ -0,0 +1,134 @@
+const db = require('./db');
+const func = require('./func');
+const { login } = require('./user');
+const vars = require('./vars');
+
+module.exports.get_users = (inp,cook,res)=>{
+    try{
+        db.crc("users",(row_count)=>{
+            // console.log(row_count);
+            db.gav("users",`${inp["from"]},${inp["load_interval"]}`,(data)=>{
+                if(data["length"] > 0){
+                    res.send({body:data,count:row_count,out:"good"});
+                }
+                else{
+                    res.send({out:"bad"});
+                }
+            },true)
+        },true)
+    } catch(error){
+        func.log("backend user getting in error - "+error);
+    }
+    // res.send("good");
+}
+
+module.exports.edit_user = (inp,cook,res)=>{
+    try {
+        if(inp["key"] == "login"){
+            db.ggv("users","id","login",`'${inp["value"]}'`,(login_in_use)=>{ login_in_use = login_in_use[0];
+                if (login_in_use){
+                    res.send({out:"bad"});
+                    return;
+                }
+                else{
+                    change();
+                    db.ggv("admins","id","uid",`'${inp["id"]}'`,(admin)=>{ admin = admin[0]
+                        if(admin) db.sv("admins","login",inp["value"],"id",admin["id"],()=>{},true);
+                    },true);
+                }
+            })
+        }else if (inp["key"] == "admin"){
+            db.ggv("users","admin","id",`'${inp["id"]}'`,(admin)=>{ admin = admin[0]["admin"];
+                if(!admin){
+                    db.nr("admins",`login,uid`,`'${inp["login"]}','${inp["id"]}'`,true);
+                    db.sv("users","admin","1","id",inp["id"],()=>{},true);
+                }
+                else if(admin){
+                    db.dl("admins","uid",inp["id"],()=>{},true);
+                    db.sv("users","admin","0","id",inp["id"],()=>{},true);
+                }
+                func.log(`admin ${cook["uuid"]} changed user ${inp["login"]} admin privileges to ${!admin}`);
+                res.send({out:"good"});
+                // if (inp["value"] != "0"){ db.nr("admins",`login,uid`,`'${inp["login"]}','${inp["id"]}'`,true);}
+                // else {
+                //     db.sv("users","admin","0","id",inp["id"],()=>{},true);
+                //     db.dl("admins","uid",inp["id"],()=>{},true);
+                // }
+                // change();
+            })
+        }else {change();}
+
+        function change(){
+            db.sv("users",inp["key"],inp["value"],"id",inp["id"],(db_res)=>{
+                func.log(`admin ${cook["uuid"]} changed user ${inp["login"]} ${inp["key"]} to ${inp["value"]}`);
+                res.send({out:"good"});
+            },true)
+        }
+    } catch (error) {
+        func.log("backend user information changing error - "+error);
+    }
+}
+
+module.exports.del_user = (inp,cook,res)=>{
+    try {
+        db.dl("users","id",`'${inp["id"]}'`,()=>{
+            func.log(`admin ${cook["uuid"]} deleted user ${inp["login"]}`);
+            res.send({out:"good"});
+        },true);
+    } catch (error) {
+        func.log("backend user sid clearing error -"+error);
+    }
+}
+
+module.exports.set_obj=(inp,cook,res)=>{
+    try {
+
+    } catch (error) {
+        func.log("backend user sid logging error - "+error);
+    }
+}
+
+module.exports.reg = (inp,cook,res)=>{
+    try {
+        let uuid = func.get_uuid(inp["login"]);
+        let admin = inp["admin"];
+        let pass = inp["pass"];
+        let login = inp["login"];
+        check_db();
+        function check_db() {
+            db.ggv("users","id","login",`'${inp["login"]}'`, (ldata)=>{ldata = ldata[0]
+                db.ggv("users","id","uuid",`'${inp["uuid"]}'`,(udata) =>{udata = udata[0]
+                    // func.log("/reg_user same login recs = "+ldata);
+                    // func.log("/reg_user same uuid recs = "+udata);
+                    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}`);
+    
+                    }
+                    else if(udata!=null){
+                        uuid = func.get_uuid(inp["login"]);
+                        check_db();
+                        // 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`);
+                        res.send({out:"bad", body:"login"});
+                        return;
+                    }
+                },true)
+            },true)
+        }
+        function good_reg(){
+            db.nr("users",'`login`,`pass`,`uuid`,`admin`',`'${login}','${pass}','${uuid}',${admin}`,true);
+            if (admin){
+                db.ggv("users","`id`","uuid",`'${uuid}'`,(udata)=>{ udata = udata[0]
+                    db.nr("admins",'`login`,`uid`',`'${login}',${udata["id"]}`,true);
+                },true)
+            }
+            res.send({out:"good", body:{uuid:uuid,login:login,admin:admin}});
+        }
+    } catch (error) {
+        func.log("backend user registration error - "+error);
+    }
+}

db.js

@@ -1,126 +1,98 @@
 const mysql = require('mysql');
 const vars = require('./vars');
+const db_host = "localhost";
 
-const logcon = mysql.createConnection({
+const admin = mysql.createConnection({
-    host: 'db',
+    host: db_host,
+    user: 'admin',
+    password: '484',
+    database: 'users'
+});
+
+const user = mysql.createConnection({
+    host: db_host,
     user: 'user',
     password: 'user',
     database: 'users'
 });
 
-logcon.connect();
+db = (prevs = false) => {
-
+    if(prevs) return admin;
-// check_for
+    else return user;
-module.exports.cv = (table,key,value,callback) => {
-    logcon.query(`SELECT * FROM ${table}`, (err, rows, fields) => {
-        let log = '';
-        if (err) {
-            console.log("sql err");
-            throw err;
-        } 
-        rows.forEach(rec => {
-            if (rec[key]==value){
-                log = rec[key];
-                return;
-            }
-        });
-        if (log != ''){
-            callback(log);
-        }
-        else{
-            callback(null);
-        }
-    })
 }
 
-// module.exports.ccv = (table,ekey,key,value,callback) => {
+admin.connect();
-//     logcon.query('SELECT * FROM `'+table+'`', (err, rows, fields) => {
+user.connect();
-//         let log = '';
-//         if (err) {
-//             console.log("sql err");
-//             throw err;
-//         } 
-//         rows.forEach(rec => {
-//             if (rec[key]==value){
-//                 log = rec[key];
-//                 return;
-//             }
-//         });
-//         if (log != ''){
-//             callback(log);
-//         }
-//         else{
-//             callback(null);
-//         }
-//     })
-// }
 
-module.exports.dl = (table,key,value,callback) => {
+
+module.exports.dl = (table,key,value,callback,prevs = false) => {
     // console.log('SELECT * FROM `'+table+'` WHERE `'+key+'` = '+value);
-    logcon.query(`DELETE FROM ${table} WHERE ${key} = ${value}`, (err, rows, fields) => {
+    db(prevs).query(`DELETE FROM ${table} WHERE ${key} = ${value}`, (err, rows, fields) => {
         if (err) {
             console.log("sql err");
             throw err;
         }else{
-            callback(rows);
+            if(callback)callback(rows);
         }
     })
 }
 
-// get_from
+// get values where 
-module.exports.gv = (table,key,value,callback) => {
+module.exports.gv = (table,key,value,callback,prevs = false) => {
     // console.log('SELECT * FROM `'+table+'` WHERE `'+key+'` = '+value);
-    logcon.query(`SELECT * FROM ${table} WHERE ${key} = ${value}`, (err, rows, fields) => {
+    db(prevs).query(`SELECT * FROM ${table} WHERE ${key} = ${value}`, (err, rows, fields) => {
         if (err) {
             console.log("sql err");
             throw err;
         }else{
-            callback(rows);
+            if(callback)callback(rows);
         }
     })
 }
 
-module.exports.gav = (table,callback) => {
+// get all from table 
+module.exports.gav = (table,limit = "0",callback,prevs = false) => {
     // console.log('SELECT * FROM `'+table+'` WHERE `'+key+'` = '+value);
-    logcon.query(`SELECT * FROM ${table} WHERE 1`, (err, rows, fields) => {
+    limit = (limit != "0")? `LIMIT ${limit}`:""; 
+    db(prevs).query(`SELECT * FROM ${table} WHERE 1 ${limit}`, (err, rows, fields) => {
         if (err) {
             console.log("sql err");
             throw err;
         }else{
-            callback(rows);
+            if(callback)callback(rows);
         }
     })
 }
 
-
+// get value where 
-module.exports.ggv = (table,ekey,key,value,callback) => {
+module.exports.ggv = (table,ekey,key,value,callback,prevs = false) => {
     // console.log('SELECT * FROM `'+table+'` WHERE `'+key+'` = '+value);
-    logcon.query(`SELECT ${ekey} FROM ${table} WHERE ${key} = ${value}`, (err, rows, fields) => {
+    db(prevs).query(`SELECT ${ekey} FROM ${table} WHERE ${key} = ${value}`, (err, rows, fields) => {
         if (err) {
             console.log("sql err");
             throw err;
         }else{
-            callback(rows);
+            if(callback)callback(rows);
         }
     })
 }
 
-// set_in
+// set value where
-module.exports.sv = (table,key,value,ekey,evalue,callback) => {
+module.exports.sv = (table,key,value,ekey,evalue,callback,prevs = false) => {
-    logcon.query(`UPDATE ${table} SET ${key} = '${value}' WHERE ${ekey} = '${evalue}'`, (err , rows) => {
+    db(prevs).query(`UPDATE ${table} SET ${key} = '${value}' WHERE ${ekey} = '${evalue}'`, (err , rows) => {
         // console.log("UPDATE `"+table+"` SET `"+key+"` = '"+value+"' WHERE `"+ekey+"` = '"+evalue+"'");
         if (err) {
             console.log("sql err");
             throw err;
         }else{
-            callback(rows);
+            if(callback)callback(rows);
         }
     })
 }
-
+// new record
-module.exports.nr = (table,keys,values) =>{
+module.exports.nr = (table,keys,values,prevs = false) =>{
     // console.log('INSERT INTO `'+table+'`('+keys+') VALUES ('+values+')');
-    logcon.query(`INSERT INTO ${table} (${keys}) VALUES (${values})`,(err,res) =>{
+    db(prevs).query(`INSERT INTO ${table} (${keys}) VALUES (${values})`,(err,res) =>{
         if (err) {
             console.log("sql err");
             throw err;
@@ -129,15 +101,27 @@ module.exports.nr = (table,keys,values) =>{
         }
     })
 }
-
+// get last value
-module.exports.glv = (table,last_value,callback) =>{
+module.exports.glv = (table,last_value,callback,prevs = false) =>{
     // console.log('INSERT INTO `'+table+'`('+keys+') VALUES ('+values+')');
-    logcon.query(`SELECT * FROM ${table} ORDER BY ${last_value} DESC LIMIT 1;`,(err,res) =>{
+    db(prevs).query(`SELECT * FROM ${table} ORDER BY ${last_value} DESC LIMIT 1;`,(err,rows) =>{
         if (err) {
             console.log("sql err");
             throw err;
         }else{
-            callback(res);
+            if(callback)callback(rows);
+        }
+    })
+}
+
+module.exports.crc = (table,callback,prevs = false) =>{
+    // console.log('INSERT INTO `'+table+'`('+keys+') VALUES ('+values+')');
+    db(prevs).query(`SELECT COUNT(*) FROM ${table}`,(err,rows) =>{
+        if (err) {
+            console.log("sql err");
+            throw err;
+        }else{
+            if(callback)callback(rows[0]["COUNT(*)"]);
         }
     })
 }

func.js

@@ -24,31 +24,7 @@ module.exports.sendfile = (fileName, response) => {
     });
 }
 
-// module.exports.check_sid = (Cookies, callback) =>{
+module.exports.sid = (cook,res,callback,auto = true,admin_check = false)=>{
-//     let uuid = Cookies["uuid"];
-//     let sid = Cookies["sid"];
-//     // console.log(uuid,sid);
-//     db.gv("users","uuid",`'${uuid}'`,(udata)=>{ udata = udata[0];
-//         // console.log(udata);
-//         db.gv("sids","uid",udata["id"],(rdata)=>{
-//             let valid = "";
-//             rdata.forEach(rec => {
-//                 if (rec["sid"] == sid){
-//                     valid = rec["sid"];
-//                     return;
-//                 }
-//             });
-//             if(valid != ""){
-//                 callback(true,udata);
-//             }
-//             else{
-//                 callback(false,udata);
-//             }
-//         });
-//     })
-// }
-
-module.exports.sid = (cook,res,callback,auto = true)=>{
     try {
         let uuid = cook["uuid"];
         let sid = cook["sid"];
@@ -56,24 +32,43 @@ module.exports.sid = (cook,res,callback,auto = true)=>{
             db.ggv("sids","`uid`","sid",`'${sid}'`,(sdata)=>{ sdata = sdata[0]
                 // console.log(sdata);
                 if(sdata != null){
-                    db.ggv("users","`uuid`,`id`","id",`'${sdata["uid"]}'`,(udata)=>{ udata = udata[0]
+                    db.ggv("users","`uuid`,`id`, `admin`","id",`'${sdata["uid"]}'`,(udata)=>{ udata = udata[0]
                         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]
+                                    if(adata != null){
                                         callback(true);                                    
                                     }
+                                    else{
+                                        db.sv("users","admin","0","id",udata["id"],()=>{},true);
+                                        db.dl("admins","uid",udata["id"],()=>{},true);
+                                        if(auto) res.redirect('/');
+                                        else if(!auto) callback(false);                                    
+                                    }
+                                },true)
+                            }
+                            else{
+                                db.sv("users","admin","0","id",udata["id"],()=>{},true);
+                                db.dl("admins","uid",udata["id"],()=>{},true);
+                                if(auto) res.redirect('/');
+                                else if(!auto) callback(false);                           
+                            }
+                        }
                         else{
                             if(auto) res.send({out:"bad",err:"wrong"});
-                            if(!auto) callback(false);
+                            else if(!auto) callback(false);
                         }
                     });
                 }
                 else{
                     if(auto) res.send({out:"bad",err:"expired"});
-                    if(!auto) callback(false);
+                    else if(!auto) callback(false);
                 }
             });
         }else{
             if(auto) res.send({out:"bad",err:"nocr"});
-            if(!auto) callback(false);
+            else if(!auto) callback(false);
         }
     } catch (error) {
         this.log("backend sid checking err0r - "+error);
@@ -81,12 +76,13 @@ module.exports.sid = (cook,res,callback,auto = true)=>{
 }
 
 module.exports.log = (message) =>{
+    message = message.replaceAll("'","*")
     var date = moment().format('YYYY-MM-DD');
     var time = moment().format('hh:mm:ss');
     let clog = `${date}_${time}|${message}`;
     console.log(clog);
     // if(vars.log_to_file) fs.appendFile('./logs.txt', `${clog} \n`, function (err) {if (err) throw err;}); 
-    if(vars.log_to_db) db.nr("logs","`date`,`time`,`log`",`'${date}','${time}','${message}'`);
+    if(vars.log_to_db) db.nr("logs","`date`,`time`,`log`",`'${date}','${time}','${message}'`,true);
 }
 
 module.exports.logs_file = (res)=>{
@@ -103,13 +99,12 @@ module.exports.logs_file = (res)=>{
       });
 
     function write_logs(res){
-        db.gav("logs",(db_logs)=>{
+        db.gav("logs","0",(db_logs)=>{
-            db.glv(`logs`,`id`,(last)=>{last = last[0];
             db_logs.forEach(log => {
                 let date = moment(log[`date_time`]).utc().format('YYYY-MM-DD');
                 fs.appendFile(path, `${date}_${log["time"]}|${log["log"]} \n`, function (err) {
                     if (err) throw err;
-                        if(log["id"] == last["id"]-1){
+                    if(log["id"] == db_logs.at(-1)["id"]){
                         res.download(path, (err) => {
                             if (err) { throw err; }
                             console.log("logs downloaded");
@@ -120,14 +115,14 @@ module.exports.logs_file = (res)=>{
                     }
                 }); 
             });
-            })
+        },true);   
-        });   
     }
 }
 
 
-module.exports.get_uuid = () =>{
+module.exports.get_uuid = (name = "") =>{
-    let unid = uuid.v4() + '%%' + uuid.v4() +'#'+(621);
+    name = (name != "")? this.encrypt(name,"name"):"";
+    let unid = uuid.v4() + '%%'+name+'#e'+(621);
     return unid;
 }
 

index.js

@@ -2,6 +2,7 @@ const express = require('express');
 const db = require('./db');
 const func = require('./func');
 const user = require('./user');
+const admin = require('./admin');
 const obj = require('./object');
 const proj = require('./project');
 const vars = require('./vars');
@@ -36,6 +37,26 @@ app.use(express.static('public'));
 app.use(cookieParser());
 
 
+
+/// user
+app.get('/', (req, res) => {
+    let inp = req.body;
+    let cook = req.cookies;
+    func.sid(cook,res,(include)=>{
+        if(include){
+            res.redirect('main');
+        }
+        else{
+            res.redirect('login');
+        }
+    },false)
+});
+app.get("/login" , (req,res) =>{
+    res.render('login');
+})
+app.get("/main", (req,res) =>{
+    res.render('main');
+});
 app.post('/back_login', (req, res) => {
     try {
         let inp = req.body;
@@ -45,17 +66,6 @@ app.post('/back_login', (req, res) => {
         func.log("router login error - "+error);
     }
 });
-
-app.post('/reg_user', (req, res) => {
-    try{
-        let inp = req.body;
-        let cook = req.cookies;
-        user.reg(inp,cook,res)
-    } catch (error) {
-        func.log("router registration error - "+error);
-    }
-})
-
 app.post("/sid_log",(req,res) =>{
     try{
         let inp = req.body;
@@ -65,7 +75,6 @@ app.post("/sid_log",(req,res) =>{
         func.log("router sid logging in error - "+error);
     }
 })
-
 app.post("/get_sid" , (req,res) =>{
     try{
         let inp = req.body;
@@ -76,8 +85,6 @@ app.post("/get_sid" , (req,res) =>{
         func.log("router sid getting error - "+error);
     }
 });
-
-
 app.post("/clear_sid" , (req,res) =>{
     try{
         let inp = req.body;
@@ -87,7 +94,6 @@ app.post("/clear_sid" , (req,res) =>{
         func.log("router sid clearing error - "+error);
     }
 });
-
 app.post("/get_cr_uuid", (req,res) => {
     try{
         let inp = req.body;
@@ -99,7 +105,10 @@ app.post("/get_cr_uuid", (req,res) => {
         func.log("router getting user information by uuid error - "+error);
     }
 })
-
+/// project
+app.get("/proj/:name" , (req,res) =>{
+    res.render('project',{proj_name:req.params["name"]});
+})
 app.post("/save_proj", (req,res) => {
     try{
         let inp = req.body;
@@ -111,7 +120,6 @@ app.post("/save_proj", (req,res) => {
         func.log("router project saving error - "+error);
     }
 })
-
 app.post("/load_proj", (req,res) => {
     try{
         let inp = req.body;
@@ -123,7 +131,6 @@ app.post("/load_proj", (req,res) => {
         func.log("router project loading error - "+error);
     }
 })
-
 app.post("/get_projs", (req,res) => {
     try{
         let inp = req.body;
@@ -135,19 +142,6 @@ app.post("/get_projs", (req,res) => {
         func.log("router user projects getting error - "+error);
     }
 })
-
-app.post("/new_obj", (req,res) => {
-    try{
-        let inp = req.body;
-        let cook = req.cookies;
-        func.sid(cook,res,()=>{
-            obj.new(inp,cook,res);
-        })
-    } catch (error) {
-        func.log("router object creating error - "+error);
-    }
-})
-
 app.post("/get_objs", (req,res) => {
     try{
         let inp = req.body;
@@ -160,7 +154,6 @@ app.post("/get_objs", (req,res) => {
         func.log("router objects getting error - "+error);
     }
 })
-
 app.post("/get_obj", (req,res) => {
     try{
         let inp = req.body;
@@ -173,54 +166,115 @@ app.post("/get_obj", (req,res) => {
         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,()=>{
+            res.render('admin');
+        },true,true)
+    } catch (error) {
+        func.log("router admin page error - "+error);
+    }
+});
+// app.get("/admin/edit/:edit" , (req,res) =>{
+//     try {
+//         let inp = req.body;
+//         let cook = req.cookies;
+//         func.sid(cook,res,()=>{
+//             switch (req.params["edit"]) {
+//                 case "users":
+//                     res.render('admin/user_edit');break;
+//                 case "projects":
+//                     res.render('admin/project_edit');break;        
+//                 case "objects":
+//                     res.render('admin/object_edit');break;
+//             }
+//         },true,true)
+//     } catch (error) {
+//         func.log("router admin edit page error - "+error);
+//     }
+// })
 app.get("/get_logs", (req,res) => {
     try{let cook = req.cookies;func.sid(cook,res,()=>{func.logs_file(res);})} 
     catch (error) {func.log("router logs download error - "+error);}
 })
-
+app.post("/new_obj", (req,res) => {
-// pages
+    try{
-app.get("/reg" , (req,res) =>{
+        let inp = req.body;
-    res.render('reg');
+        let cook = req.cookies;
-})
+        func.sid(cook,res,()=>{
-
+            obj.new(inp,cook,res);
-app.get("/proj/:name" , (req,res) =>{
+        },true,true)
-    res.render('project',{proj_name:req.params["name"]});
+    } catch (error) {
-})
+        func.log("router object creating error - "+error);
-
-app.get("/login" , (req,res) =>{
-    res.render('login');
-})
-
-app.get("/main", (req,res) =>{
-    res.render('main');
-});
-
-app.get("/admin", (req,res) =>{
-    res.render('admin');
-});
-
-// app.get("/test", (req,res) =>{
-//     let inp = req.body;
-//     let cook = req.cookies;
-//     func.sid(cook,res,()=>{
-//         console.log("asd");
-//     })
-
-// });
-
-app.get('/', (req, res) => {
-    if(req.cookies["uuid"] != null){
-        res.redirect('main');
     }
-    else{
+})
-        res.redirect('login');
+app.post("/admin/users/get", (req,res) => {
+    try{
+        let inp = req.body;
+        let cook = req.cookies;
+        func.sid(cook,res,()=>{
+            admin.get_users(inp,cook,res);
+        },true,true)
+    } catch (error) {
+        func.log("router object creating error - "+error);
     }
-});
+})
+app.post('/admin/users/reg', (req, res) => {
+    try{
+        let inp = req.body;
+        let cook = req.cookies;
+        func.sid(cook,res,()=>{
+            admin.reg(inp,cook,res);
+        },true,true)
+    } catch (error) {
+        func.log("router registration error - "+error);
+    }
+})
+app.post("/admin/users/edit", (req,res) => {
+    try{
+        let inp = req.body;
+        let cook = req.cookies;
+        func.sid(cook,res,()=>{
+            admin.edit_user(inp,cook,res);
+        },true,true)
+    } catch (error) {
+        func.log("router object creating error - "+error);
+    }
+})
+app.post("/admin/users/get/user", (req,res) => {
+    try{
+        let inp = req.body;
+        let cook = req.cookies;
+        func.sid(cook,res,()=>{
+            admin.get_users(inp,cook,res);
+        },true,true)
+    } catch (error) {
+        func.log("router object creating error - "+error);
+    }
+})
+app.post("/admin/users/del/user", (req,res) => {
+    try{
+        let inp = req.body;
+        let cook = req.cookies;
+        func.sid(cook,res,()=>{
+            admin.del_user(inp,cook,res);
+        },true,true)
+    } catch (error) {
+        func.log("router object creating error - "+error);
+    }
+})
+app.post("/admin/change_objs", (req,res) => {
+    try{let cook = req.cookies;func.sid(cook,res,()=>{func.logs_file(res);})} 
+    catch (error) {func.log("router logs download error - "+error);}
+})
+
+
+
 
 app.all('*', (req, res) => {
     res.status(404).send('<h1>404! Page not</h1> <br> <a href="/">go to main page</a>');
 });
-
 app.listen(process.env.PORT || 8080, () => func.log("server for puzzle started UwU"));

object.js

@@ -27,15 +27,15 @@ module.exports.load = (inp,cook,res)=>{
 
 module.exports.new = (inp,cook,res)=>{
     try {
-        db.cv("objects","name",inp["name"],(include)=>{
+        db.ggv("objects","id","name",`'${inp["name"]}'`,(db_name)=>{db_name= db_name[0]
-            if(include){
+            if(db_name != null){
                 res.send({out:"bad",err:"name"});
             }
-            else if (!include){
+            else if (db_name == null){
-                db.nr("objects","`name`,`img`,`height`,`width`,`description`",`'${inp["name"]}','${inp["img"]}','${inp["height"]}','${inp["width"]}','${inp["desc"]}'`);
+                db.nr("objects","`name`,`img`,`height`,`width`,`description`",`'${inp["name"]}','${inp["img"]}','${inp["height"]}','${inp["width"]}','${inp["desc"]}'`,true);
                 res.send({out:"good"});
             }
-        })
+        },true)
     } catch (error) {
         func.log("backend object creating error - "+error);
     }

project.js

@@ -59,7 +59,7 @@ module.exports.save = (inp,cook,res)=>{
                     res.send({out:"good"});
                 } else if (projin != null){
                     db.sv("projects","body",inp["proj"],"id",projin["id"],()=>{});
-                    if(inp["img"] != "") db.sv("projects","img",inp["img"],"id",projin["id"],()=>{});
+                    if(inp["img"] != "") db.sv("projects","img",inp["img"],"id",projin["id"],()=>{},"user");
                     func.log(`good boy ${udata["uuid"]} saved project ${projin["name"]} from ${cook["sid"]}`);
                     // func.log("proj in");
                     res.send({out:"good"});

public/lib/fn.js

@@ -67,14 +67,14 @@ function check_sid(redirect = true){
 }
 
 function logout(redirect = true) {
-    let dialog = confirm("logout?");
+    let dialog = confirm(`${lang("logout")}?`);
     if(dialog){
         clear_ck(redirect);
     }
 }
 
-function ask() {
+function ask(text,def = "") {
-    let name = prompt("please enter project name");
+    let name = prompt(text,def);
     if(name != "" && name != " "){
         return name;
     }

public/lib/inter.js

@@ -2,6 +2,7 @@ window.dragMoveListener = dragMoveListener;
 let root = document.getElementById("drags");
 let objs = { height:"2",width:"4"};
 let objs_store = {};
+let proj_from = "cloud";
 
 function create(clas,x,y,body,id,size){
     let main_clas = clas.split(" ")[0];
@@ -34,9 +35,15 @@ function create(clas,x,y,body,id,size){
         function make(img){
             if (db_data == null) {
                 delete objs[main_clas][id];
+                if(proj_from == "cloud"){
                     save(()=>{
                         goto("/proj/"+proj_name);
-                });
+                    },false);
+                }
+                else if (proj_from == "local"){
+                    save_local();
+                    load_proj_local();
+                }
             }
             else if (db_data != null){
                 obj.src = img;
@@ -49,14 +56,14 @@ function create(clas,x,y,body,id,size){
             }
         }
     })
-    obj.setAttribute("max-width","100px");
     root.append(obj);
     set_pos(obj,x,y);
 }
 
 function resize_drags(){
-    document.getElementById('drags').style.left = $('.dropzone')[0].getBoundingClientRect().x;
+    document.getElementById('drags').setAttribute("data-x",document.getElementsByClassName("wall")[0].getBoundingClientRect().left.toString()+"px");
-    document.getElementById('drags').style.width = $('.dropzone')[0].style.width;
+    document.getElementById('drags').style.left = document.getElementsByClassName("wall")[0].getBoundingClientRect().left.toString()+"px";
+    document.getElementById('drags').style.width = document.getElementsByClassName("wall")[0].style.width;
     drag_start();
 }
 
@@ -108,11 +115,11 @@ function load(objss){
             // document.getElementById("drags").style.left = $(".dropzone")[0].getBoundingClientRect().x;
         }
     });
-    document.getElementById("drags").style.left = $(".dropzone")[0].getBoundingClientRect().x;
+    resize_drags();
-    drag_start();
 }
 
 function load_proj_cloud(){
+    proj_from = "cloud";
     document.getElementById("drags").innerHTML = "";
     document.getElementById("top_panel_center").innerText = `${lang("loading")} ${proj_name} ${lang("from")} ${lang("cloud")}`;
     $.post( "/load_proj",{name:proj_name})
@@ -136,6 +143,7 @@ function load_proj_cloud(){
 
 function load_proj_local(){
     // document.getElementById("top_panel_center").innerText = `loading ${proj_name} from local storage`;
+    proj_from = "local";
     if(localStorage.getItem(proj_name) == null){
         save_local()
     }
@@ -146,18 +154,30 @@ function load_proj_local(){
 
 function save_local(){
     // console.log(objs);
+    proj_from = "local";
     localStorage.setItem(proj_name,JSON.stringify(objs));
 }
 
-function save(callback){
+function save(callback,with_pic = true){
     // console.log(objs);
-    html2canvas(document.querySelector("body"),{height: document.getElementById("wall").style.height.split("p")[0], width:document.getElementById("wall").style.width.split("p")[0], y:document.getElementById("wall").getBoundingClientRect().top,x:document.getElementById("wall").getBoundingClientRect().left}).then(canvas => {
+    proj_from = "cloud";
-        let scr = "";
+    if(with_pic){
-        // console.log(canvas.toDataURL().length);
+        html2canvas(document.querySelector("body"),{
-        scr = canvas.toDataURL();
+            height: document.getElementById("wall").style.height.split("p")[0], 
-        // if (canvas.toDataURL().length < 120000) scr = canvas.toDataURL()
+            width:document.getElementById("wall").style.width.split("p")[0], 
-        // console.log(scr);
+            y:document.getElementById("wall").getBoundingClientRect().top,
-        $.post( "/save_proj", {proj:JSON.stringify(objs),name:proj_name,img:scr})
+            x:document.getElementById("wall").getBoundingClientRect().left
+        }).then(canvas => {
+            let src = "";
+            src = canvas.toDataURL();
+            make_save(src);
+        });
+    }
+    else{
+        make_save("none");
+    }
+    function make_save(src = "none"){
+        $.post( "/save_proj", {proj:JSON.stringify(objs),name:proj_name,img:src})
         .done(function( res ) {
         if(res["out"] == "good"){
                 // console.log(scr)
@@ -165,7 +185,7 @@ function save(callback){
                 if(callback) callback(res);
             }
         })
-    });
+    }
 }
 
 function load_objs(callback){

user.js

@@ -7,7 +7,7 @@ module.exports.login = (inp,cook,res)=>{
         let ilogin = func.decrypt(inp["login"],inp["sid"]);
         let ipass = func.decrypt(inp["pass"],inp["sid"]);
     
-        db.cv("users","login",ilogin,(login) => {
+        db.ggv("users","id","login",`'${ilogin}'`,(login) => {login = login[0];
             if(login == null){
                 res.status(210).send({out:"bad", err:"user"});
             }
@@ -20,7 +20,6 @@ module.exports.login = (inp,cook,res)=>{
                                 // res.send({out:"logged",sid:sdata["sid"]});
                                 // console.log(sdata);
                                 db.dl("sids","uid",`'${udata["id"]}'`,() =>{});
-    
                             }
                             func.log("good boy "+udata["uuid"]+" logged in by login & pass from "+cook["sid"]);
                             res.cookie("uuid",udata["uuid"],{maxAge:vars.week,path:"/;SameSite=Strict"});
@@ -32,7 +31,6 @@ module.exports.login = (inp,cook,res)=>{
                         else{
                             res.status(210).send({out:"bad", err:"pass"});
                         }
-    
                     })
                 });
             }
@@ -43,51 +41,6 @@ module.exports.login = (inp,cook,res)=>{
     // res.send("good");
 }
 
-module.exports.reg = (inp,cook,res)=>{
-    try {
-        let uuid = func.get_uuid(inp["login"]);
-        let admin = inp["admin"];
-        let pass = inp["pass"];
-        let login = inp["login"];
-        check_db();
-        function check_db() {
-            db.cv("users","login",inp["login"], (ldata)=>{
-                db.cv("users","login",inp["uuid"],(udata) =>{
-                    // func.log("/reg_user same login recs = "+ldata);
-                    // func.log("/reg_user same uuid recs = "+udata);
-                    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}`);
-    
-                    }
-                    else if(udata!=null){
-                        uuid = func.get_uuid(inp["login"]);
-                        check_db();
-                        // 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`);
-                        res.send({out:"bad", body:"login"});
-                        return;
-                    }
-                })
-            })
-        }
-        function good_reg(){
-            db.nr("users",'`login`,`pass`,`uuid`,`admin`',`'${login}','${pass}','${uuid}',${admin}`);
-            if (admin){
-                db.ggv("users","`id`","uuid",`'${uuid}'`,(udata)=>{ udata = udata[0]
-                    db.nr("admins",'`login`,`uid`',`'${login}',${udata["id"]}`);
-                })
-            }
-            res.send({out:"good", body:{uuid:uuid,login:login,admin:admin}});
-        }
-    } catch (error) {
-        func.log("backend user registration error - "+error);
-    }
-}
-
 module.exports.get_cr = (inp,cook,res)=>{
     try {
         db.ggv("users","`login`,`admin`,`id`","uuid",`"${inp["uuid"]}"`,(udata)=>{udata = udata[0];

views/admin.ejs

@@ -1,92 +1,21 @@
+<!DOCTYPE html>
 <style>
-    .nobj{
-        display: flex;
-        justify-content: space-between;
-        margin: auto;
-        /* margin-bottom: 50px; */
-    }
-    #img_file{
-        text-overflow:ellipsis;
-        max-width:100px;
-    }
-    .img_preview{
-        /* width: 50px;
-        height: 20px; */
-        display: flex;
-    }
-    #img_prev{
-        height: 200px;
-        width: 200px;
-    }
-    .main_sec{
-        margin: auto;
-        /* display: flex; */
-        text-align: center;
-    }
     section{
         width: 80vw;
         margin: auto;
     }
 </style>
-
 <%- include('./static/start.ejs',{name:"admin",async: true}) %>
 <%- include('./header.ejs') %>
 
 <h1 style="text-align: center;"><%= lang("hello admin") %></h1> <br>
     <section>
-        <h1><%= lang("create new object") %></h1>
+        <%- include('./admin/objects/object_creation.ejs') %>
-        <div class="nobj">
-            <div>
-                <div class="img_preview">
-                    <label for="img_file"><%= lang("img max size") %></label><br>
-                    <input type="file" id="img_file" onchange="previewFile()"  accept="image/*" value="" maxlength="1"><br>
-    
-                </div>
-                <div style="width: 200px; height: 200px;">
-                    <img src="" id="img_prev" height="100" alt="<%= lang('Image preview') %>">
-                </div>
-            </div>
-            <textarea id="nobj_description" cols="30" rows="5" placeholder="<%= lang("object description") %>"></textarea>
-            <div>
-                <div class="nobj_options">
-                    <input type="text" id="nobj_name" placeholder="<%= lang("object name") %>">
-                    <button onclick="create_obj()"><%= lang("create object")%></button>
-                    <div id="obj_resp"></div>
-                </div>
-                <div id="obj_input">
-                    <div>
-                        <div style="display: flex;width: 100%;justify-content: space-between;">
-                            <label for="obj_height"><%= lang("height") %> </label>
-                            <div id="obj_height_value">100см</div>
-                        </div>
-                        <input style="width: 100%;" type="range" step="0.5" min="1" max="100" id="obj_height" value="100" oninput="obj_size_change('height')"> 
-                    </div>
-                    <div>
-                        <div style="display: flex;width: 100%;justify-content: space-between;">
-                            <label for="obj_width"><%= lang("width") %></label>
-                            <div id="obj_width_value">100см</div>
-                        </div>
-                        <input style="width: 100%;" type="range" step="0.5" min="1" max="100" id="obj_width" value="100" oninput="obj_size_change('width')"> 
-                    </div>
-                </div>
-            </div>
-        </div>
     </section>
 
     <section>
-        <h1><%= lang("user registration") %></h1>
+        <%- include('./admin/users/user_reg.ejs') %>
-        <div class="main_sec">
+        <%- include('./admin/users/user_edit.ejs') %>
-            <div>
-                <input type="text" id="login" name="login" placeholder="<%= lang("login") %>">
-                <input type="password" id="pass" name="pass" placeholder="<%= lang("password") %>">
-                <button onclick='reg();'><%= lang("register") %></button>
-            </div>
-            <div>
-                <label for="admin_check"><%= lang("admin") %></label>
-                <input type="checkbox" name="admin" value='false' id="admin_check">
-            </div>
-            <div id="reg_response"></div>
-        </div>
     </section>
 
     <section style="display: flex; justify-content: space-between;">
@@ -97,94 +26,3 @@
     </section>
 
 <%- include('./static/end.ejs') %>
-
-
-<script>
-    function reg(){
-        console.log("reg");
-        let login = document.getElementById("login").value;
-        let pass = document.getElementById("pass").value;
-        let admin = document.getElementById("admin_check").checked;
-        // console.log(login,pass,admin);
-        // console.log("cl reg");
-        $.post( "/reg_user", { login:login,pass:pass,admin:admin })
-        .done(function( res ) {
-            // console.log("serv reg");
-            if(res["out"] == "good"){
-                // console.log(res["body"]);
-                document.getElementById("reg_response").innerHTML = `user ${login} successfully registered `;
-            }
-            else if (res["out"] == "bad"){
-                document.getElementById("reg_response").innerHTML = "cannot register user "+login+" already in use";
-            }
-        });
-    }
-</script>
-
-<script>
-    function obj_size_change(type){
-        if(type == "height"){
-            let img = document.getElementById('img_prev');
-            let range = document.getElementById('obj_height');
-            let text = document.getElementById('obj_height_value');
-            img.style.height = `${range.value * 2}px`;
-            text.innerHTML = `${range.value}см`;
-        }else if (type == "width"){
-            let img = document.getElementById('img_prev');
-            let range = document.getElementById('obj_width');
-            let text = document.getElementById('obj_width_value');
-            img.style.width = `${range.value * 2}px`;
-            text.innerHTML = `${range.value}см`;
-
-        }
-    }
-    function previewFile() {
-        var preview = document.querySelector('img');
-        var file    = document.querySelector('input[type=file]').files[0];
-        var reader  = new FileReader();
-
-        reader.onloadend = function () {
-            preview.src = reader.result;
-        }
-
-        if (file) {
-            reader.readAsDataURL(file);
-        } else {
-            preview.src = "";
-        }
-    }
-
-    function new_obj(name,img,height,width,description,callback){
-        $.post( "/new_obj", { name:name,img:img,desc:description,height:height,width:width })
-        .done(function( res ) {
-            // if(res["out"] == "good"){
-            //     console.log(res["body"]);
-            // }
-            callback(res);
-        });
-    }
-
-    function create_obj(){
-        let name = document.getElementById("nobj_name").value;
-        let description = document.getElementById("nobj_description").value;
-        let height = document.getElementById("obj_height").value;
-        let width = document.getElementById("obj_width").value;
-        var img = document.querySelector('img').src;
-        name = name.replace(" ","_");
-        if (img != "http://n0rsrv2:3002/admin"){
-            document.getElementById("obj_resp").innerHTML = "creating object";
-            new_obj(name,img,height,width,description,(res)=>{
-                if(res["out"] == "bad" && res["err"] == "name"){
-                    document.getElementById("obj_resp").innerHTML = "object already exist";
-                }
-                else if(res["out"] == "good"){
-                    document.getElementById("obj_resp").innerHTML = "object created";
-                }
-            });
-        }
-        else{
-            document.getElementById("obj_resp").innerHTML = "image not selected";
-        }
-    }
-
-</script>

views/admin/objects/object_creation.ejs

@@ -0,0 +1,127 @@
+
+<style>
+    .nobj{
+        display: flex;
+        justify-content: space-between;
+        margin: auto;
+        /* margin-bottom: 50px; */
+    }
+    #img_file{
+        text-overflow:ellipsis;
+        max-width:100px;
+    }
+    .img_preview{
+        /* width: 50px;
+        height: 20px; */
+        display: flex;
+    }
+    #img_prev{
+        height: 200px;
+        width: 200px;
+    }
+</style>
+
+<h1><%= lang("create new object") %></h1>
+<div class="nobj">
+    <div>
+        <div class="img_preview">
+            <label for="img_file"><%= lang("img max size") %></label><br>
+            <input type="file" id="img_file" onchange="previewFile()"  accept="image/*" value="" maxlength="1"><br>
+
+        </div>
+        <div style="width: 200px; height: 200px;">
+            <img src="" id="img_prev" height="100" alt="<%= lang('Image preview') %>">
+        </div>
+    </div>
+    <textarea id="nobj_description" cols="30" rows="5" placeholder="<%= lang("object description") %>"></textarea>
+    <div>
+        <div class="nobj_options">
+            <input type="text" id="nobj_name" placeholder="<%= lang("object name") %>">
+            <button onclick="create_obj()"><%= lang("create object")%></button>
+            <div id="obj_resp"></div>
+        </div>
+        <div id="obj_input">
+            <div>
+                <div style="display: flex;width: 100%;justify-content: space-between;">
+                    <label for="obj_height"><%= lang("height") %> </label>
+                    <div id="obj_height_value">100см</div>
+                </div>
+                <input style="width: 100%;" type="range" step="0.5" min="1" max="100" id="obj_height" value="100" oninput="obj_size_change('height')"> 
+            </div>
+            <div>
+                <div style="display: flex;width: 100%;justify-content: space-between;">
+                    <label for="obj_width"><%= lang("width") %></label>
+                    <div id="obj_width_value">100см</div>
+                </div>
+                <input style="width: 100%;" type="range" step="0.5" min="1" max="100" id="obj_width" value="100" oninput="obj_size_change('width')"> 
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+        function obj_size_change(type){
+        if(type == "height"){
+            let img = document.getElementById('img_prev');
+            let range = document.getElementById('obj_height');
+            let text = document.getElementById('obj_height_value');
+            img.style.height = `${range.value * 2}px`;
+            text.innerHTML = `${range.value}см`;
+        }else if (type == "width"){
+            let img = document.getElementById('img_prev');
+            let range = document.getElementById('obj_width');
+            let text = document.getElementById('obj_width_value');
+            img.style.width = `${range.value * 2}px`;
+            text.innerHTML = `${range.value}см`;
+
+        }
+    }
+    function previewFile() {
+        var preview = document.querySelector('img');
+        var file    = document.querySelector('input[type=file]').files[0];
+        var reader  = new FileReader();
+
+        reader.onloadend = function () {
+            preview.src = reader.result;
+        }
+
+        if (file) {
+            reader.readAsDataURL(file);
+        } else {
+            preview.src = "";
+        }
+    }
+
+    function new_obj(name,img,height,width,description,callback){
+        $.post( "/new_obj", { name:name,img:img,desc:description,height:height,width:width })
+        .done(function( res ) {
+            // if(res["out"] == "good"){
+            //     console.log(res["body"]);
+            // }
+            callback(res);
+        });
+    }
+
+    function create_obj(){
+        let name = document.getElementById("nobj_name").value;
+        let description = document.getElementById("nobj_description").value;
+        let height = document.getElementById("obj_height").value;
+        let width = document.getElementById("obj_width").value;
+        var img = document.querySelector('img').src;
+        name = name.replace(" ","_");
+        if (img != "http://n0rsrv2:3002/admin"){
+            document.getElementById("obj_resp").innerHTML = "creating object";
+            new_obj(name,img,height,width,description,(res)=>{
+                if(res["out"] == "bad" && res["err"] == "name"){
+                    document.getElementById("obj_resp").innerHTML = "object already exist";
+                }
+                else if(res["out"] == "good"){
+                    document.getElementById("obj_resp").innerHTML = "object created";
+                }
+            });
+        }
+        else{
+            document.getElementById("obj_resp").innerHTML = "image not selected";
+        }
+    }
+</script>

views/admin/users/user_edit.ejs

@@ -0,0 +1,163 @@
+<style>
+    #users_section{
+        width: 80vw;
+        margin: auto;
+    }
+    #users_section li{
+        display: flex;
+        justify-content: space-between;
+        text-align: center;
+        margin: 20px auto;
+        padding: 10px;
+        background-color:cornsilk;
+    }
+    #users_section li div:not(#first_user div){
+        /* margin: auto; */
+        width: 100px;
+        text-align: center;
+    }
+    #first_user div{
+        /* text-align: center; */
+        width: 100px;
+        text-align: center;
+    }
+    #users_section ul{
+        padding: 0px;
+        margin: 0px;
+        list-style: none;
+        height: 320px;
+    }
+</style>
+
+<h1><%=lang("users")%></h1>
+<section id="users_section">
+    <div style="display: flex;justify-content: space-between;margin: auto;">
+        <div style="display: flex;"><h1><%= lang("total") %>:&nbsp;</h1> <h1 id="users_count">0</h1></div>
+        <div style="display: flex;margin: auto 0px;"><%=lang("from")%>&nbsp;<div id="users_from">0</div>&nbsp;<%=lang("to")%>&nbsp;<div id="users_to">10</div></div>
+        <div style="margin: auto 0px;"><button onclick="if(users_from-load_interval>=0){users_from-=load_interval;load_users_data(users_from);}">< 10 <%= lang("back") %></button></div>
+        <div style="margin: auto 0px;"><button onclick="users_from+=load_interval;load_users_data(users_from);"><%= lang("next") %> 10 ></button></div>
+    </div>
+    <div>
+        <li id="first_user"><div><%= lang("login") %></div><div><%= lang("privileges") %></div><div><%= lang("edit") %></div></li>
+        <ul id="user_list">
+        </ul>
+    </div>
+</section>
+
+
+<script>
+    let users_from = 0;
+    let load_interval = 5;
+    load_users_data(users_from);
+    function load_users_data(from,to){
+        // if(to == "forward") {users_from+=load_interval;}
+        // else if(to == "back") {users_from-=load_interval;}
+        document.getElementById("user_list").innerHTML = "";
+        document.getElementById("users_from").innerText = from;
+        document.getElementById("users_to").innerText = from+load_interval;
+        $.post( "/admin/users/get",{from:from,load_interval:load_interval})
+        .done(function( res ) {
+            // console.log("serv reg");
+            if(res["out"] == "good"){
+                // console.log(res["body"]);
+                document.getElementById("users_count").innerText = res["count"];
+                res["body"].forEach(user => {
+                    let user_sec = document.createElement("li");
+                    user_sec.id = `user_${user["id"]}`;
+
+                    let user_name = document.createElement("div");
+                    user_name.id = `login_${user["id"]}`;
+                    user_name.innerText = user["login"];
+
+                    let user_pass = document.createElement("div");
+                    user_pass.id = `pass_${user["id"]}`;
+                    user_pass.innerText = user["pass"];
+                    user_pass.style.display = "none";
+
+                    let user_prevs = document.createElement("div");
+                    user_prevs.id = `admin_${user["id"]}`;
+                    user_prevs.innerText = Boolean(user["admin"]);
+
+                    let user_buttons = document.createElement("button");
+                    user_buttons.id = "user_buttons"; 
+                    user_buttons.innerText = "<%=lang('edit')%>"; 
+                    user_buttons.classList.add(user["id"]); 
+                    user_buttons.classList.add("menu_btn"); 
+
+                    user_sec.append(user_pass);
+                    user_sec.append(user_name);
+                    user_sec.append(user_prevs);
+                    user_sec.append(user_buttons);
+
+                    document.getElementById("user_list").append(user_sec);
+                });
+                // document.getElementById("reg_response").innerHTML = `user ${login} successfully registered `;
+            }
+            else if (res["out"] == "bad"){
+
+            }
+        });
+    }
+    function user_edit(key){
+        let user = document.getElementById("user_edit_menu");
+        let id = user.getAttribute("login_id");
+        let login = user.getAttribute("login_name");
+        let admin = JSON.parse(user.getAttribute("login_admin"));
+        let pass= user.getAttribute("login_pass");
+        let value = null;
+
+        if(key!="admin") {value = ask(key,document.getElementById(`${key}_${id}`).innerText)}
+        else if (confirm(`<%=lang('are you sure you want to change')%> <%=lang('admin privileges')%> <%=lang('for')%> ${login} <%=lang("to the")%> ${!admin}?`) == true){value = (!admin)};
+        if(value != null){
+            $.post( "/admin/users/edit",{key:key,value:value,id:id,login:login})
+            .done(function( res ) {
+                // console.log("serv reg");
+                if(res["out"] == "good"){
+                    document.getElementById(`${key}_${id}`).innerText = value;
+                }
+                if(res["out"] == "bad"){
+                    alert("cant change name in use")
+                }
+            });
+        }
+    }
+    function user_del(){
+        let user = document.getElementById("user_edit_menu");
+        let id = user.getAttribute("login_id");
+        let login = user.getAttribute("login_name");
+        if(confirm(`<%= lang("are you sure you want to delete user") %> ${login}?`) == true){
+            $.post( "/admin/users/del/user",{login:login,id:id})
+            .done(function( res ) {
+                if(res["out"] == "good"){
+                    load_users_data(users_from);
+                }
+            });
+        }
+    }
+
+    let user_edit_menu = document.createElement("div");
+    user_edit_menu.id = "user_edit_menu"; 
+    user_edit_menu.classList.add("cmenu"); 
+
+    let user_chenge_name = document.createElement("button");
+    user_chenge_name.innerHTML = "<%= lang('change login') %>"; 
+    user_chenge_name.setAttribute("onclick","user_edit('login')"); 
+
+    let user_chenge_pass = document.createElement("button");
+    user_chenge_pass.innerHTML = "<%= lang('change password') %>"; 
+    user_chenge_pass.setAttribute("onclick","user_edit('pass')"); 
+
+    let user_chenge_prevs = document.createElement("button");
+    user_chenge_prevs.innerHTML = "<%= lang('change privileges') %>";
+    user_chenge_prevs.setAttribute("onclick","user_edit('admin')"); 
+
+    let user_delete = document.createElement("button");
+    user_delete.innerHTML = "<%= lang('delete user') %>";
+    user_delete.setAttribute("onclick","user_del()"); 
+
+    user_edit_menu.append(user_chenge_name);
+    user_edit_menu.append(user_chenge_pass);
+    user_edit_menu.append(user_chenge_prevs);
+    user_edit_menu.append(user_delete);
+    document.body.append(user_edit_menu);
+</script>

views/admin/users/user_reg.ejs

@@ -0,0 +1,44 @@
+<style>
+    .main_sec{
+        margin: auto;
+        /* display: flex; */
+        text-align: center;
+    }
+</style>
+<h1><%= lang("user registration") %></h1>
+<div class="main_sec">
+    <div>
+        <input type="text" id="login" name="login" value="" placeholder="<%= lang("login") %>">
+        <input type="password" id="pass" name="pass" value="" placeholder="<%= lang("password") %>">
+        <button onclick='reg();'><%= lang("register") %></button>
+    </div>
+    <div>
+        <label for="admin_check"><%= lang("admin") %></label>
+        <input type="checkbox" name="admin" value='false' id="admin_check">
+    </div>
+    <div id="reg_response"></div>
+</div>
+
+<script>
+        function reg(){
+            console.log("reg");
+            let login = document.getElementById("login").value;
+            let pass = document.getElementById("pass").value;
+            let admin = document.getElementById("admin_check").checked;
+            // console.log(login,pass,admin);
+            // console.log("cl reg");
+            $.post( "/admin/users/reg", { login:login,pass:pass,admin:admin })
+            .done(function( res ) {
+                // console.log("serv reg");
+                if(res["out"] == "good"){
+                    // console.log(res["body"]);
+                    document.getElementById("reg_response").innerHTML = `user ${login} successfully registered `;
+                    load_users_data(users_from);
+
+                }
+                else if (res["out"] == "bad"){
+                    document.getElementById("reg_response").innerHTML = "cannot register user "+login+" already in use";
+                }
+            });
+        }
+</script>

views/header.ejs

@@ -37,7 +37,7 @@
     }
     .cmenu{
         position: fixed;
-        display: block;
+        display: grid;
         background: ghostwhite;
         color: black;
         cursor: pointer;
@@ -60,7 +60,9 @@
 </header>
 <div id="user_menu" class="cmenu"></div>
 
-<script>get_from_uuid((res)=>{
+
+<script>
+    get_from_uuid((res)=>{
         let uname = document.getElementById("user_name"); 
         let menu = document.getElementById("user_menu"); 
         let header = document.getElementById("top_panel"); 
@@ -80,20 +82,20 @@ onclick = (e) => {
         // e.preventDefault()
         //   console.log(e);
         //   console.log(document.getElementById(e.target.id).parentElement);
-      if(e.target.onclick != null){
+        // if(e.target.onclick != null){
-        if(document.title == "login"){
+        //     if(document.title == "login"){
-            // console.log(document.title);
+        //         // console.log(document.title);
-            log_by_sid();
+        //         log_by_sid();
-        }else if(document.title != "login"){
+        //     }else if(document.title != "login"){
-            check_sid(true);
+        //         check_sid(true);
-            // console.log("check");
+        //         // console.log("check");
-        }
+        //     }
-      }
+        // }
         if(e.target.id == "user_name"){
             hide_menus();
             let menu = document.getElementById("user_menu");
             menu.style.display = 'block';
-        menu.style = `top:${e.target.getBoundingClientRect().top+30}px;left:${e.target.getBoundingClientRect().left}px`
+            menu.style = `top:${e.target.getBoundingClientRect().top+30}px;left:${e.target.getBoundingClientRect().left}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)
@@ -101,11 +103,25 @@ onclick = (e) => {
             hide_menus();
             let menu = document.getElementById("project_menu");
             menu.style.display = 'block';
-        menu.style = `top:${e.target.getBoundingClientRect().top+30}px;left:${e.target.getBoundingClientRect().left}px`
+            menu.style = `top:${e.target.getBoundingClientRect().top+30}px;left:${e.target.getBoundingClientRect().left}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)
         }
+        else if(e.target.id == "user_buttons"){
+            hide_menus();
+            let menu = document.getElementById("user_edit_menu");
+            menu.setAttribute("login_id",e.target.classList[0]);
+            menu.setAttribute("login_name",document.getElementById(`login_${e.target.classList[0]}`).innerText);
+            menu.setAttribute("login_pass",document.getElementById(`pass_${e.target.classList[0]}`).innerText);
+            menu.setAttribute("login_admin",document.getElementById(`admin_${e.target.classList[0]}`).innerText);
+            menu.style.display = 'block';
+            menu.style = `top:${e.target.getBoundingClientRect().top+30}px;left:${e.target.getBoundingClientRect().left-40}px`;
+            // menu.onmouseleave = () => menu.style.display = 'none';
+            // menu.innerHTML = "<p>Option1</p><p>Option2</p><p>Option3</p><p>Option4</p>"
+            // document.body.appendChild(menu)
+        
+        }
         else{
             hide_menus();
         }

views/login.ejs

@@ -1,5 +1,4 @@
-<%- include('./static/start.ejs',{name:'login',async: true}) %>
+<!DOCTYPE html>
-
 <style>
     * {
         text-align: center;
@@ -9,6 +8,8 @@
         display: none;
     }
 </style>
+<%- include('./static/start.ejs',{name:'login',async: true}) %>
+
 
 <div class="login-page">
     <input name="login" type="text" id="login" required>
@@ -23,8 +24,6 @@
 <!-- <input type="submit" value=""  hidden> -->
 <div id="res"></div>
 
-<%- include('./static/end.ejs') %>
-
 <script>
     // console.log($.cookie("uuid"));
     // log_by_sid();
@@ -62,3 +61,4 @@
     }
     }); 
 </script>
+<%- include('./static/end.ejs') %>

views/main.ejs

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <style>
     .drag{
         height: 50px;
@@ -39,9 +40,10 @@
         border-style: solid;
     }
 </style>
-
 <%- include('./static/start.ejs',{name:'main',async: true}) %>
 <%- include('./header.ejs') %>
+
+
 <!-- <script src="/lib/interact.min.js"></script> -->
 
 <section class="main">
@@ -50,7 +52,6 @@
 </section>
 
 <!-- <script src="/lib/inter.js"></script> -->
-<%- include('./static/end.ejs') %>
 
 <script>
     function load_projs(callback){
@@ -63,7 +64,7 @@
         });
     }
     function new_proj(){
-        let name = ask();
+        let name = ask("please enter project name");
         if(name != null && name!= "" && name!=" " && typeof name != "undefined" && name!="undefined"){
             goto(`/proj/${name}`);
         }
@@ -76,3 +77,4 @@
         });
     });
 </script>
+<%- include('./static/end.ejs') %>

views/project.ejs

@@ -1,3 +1,7 @@
+<%- include('./static/start.ejs',{name:proj_name,async:true}) %>
+<%- include('./header.ejs') %>
+<script src="/lib/interact.js"></script>
+<script src="/lib/html2canvas.js"></script>
 <style>
     .drag{
         height: 50px;
@@ -13,19 +17,25 @@
         margin: auto;
     }
 
-    .dropzone {
+    .wall {
-        background-color: #bfe4ff;
+        /* border: dashed 4px transparent; */
-        border: dashed 4px transparent;
         border-radius: 4px;
-        height: 140px;
-        margin: 10px auto 30px;
-        /* padding: 10px; */
-        width: 80%;
         transition: background-color 0.3s;
         position: absolute;
         inset: 0px;
         margin: 250px auto;
+        width: 400px;
+        height: 200px;
+        background-color: #fff;
+        background-image: url("/img/bg1red.png");
+        background-size: 200px;
+        background-repeat: repeat;
+        background-position: bottom 0px left 0px;
+        border: 2px solid black;
+        /* overflow: visible; */
+        z-index: 2;
     }
+
     .createzone {
         background-color: #bfe4ff;
         border: dashed 4px transparent;
@@ -63,11 +73,11 @@
         border-color: #aaa;
     }
 
-    .drop-target {
+    /* .drop-target {
         background-color: #29e;
         border-color: #fff;
         border-style: solid;
-    }
+    } */
 
     #proj_top{
         margin: auto;
@@ -89,32 +99,8 @@
         padding-bottom: 0px;
         margin-top: 50px;
     }
-
-    .wall{
-        /* display: flex; */
-        /* position: relative; */
-        /* margin: 60px auto; */
-        width: 400px;
-        height: 200px;
-        background-color: #fff;
-        background-image: url("/img/bg1red.png");
-        background-size: 200px;
-        background-repeat: repeat;
-        background-position: bottom 0px left 0px;
-        border: 2px solid black;
-        /* overflow: visible; */
-        z-index: 2;
-    }
 </style>
 
-<%- include('./static/start.ejs',{name:proj_name,async: true}) %>
-<%- include('./header.ejs',{async: true}) %>
-<script src="/lib/interact.js"></script>
-<script src="/lib/html2canvas.js"></script>
-
-<div id="drags">
-    <!-- <div class="cube drag spawn" id="cube_0" style="transform: translate(197.7px, 57.8667px);" data-x="197.6999969482422" data-y="57.866668701171875" >cube</div>     -->
-</div>
 
 <div id="project_menu" class="cmenu"></div>
 
@@ -128,7 +114,7 @@
                 <label for="wall_height"><%= lang("height") %> </label>
                 <div id="wall_height_value">0</div>
             </div>
-            <input type="range" step="0.1" min="0" max="5" id="wall_height" value="2" oninput="wall_size_change('height')"> 
+            <input type="range" step="0.1" min="0" max="5" id="wall_height" value="2" oninput="wall_size_change('height')" onchange="resize_drags()"> 
         </div>
         <div>
             <div style="display: flex;width: 150px;justify-content: space-between;">
@@ -142,31 +128,12 @@
     <img class="trash" style="height: 100px; width: 100px;" src="/img/shadow-energy.gif" alt="<%= lang('black hole') %>">
 </div>
 
+<div id="drags"></div>
 <div class="wall dropzone" id="wall"></div>
 
+
 <script src="/lib/inter.js"></script>
-<%- include('./static/end.ejs') %>
 <script>
-    // function scree(){
-    //     // console.log(document.getElementById("wall").style.height.split("p")[0]);
-    //     html2canvas(document.querySelector("body"),{height: document.getElementById("wall").style.height.split("p")[0], width:document.getElementById("wall").style.width.split("p")[0], y:255}).then(canvas => {
-    //         console.log(canvas.toDataURL().length);
-    //         let scr = canvas.toDataURL();
-    //         let img = document.createElement("img");
-    //         img.src = scr;
-    //         document.body.append(img);
-    //         // return canvas;
-    //         // console.log(scr)
-    //     });
-
-
-
-    //     // html2canvas(document.querySelector("#drags")).then(canvas => {
-    //     //     document.body.appendChild(canvas)
-    //     // });
-
-
-    // }
     load_objs((data)=>{
         data.forEach(value => {
             // console.log(value);
@@ -178,8 +145,7 @@
         });
         load_proj_cloud();
     })
-</script>
+
-<script>
     let proj_name = "<%= proj_name %>";
     if($.cookie("cache") ==null)$.cookie("cache","true",{path:"/proj;SameSite=Strict"});
     // console.log(proj_name);
@@ -226,3 +192,4 @@
         resize_drags();
     }
 </script>
+<%- include('./static/end.ejs') %>

views/static/language.ejs

@@ -15,16 +15,16 @@ language = {
         "width": "ширина",
         "img max size": "макс. размер 2мб",
         "user registration": "регистрация пользователя",
-        "create object": "создать обьект",
+        "create object": "создать объект",
         "admin": "админ",
         "register": "зарегистрировать",
         "download logs": "скачать логи",
-        "create new object": "создание нового обьекта",
+        "create new object": "создание нового объекта",
         "logs": "логи",
         "password": "пароль",
         "login": "логин",
-        "object name": "название обьекта",
+        "object name": "название объекта",
-        "object description": "описание обьекта",
+        "object description": "описание объекта",
         "black hole": "чёрная дыра",
         "project settings": "настройки проекта",
         "save to cloud": "сохранить в облако",
@@ -43,8 +43,29 @@ language = {
         "loading": "загружается",
         "loaded": "загружено",
         "from": "из",
-        "to": "в",
+        "in": "в",
-        "in": "в"
+        "edit current / list": "редактирование / просмотр",
+        "users": "пользователи",
+        "objects": "объекты",
+        "back": "назад",
+        "next": "далле",
+        "edit": "радактирование",
+        "name": "имя",
+        "delete user": "удалить пользователя",
+        "change privileges": "изменить привилегии",
+        "change name": "изменить имя",
+        "change login": "изменить логин",
+        "change password": "изменить пароль",
+        "privileges": "привилегии",
+        "from": "от",
+        "to": "до",
+        "for": "для",
+        "to the": "на",
+        "total": "всего",
+        "are you sure you want to change": "вы точно хотите именить",
+        "admin privileges to": "превилегии администратора на",
+        "admin privileges": "превилегии администратора",
+        "are you sure you want to delete user": "вы точно хотите удалить пользователя"
     },
     "en":{
         "main page": "main page",
@@ -85,8 +106,29 @@ language = {
         "loading": "loading",
         "loaded": "loaded",
         "from": "from",
+        "in": "in",
+        "back": "back",
+        "next": "next",
+        "edit": "edit",
+        "name": "name",
+        "users": "users",
+        "objects": "objects",
+        "delete user": "delete user",
+        "change privileges": "change privileges",
+        "change name": "change name",
+        "change login": "change login",
+        "change password": "change password",
+        "privileges": "privileges",
+        "edit current / list": "edit current / list",
+        "from": "from",
         "to": "to",
-        "in": "in"
+        "for": "for",
+        "to the": "to the",
+        "total": "total",
+        "are you sure you want to change": "are you sure you want to change",
+        "admin privileges to": "admin privileges to",
+        "admin privileges": "admin privileges",
+        "are you sure you want to delete user": "are you sure you want to delete user"
     }
 }
 %>

views/static/start.ejs

@@ -10,6 +10,15 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title> <%= name %> </title>
+    <script>
+        if(document.title == "login"){
+            // console.log(document.title);
+            log_by_sid();
+        }else if(document.title != "login"){
+            check_sid(true);
+            // console.log("check");
+        }
+    </script>
     <style>
         .main{
             width: 80vw;
@@ -20,15 +29,6 @@
             background-color:aliceblue;
         }
     </style>
-    <script>
-        if(document.title == "login"){
-            // console.log(document.title);
-            log_by_sid();
-        }else if(document.title != "login"){
-            check_sid(true);
-            // console.log("check");
-        }
-    </script>
 </head>
 <body>