M Dockerfile

M db.js
 M docker-compose.yml
 M package-lock.json
 M package.json

.dockerignore

@@ -1,2 +0,0 @@
-node_modules
-npm-debug.log

docker-compose.yml

@@ -1,5 +1,4 @@
 version: '3.1'
-
 services:
   db:
     image: mysql

package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "puzle",
+  "name": "puzzle",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "puzle",
+      "name": "puzzle",
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {

package.json

@@ -14,7 +14,7 @@
     "replace-color": "^2.3.0",
     "uuid": "^9.0.0"
   },
-  "name": "puzle",
+  "name": "puzzle",
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {

public/lib/inter.js

@@ -123,6 +123,10 @@ function obj_click(id){
 function obj_selection(clear = false){
     cur_obj = (clear == true)? null:cur_obj;
     let drags = document.getElementsByClassName("drag");
+    // let layer_inp = document.getElementsByClassName("layer_inp");
+    // let obj_color = document.getElementsByClassName("obj_color_div");
+    // layer_inp.value = 0;
+    // obj_color.style.display = "none";
     Object.values(drags).forEach(element => {
         // console.log(element.id,cur_obj);
         if (element.id != cur_obj){
@@ -190,7 +194,7 @@ function calc_total(start = false){
                 let obj_cost_div = document.createElement("li");
                 obj_cost_div.innerHTML =
                 `<div style="display:flex;"> ` +
-                    `<div id='obj_cost_name' style='font-size:calc(var(--main-font-size)/1);'>${key.split("~g~")[0].replaceAll("$"," ")}`+
+                    `<div id='obj_cost_name'>${key.split("~g~")[0].replaceAll("$"," ")}`+
                     `<div id='obj_cost_count'>&nbsp${Object.keys(value).length}X</div> </div>`+
                 `</div>`+
                 `<div id='obj_cost'>${parseInt(parseInt(objs_store[key]["cost"]) * Object.keys(value).length)}</div>`;
@@ -202,7 +206,7 @@ function calc_total(start = false){
     // return total;
 
     objs["total"] = total;
-    document.getElementById("proj_cost_text").innerText = `стоимость: ${total} руб.`;
+    document.getElementById("proj_cost_text").innerText = `Стоимость: ${total} руб.`;
 }
 
 function load(objss){
@@ -242,8 +246,12 @@ function load(objss){
 function reload(save = false){
     // objs = JSON.parse($.cookie("objs"));
     // console.log(objs);
+    // objs = objs.sort();
     document.getElementById("drags").innerHTML = "";
+    let cro = cur_obj;
     load(objs);
+    cur_obj = cro;
+    obj_selection();
     if(save){save(()=>{},false)}
 }
 

update.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+git pull https://github.com/n0rdye/puzzle.git --autostash;
+docker-compose restart;

views/admin/objects/group_object.ejs

@@ -187,10 +187,10 @@
 <div style="display:flex; justify-content: space-around;"></div>
 
 
-<div class="inputs" style="display: flex;justify-content: space-between;height: 5vh;">
+<div class="inputs" style="display: flex;justify-content: space-between;height: 6vh;">
     <div id="obj_color_div" style="justify-content: space-evenly; width: 50vw;display: none;transform: translateX(30%);">
         <label for="obj_colors" style="min-width: 10vw;">цвет объекта</label>
-        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 50px;"></div>      
+        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 100%;"></div>      
         <!-- <input id="obj_color" type="color" onchange="obj_color_change(event)"> -->
     </div>
 </div>

views/admin/objects/object_colors.ejs

@@ -1,7 +1,7 @@
-<div id="admin_colors" style="display: flex;justify-content: space-between;margin-top: 4vh;">
+<div id="admin_colors" style="display: flex;justify-content: space-between;height: 6vh;">
     <div id="obj_color_div" style="justify-content: space-between; width: 50vw;display: flex;">
         <label for="obj_colors" style="min-width: 10vw;float: left;">цвет объекта</label>
-        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 50px;"></div>      
+        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 100%;"></div>      
     </div>
     <div id="inp">
         <input type="color" id="new_color" style="margin: auto;">

views/admin/objects/object_edit.ejs

@@ -61,6 +61,7 @@
     //     edit_get_objs();
     // });
     const get_object_id = new URL(window.location).searchParams.get("object_id");
+    let wait_msg_object_load = (get_object_id != null)? msg("загружаем прошлый объект",{type:"wait"}):null;
     
 
     function set_edit(id){
@@ -83,8 +84,7 @@
 
     function edit_get_objs(by_name = false,callback){
         document.getElementById("objs_in_group").innerHTML = "";
-        if (obj_edit_type == "edit") set_obj_edit_params();
+        // if (obj_edit_type == "edit") set_obj_edit_params();
-        let wait_msg_object_load = (get_object_id != null)? msg("загружаем прошлый объект",{type:"wait"}):null;
         edit_load_objs((data)=>{
             let wait_msg = msg("Загрузка объектов",{type:"wait"})
             data.forEach(value => {
@@ -98,6 +98,7 @@
                         if(get_object_id != null && wait_msg_object_load != null){
                             set_edit(get_object_id);
                             msg_del(wait_msg_object_load.id);
+                            wait_msg_object_load = null;
                         }
                         if(callback)callback(true);
                     }
@@ -194,9 +195,10 @@
                             msg("название товара не было изменино поскольку оно занято",{type:"warning"})
                         }
                         else{
-                            window.history.pushState({}, null, `${(new URL(window.location)).toString().split("?")[0]}`);
+                            // window.history.pushState({}, null, `${(new URL(window.location)).toString().split("?")[0]}`);
+                            // delete get_object_id;
                             msg("товар сохранён");
-                            set_obj_edit_params();
+                            // set_obj_edit_params();
                             edit_get_objs();
                         }
                     }

views/project.ejs

@@ -147,7 +147,7 @@
         </div>
         <div id="cost_div" style="display: flex;width: 15vw;justify-content: space-between;">
             <button id="proj_cost" class="menu_btn" style="width: 100%;z-index: 3;">
-                <div id="proj_cost_text" style="pointer-events: none;">Расчет стоимости</div>
+                <div id="proj_cost_text" style="pointer-events: none;font-size:calc(var(--main-font-size)/1.2);">Стоимость</div>
                 <img src="/img/drop.png" style="width: 1vw;height: 0.5vw;pointer-events: none;" alt="\/">
             </button>
             <style>
@@ -165,6 +165,15 @@
                     width: 14vw;
                     padding: 0.45vw;
                 }
+                #cost_list #obj_cost_name{
+                    font-size:calc(var(--main-font-size)/1.3);
+                }
+                #cost_list #obj_cost_count{
+                    font-size:calc(var(--main-font-size)/1.3);
+                }
+                #cost_list #obj_cost{
+                    font-size:calc(var(--main-font-size)/1.3);
+                }
             </style>
             <ul id="cost_list" class="cmenu">
             </ul>
@@ -187,10 +196,10 @@
 <div style="display:flex; justify-content: space-around;"></div>
 
 
-<div class="inputs" style="display: flex;justify-content: space-between;height: 5vh;">
+<div class="inputs" style="display: flex;justify-content: space-between;height: 6vh;">
     <div id="obj_color_div" style="justify-content: space-evenly; width: 50vw;display: none;transform: translateX(30%);">
         <label for="obj_colors" style="min-width: 10vw;">цвет объекта</label>
-        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 50px;"></div>      
+        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 100%;"></div>      
         <!-- <input id="obj_color" type="color" onchange="obj_color_change(event)"> -->
     </div>
 </div>
@@ -320,7 +329,7 @@
     }
 
     function img_download(){
-        msg("добавить на фото стоимость?",{type:"ask",res:(out)=>{
+        msg("добавить на фото Стоимость?",{type:"ask",res:(out)=>{
             let wait_msg = msg("делаем фото",{type:"wait"})
             proj_img((src)=>{
                 msg("изображение проекта готово",{time:3})
@@ -343,12 +352,13 @@
             width += document.getElementById("proj_cost").getBoundingClientRect().width;
             document.getElementById("drags").append(document.getElementById("cost_div"));
             document.getElementById("cost_div").style.marginLeft = `${parseInt(document.getElementById("wall").style.width) + 4}px`;
+            document.getElementById("cost_div").style.marginTop = `4px`;
             document.getElementById("cost_list").style.display = "block";
         }
         html2canvas(document.getElementById("drags"),{
-            y:7,
+            y:6,
-            x:2,
+            x:0,
-            width:width,
+            width:(width+5),
             logging:false
             // scale:0.99
         }).then(canvas => {
@@ -418,6 +428,7 @@
     }
 
     function go_back(){
+        obj_selection(true)
         if(objs_back.length > 0){
             objs_forw.push(objs);
             objs = objs_back.at(-1);
@@ -427,6 +438,7 @@
         }
     }
     function go_forw(){
+        obj_selection(true)
         if(objs_forw.length > 0){
             objs_back.push(objs);
             objs = objs_forw.at(-1);
@@ -465,6 +477,7 @@
             }
         }
         // console.log(objs[obj.classList[0]][obj.getAttribute("id")]);
+        reload();
     }
 
     function obj_del(){

views/template.ejs

@@ -187,10 +187,10 @@
 <div style="display:flex; justify-content: space-around;"></div>
 
 
-<div class="inputs" style="display: flex;justify-content: space-between;height: 5vh;">
+<div class="inputs" style="display: flex;justify-content: space-between;height: 6vh;">
     <div id="obj_color_div" style="justify-content: space-evenly; width: 50vw;display: none;transform: translateX(30%);">
         <label for="obj_colors" style="min-width: 10vw;">цвет объекта</label>
-        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 4.5vh;"></div>      
+        <div id="obj_colors" style="display: flex; width: 30vw;overflow: auto;height: 100%;"></div>      
         <!-- <input id="obj_color" type="color" onchange="obj_color_change(event)"> -->
     </div>
 </div>