diff --git a/db/lawn_scheduler.db b/db/lawn_scheduler.db index f5befce..81eae8f 100644 Binary files a/db/lawn_scheduler.db and b/db/lawn_scheduler.db differ diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c0f58f6..494a414 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -14,7 +14,7 @@ services: - .:/app - /app/node_modules - ./uploads:/app/uploads - - ./db:/app/db + - ./db:/app/db:rw environment: - NODE_ENV=development - CHOKIDAR_USEPOLLING=true diff --git a/docker-compose.yml b/docker-compose.yml index 9625add..c5d206b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: restart: unless-stopped volumes: - ./uploads:/app/uploads - - ./lawn_scheduler.db:/app/lawn_scheduler.db + - ./lawn_scheduler.db:/app/db/lawn_scheduler.db environment: - NODE_ENV=production networks: diff --git a/package.json b/package.json index f7fe8f1..d276c07 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "lawn-mowing-scheduler", "private": true, - "version": "0.3.0", + "version": "0.3.1", "type": "module", "scripts": { "dev": "concurrently \"npm run server\" \"npm run client\"", diff --git a/scripts/start-dev.sh b/scripts/start-dev.sh index d22aad8..f93c5af 100644 --- a/scripts/start-dev.sh +++ b/scripts/start-dev.sh @@ -6,13 +6,13 @@ echo "Starting Lawn Scheduler in Development Mode..." mkdir -p uploads # Build and start services -docker-compose -f docker-compose.dev.yml down -docker-compose -f docker-compose.dev.yml build --no-cache -docker-compose -f docker-compose.dev.yml up -d +docker compose -f docker-compose.dev.yml down +docker compose -f docker-compose.dev.yml build --no-cache +docker compose -f docker-compose.dev.yml up -d echo "Development environment started!" echo "Frontend (Vite): http://localhost:8080" echo "Backend API: http://localhost:3001" echo "" -echo "To view logs: docker-compose -f docker-compose.dev.yml logs -f" -echo "To stop: docker-compose -f docker-compose.dev.yml down" \ No newline at end of file +echo "To view logs: docker compose -f docker-compose.dev.yml logs -f" +echo "To stop: docker compose -f docker-compose.dev.yml down" \ No newline at end of file diff --git a/scripts/start-prod.sh b/scripts/start-prod.sh index 52d5a46..ff0f190 100644 --- a/scripts/start-prod.sh +++ b/scripts/start-prod.sh @@ -7,12 +7,12 @@ mkdir -p nginx/conf.d mkdir -p uploads # Build and start services -docker-compose down -docker-compose build --no-cache -docker-compose up -d +docker compose down +docker compose build --no-cache +docker compose up -d echo "Application started!" echo "Access the application at: http://localhost" echo "" -echo "To view logs: docker-compose logs -f" -echo "To stop: docker-compose down" \ No newline at end of file +echo "To view logs: docker compose logs -f" +echo "To stop: docker compose down" \ No newline at end of file diff --git a/server/index.js b/server/index.js index c9ea70a..d68b4a0 100644 --- a/server/index.js +++ b/server/index.js @@ -641,7 +641,11 @@ app.put('/api/zones/:id', upload.single('image'), async (req, res) => { sql = 'UPDATE zones SET name = ?, imagePath = ?, lastMowedDate = ?, intervalDays = ?, scheduleType = ?, nextMowDate = NULL, area = ? WHERE id = ?'; args = [name, imagePath, lastMowedDate || null, parseInt(intervalDays), scheduleType || 'interval', parseFloat(area) || 0, req.params.id]; } - + + console.log('Updating zone with data:', { name, intervalDays, lastMowedDate, nextMowDate, scheduleType, area }); + console.log('SQL:', sql); + console.log('ARGS:', args); + await db.execute({ sql, args }); // Delete old image if new one was provided diff --git a/src/components/Dashboard.tsx b/src/components/Dashboard.tsx index d31f141..9fa8148 100644 --- a/src/components/Dashboard.tsx +++ b/src/components/Dashboard.tsx @@ -290,7 +290,7 @@ const Dashboard: React.FC = () => {
Актуально
{okCount}
-обслужено зон
+зон обслужено