3 Commits
lab5 ... lab6

Author SHA1 Message Date
xom9k
180f749707 обновил информацию в отчет 2025-05-26 15:35:45 +04:00
xom9k
6a0c72354f добавление отчета 2025-05-23 11:36:49 +04:00
xom9k
ba4efe44be 6 лаба 2025-05-23 10:09:03 +04:00
23 changed files with 958 additions and 405 deletions

View File

@@ -1,36 +1,44 @@
{
"products": [
{
"id": "1533",
"name": "Отвертка",
"name": "Отвертккк",
"price": 450,
"image": "https://cdn.kuvalda.ru/data/file_resize/product/7c/c9/1b/landing-7cc91b79db759ca3e2a14868fcabbaf0.jpg",
"brandId": "2",
"categoryId": "2"
},
{
"id": "dbd9",
"name": "Дрель",
"price": 8999,
"image": "https://cdn.kuvalda.ru/data/file_resize/product/7c/c9/1b/landing-7cc91b79db759ca3e2a14868fcabbaf0.jpg",
"brandId": "1",
"categoryId": "1"
},
{
"name": "Отвертка",
"price": 100,
"image": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTCxcN67AQirgFwXQ3RmffA715CIAIsLJlhLw&s",
"brandId": "2",
"brandId": "3",
"categoryId": "2",
"id": "088f"
"id": "7922"
},
{
"id": "aff4",
"name": "ЖУЖУЖУЖУ",
"id": "569e",
"name": "Дрель",
"price": 9000,
"image": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTCxcN67AQirgFwXQ3RmffA715CIAIsLJlhLw&s",
"image": "https://cdn.kuvalda.ru/data/file_resize/product/7c/c9/1b/landing-7cc91b79db759ca3e2a14868fcabbaf0.jpg",
"brandId": "1",
"categoryId": "1"
},
{
"name": "Друль",
"price": 5600,
"image": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTCxcN67AQirgFwXQ3RmffA715CIAIsLJlhLw&s",
"brandId": "1",
"categoryId": "1",
"id": "0f7d"
},
{
"name": "Лопата",
"price": 1100,
"image": "https://cdn.kuvalda.ru/data/file_resize/product/9e/55/8a/landing-9e558a48a9b3efc6b4e2dfa53a82f0713962.jpg",
"brandId": "3",
"categoryId": "3",
"id": "1354"
},
{
"name": "Бетоносмеситель",
"price": 24000,
"image": "https://electrolite.ru/Pc/shop/full/2252_15929192901144.jpg",
"brandId": "2",
"categoryId": "3",
"id": "aa78"
}
],
"categories": [

View File

@@ -12,7 +12,8 @@
"bootstrap-icons": "1.11.3",
"express": "^4.21.2",
"react": "^19.1.0",
"react-dom": "^19.1.0"
"react-dom": "^19.1.0",
"react-router-dom": "^7.6.0"
},
"devDependencies": {
"@vitejs/plugin-react": "^4.4.1",
@@ -345,9 +346,9 @@
"license": "(Apache-2.0 AND BSD-3-Clause)"
},
"node_modules/@esbuild/aix-ppc64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
"integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
"integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
"cpu": [
"ppc64"
],
@@ -362,9 +363,9 @@
}
},
"node_modules/@esbuild/android-arm": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
"integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
"integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
"cpu": [
"arm"
],
@@ -379,9 +380,9 @@
}
},
"node_modules/@esbuild/android-arm64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
"integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
"integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
"cpu": [
"arm64"
],
@@ -396,9 +397,9 @@
}
},
"node_modules/@esbuild/android-x64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
"integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
"integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
"cpu": [
"x64"
],
@@ -413,9 +414,9 @@
}
},
"node_modules/@esbuild/darwin-arm64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
"integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
"integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
"cpu": [
"arm64"
],
@@ -430,9 +431,9 @@
}
},
"node_modules/@esbuild/darwin-x64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
"integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
"integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
"cpu": [
"x64"
],
@@ -447,9 +448,9 @@
}
},
"node_modules/@esbuild/freebsd-arm64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
"integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
"integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
"cpu": [
"arm64"
],
@@ -464,9 +465,9 @@
}
},
"node_modules/@esbuild/freebsd-x64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
"integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
"integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
"cpu": [
"x64"
],
@@ -481,9 +482,9 @@
}
},
"node_modules/@esbuild/linux-arm": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
"integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
"integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
"cpu": [
"arm"
],
@@ -498,9 +499,9 @@
}
},
"node_modules/@esbuild/linux-arm64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
"integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
"integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
"cpu": [
"arm64"
],
@@ -515,9 +516,9 @@
}
},
"node_modules/@esbuild/linux-ia32": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
"integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
"integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
"cpu": [
"ia32"
],
@@ -532,9 +533,9 @@
}
},
"node_modules/@esbuild/linux-loong64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
"integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
"integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
"cpu": [
"loong64"
],
@@ -549,9 +550,9 @@
}
},
"node_modules/@esbuild/linux-mips64el": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
"integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
"integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
"cpu": [
"mips64el"
],
@@ -566,9 +567,9 @@
}
},
"node_modules/@esbuild/linux-ppc64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
"integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
"integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
"cpu": [
"ppc64"
],
@@ -583,9 +584,9 @@
}
},
"node_modules/@esbuild/linux-riscv64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
"integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
"integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
"cpu": [
"riscv64"
],
@@ -600,9 +601,9 @@
}
},
"node_modules/@esbuild/linux-s390x": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
"integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
"integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
"cpu": [
"s390x"
],
@@ -617,9 +618,9 @@
}
},
"node_modules/@esbuild/linux-x64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
"integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
"integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
"cpu": [
"x64"
],
@@ -634,9 +635,9 @@
}
},
"node_modules/@esbuild/netbsd-arm64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
"integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.4.tgz",
"integrity": "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==",
"cpu": [
"arm64"
],
@@ -651,9 +652,9 @@
}
},
"node_modules/@esbuild/netbsd-x64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
"integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
"integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
"cpu": [
"x64"
],
@@ -668,9 +669,9 @@
}
},
"node_modules/@esbuild/openbsd-arm64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
"integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
"integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
"cpu": [
"arm64"
],
@@ -685,9 +686,9 @@
}
},
"node_modules/@esbuild/openbsd-x64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
"integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
"integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
"cpu": [
"x64"
],
@@ -702,9 +703,9 @@
}
},
"node_modules/@esbuild/sunos-x64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
"integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
"integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
"cpu": [
"x64"
],
@@ -719,9 +720,9 @@
}
},
"node_modules/@esbuild/win32-arm64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
"integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
"integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
"cpu": [
"arm64"
],
@@ -736,9 +737,9 @@
}
},
"node_modules/@esbuild/win32-ia32": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
"integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
"integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
"cpu": [
"ia32"
],
@@ -753,9 +754,9 @@
}
},
"node_modules/@esbuild/win32-x64": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
"integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
"integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
"cpu": [
"x64"
],
@@ -993,9 +994,9 @@
}
},
"node_modules/@rollup/rollup-android-arm-eabi": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.4.tgz",
"integrity": "sha512-gGi5adZWvjtJU7Axs//CWaQbQd/vGy8KGcnEaCWiyCqxWYDxwIlAHFuSe6Guoxtd0SRvSfVTDMPd5H+4KE2kKA==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.2.tgz",
"integrity": "sha512-JkdNEq+DFxZfUwxvB58tHMHBHVgX23ew41g1OQinthJ+ryhdRk67O31S7sYw8u2lTjHUPFxwar07BBt1KHp/hg==",
"cpu": [
"arm"
],
@@ -1007,9 +1008,9 @@
]
},
"node_modules/@rollup/rollup-android-arm64": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.4.tgz",
"integrity": "sha512-1aRlh1gqtF7vNPMnlf1vJKk72Yshw5zknR/ZAVh7zycRAGF2XBMVDAHmFQz/Zws5k++nux3LOq/Ejj1WrDR6xg==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.2.tgz",
"integrity": "sha512-13unNoZ8NzUmnndhPTkWPWbX3vtHodYmy+I9kuLxN+F+l+x3LdVF7UCu8TWVMt1POHLh6oDHhnOA04n8oJZhBw==",
"cpu": [
"arm64"
],
@@ -1021,9 +1022,9 @@
]
},
"node_modules/@rollup/rollup-darwin-arm64": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.4.tgz",
"integrity": "sha512-drHl+4qhFj+PV/jrQ78p9ch6A0MfNVZScl/nBps5a7u01aGf/GuBRrHnRegA9bP222CBDfjYbFdjkIJ/FurvSQ==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.2.tgz",
"integrity": "sha512-Gzf1Hn2Aoe8VZzevHostPX23U7N5+4D36WJNHK88NZHCJr7aVMG4fadqkIf72eqVPGjGc0HJHNuUaUcxiR+N/w==",
"cpu": [
"arm64"
],
@@ -1035,9 +1036,9 @@
]
},
"node_modules/@rollup/rollup-darwin-x64": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.4.tgz",
"integrity": "sha512-hQqq/8QALU6t1+fbNmm6dwYsa0PDD4L5r3TpHx9dNl+aSEMnIksHZkSO3AVH+hBMvZhpumIGrTFj8XCOGuIXjw==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.2.tgz",
"integrity": "sha512-47N4hxa01a4x6XnJoskMKTS8XZ0CZMd8YTbINbi+w03A2w4j1RTlnGHOz/P0+Bg1LaVL6ufZyNprSg+fW5nYQQ==",
"cpu": [
"x64"
],
@@ -1049,9 +1050,9 @@
]
},
"node_modules/@rollup/rollup-freebsd-arm64": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.4.tgz",
"integrity": "sha512-/L0LixBmbefkec1JTeAQJP0ETzGjFtNml2gpQXA8rpLo7Md+iXQzo9kwEgzyat5Q+OG/C//2B9Fx52UxsOXbzw==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.2.tgz",
"integrity": "sha512-8t6aL4MD+rXSHHZUR1z19+9OFJ2rl1wGKvckN47XFRVO+QL/dUSpKA2SLRo4vMg7ELA8pzGpC+W9OEd1Z/ZqoQ==",
"cpu": [
"arm64"
],
@@ -1063,9 +1064,9 @@
]
},
"node_modules/@rollup/rollup-freebsd-x64": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.4.tgz",
"integrity": "sha512-6Rk3PLRK+b8L/M6m/x6Mfj60LhAUcLJ34oPaxufA+CfqkUrDoUPQYFdRrhqyOvtOKXLJZJwxlOLbQjNYQcRQfw==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.2.tgz",
"integrity": "sha512-C+AyHBzfpsOEYRFjztcYUFsH4S7UsE9cDtHCtma5BK8+ydOZYgMmWg1d/4KBytQspJCld8ZIujFMAdKG1xyr4Q==",
"cpu": [
"x64"
],
@@ -1077,9 +1078,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.4.tgz",
"integrity": "sha512-kmT3x0IPRuXY/tNoABp2nDvI9EvdiS2JZsd4I9yOcLCCViKsP0gB38mVHOhluzx+SSVnM1KNn9k6osyXZhLoCA==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.2.tgz",
"integrity": "sha512-de6TFZYIvJwRNjmW3+gaXiZ2DaWL5D5yGmSYzkdzjBDS3W+B9JQ48oZEsmMvemqjtAFzE16DIBLqd6IQQRuG9Q==",
"cpu": [
"arm"
],
@@ -1091,9 +1092,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-musleabihf": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.4.tgz",
"integrity": "sha512-3iSA9tx+4PZcJH/Wnwsvx/BY4qHpit/u2YoZoXugWVfc36/4mRkgGEoRbRV7nzNBSCOgbWMeuQ27IQWgJ7tRzw==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.2.tgz",
"integrity": "sha512-urjaEZubdIkacKc930hUDOfQPysezKla/O9qV+O89enqsqUmQm8Xj8O/vh0gHg4LYfv7Y7UsE3QjzLQzDYN1qg==",
"cpu": [
"arm"
],
@@ -1105,9 +1106,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-gnu": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.4.tgz",
"integrity": "sha512-7CwSJW+sEhM9sESEk+pEREF2JL0BmyCro8UyTq0Kyh0nu1v0QPNY3yfLPFKChzVoUmaKj8zbdgBxUhBRR+xGxg==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.2.tgz",
"integrity": "sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg==",
"cpu": [
"arm64"
],
@@ -1119,9 +1120,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-musl": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.4.tgz",
"integrity": "sha512-GZdafB41/4s12j8Ss2izofjeFXRAAM7sHCb+S4JsI9vaONX/zQ8cXd87B9MRU/igGAJkKvmFmJJBeeT9jJ5Cbw==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.2.tgz",
"integrity": "sha512-j8CgxvfM0kbnhu4XgjnCWJQyyBOeBI1Zq91Z850aUddUmPeQvuAy6OiMdPS46gNFgy8gN1xkYyLgwLYZG3rBOg==",
"cpu": [
"arm64"
],
@@ -1133,9 +1134,9 @@
]
},
"node_modules/@rollup/rollup-linux-loongarch64-gnu": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.4.tgz",
"integrity": "sha512-uuphLuw1X6ur11675c2twC6YxbzyLSpWggvdawTUamlsoUv81aAXRMPBC1uvQllnBGls0Qt5Siw8reSIBnbdqQ==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.2.tgz",
"integrity": "sha512-Ybc/1qUampKuRF4tQXc7G7QY9YRyeVSykfK36Y5Qc5dmrIxwFhrOzqaVTNoZygqZ1ZieSWTibfFhQ5qK8jpWxw==",
"cpu": [
"loong64"
],
@@ -1147,9 +1148,9 @@
]
},
"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.4.tgz",
"integrity": "sha512-KvLEw1os2gSmD6k6QPCQMm2T9P2GYvsMZMRpMz78QpSoEevHbV/KOUbI/46/JRalhtSAYZBYLAnT9YE4i/l4vg==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.2.tgz",
"integrity": "sha512-3FCIrnrt03CCsZqSYAOW/k9n625pjpuMzVfeI+ZBUSDT3MVIFDSPfSUgIl9FqUftxcUXInvFah79hE1c9abD+Q==",
"cpu": [
"ppc64"
],
@@ -1161,9 +1162,23 @@
]
},
"node_modules/@rollup/rollup-linux-riscv64-gnu": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.4.tgz",
"integrity": "sha512-wcpCLHGM9yv+3Dql/CI4zrY2mpQ4WFergD3c9cpRowltEh5I84pRT/EuHZsG0In4eBPPYthXnuR++HrFkeqwkA==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.2.tgz",
"integrity": "sha512-QNU7BFHEvHMp2ESSY3SozIkBPaPBDTsfVNGx3Xhv+TdvWXFGOSH2NJvhD1zKAT6AyuuErJgbdvaJhYVhVqrWTg==",
"cpu": [
"riscv64"
],
"dev": true,
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@rollup/rollup-linux-riscv64-musl": {
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.2.tgz",
"integrity": "sha512-5W6vNYkhgfh7URiXTO1E9a0cy4fSgfE4+Hl5agb/U1sa0kjOLMLC1wObxwKxecE17j0URxuTrYZZME4/VH57Hg==",
"cpu": [
"riscv64"
],
@@ -1175,9 +1190,9 @@
]
},
"node_modules/@rollup/rollup-linux-s390x-gnu": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.4.tgz",
"integrity": "sha512-nLbfQp2lbJYU8obhRQusXKbuiqm4jSJteLwfjnunDT5ugBKdxqw1X9KWwk8xp1OMC6P5d0WbzxzhWoznuVK6XA==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.2.tgz",
"integrity": "sha512-B7LKIz+0+p348JoAL4X/YxGx9zOx3sR+o6Hj15Y3aaApNfAshK8+mWZEf759DXfRLeL2vg5LYJBB7DdcleYCoQ==",
"cpu": [
"s390x"
],
@@ -1189,9 +1204,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-gnu": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.4.tgz",
"integrity": "sha512-JGejzEfVzqc/XNiCKZj14eb6s5w8DdWlnQ5tWUbs99kkdvfq9btxxVX97AaxiUX7xJTKFA0LwoS0KU8C2faZRg==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.2.tgz",
"integrity": "sha512-lG7Xa+BmBNwpjmVUbmyKxdQJ3Q6whHjMjzQplOs5Z+Gj7mxPtWakGHqzMqNER68G67kmCX9qX57aRsW5V0VOng==",
"cpu": [
"x64"
],
@@ -1203,9 +1218,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-musl": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.4.tgz",
"integrity": "sha512-/iFIbhzeyZZy49ozAWJ1ZR2KW6ZdYUbQXLT4O5n1cRZRoTpwExnHLjlurDXXPKEGxiAg0ujaR9JDYKljpr2fDg==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.2.tgz",
"integrity": "sha512-tD46wKHd+KJvsmije4bUskNuvWKFcTOIM9tZ/RrmIvcXnbi0YK/cKS9FzFtAm7Oxi2EhV5N2OpfFB348vSQRXA==",
"cpu": [
"x64"
],
@@ -1217,9 +1232,9 @@
]
},
"node_modules/@rollup/rollup-win32-arm64-msvc": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.4.tgz",
"integrity": "sha512-qORc3UzoD5UUTneiP2Afg5n5Ti1GAW9Gp5vHPxzvAFFA3FBaum9WqGvYXGf+c7beFdOKNos31/41PRMUwh1tpA==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.2.tgz",
"integrity": "sha512-Bjv/HG8RRWLNkXwQQemdsWw4Mg+IJ29LK+bJPW2SCzPKOUaMmPEppQlu/Fqk1d7+DX3V7JbFdbkh/NMmurT6Pg==",
"cpu": [
"arm64"
],
@@ -1231,9 +1246,9 @@
]
},
"node_modules/@rollup/rollup-win32-ia32-msvc": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.4.tgz",
"integrity": "sha512-5g7E2PHNK2uvoD5bASBD9aelm44nf1w4I5FEI7MPHLWcCSrR8JragXZWgKPXk5i2FU3JFfa6CGZLw2RrGBHs2Q==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.2.tgz",
"integrity": "sha512-dt1llVSGEsGKvzeIO76HToiYPNPYPkmjhMHhP00T9S4rDern8P2ZWvWAQUEJ+R1UdMWJ/42i/QqJ2WV765GZcA==",
"cpu": [
"ia32"
],
@@ -1245,9 +1260,9 @@
]
},
"node_modules/@rollup/rollup-win32-x64-msvc": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.4.tgz",
"integrity": "sha512-p0scwGkR4kZ242xLPBuhSckrJ734frz6v9xZzD+kHVYRAkSUmdSLCIJRfql6H5//aF8Q10K+i7q8DiPfZp0b7A==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.2.tgz",
"integrity": "sha512-bwspbWB04XJpeElvsp+DCylKfF4trJDa2Y9Go8O6A7YLX2LIKGcNK/CYImJN6ZP4DcuOHB4Utl3iCbnR62DudA==",
"cpu": [
"x64"
],
@@ -1568,9 +1583,9 @@
}
},
"node_modules/@types/estree": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
"integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
"integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
"dev": true,
"license": "MIT"
},
@@ -2719,9 +2734,9 @@
}
},
"node_modules/esbuild": {
"version": "0.24.2",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
"integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
"version": "0.25.4",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz",
"integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==",
"dev": true,
"hasInstallScript": true,
"license": "MIT",
@@ -2732,31 +2747,31 @@
"node": ">=18"
},
"optionalDependencies": {
"@esbuild/aix-ppc64": "0.24.2",
"@esbuild/android-arm": "0.24.2",
"@esbuild/android-arm64": "0.24.2",
"@esbuild/android-x64": "0.24.2",
"@esbuild/darwin-arm64": "0.24.2",
"@esbuild/darwin-x64": "0.24.2",
"@esbuild/freebsd-arm64": "0.24.2",
"@esbuild/freebsd-x64": "0.24.2",
"@esbuild/linux-arm": "0.24.2",
"@esbuild/linux-arm64": "0.24.2",
"@esbuild/linux-ia32": "0.24.2",
"@esbuild/linux-loong64": "0.24.2",
"@esbuild/linux-mips64el": "0.24.2",
"@esbuild/linux-ppc64": "0.24.2",
"@esbuild/linux-riscv64": "0.24.2",
"@esbuild/linux-s390x": "0.24.2",
"@esbuild/linux-x64": "0.24.2",
"@esbuild/netbsd-arm64": "0.24.2",
"@esbuild/netbsd-x64": "0.24.2",
"@esbuild/openbsd-arm64": "0.24.2",
"@esbuild/openbsd-x64": "0.24.2",
"@esbuild/sunos-x64": "0.24.2",
"@esbuild/win32-arm64": "0.24.2",
"@esbuild/win32-ia32": "0.24.2",
"@esbuild/win32-x64": "0.24.2"
"@esbuild/aix-ppc64": "0.25.4",
"@esbuild/android-arm": "0.25.4",
"@esbuild/android-arm64": "0.25.4",
"@esbuild/android-x64": "0.25.4",
"@esbuild/darwin-arm64": "0.25.4",
"@esbuild/darwin-x64": "0.25.4",
"@esbuild/freebsd-arm64": "0.25.4",
"@esbuild/freebsd-x64": "0.25.4",
"@esbuild/linux-arm": "0.25.4",
"@esbuild/linux-arm64": "0.25.4",
"@esbuild/linux-ia32": "0.25.4",
"@esbuild/linux-loong64": "0.25.4",
"@esbuild/linux-mips64el": "0.25.4",
"@esbuild/linux-ppc64": "0.25.4",
"@esbuild/linux-riscv64": "0.25.4",
"@esbuild/linux-s390x": "0.25.4",
"@esbuild/linux-x64": "0.25.4",
"@esbuild/netbsd-arm64": "0.25.4",
"@esbuild/netbsd-x64": "0.25.4",
"@esbuild/openbsd-arm64": "0.25.4",
"@esbuild/openbsd-x64": "0.25.4",
"@esbuild/sunos-x64": "0.25.4",
"@esbuild/win32-arm64": "0.25.4",
"@esbuild/win32-ia32": "0.25.4",
"@esbuild/win32-x64": "0.25.4"
}
},
"node_modules/escalade": {
@@ -3244,6 +3259,21 @@
"reusify": "^1.0.4"
}
},
"node_modules/fdir": {
"version": "6.4.4",
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
"integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
"dev": true,
"license": "MIT",
"peerDependencies": {
"picomatch": "^3 || ^4"
},
"peerDependenciesMeta": {
"picomatch": {
"optional": true
}
}
},
"node_modules/file-entry-cache": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -4567,9 +4597,9 @@
"license": "MIT"
},
"node_modules/nanoid": {
"version": "3.3.8",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
"integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
"version": "3.3.11",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
"integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
"dev": true,
"funding": [
{
@@ -4882,6 +4912,19 @@
"dev": true,
"license": "ISC"
},
"node_modules/picomatch": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
"integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/sponsors/jonschlinkert"
}
},
"node_modules/possible-typed-array-names": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
@@ -4893,9 +4936,9 @@
}
},
"node_modules/postcss": {
"version": "8.5.1",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
"integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
"version": "8.5.3",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
"integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
"dev": true,
"funding": [
{
@@ -5084,6 +5127,53 @@
"node": ">=0.10.0"
}
},
"node_modules/react-router": {
"version": "7.6.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-7.6.0.tgz",
"integrity": "sha512-GGufuHIVCJDbnIAXP3P9Sxzq3UUsddG3rrI3ut1q6m0FI6vxVBF3JoPQ38+W/blslLH4a5Yutp8drkEpXoddGQ==",
"license": "MIT",
"dependencies": {
"cookie": "^1.0.1",
"set-cookie-parser": "^2.6.0"
},
"engines": {
"node": ">=20.0.0"
},
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18"
},
"peerDependenciesMeta": {
"react-dom": {
"optional": true
}
}
},
"node_modules/react-router-dom": {
"version": "7.6.0",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.6.0.tgz",
"integrity": "sha512-DYgm6RDEuKdopSyGOWZGtDfSm7Aofb8CCzgkliTjtu/eDuB0gcsv6qdFhhi8HdtmA+KHkt5MfZ5K2PdzjugYsA==",
"license": "MIT",
"dependencies": {
"react-router": "7.6.0"
},
"engines": {
"node": ">=20.0.0"
},
"peerDependencies": {
"react": ">=18",
"react-dom": ">=18"
}
},
"node_modules/react-router/node_modules/cookie": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
"integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
"license": "MIT",
"engines": {
"node": ">=18"
}
},
"node_modules/readdirp": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
@@ -5222,13 +5312,13 @@
}
},
"node_modules/rollup": {
"version": "4.34.4",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.4.tgz",
"integrity": "sha512-spF66xoyD7rz3o08sHP7wogp1gZ6itSq22SGa/IZTcUDXDlOyrShwMwkVSB+BUxFRZZCUYqdb3KWDEOMVQZxuw==",
"version": "4.40.2",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.2.tgz",
"integrity": "sha512-tfUOg6DTP4rhQ3VjOO6B4wyrJnGOX85requAXvqYTHsOgb2TFJdZ3aWpT8W2kPoypSGP7dZUyzxJ9ee4buM5Fg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@types/estree": "1.0.6"
"@types/estree": "1.0.7"
},
"bin": {
"rollup": "dist/bin/rollup"
@@ -5238,25 +5328,26 @@
"npm": ">=8.0.0"
},
"optionalDependencies": {
"@rollup/rollup-android-arm-eabi": "4.34.4",
"@rollup/rollup-android-arm64": "4.34.4",
"@rollup/rollup-darwin-arm64": "4.34.4",
"@rollup/rollup-darwin-x64": "4.34.4",
"@rollup/rollup-freebsd-arm64": "4.34.4",
"@rollup/rollup-freebsd-x64": "4.34.4",
"@rollup/rollup-linux-arm-gnueabihf": "4.34.4",
"@rollup/rollup-linux-arm-musleabihf": "4.34.4",
"@rollup/rollup-linux-arm64-gnu": "4.34.4",
"@rollup/rollup-linux-arm64-musl": "4.34.4",
"@rollup/rollup-linux-loongarch64-gnu": "4.34.4",
"@rollup/rollup-linux-powerpc64le-gnu": "4.34.4",
"@rollup/rollup-linux-riscv64-gnu": "4.34.4",
"@rollup/rollup-linux-s390x-gnu": "4.34.4",
"@rollup/rollup-linux-x64-gnu": "4.34.4",
"@rollup/rollup-linux-x64-musl": "4.34.4",
"@rollup/rollup-win32-arm64-msvc": "4.34.4",
"@rollup/rollup-win32-ia32-msvc": "4.34.4",
"@rollup/rollup-win32-x64-msvc": "4.34.4",
"@rollup/rollup-android-arm-eabi": "4.40.2",
"@rollup/rollup-android-arm64": "4.40.2",
"@rollup/rollup-darwin-arm64": "4.40.2",
"@rollup/rollup-darwin-x64": "4.40.2",
"@rollup/rollup-freebsd-arm64": "4.40.2",
"@rollup/rollup-freebsd-x64": "4.40.2",
"@rollup/rollup-linux-arm-gnueabihf": "4.40.2",
"@rollup/rollup-linux-arm-musleabihf": "4.40.2",
"@rollup/rollup-linux-arm64-gnu": "4.40.2",
"@rollup/rollup-linux-arm64-musl": "4.40.2",
"@rollup/rollup-linux-loongarch64-gnu": "4.40.2",
"@rollup/rollup-linux-powerpc64le-gnu": "4.40.2",
"@rollup/rollup-linux-riscv64-gnu": "4.40.2",
"@rollup/rollup-linux-riscv64-musl": "4.40.2",
"@rollup/rollup-linux-s390x-gnu": "4.40.2",
"@rollup/rollup-linux-x64-gnu": "4.40.2",
"@rollup/rollup-linux-x64-musl": "4.40.2",
"@rollup/rollup-win32-arm64-msvc": "4.40.2",
"@rollup/rollup-win32-ia32-msvc": "4.40.2",
"@rollup/rollup-win32-x64-msvc": "4.40.2",
"fsevents": "~2.3.2"
}
},
@@ -5851,6 +5942,12 @@
"node": ">= 0.8.0"
}
},
"node_modules/set-cookie-parser": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
"integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
"license": "MIT"
},
"node_modules/set-function-length": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -6263,6 +6360,23 @@
"dev": true,
"license": "MIT"
},
"node_modules/tinyglobby": {
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
"integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
"dev": true,
"license": "MIT",
"dependencies": {
"fdir": "^6.4.4",
"picomatch": "^4.0.2"
},
"engines": {
"node": ">=12.0.0"
},
"funding": {
"url": "https://github.com/sponsors/SuperchupuDev"
}
},
"node_modules/toidentifier": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -6524,15 +6638,18 @@
}
},
"node_modules/vite": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.1.0.tgz",
"integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==",
"version": "6.3.5",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
"integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"esbuild": "^0.24.2",
"postcss": "^8.5.1",
"rollup": "^4.30.1"
"esbuild": "^0.25.0",
"fdir": "^6.4.4",
"picomatch": "^4.0.2",
"postcss": "^8.5.3",
"rollup": "^4.34.9",
"tinyglobby": "^0.2.13"
},
"bin": {
"vite": "bin/vite.js"

View File

@@ -29,7 +29,8 @@
"bootstrap-icons": "1.11.3",
"express": "^4.21.2",
"react": "^19.1.0",
"react-dom": "^19.1.0"
"react-dom": "^19.1.0",
"react-router-dom": "^7.6.0"
},
"type": "module"
}

View File

@@ -1,10 +1,16 @@
import React, { useState, useEffect, useCallback } from 'react';
import { Routes, Route } from 'react-router-dom';
import Header from './components/Header';
import Footer from './components/Footer';
import ProductList from './components/ProductList';
import ProductAddForm from './components/ProductAddForm';
import ProductEditForm from './components/ProductEditForm';
import ProductEditForm from './components/ProductEditForm';
import HomePage from './pages/HomePage';
import CartPage from './pages/CartPage';
import ContactsPage from './pages/ContactsPage';
import DeliveryPage from './pages/DeliveryPage';
import SalesPage from './pages/SalesPage';
import AddProductPage from './pages/AddProductPage';
import NotFoundPage from './pages/NotFoundPage';
const CART_STORAGE_KEY = 'reactMasterokCart';
@@ -12,10 +18,7 @@ function App() {
const [products, setProducts] = useState([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState(null);
const [editingProduct, setEditingProduct] = useState(null);
const [sortOrder, setSortOrder] = useState('asc');
const [editingProduct, setEditingProduct] = useState(null);
const [cart, setCart] = useState(() => {
const storedCart = localStorage.getItem(CART_STORAGE_KEY);
return storedCart ? JSON.parse(storedCart) : [];
@@ -29,12 +32,10 @@ function App() {
try {
setLoading(true);
const response = await fetch('/api/products');
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
const data = await response.json();
setProducts(data);
setError(null);
setError(null);
} catch (e) {
setError(e.message);
console.error("Failed to fetch products:", e);
@@ -44,49 +45,18 @@ function App() {
}
}, []);
useEffect(() => {
fetchProducts();
}, [fetchProducts]);
const handleSortByPrice = () => {
const sorted = [...products].sort((a, b) => {
return sortOrder === 'asc'
? a.price - b.price
: b.price - a.price;
});
setProducts(sorted);
setSortOrder(sortOrder === 'asc' ? 'desc' : 'asc');
};
const handleProductAdded = useCallback(() => {
fetchProducts();
}, [fetchProducts]);
const handleEditProduct = useCallback((product) => {
setEditingProduct(product);
}, []);
const handleCloseEditModal = useCallback(() => {
setEditingProduct(null);
}, []);
const handleProductUpdated = useCallback(() => {
fetchProducts();
setEditingProduct(null);
}, [fetchProducts]);
useEffect(() => { fetchProducts(); }, [fetchProducts]);
const handleProductAdded = useCallback(() => { fetchProducts(); }, [fetchProducts]);
const handleEditProduct = useCallback((product) => { setEditingProduct(product); }, []);
const handleCloseEditModal = useCallback(() => { setEditingProduct(null); }, []);
const handleProductUpdated = useCallback(() => { fetchProducts(); setEditingProduct(null); }, [fetchProducts]);
const handleDeleteProduct = useCallback(async (productId) => {
if (!window.confirm("Вы уверены, что хотите удалить этот товар?")) {
return;
}
if (!window.confirm("Вы уверены, что хотите удалить этот товар?")) return;
try {
const response = await fetch(`/api/products/${productId}`, {
method: 'DELETE',
});
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
fetchProducts();
const response = await fetch(`/api/products/${productId}`, { method: 'DELETE' });
if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
fetchProducts();
} catch (e) {
setError(e.message);
console.error("Failed to delete product:", e);
@@ -97,36 +67,60 @@ function App() {
setCart(prevCart => {
const existingItem = prevCart.find(item => item.id === productToAdd.id);
if (existingItem) {
alert(`${productToAdd.name} уже в корзине!`);
return prevCart;
alert(`${productToAdd.name} уже в корзине!`);
return prevCart;
} else {
alert(`${productToAdd.name} добавлен в корзину!`);
return [...prevCart, { ...productToAdd, quantity: 1 }];
}
});
}, []);
const cartItemCount = cart.reduce((count, item) => count + item.quantity, 0);
return (
<div className={`d-flex flex-column min-vh-100 ${editingProduct ? 'modal-open' : ''}`}>
<Header cartItemCount={cart.reduce((count, item) => count + item.quantity, 0)} />
<Header cartItemCount={cartItemCount} />
<main className="flex-grow-1 py-4">
<div className="container">
<ProductAddForm onProductAdded={handleProductAdded} />
<hr className="my-4"/>
<h2 className="mb-4">Товары</h2>
<button className="btn btn-outline-secondary mb-4" onClick={handleSortByPrice}>
Сортировать по цене ({sortOrder === 'asc' ? 'возр.' : 'убыв.'})
</button>
{loading && <p>Загрузка товаров...</p>}
{error && <div className="alert alert-danger">Ошибка: {error} <button onClick={fetchProducts} className='btn btn-sm btn-link'>Попробовать снова</button></div>}
{!loading && !error &&
<ProductList
products={products}
onEdit={handleEditProduct}
onDelete={handleDeleteProduct}
onAddToCart={handleAddToCart}
<Routes>
<Route
path="/"
element={ (
<HomePage
products={products}
loading={loading}
error={error}
onEditProduct={handleEditProduct}
onDeleteProduct={handleDeleteProduct}
onAddToCart={handleAddToCart}
fetchProducts={fetchProducts}
/>
)}
/>
}
<Route
path="/add-product"
element={<AddProductPage onProductAdded={handleProductAdded} />}
/>
<Route path="/cart" element={<CartPage cart={cart} setCart={setCart} />} />
<Route path="/contacts" element={<ContactsPage />} />
<Route path="/delivery" element={<DeliveryPage />} />
<Route
path="/sales"
element={ (
<SalesPage
products={products}
loading={loading}
error={error}
onEditProduct={handleEditProduct}
onDeleteProduct={handleDeleteProduct}
onAddToCart={handleAddToCart}
fetchProducts={fetchProducts}
/>
)}
/>
<Route path="*" element={<NotFoundPage />} />
</Routes>
</div>
</main>
<Footer />

View File

@@ -2,7 +2,7 @@ import React from 'react';
function Footer() {
return (
<footer className="bg-dark text-white py-4 mt-auto"> {/* mt-auto for sticky footer with flex */}
<footer className="bg-dark text-white py-4 mt-auto"> {}
<div className="container">
<div className="row text-center text-md-start">
<div className="col-md-6 mb-4 mb-md-0">
@@ -13,14 +13,11 @@ function Footer() {
</div>
<div className="col-md-6 text-md-end">
<h3>Мы в соцсетях</h3>
{/* Assuming images are in public/images or handled via Vite's public directory feature */}
<a href="https://t.me/" target="_blank" rel="noopener noreferrer" className="me-2">
{/* <img src="/images/tg.png" alt="Telegram" style={{ width: '32px' }} /> */}
<i className="bi bi-telegram" style={{ fontSize: '32px' }}></i> {/* Using Bootstrap Icon */}
<img src="/images/tg.png" alt="Telegram" style={{ width: '32px' }} />
</a>
<a href="https://vk.com/" target="_blank" rel="noopener noreferrer">
{/* <img src="/images/vk.png" alt="VK" style={{ width: '32px' }} /> */}
<i className="bi bi-facebook" style={{ fontSize: '32px' }}></i> {/* Placeholder, use bi-vk if available or custom SVG */}
<img src="/images/vk.png" alt="VK" style={{ width: '32px' }} />
</a>
</div>
</div>

View File

@@ -1,39 +1,39 @@
import React from 'react';
import { Link } from 'react-router-dom';
// Header now accepts cartItemCount
function Header({ cartItemCount }) {
return (
<header className="custom-header py-3 bg-warning text-white">
<header className="custom-header py-3 bg-warning text-dark">
<div className="container">
<nav className="navbar navbar-expand-lg navbar-dark">
<div className="container-fluid">
<div className="logo d-flex align-items-center">
<Link to="/" className="navbar-brand d-flex align-items-center text-decoration-none text-dark fs-4 fw-bold">
<img src="/images/местерок.png" alt="Логотип МастерОК" className="me-2" style={{ height: '50px' }} />
<a href="/" className="text-decoration-none text-black fs-4 fw-bold">МастерОК</a>
</div>
МастерОК
</Link>
<button className="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span className="navbar-toggler-icon"></span>
</button>
<div className="collapse navbar-collapse" id="navbarNav">
<ul className="navbar-nav ms-auto mb-2 mb-lg-0">
<li className="nav-item me-4"><a href="#" className="nav-link text-black">Добавить</a></li>
<li className="nav-item me-4"><Link to="/add-product" className="nav-link text-dark">Добавить товар</Link></li>
<li className="nav-item dropdown me-4">
<a href="#" className="nav-link text-black dropdown-toggle" role="button" data-bs-toggle="dropdown" aria-expanded="false">
<Link to="/sales" className="nav-link text-dark dropdown-toggle" id="salesDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Акции
</a>
<ul className="dropdown-menu">
<li><a className="dropdown-item" href="#">Подарок папе</a></li>
<li><a className="dropdown-item" href="#">Супер цены</a></li>
<li><a className="dropdown-item" href="#">Постоянным клиентам</a></li>
</Link>
<ul className="dropdown-menu" aria-labelledby="salesDropdown">
<li><Link className="dropdown-item" to="/sales">Все акции</Link></li>
<li><Link className="dropdown-item" to="/sales">Праздничные акции</Link></li>
<li><Link className="dropdown-item" to="/sales">Акции частым покупателям</Link></li>
</ul>
</li>
<li className="nav-item me-4"><a href="#" className="nav-link text-black">Контакты</a></li>
<li className="nav-item me-4"><a href="#" className="nav-link text-black">Доставка</a></li>
<li className="nav-item me-4"><Link to="/contacts" className="nav-link text-dark">Контакты</Link></li>
<li className="nav-item me-4"><Link to="/delivery" className="nav-link text-dark">Доставка</Link></li>
<li className="nav-item">
<a href="#" className="nav-link text-black">
<Link to="/cart" className="nav-link text-dark">
<i className="bi bi-cart"></i> Корзина
{cartItemCount > 0 && <span className="badge bg-danger ms-1">{cartItemCount}</span>}
</a>
</Link>
</li>
</ul>
</div>

View File

@@ -57,7 +57,7 @@ function ProductAddForm({ onProductAdded }) {
setBrandId('');
setCategoryId('');
if (onProductAdded) {
onProductAdded();
onProductAdded();
}
} catch (err) {
setError(err.message);
@@ -66,86 +66,64 @@ function ProductAddForm({ onProductAdded }) {
};
return (
<div className="accordion mb-3" id="addProductAccordion">
<div className="accordion-item">
<h2 className="accordion-header" id="headingOne">
<button
className="accordion-button collapsed"
type="button"
data-bs-toggle="collapse"
data-bs-target="#collapseOne"
aria-expanded="false"
aria-controls="collapseOne"
>
Форма добавления товара
</button>
</h2>
<div
id="collapseOne"
className="accordion-collapse collapse"
aria-labelledby="headingOne"
data-bs-parent="#addProductAccordion"
>
<div className="accordion-body">
{error && <div className="alert alert-danger">{error}</div>}
{success && <div className="alert alert-success">Товар успешно добавлен!</div>}
<form onSubmit={handleSubmit}>
<div className="mb-3">
<label htmlFor="productName" className="form-label">Название товара</label>
<input
type="text"
className="form-control"
id="productName"
value={name}
onChange={(e) => setName(e.target.value)}
required
/>
</div>
<div className="mb-3">
<label htmlFor="productPrice" className="form-label">Стоимость товара (руб.)</label>
<input
type="number"
className="form-control"
id="productPrice"
value={price}
onChange={(e) => setPrice(e.target.value)}
required
/>
</div>
<div className="mb-3">
<label htmlFor="brandSelect" className="form-label">Бренд</label>
<select className="form-select" id="brandSelect" value={brandId} onChange={(e) => setBrandId(e.target.value)} required>
<option value="">Выберите бренд</option>
{brands.map(brand => (
<option key={brand.id} value={brand.id}>{brand.name}</option>
))}
</select>
</div>
<div className="mb-3">
<label htmlFor="categorySelect" className="form-label">Категория</label>
<select className="form-select" id="categorySelect" value={categoryId} onChange={(e) => setCategoryId(e.target.value)} required>
<option value="">Выберите категорию</option>
{categories.map(category => (
<option key={category.id} value={category.id}>{category.name}</option>
))}
</select>
</div>
<div className="mb-3">
<label htmlFor="productImageUrl" className="form-label">URL картинки товара</label>
<input
type="url"
className="form-control"
id="productImageUrl"
value={imageUrl}
onChange={(e) => setImageUrl(e.target.value)}
required
/>
</div>
<button type="submit" className="btn btn-primary">Добавить товар</button>
</form>
</div>
<div className="container mt-4">
<h2>Добавление нового товара</h2>
{error && <div className="alert alert-danger">{error}</div>}
{success && <div className="alert alert-success">Товар успешно добавлен!</div>}
<form onSubmit={handleSubmit}>
<div className="mb-3">
<label htmlFor="productName" className="form-label">Название товара</label>
<input
type="text"
className="form-control"
id="productName"
value={name}
onChange={(e) => setName(e.target.value)}
required
/>
</div>
</div>
<div className="mb-3">
<label htmlFor="productPrice" className="form-label">Стоимость товара (руб.)</label>
<input
type="number"
className="form-control"
id="productPrice"
value={price}
onChange={(e) => setPrice(e.target.value)}
required
/>
</div>
<div className="mb-3">
<label htmlFor="brandSelect" className="form-label">Бренд</label>
<select className="form-select" id="brandSelect" value={brandId} onChange={(e) => setBrandId(e.target.value)} required>
<option value="">Выберите бренд</option>
{brands.map(brand => (
<option key={brand.id} value={brand.id}>{brand.name}</option>
))}
</select>
</div>
<div className="mb-3">
<label htmlFor="categorySelect" className="form-label">Категория</label>
<select className="form-select" id="categorySelect" value={categoryId} onChange={(e) => setCategoryId(e.target.value)} required>
<option value="">Выберите категорию</option>
{categories.map(category => (
<option key={category.id} value={category.id}>{category.name}</option>
))}
</select>
</div>
<div className="mb-3">
<label htmlFor="productImageUrl" className="form-label">URL картинки товара</label>
<input
type="url"
className="form-control"
id="productImageUrl"
value={imageUrl}
onChange={(e) => setImageUrl(e.target.value)}
required
/>
</div>
<button type="submit" className="btn btn-primary">Добавить товар</button>
</form>
</div>
);
}

View File

@@ -6,7 +6,9 @@ function ProductCard({ product, onEdit, onDelete, onAddToCart }) {
const discountPrice = product.discountPrice ? parseFloat(product.discountPrice) : null;
const [brand, setBrand] = useState(null);
const [category, setCategory] = useState(null);
const isOnSale = discountPrice !== null && discountPrice < regularPrice;
useEffect(() => {
fetch(`/api/brands/${product.brandId}`)
.then(res => res.json())
@@ -18,6 +20,7 @@ function ProductCard({ product, onEdit, onDelete, onAddToCart }) {
.then(setCategory)
.catch(console.error);
}, [product]);
return (
<div className="col">
<div className={`card h-100 ${isOnSale ? 'border-danger' : ''}`}>

View File

@@ -29,7 +29,7 @@ function ProductEditForm({ product, onProductUpdated, onClose }) {
}
fetch('/api/brands').then(res => res.json()).then(setBrands).catch(console.error);
fetch('/api/categories').then(res => res.json()).then(setCategories).catch(console.error);
}, [product]);
}, [product]);
const handleSubmit = async (e) => {
e.preventDefault();
@@ -65,7 +65,7 @@ function ProductEditForm({ product, onProductUpdated, onClose }) {
setSuccess(true);
if (onProductUpdated) {
onProductUpdated();
onProductUpdated();
}
} catch (err) {
setError(err.message);

View File

@@ -9,11 +9,11 @@ function ProductList({ products, onEdit, onDelete, onAddToCart }) {
return (
<div className="row row-cols-1 row-cols-md-3 row-cols-lg-4 g-4">
{products.map(product => (
<ProductCard
key={product.id}
product={product}
onEdit={onEdit}
onDelete={onDelete}
<ProductCard
key={product.id}
product={product}
onEdit={onEdit}
onDelete={onDelete}
onAddToCart={onAddToCart}
/>
))}

Binary file not shown.

View File

@@ -12,14 +12,13 @@ code {
monospace;
}
/* Basic App styling placeholder */
.App {
text-align: center;
}
.App-header {
background-color: #282c34;
background-color: #c79840;
min-height: 10vh;
display: flex;
flex-direction: column;

View File

@@ -1,10 +1,13 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { BrowserRouter } from 'react-router-dom';
import App from './App.jsx';
import './index.css';
import './index.css';
ReactDOM.createRoot(document.getElementById('root')).render(
<React.StrictMode>
<App />
<BrowserRouter>
<App />
</BrowserRouter>
</React.StrictMode>,
);
);

View File

@@ -0,0 +1,24 @@
import React from 'react';
import ProductAddForm from '../components/ProductAddForm';
import { useNavigate } from 'react-router-dom';
function AddProductPage({ onProductAdded }) {
const navigate = useNavigate();
const handleFormSubmitted = () => {
if (onProductAdded) {
onProductAdded();
}
navigate('/');
};
return (
<div>
<ProductAddForm onProductAdded={handleFormSubmitted} />
</div>
);
}
export default AddProductPage;

View File

@@ -0,0 +1,168 @@
import React, { useState, useEffect } from 'react';
import { Link } from 'react-router-dom';
function CartPage({ cart, setCart }) {
const [firstName, setFirstName] = useState('');
const [lastName, setLastName] = useState('');
const [phone, setPhone] = useState('');
const handleRemoveFromCart = (productId) => {
setCart(prevCart => prevCart.filter(item => item.id !== productId));
};
const handleUpdateQuantity = (productId, newQuantity) => {
if (newQuantity < 1) {
handleRemoveFromCart(productId);
return;
}
setCart(prevCart =>
prevCart.map(item =>
item.id === productId ? { ...item, quantity: newQuantity } : item
)
);
};
const calculateTotalPrice = () => {
return cart.reduce((total, item) => {
const price = parseFloat(item.discountPrice && parseFloat(item.discountPrice) < parseFloat(item.price) ? item.discountPrice : item.price);
return total + price * item.quantity;
}, 0).toFixed(2);
};
const handleCheckoutSubmit = (event) => {
event.preventDefault();
const orderDetails = {
customer: {
firstName,
lastName,
phone,
},
items: cart,
total: calculateTotalPrice(),
orderDate: new Date().toISOString(),
};
console.log("Новый заказ:", orderDetails);
alert("Спасибо за ваш заказ! Ваш заказ успешно оформлен.");
setFirstName('');
setLastName('');
setPhone('');
setCart([]);
const modalElement = document.getElementById('checkoutModal');
if (modalElement && window.bootstrap) {
const modalInstance = window.bootstrap.Modal.getInstance(modalElement);
if (modalInstance) {
modalInstance.hide();
}
}
};
if (!cart || cart.length === 0) {
return (
<div className="text-center">
<h1>Корзина пуста</h1>
<p>Похоже, вы еще ничего не добавили в корзину.</p>
<Link to="/" className="btn btn-primary">К товарам</Link>
</div>
);
}
return (
<div>
<h1 className="mb-4">Ваша корзина</h1>
<div className="list-group mb-4">
{cart.map(item => {
const itemPrice = parseFloat(item.discountPrice && parseFloat(item.discountPrice) < parseFloat(item.price) ? item.discountPrice : item.price);
return (
<div key={item.id} className="list-group-item list-group-item-action flex-column align-items-start">
<div className="row">
<div className="col-md-2 col-lg-1 mb-2 mb-md-0">
<img src={item.image || 'https://via.placeholder.com/100x100.png?text=No+Image'} alt={item.name} className="img-fluid rounded" style={{maxHeight: '75px', objectFit: 'contain'}}/>
</div>
<div className="col-md-5 col-lg-6">
<h5 className="mb-1">{item.name}</h5>
<p className="mb-1 text-muted" style={{fontSize: '0.9em'}}>Цена: {itemPrice.toFixed(2)} руб.</p>
</div>
<div className="col-md-3 col-lg-3 d-flex align-items-center">
<button
className="btn btn-outline-secondary btn-sm me-2"
onClick={() => handleUpdateQuantity(item.id, item.quantity - 1)}
disabled={item.quantity <= 1} // Disable if quantity is 1 to prevent going below 1 (remove instead)
>
-
</button>
<span>{item.quantity}</span>
<button
className="btn btn-outline-secondary btn-sm ms-2"
onClick={() => handleUpdateQuantity(item.id, item.quantity + 1)}
>
+
</button>
</div>
<div className="col-md-2 col-lg-2 d-flex align-items-center justify-content-end">
<button
className="btn btn-danger btn-sm"
onClick={() => handleRemoveFromCart(item.id)}
>
<i className="bi bi-trash"></i> Удалить
</button>
</div>
</div>
<div className="row mt-2">
<div className="col text-end">
<strong>Сумма по товару: {(itemPrice * item.quantity).toFixed(2)} руб.</strong>
</div>
</div>
</div>
);
})}
</div>
<div className="d-flex justify-content-end align-items-center mb-3">
<h3>Итого: {calculateTotalPrice()} руб.</h3>
</div>
<div className="d-flex justify-content-end">
<Link to="/" className="btn btn-outline-secondary me-2">Продолжить покупки</Link>
<button className="btn btn-primary" data-bs-toggle="modal" data-bs-target="#checkoutModal">
Оформить заказ
</button>
</div>
<div className="modal fade" id="checkoutModal" tabIndex="-1" aria-labelledby="checkoutModalLabel" aria-hidden="true">
<div className="modal-dialog modal-dialog-centered">
<div className="modal-content">
<div className="modal-header">
<h5 className="modal-title" id="checkoutModalLabel">Оформление заказа</h5>
<button type="button" className="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div className="modal-body">
<p>Общая сумма заказа: <strong>{calculateTotalPrice()}</strong> руб.</p>
{/* Attach onSubmit to the form and manage input values with state */}
<form id="checkoutForm" onSubmit={handleCheckoutSubmit}>
<div className="mb-3">
<label htmlFor="firstName" className="form-label">Имя</label>
<input type="text" className="form-control" id="firstName" value={firstName} onChange={e => setFirstName(e.target.value)} required />
</div>
<div className="mb-3">
<label htmlFor="lastName" className="form-label">Фамилия</label>
<input type="text" className="form-control" id="lastName" value={lastName} onChange={e => setLastName(e.target.value)} required />
</div>
<div className="mb-3">
<label htmlFor="phone" className="form-label">Телефон</label>
<input type="tel" className="form-control" id="phone" value={phone} onChange={e => setPhone(e.target.value)} required />
</div>
<div className="modal-footer">
<button type="button" className="btn btn-secondary" data-bs-dismiss="modal">Отмена</button>
<button type="submit" className="btn btn-primary">Подтвердить заказ</button> { /* form attribute is no longer strictly needed but harmless */}
</div>
</form>
</div>
</div>
</div>
</div>
</div>
);
}
export default CartPage;

View File

@@ -0,0 +1,39 @@
import React from 'react';
function ContactsPage() {
return (
<main class="py-4">
<div class="container">
<h1 class="text-center mb-4">Контакты</h1>
<div class="card mb-4">
<div class="card-body">
<h2 class="card-title">Оформить заказ и узнать наличие</h2>
<p class="card-text"><i class="bi bi-telephone"></i> +7 (8422) 99-99-90</p>
<p class="card-text">ПН - ВС: 8:00 - 20:00</p>
<p class="card-text"><i class="bi bi-envelope"></i> <a href="mailto:masterok@mail.ru">masterok@mail.ru</a></p>
</div>
</div>
<div class="card mb-4">
<div class="card-body">
<h2 class="card-title">Обратная связь</h2>
<p class="card-text">Оставьте свои вопросы, пожелания и комментарии</p>
<a href="#" class="btn btn-warning">НАПИСАТЬ</a>
</div>
</div>
<div class="card">
<div class="card-body">
<h2 class="card-title">Реквизиты</h2>
<p class="card-text">Наименование: ООО «МастерОК»</p>
<p class="card-text"><i class="bi bi-house-door"></i> Адрес: г. Ульяновск, ул. Северный венец, д. 32, к. 3</p>
<p class="card-text">ИНН: 6666666666</p>
<p class="card-text">ОГРН: 1111111111111</p>
<p class="card-text">КПП: 666666666</p>
<p class="card-text">Расчетный счет: 40702810154400028559</p>
</div>
</div>
</div>
</main>
);
}
export default ContactsPage;

View File

@@ -0,0 +1,47 @@
import React from 'react';
function DeliveryPage() {
return (
<main class="py-4">
<div class="container">
<h1 class="text-center mb-4">Доставка</h1>
<div class="card mb-4">
<div class="card-body">
<h3 class="card-title">Шаг 1: Выберите товар</h3>
<p class="card-text">Перейдите в каталог нашего магазина и выберите нужный товар. Добавьте его в корзину.</p>
</div>
</div>
<div class="card mb-4">
<div class="card-body">
<h3 class="card-title">Шаг 2: Оформите заказ</h3>
<p class="card-text">Перейдите в корзину и нажмите на кнопку "Оформить заказ". Заполните необходимые данные для доставки.</p>
</div>
</div>
<div class="card mb-4">
<div class="card-body">
<h3 class="card-title">Шаг 3: Оплатите заказ</h3>
<p class="card-text">Выберите удобный способ оплаты и завершите процесс оплаты. После подтверждения оплаты ваш заказ будет обработан.</p>
</div>
</div>
<div class="card mb-4">
<div class="card-body">
<h3 class="card-title">Шаг 4: Получите заказ</h3>
<p class="card-text">После обработки заказа мы отправим его вам. Вы получите уведомление о доставке с номером для отслеживания.</p>
</div>
</div>
<div class="card">
<div class="card-body">
<h2 class="card-title">Способы оплаты</h2>
<ul class="list-unstyled">
<li><i class="bi bi-check2"></i> Банковская карта (Visa, MasterCard, Мир)</li>
<li><i class="bi bi-check2"></i> Электронные кошельки (WebMoney, Яндекс.Деньги)</li>
<li><i class="bi bi-check2"></i> Наложенный платеж (оплата при получении)</li>
</ul>
</div>
</div>
</div>
</main>
);
}
export default DeliveryPage;

View File

@@ -0,0 +1,86 @@
import React, { useEffect, useState } from 'react';
import ProductList from '../components/ProductList';
function HomePage(props) {
const {
products,
loading,
error,
onEditProduct,
onDeleteProduct,
onAddToCart,
fetchProducts
} = props;
const [sortedProducts, setSortedProducts] = useState([]);
const [sortOrder, setSortOrder] = useState('asc');
const [selectedCategoryId, setSelectedCategoryId] = useState('all');
const [categories, setCategories] = useState([]);
useEffect(() => {
fetch('http://localhost:3000/categories')
.then(res => res.json())
.then(data => setCategories([{ id: 'all', name: 'Все категории' }, ...data]))
.catch(err => console.error('Ошибка при загрузке категорий:', err));
}, []);
useEffect(() => {
let filtered = selectedCategoryId === 'all'
? products
: products.filter(p => p.categoryId === selectedCategoryId);
setSortedProducts(filtered);
}, [products, selectedCategoryId]);
const handleSortByPrice = () => {
const sorted = [...sortedProducts].sort((a, b) =>
sortOrder === 'asc' ? a.price - b.price : b.price - a.price
);
setSortedProducts(sorted);
setSortOrder(prev => (prev === 'asc' ? 'desc' : 'asc'));
};
const handleCategoryChange = (e) => {
setSelectedCategoryId(e.target.value);
};
return (
<div>
<h2 className="mb-4">Товары</h2>
<button className="btn btn-outline-secondary mb-4" onClick={handleSortByPrice}>
Сортировать по цене ({sortOrder === 'asc' ? 'возр.' : 'убыв.'})
</button>
<div className="mb-3">
<label htmlFor="categoryFilter" className="form-label">Фильтр по категории:</label>
<select
id="categoryFilter"
className="form-select"
value={selectedCategoryId}
onChange={handleCategoryChange}
>
{categories.map((cat) => (
<option key={cat.id} value={cat.id}>
{cat.name}
</option>
))}
</select>
</div>
{loading && <p>Загрузка товаров...</p>}
{error && (
<div className="alert alert-danger">
Ошибка: {error}
<button onClick={fetchProducts} className='btn btn-sm btn-link'>Попробовать снова</button>
</div>
)}
{!loading && !error && (
<ProductList
products={sortedProducts}
onEdit={onEditProduct}
onDelete={onDeleteProduct}
onAddToCart={onAddToCart}
/>
)}
</div>
);
}
export default HomePage;

View File

@@ -0,0 +1,14 @@
import React from 'react';
import { Link } from 'react-router-dom';
function NotFoundPage() {
return (
<div className="text-center mt-5">
<h1>404 - Страница не найдена</h1>
<p>Извините, запрашиваемая вами страница не существует.</p>
<Link to="/" className="btn btn-primary">На главную</Link>
</div>
);
}
export default NotFoundPage;

View File

@@ -0,0 +1,75 @@
import React, { useState, useEffect, useCallback } from 'react';
import ProductList from '../components/ProductList';
function SalesPage({ products, loading, error, onEditProduct, onDeleteProduct, onAddToCart, fetchProducts }) {
const [saleProducts, setSaleProducts] = useState([]);
useEffect(() => {
if (products && products.length > 0) {
const filtered = products.filter(p => {
const regularPrice = parseFloat(p.price);
const discountPrice = p.discountPrice ? parseFloat(p.discountPrice) : null;
return discountPrice !== null && discountPrice < regularPrice;
});
setSaleProducts(filtered);
}
}, [products]);
return (
<main class="flex-grow-1 py-4">
<div class="container">
<h2 className="mb-4">Текущие</h2>
<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-4">
<div class="col">
<div class="card h-100">
<img src="public/images/акциямасла.jpg" class="card-img-top" alt="GNV Акция"/>
<div class="card-body">
<h5 class="card-title">Подарок при покупке моторного масла GNV</h5>
<p class="card-text">Действует до 20 февраля 2025</p>
</div>
</div>
</div>
<div class="col">
<div class="card h-100">
<img src="public/images/акция23февраля.jpg" class="card-img-top" alt="Подарок папе"/>
<div class="card-body">
<h5 class="card-title">Подарок папе</h5>
<p class="card-text">Действует до 23 февраля 2025</p>
</div>
</div>
</div>
<div class="col">
<div class="card h-100">
<img src="public/images/акциямакита.jpg" class="card-img-top" alt="Makita Акция"/>
<div class="card-body">
<h5 class="card-title">Подарок при покупке инструмента Makita</h5>
<p class="card-text">Действует до 24 февраля 2025</p>
</div>
</div>
</div>
<div class="col">
<div class="card h-100">
<img src="public/images/акциястанки.jpg" class="card-img-top" alt="BELMASH Акция"/>
<div class="card-body">
<h5 class="card-title">Супер цены на станки BELMASH</h5>
<p class="card-text">Действует до 28 февраля 2025</p>
</div>
</div>
</div>
<div class="col">
<div class="card h-100">
<img src="public/images/масло.jpg" class="card-img-top" alt="Масло Акция"/>
<div class="card-body">
<h5 class="card-title">Масло в подарок при покупке компрессора</h5>
<p class="card-text">Действует до 1 марта 2025</p>
</div>
</div>
</div>
</div>
</div>
</main>
);
}
export default SalesPage;

Binary file not shown.

Binary file not shown.

BIN
Отчет_6.docx Normal file

Binary file not shown.