anibilag/lawnmowing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Версия 0.3.0 Отдельные .env файлы для локальной разработки и для Docker.

Browse Source
This commit is contained in:
anibilag 2025-07-10 14:27:16 +03:00
parent 41c21b9d25
commit 4cf6f8034c
8 changed files with 56 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.env → .env.development
View File

1
.env.docker Normal file
View File

@ -0,0 +1 @@
VITE_API_URL=/api

2
docker-compose.dev.yml
View File

@ -18,6 +18,8 @@ services:
environment: environment:
- NODE_ENV=development - NODE_ENV=development
- CHOKIDAR_USEPOLLING=true - CHOKIDAR_USEPOLLING=true
env_file:
- .env.docker
networks: networks:
- lawn-scheduler-dev-network - lawn-scheduler-dev-network

92
package-lock.json generated
View File

@ -1,18 +1,18 @@
{ {
"name": "lawn-mowing-scheduler", "name": "lawn-mowing-scheduler",
"version": "0.0.0", "version": "0.2.5",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "lawn-mowing-scheduler", "name": "lawn-mowing-scheduler",
"version": "0.0.0", "version": "0.2.5",
"dependencies": { "dependencies": {
"@libsql/client": "^0.4.0", "@libsql/client": "^0.4.0",
"cors": "^2.8.5", "cors": "^2.8.5",
"express": "^4.18.2", "express": "^4.18.2",
"lucide-react": "^0.344.0", "lucide-react": "^0.344.0",
"multer": "^1.4.5-lts.1", "multer": "^2.0.1",
"react": "^18.3.1", "react": "^18.3.1",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",
"react-router-dom": "^6.26.0" "react-router-dom": "^6.26.0"
@ -2329,17 +2329,17 @@
"dev": true "dev": true
}, },
"node_modules/concat-stream": { "node_modules/concat-stream": {
"version": "1.6.2", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
"engines": [ "engines": [
"node >= 0.8" "node >= 6.0"
], ],
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"buffer-from": "^1.0.0", "buffer-from": "^1.0.0",
"inherits": "^2.0.3", "inherits": "^2.0.3",
"readable-stream": "^2.2.2", "readable-stream": "^3.0.2",
"typedarray": "^0.0.6" "typedarray": "^0.0.6"
} }
}, },
@ -2505,12 +2505,6 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/core-util-is": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
"license": "MIT"
},
"node_modules/cors": { "node_modules/cors": {
"version": "2.8.5", "version": "2.8.5",
"resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
@ -3725,12 +3719,6 @@
"node": ">=0.12.0" "node": ">=0.12.0"
} }
}, },
"node_modules/isarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
"license": "MIT"
},
"node_modules/isexe": { "node_modules/isexe": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@ -4100,22 +4088,21 @@
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
}, },
"node_modules/multer": { "node_modules/multer": {
"version": "1.4.5-lts.2", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.2.tgz", "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
"integrity": "sha512-VzGiVigcG9zUAoCNU+xShztrlr1auZOlurXynNvO9GiWD1/mTBbUljOKY+qMeazBqXgRnjzeEgJI/wyjJUHg9A==", "integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
"deprecated": "Multer 1.x is impacted by a number of vulnerabilities, which have been patched in 2.x. You should upgrade to the latest 2.x version.",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"append-field": "^1.0.0", "append-field": "^1.0.0",
"busboy": "^1.0.0", "busboy": "^1.6.0",
"concat-stream": "^1.5.2", "concat-stream": "^2.0.0",
"mkdirp": "^0.5.4", "mkdirp": "^0.5.6",
"object-assign": "^4.1.1", "object-assign": "^4.1.1",
"type-is": "^1.6.4", "type-is": "^1.6.18",
"xtend": "^4.0.0" "xtend": "^4.0.2"
}, },
"engines": { "engines": {
"node": ">= 6.0.0" "node": ">= 10.16.0"
} }
}, },
"node_modules/mz": { "node_modules/mz": {
@ -4621,12 +4608,6 @@
"node": ">= 0.8.0" "node": ">= 0.8.0"
} }
}, },
"node_modules/process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
"license": "MIT"
},
"node_modules/proxy-addr": { "node_modules/proxy-addr": {
"version": "2.0.7", "version": "2.0.7",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@ -4789,26 +4770,19 @@
} }
}, },
"node_modules/readable-stream": { "node_modules/readable-stream": {
"version": "2.3.8", "version": "3.6.2",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"core-util-is": "~1.0.0", "inherits": "^2.0.3",
"inherits": "~2.0.3", "string_decoder": "^1.1.1",
"isarray": "~1.0.0", "util-deprecate": "^1.0.1"
"process-nextick-args": "~2.0.0", },
"safe-buffer": "~5.1.1", "engines": {
"string_decoder": "~1.1.1", "node": ">= 6"
"util-deprecate": "~1.0.1"
} }
}, },
"node_modules/readable-stream/node_modules/safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"license": "MIT"
},
"node_modules/readdirp": { "node_modules/readdirp": {
"version": "3.6.0", "version": "3.6.0",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@ -5224,20 +5198,14 @@
} }
}, },
"node_modules/string_decoder": { "node_modules/string_decoder": {
"version": "1.1.1", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"safe-buffer": "~5.1.0" "safe-buffer": "~5.2.0"
} }
}, },
"node_modules/string_decoder/node_modules/safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"license": "MIT"
},
"node_modules/string-width": { "node_modules/string-width": {
"version": "5.1.2", "version": "5.1.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",

4
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "lawn-mowing-scheduler", "name": "lawn-mowing-scheduler",
"private": true, "private": true,
"version": "0.2.5", "version": "0.3.0",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "concurrently \"npm run server\" \"npm run client\"", "dev": "concurrently \"npm run server\" \"npm run client\"",
@ -16,7 +16,7 @@
"cors": "^2.8.5", "cors": "^2.8.5",
"express": "^4.18.2", "express": "^4.18.2",
"lucide-react": "^0.344.0", "lucide-react": "^0.344.0",
"multer": "^1.4.5-lts.1", "multer": "^2.0.1",
"react": "^18.3.1", "react": "^18.3.1",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",
"react-router-dom": "^6.26.0" "react-router-dom": "^6.26.0"

4
src/components/BulkMowingModal.tsx
View File

@ -169,7 +169,7 @@ const BulkMowingModal: React.FC<BulkMowingModalProps> = ({
{/* Zone Selection */} {/* Zone Selection */}
<div> <div>
<label className="block text-sm font-medium text-gray-700 mb-3"> <label className="block text-sm font-medium text-gray-700 mb-3">
Выберите зоны для скашивания ({formData.selectedZoneIds.length} выбрано) Выберите скошенные зоны ({formData.selectedZoneIds.length} выбрано)
</label> </label>
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-3 max-h-60 overflow-y-auto border rounded-lg p-3"> <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-3 max-h-60 overflow-y-auto border rounded-lg p-3">
{zones.map(zone => ( {zones.map(zone => (
@ -320,7 +320,7 @@ const BulkMowingModal: React.FC<BulkMowingModalProps> = ({
<div className="bg-gray-50 rounded-lg p-4"> <div className="bg-gray-50 rounded-lg p-4">
<h4 className="text-sm font-medium text-gray-900 mb-3 flex items-center gap-2"> <h4 className="text-sm font-medium text-gray-900 mb-3 flex items-center gap-2">
<Timer className="h-4 w-4" /> <Timer className="h-4 w-4" />
{activityType === 'trimming' ? 'Trimming' : 'Mowing'} Time Distribution Preview {activityType === 'trimming' ? 'Подравнивание' : 'Покос'} Time Distribution Preview
</h4> </h4>
<div className="space-y-2"> <div className="space-y-2">
{timeDistribution.map(({ zone, proportion, allocatedTime }) => ( {timeDistribution.map(({ zone, proportion, allocatedTime }) => (

54
src/components/Dashboard.tsx
View File

@ -1,5 +1,5 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { Plus, Filter, Calendar, Scissors, AlertTriangle, Square, CheckCircle, Clock, Map, History, Zap } from './Icons'; import { Plus, Filter, Calendar, Scissors, AlertTriangle, Square, CheckCircle, Clock, Map, History } from './Icons';
import { Zone, MowingFormData, BulkMowingFormData } from '../types/zone'; import { Zone, MowingFormData, BulkMowingFormData } from '../types/zone';
import { api } from '../services/api'; import { api } from '../services/api';
import ZoneCard from './ZoneCard'; import ZoneCard from './ZoneCard';
@ -176,10 +176,6 @@ const Dashboard: React.FC = () => {
.filter(zone => zone.status === 'ok') .filter(zone => zone.status === 'ok')
.reduce((sum, zone) => sum + zone.area, 0); .reduce((sum, zone) => sum + zone.area, 0);
const remainingArea = zones
.filter(zone => zone.status === 'due' || zone.status === 'overdue' || zone.status === 'new')
.reduce((sum, zone) => sum + zone.area, 0);
const mowedPercentage = totalArea > 0 ? (mowedArea / totalArea) * 100 : 0; const mowedPercentage = totalArea > 0 ? (mowedArea / totalArea) * 100 : 0;
// Check if there are zones that need mowing for bulk action // Check if there are zones that need mowing for bulk action
@ -245,30 +241,6 @@ const Dashboard: React.FC = () => {
История История
</button> </button>
</div> </div>
{/* Bulk Mowing Button */}
{view === 'dashboard' && zonesNeedingMowing.length > 0 && (
<div className="flex gap-2">
{/*
<button
onClick={() => setShowBulkMowingModal(true)}
className="bg-orange-600 hover:bg-orange-700 text-white px-6 py-3 rounded-lg flex items-center gap-2 transition-colors duration-200 shadow-lg hover:shadow-xl"
>
<Scissors className="h-5 w-5" />
Массовый покос ({zonesNeedingMowing.length})
</button>
*/}
<button
onClick={() => setShowBulkTrimmingModal(true)}
className="bg-purple-600 hover:bg-purple-700 text-white px-6 py-3 rounded-lg flex items-center gap-2 transition-colors duration-200 shadow-lg hover:shadow-xl"
>
<Zap className="h-5 w-5" />
Массовое выравнование
</button>
</div>
)}
<button <button
onClick={() => setShowForm(true)} onClick={() => setShowForm(true)}
className="bg-green-600 hover:bg-green-700 text-white px-6 py-3 rounded-lg flex items-center gap-2 transition-colors duration-200 shadow-lg hover:shadow-xl" className="bg-green-600 hover:bg-green-700 text-white px-6 py-3 rounded-lg flex items-center gap-2 transition-colors duration-200 shadow-lg hover:shadow-xl"
@ -405,19 +377,27 @@ const Dashboard: React.FC = () => {
<Scissors className="h-5 w-5 text-orange-600" /> <Scissors className="h-5 w-5 text-orange-600" />
<div> <div>
<h4 className="text-sm font-medium text-orange-800"> <h4 className="text-sm font-medium text-orange-800">
Необходимо скосить несколько зон Необходимо скосить или подравнять несколько зон
</h4> </h4>
<p className="text-sm text-orange-700"> <p className="text-sm text-orange-700">
Используйте массовое скашивание для записи нескольких зон, скошенных за один сеанс, с пропорциональным распределением времени Используйте массовые операции для нескольких зон, за один сеанс, с пропорциональным распределением времени
</p> </p>
</div> </div>
</div> </div>
<button <div className="flex gap-2">
onClick={() => setShowBulkMowingModal(true)} <button
className="bg-orange-600 hover:bg-orange-700 text-white px-4 py-2 rounded-md text-sm font-medium transition-colors duration-200" onClick={() => setShowBulkMowingModal(true)}
> className="bg-orange-600 hover:bg-orange-700 text-white px-4 py-2 rounded-md text-sm font-medium transition-colors duration-200"
Массовый покос ({zonesNeedingMowing.length}) >
</button> Покос ({zonesNeedingMowing.length})
</button>
<button
onClick={() => setShowBulkTrimmingModal(true)}
className="bg-purple-600 hover:bg-purple-700 text-white px-4 py-2 rounded-md text-sm font-medium transition-colors duration-200"
>
Подравнование
</button>
</div>
</div> </div>
</div> </div>
)} )}

4
src/components/HistoryView.tsx
View File

@ -123,7 +123,7 @@ const HistoryView: React.FC<HistoryViewProps> = ({ zones }) => {
}; };
const getActivityLabel = (activityType?: string) => { const getActivityLabel = (activityType?: string) => {
return activityType === 'trimming' ? 'Trimming' : 'Mowing'; return activityType === 'trimming' ? 'Подравнивание' : 'Покос';
}; };
// Group history entries by session // Group history entries by session
@ -365,7 +365,7 @@ const HistoryView: React.FC<HistoryViewProps> = ({ zones }) => {
</div> </div>
)} )}
<h4 className="text-lg font-medium text-gray-900"> <h4 className="text-lg font-medium text-gray-900">
Массовая {getActivityLabel(session.entries[0]?.activityType)} сессия Массовая сессия - {getActivityLabel(session.entries[0]?.activityType)}
</h4> </h4>
<span className={`text-xs font-medium px-2.5 py-0.5 rounded-full ${ <span className={`text-xs font-medium px-2.5 py-0.5 rounded-full ${
session.entries[0]?.activityType === 'trimming' session.entries[0]?.activityType === 'trimming'