5 Commits

Author SHA1 Message Date
Ilia Miheev a57ab9b8a6 Переделал стили для обводки кнопок, переделал вывод иконки корзины 2026-03-31 20:44:57 +03:00
Ilia Miheev e213475de5 Фиксы ошибок
Увеличил шрифт
Сделал иконку удаления
Убрал обводку после нажатия у кнопок на панели инструментов
2026-03-31 18:16:15 +03:00
alisagerasimova dc31ec1cb6 добавили тултипы 2026-03-30 14:42:09 +03:00
Alisa Gerasimova e24fa92a84 Merge pull request #17 from IliaMiheev/develop
Develop
2026-03-30 13:22:09 +03:00
Ilia Miheev d1cc7875a8 Merge pull request #5 from IliaMiheev/develop
Develop
2026-03-09 19:14:27 +03:00
9 changed files with 98 additions and 72 deletions
+1 -4
View File
@@ -4,15 +4,12 @@ const { FuseV1Options, FuseVersion } = require('@electron/fuses');
module.exports = {
packagerConfig: {
asar: true,
icon: './mainicon',
},
rebuildConfig: {},
makers: [
{
name: '@electron-forge/maker-squirrel',
config: {
setupIcon: './mainicon.ico',
},
config: {},
},
{
name: '@electron-forge/maker-zip',
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 KiB

+10 -11
View File
@@ -638,6 +638,7 @@
"integrity": "sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"chalk": "^4.1.1",
"fs-extra": "^9.0.1",
@@ -1781,6 +1782,7 @@
"integrity": "sha512-yl43JD/86CIj3Mz5mvvLJqAOfIup7ncxfJ0Btnl0/v5TouVUyeEdcpknfgc+yMevS/48oH9WAkkw93m7otLb/A==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@inquirer/checkbox": "^3.0.1",
"@inquirer/confirm": "^4.0.1",
@@ -2963,6 +2965,7 @@
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -3029,6 +3032,7 @@
"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.3",
"fast-uri": "^3.0.1",
@@ -3253,6 +3257,7 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"baseline-browser-mapping": "^2.9.0",
"caniuse-lite": "^1.0.30001759",
@@ -3769,6 +3774,7 @@
"integrity": "sha512-9nF4PdUle+5ta4W5SyZdLCCmFd37uVimSjg1evcTqKJCyvCEEj12WKzOSBNak6r4im4J4iYXKH1OWpUV5LBYFg==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@emotion/hash": "~0.8.0",
"csstype": "~3.0.5"
@@ -3793,6 +3799,7 @@
"integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
"dev": true,
"license": "MIT",
"peer": true,
"funding": {
"type": "github",
"url": "https://github.com/sponsors/kossnocorp"
@@ -4598,17 +4605,6 @@
"dev": true,
"license": "MIT"
},
"node_modules/encoding": {
"version": "0.1.13",
"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
"integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
"dev": true,
"license": "MIT",
"optional": true,
"dependencies": {
"iconv-lite": "^0.6.2"
}
},
"node_modules/end-of-stream": {
"version": "1.4.5",
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
@@ -8222,6 +8218,7 @@
"integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"esbuild": "^0.21.3",
"postcss": "^8.4.43",
@@ -8294,6 +8291,7 @@
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.28.tgz",
"integrity": "sha512-BRdrNfeoccSoIZeIhyPBfvWSLFP4q8J3u8Ju8Ug5vu3LdD+yTM13Sg4sKtljxozbnuMu1NB1X5HBHRYUzFocKg==",
"license": "MIT",
"peer": true,
"dependencies": {
"@vue/compiler-dom": "3.5.28",
"@vue/compiler-sfc": "3.5.28",
@@ -8366,6 +8364,7 @@
"integrity": "sha512-gX/dMkRQc7QOMzgTe6KsYFM7DxeIONQSui1s0n/0xht36HvrgbxtM1xBlgx596NbpHuQU8P7QpKwrZYwUX48nw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@types/eslint-scope": "^3.7.7",
"@types/estree": "^1.0.8",
-1
View File
@@ -1 +0,0 @@
<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>

Before

Width:  |  Height:  |  Size: 1.0 KiB

+62 -25
View File
@@ -14,7 +14,7 @@ import Preview from "@/components/UI/svg/Preview.vue";
import Save from "@/components/UI/svg/Save.vue";
import Trash from "@/components/UI/svg/Trash.vue";
import Back from "@/components/UI/svg/Back.vue";
import { NTooltip } from 'naive-ui'
const numbers = ref([]); // Инициализируем массив с пустыми строками
const clickCount = ref(1); // Счетчик нажатий
@@ -272,6 +272,16 @@ function createIcon(src) {
})
}
function createSvgIcon(svg) {
return h(svg,{
style:{
color: '#000',
width: '20px',
height: '20px',
}
})
}
function onContextMenu(e, item) {
ContextMenu.showContextMenu({
theme: 'mac dark',
@@ -300,7 +310,7 @@ function onContextMenu(e, item) {
{
label: "Удалить",
onClick: () => deletePlatform(item),
icon: createIcon('icons/trash.svg'),
icon: createSvgIcon(Trash),
},
]
},
@@ -316,14 +326,14 @@ function onContextMenu(e, item) {
{
label: "Удалить",
onClick: () => deleteQR(item),
icon: createIcon('icons/trash.svg')
icon: createSvgIcon(Trash),
},
],
},
{
label: "Удалить",
icon: createIcon('icons/trash.svg'),
icon: createSvgIcon(Trash),
onClick: () => deletePointMap(item),
},
]
@@ -341,10 +351,30 @@ function onContextMenu(e, item) {
</div>
<div class="actions">
<n-tooltip trigger="hover">
<template #trigger>
<Save @click="saveResult" />
</template>
Сохранить
</n-tooltip>
<n-tooltip trigger="hover">
<template #trigger>
<Trash @click="cleanResult" />
</template>
Удалить
</n-tooltip>
<n-tooltip trigger="hover">
<template #trigger>
<Back @click="cancel" />
</template>
Отменить
</n-tooltip>
<n-tooltip trigger="hover">
<template #trigger>
<Preview @click="openPreview" />
</template>
Превью
</n-tooltip>
</div>
<MyDropMenu ref="dropMenu" />
<MyDialog v-model:show="isModalVisible" class="dialogWindow" :is-success=Boolean(listOfTrips.length)>
@@ -356,10 +386,12 @@ function onContextMenu(e, item) {
<p v-if="listOfTrips.length">Скопируйте или скачайте ваш код</p>
<p v-else>Выстройте маршрут перед сохранением кода.</p>
</main>
<template v-if="listOfTrips.length" #footer>
<template #footer>
<div v-if="listOfTrips.length">
<button @click="isCodeViewVisible = true">Предпросмотр</button>
<button @click="handleDownloadBtn">Скачать код</button>
<button @click="copyAndToast(finallyText)">Скопировать код</button>
</div>
</template>
</MyDialog>
</div>
@@ -369,20 +401,23 @@ function onContextMenu(e, item) {
<style>
* {
font-family: 'Courier New', Courier, monospace;
outline: none;
}
* :focus-visible {
box-shadow: 0 0 0 3px #23aae3e2;
}
html {
background-image: radial-gradient(#23aae3e2, #222222);
font-size: 18px;
}
body {
font-size: 18px;
margin: 0;
}
:root {
--side: 8vh;
--sizeActions: 5vh;
--side: 75px;
}
.wraper {
@@ -395,40 +430,36 @@ body {
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: 100%;
height: 100%;
text-align: center;
width: var(--side);
height: var(--side);
background-size: cover;
border: 3px solid #ffffff;
border: 3px solid rgb(251, 251, 251);
cursor: pointer;
overflow-y: scroll;
background-blend-mode: multiply;
background-color: #ffffff;
background-color: transparent;
transition: background-color 0.3s ease;
color: #2267fce2;
text-shadow: -1px -1px 0 #fff,
1px -1px 0 #fff,
-1px 1px 0 #fff,
1px 1px 0 #fff;
color: white;
text-shadow: -1px -1px 0 black,
1px -1px 0 black,
-1px 1px 0 black,
1px 1px 0 black;
box-sizing: border-box;
font-size: 1.1rem;
font-weight: bold
}
.square:hover {
background-color: #949494;
background-color: rgb(166, 162, 162);
}
.square:active {
background-color: #747474;
background-color: rgb(164, 162, 162);
}
.square::-webkit-scrollbar {
@@ -456,11 +487,17 @@ body {
}
.actions svg {
width: var(--sizeActions);
height: var(--sizeActions);
outline: none;
width: 40px;
height: 40px;
transition: color 0.4s;
}
.actions svg:focus-visible {
box-shadow: 0 0 0 3px #23aae3e2;
border-radius: 8px;
}
.actions svg:hover {
color: rgba(20, 104, 140, 0.89);
}
+2 -2
View File
@@ -18,13 +18,13 @@ const props = defineProps({
<div class="code-view" v-if="show">
<CustomButton
@click.stop="$emit('update:show', false)">
Вернуться к генерации маршрута
Вернуться к сохранению сгенерированного кода
</CustomButton>
<CodeBlock :code="code" />
<CustomButton
@click.stop="$emit('update:show', false)">
Вернуться к генерации маршрута
Вернуться к сохранению сгенерированного кода
</CustomButton>
<MovementButtons/>
</div>
+5 -6
View File
@@ -80,9 +80,9 @@ useEventListener("keydown", handleKeydown);
overflow-x: auto;
display: flex;
flex-direction: column;
width: 55%;
max-width: 500px;
width: 90%;
border-radius: 5px;
font-size: 1.5rem;
}
.modal-header,
@@ -110,17 +110,16 @@ useEventListener("keydown", handleKeydown);
}
.modal-footer {
justify-content: flex-end;
border-top: 1px solid white;
display: flex;
gap: 5px;
}
.modal-footer button {
width: 33%;
justify-content: flex-end;
border-top: 1px solid white;
padding: 5px;
color: black;
font-size: 20px;
font-size: 15px;
border-radius: 5px;
}
+2 -8
View File
@@ -99,8 +99,8 @@ defineExpose({open: () => (isOpen.value = true), close: closeMenu});
display: flex;
flex-direction: column;
justify-content: space-around;
min-width: 40px;
min-height: 30px;
width: 40px;
height: 30px;
background: rgba(255, 255, 255, 0.508);
border: 1px solid #383838;
cursor: pointer;
@@ -109,18 +109,12 @@ defineExpose({open: () => (isOpen.value = true), close: closeMenu});
h1 {
text-align: center;
font-size: 3rem;
}
.menu-content {
display: flex;
flex-direction: column;
gap: 10px;
padding-bottom: 20px;
}
.menu-content button{
font-size: 1.2rem;
}
.line {
+3 -2
View File
@@ -17,6 +17,7 @@
</template>
<style scoped>
.cls-1{fill:none;}
.cls-1{
fill:none;
}
</style>