Фикс мержа

forge.config.js

@@ -4,12 +4,15 @@ const { FuseV1Options, FuseVersion } = require('@electron/fuses');
 module.exports = {
   packagerConfig: {
     asar: true,
+    icon: './mainicon',
   },
   rebuildConfig: {},
   makers: [
     {
       name: '@electron-forge/maker-squirrel',
-      config: {},
+      config: {
+        setupIcon: './mainicon.ico',
+      },
     },
     {
       name: '@electron-forge/maker-zip',

public/icons/trash.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="48px" height="48px"><path d="M 24 4 C 20.704135 4 18 6.7041348 18 10 L 11.746094 10 A 1.50015 1.50015 0 0 0 11.476562 9.9785156 A 1.50015 1.50015 0 0 0 11.259766 10 L 7.5 10 A 1.50015 1.50015 0 1 0 7.5 13 L 10 13 L 10 38.5 C 10 41.519774 12.480226 44 15.5 44 L 32.5 44 C 35.519774 44 38 41.519774 38 38.5 L 38 13 L 40.5 13 A 1.50015 1.50015 0 1 0 40.5 10 L 36.746094 10 A 1.50015 1.50015 0 0 0 36.259766 10 L 30 10 C 30 6.7041348 27.295865 4 24 4 z M 24 7 C 25.674135 7 27 8.3258652 27 10 L 21 10 C 21 8.3258652 22.325865 7 24 7 z M 13 13 L 35 13 L 35 38.5 C 35 39.898226 33.898226 41 32.5 41 L 15.5 41 C 14.101774 41 13 39.898226 13 38.5 L 13 13 z M 20.476562 17.978516 A 1.50015 1.50015 0 0 0 19 19.5 L 19 34.5 A 1.50015 1.50015 0 1 0 22 34.5 L 22 19.5 A 1.50015 1.50015 0 0 0 20.476562 17.978516 z M 27.476562 17.978516 A 1.50015 1.50015 0 0 0 26 19.5 L 26 34.5 A 1.50015 1.50015 0 1 0 29 34.5 L 29 19.5 A 1.50015 1.50015 0 0 0 27.476562 17.978516 z"/></svg>

src/App.vue

@@ -9,6 +9,9 @@
 
 html {
     background-image: radial-gradient(#23aae3e2, #222222);
+    background-repeat: no-repeat;
+        background-attachment: fixed;
+
 }
 
 body {

src/components/CodeView.vue

@@ -16,12 +16,12 @@ defineEmits(['back'])
 <template>
     <div class="code-view">
         <CustomButton @click="$emit('back')">
-            Вернуться к маршруту
+            Вернуться к генерации маршрута
         </CustomButton>
         <CodeBlock :code="code" />
 
         <CustomButton @click="$emit('back')">
-            Вернуться к маршруту
+            Вернуться к генерации маршрута
         </CustomButton>
         <MovementButtons/>
     </div>

src/components/MyDialog.vue

@@ -80,15 +80,16 @@ useEventListener("keydown", handleKeydown);
     overflow-x: auto;
     display: flex;
     flex-direction: column;
-    max-width: 500px;
+    width: 55%;
-    width: 90%;
     border-radius: 5px;
+    font-size: 1.5rem;
 }
 
 .modal-header,
 .modal-footer {
     padding: 10px;
     display: flex;
+    justify-content: flex-end;
 }
 
 .modal-header {
@@ -110,16 +111,17 @@ useEventListener("keydown", handleKeydown);
 }
 
 .modal-footer {
-    justify-content: flex-end;
     border-top: 1px solid white;
+    display: flex;
+    gap: 5px;
 }
 
 .modal-footer button {
-    justify-content: flex-end;
+    width: 33%;
     border-top: 1px solid white;
     padding: 5px;
     color: black;
-    font-size: 15px;
+    font-size: 20px;
     border-radius: 5px;
 }
 

src/components/MyDropMenu.vue

@@ -107,8 +107,8 @@ defineExpose({ open: () => (isOpen.value = true), close: closeMenu });
     display: flex;
     flex-direction: column;
     justify-content: space-around;
-    width: 40px;
+    min-width: 40px;
-    height: 30px;
+    min-height: 30px;
     background: rgba(255, 255, 255, 0.508);
     border: 1px solid #383838;
     cursor: pointer;
@@ -117,6 +117,7 @@ defineExpose({ open: () => (isOpen.value = true), close: closeMenu });
 
 h1 {
     text-align: center;
+    font-size: 3rem;
 }
 
 .menu-content {
@@ -157,6 +158,11 @@ h1 {
 
 .menu-list-item.is-active {
     background-color: transparent !important;
+    padding-bottom: 20px;
+}
+
+.menu-content button{
+    font-size: 1.2rem;
 }
 
 .line {

src/views/PlannerView.vue

@@ -384,11 +384,11 @@ function onContextMenu(e, item) {
                 <p v-else>Выстройте маршрут перед сохранением кода.</p>
             </main>
             <template #footer>
-                <div v-if="listOfTrips.length">
+                <template v-if="listOfTrips.length">
                     <button @click="openPreviewFromModal">Предпросмотр</button>
                     <button @click="handleDownloadBtn">Скачать код</button>
                     <button @click="copyAndToast(finallyText)">Скопировать код</button>
-                </div>
+                </template>
             </template>
         </MyDialog>
     </div>
@@ -396,7 +396,8 @@ function onContextMenu(e, item) {
 
 <style>
 :root {
-    --side: 75px;
+    --side: 8vh;
+    --sizeActions: 5vh;
 }
 
 .wraper {
@@ -409,36 +410,40 @@ function onContextMenu(e, item) {
     display: grid;
     padding: 3px;
     grid-template-columns: repeat(10, var(--side));
+    grid-template-rows: repeat(10, var(--side));
     gap: 5px;
     user-select: none;
 }
 
 .square {
-    width: var(--side);
+    width: 100%;
-    height: var(--side);
+    height: 100%;
+    text-align: center;
     background-size: cover;
-    border: 3px solid rgb(251, 251, 251);
+    border: 3px solid #ffffff;
     cursor: pointer;
     overflow-y: scroll;
 
     background-blend-mode: multiply;
-    background-color: transparent;
+    background-color: #ffffff;
     transition: background-color 0.3s ease;
 
-    color: white;
+    color: #2267fce2;
-    text-shadow: -1px -1px 0 black,
+    text-shadow: -1px -1px 0 #fff,
-        1px -1px 0 black,
+    1px -1px 0 #fff,
-        -1px 1px 0 black,
+    -1px 1px 0 #fff,
-        1px 1px 0 black;
+    1px 1px 0 #fff;
     box-sizing: border-box;
+    font-size: 1.1rem;
+    font-weight: bold
 }
 
 .square:hover {
-    background-color: rgb(166, 162, 162);
+    background-color: #949494;
 }
 
 .square:active {
-    background-color: rgb(164, 162, 162);
+    background-color: #747474;;
 }
 
 .square::-webkit-scrollbar {
@@ -466,8 +471,8 @@ function onContextMenu(e, item) {
 }
 
 .actions svg {
-    width: 40px;
+    width: var(--sizeActions);
-    height: 40px;
+    height: var(--sizeActions);
     transition: color 0.4s;
 }