remove address auto-parsing and always display address detail fields in DeliveryForm

.env.production.example

@@ -0,0 +1,15 @@
+# Database
+POSTGRES_USER=delivery_user
+POSTGRES_PASSWORD=your_secure_password_here
+POSTGRES_DB=delivery_tracker
+
+# JWT
+JWT_SECRET=your_random_jwt_secret_min_32_chars
+
+# Seed admin password
+SEED_ADMIN_PASSWORD=your_secure_password_here
+
+# Gitea Registry credentials for Watchtower
+GITEA_REGISTRY=gitea.chedius.ru/chedius
+GITEA_USER=chedius
+GITEA_TOKEN=your_gitea_token_or_password

.gitea/workflows/deploy.yml

@@ -0,0 +1,48 @@
+name: Build and Push Docker Images
+
+on:
+  push:
+    branches: [main, master]
+
+jobs:
+  build-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Login to Gitea Registry
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.chedius.ru
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.GITEA_TOKEN }}
+
+      - name: Build and push backend
+        uses: docker/build-push-action@v5
+        with:
+          context: ./backend
+          push: true
+          tags: |
+            gitea.gitea.chedius.ru/${{ gitea.repository_owner }}/delivery-tracker/backend:latest
+            gitea.gitea.chedius.ru/${{ gitea.repository_owner }}/delivery-tracker/backend:${{ gitea.sha }}
+
+  build-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Login to Gitea Registry
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.chedius.ru
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.GITEA_TOKEN }}
+
+      - name: Build and push frontend
+        uses: docker/build-push-action@v5
+        with:
+          context: ./frontend
+          push: true
+          tags: |
+            gitea.gitea.chedius.ru/${{ gitea.repository_owner }}/delivery-tracker/frontend:latest
+            gitea.gitea.chedius.ru/${{ gitea.repository_owner }}/delivery-tracker/frontend:${{ gitea.sha }}

.gitignore

@@ -9,6 +9,7 @@ lerna-debug.log*
 
 node_modules
 dist
+dev-dist
 dist-ssr
 *.local
 
@@ -16,6 +17,8 @@ dist-ssr
 .env
 .env.local
 .env.*.local
+backend/.env
+backend/.env.local
 
 # Testing
 coverage

DEPLOY.md

@@ -0,0 +1,168 @@
+# Автоматический деплой на LXC + Docker + Nginx Proxy Manager
+
+## Схема работы
+
+```
+[Git Push] → [Gitea Actions] → [Build Images] → [Gitea Registry]
+                                               ↓
+[LXC Server] ← [Watchtower] ← [Poll every 60s]
+       ↓
+[Nginx Proxy Manager] → [HTTPS] → [frontend:80]
+                                         ↓
+                              /api/* → [backend:8080] (внутри сети)
+```
+
+## Пошаговая настройка
+
+### 1. Настройка Gitea
+
+В конфиге Gitea (`app.ini`) включи registry:
+
+```ini
+[packages]
+ENABLED = true
+```
+
+Перезапусти Gitea.
+
+### 2. Обнови workflow файл
+
+Открой `.gitea/workflows/deploy.yml` и замени:
+- `gitea.your-domain.com` → на твой домен Gitea
+- Убедись что путь `${{ gitea.repository_owner }}/delivery-tracker` корректен
+
+### 3. Создай токен в Gitea
+
+- Gitea → Settings → Applications → Generate Token
+- Сохрани токен (понадобится для Watchtower)
+
+### 4. Настройка LXC сервера (если еще не настроен Docker)
+
+```bash
+curl -fsSL https://get.docker.com | sh
+sudo usermod -aG docker $USER
+newgrp docker
+```
+
+### 5. Клонируй репозиторий на сервер
+
+```bash
+cd /opt
+sudo git clone https://gitea.your-domain.com/yourusername/delivery-tracker.git
+sudo chown -R $USER:$USER delivery-tracker
+```
+
+### 6. Настрой переменные окружения
+
+```bash
+cd delivery-tracker
+cp .env.production.example .env
+nano .env
+```
+
+Заполни:
+- Пароли для PostgreSQL
+- JWT секрет: `openssl rand -hex 32`
+- Gitea credentials для Watchtower
+- `GITEA_REGISTRY` — твой registry (например: `gitea.example.com/yourusername`)
+
+### 7. Логин в Gitea Registry на сервере
+
+```bash
+docker login gitea.your-domain.com
+# Введи username и токен/password
+```
+
+### 8. Первый запуск
+
+```bash
+docker-compose -f docker-compose.prod.yml pull
+docker-compose -f docker-compose.prod.yml up -d
+```
+
+### 9. Настройка Nginx Proxy Manager
+
+Открой веб-интерфейс NPM (обычно `http://server-ip:81` или через твой домен).
+
+#### Добавь Proxy Host для приложения:
+
+- **Domain Names**: `delivery.yourdomain.com` (замени на свой поддомен)
+- **Scheme**: `http`
+- **Forward Hostname/IP**: `frontend` (имя сервиса в docker-compose)
+- **Forward Port**: `80`
+- **Cache Assets**: Включи
+- **Block Common Exploits**: Включи
+
+**SSL Tab:**
+- SSL Certificate: Request a new SSL Certificate
+- Force SSL: Включи
+- HTTP/2 Support: Включи
+
+**Как это работает:**
+- NPM проксирует все запросы на frontend контейнер
+- Frontend nginx сам проксирует `/api/*` запросы на backend через docker network
+- Backend вообще не доступен извне — только через frontend
+
+**Важно**: Контейнеры используют `expose` порты (не `ports`). NPM достучится до `frontend` через docker network если NPM в той же сети, или по IP сервера.
+
+#### Подключение NPM к сети контейнеров:
+
+Если NPM запущен в другом compose, подключи его к сети delivery-tracker:
+
+```bash
+docker network connect delivery-tracker_delivery-network npm-app-1
+```
+
+Или используй IP адрес сервера (`172.17.0.1` или `host.docker.internal`) в поле Forward Hostname.
+
+### 10. Проверь автоматическое обновление
+
+Watchtower будет каждые 60 секунд проверять новые образы:
+
+```bash
+docker-compose -f docker-compose.prod.yml logs -f watchtower
+```
+
+## Как работает автодеплой
+
+1. `git push` в main/master
+2. Gitea Actions собирает образы → push в Registry
+3. Watchtower (60s poll) → проверяет registry → pull новых образов → перезапускает контейнеры
+4. NPM продолжает проксировать трафик на обновленные контейнеры
+
+## Ручной деплой
+
+```bash
+cd /opt/delivery-tracker
+docker-compose -f docker-compose.prod.yml pull
+docker-compose -f docker-compose.prod.yml up -d
+```
+
+## Обновление SSL через NPM
+
+NPM автоматически обновляет SSL сертификаты Let's Encrypt. Ничего делать не нужно.
+
+## Траблшутинг
+
+**Образы не обновляются:**
+```bash
+docker-compose -f docker-compose.prod.yml logs watchtower
+docker login gitea.your-domain.com
+```
+
+**NPM не видит контейнеры:**
+- Проверь что NPM и delivery-tracker в одной docker-сети
+- Или используй IP сервера вместо имен сервисов
+- Проверь `docker network ls` и `docker network inspect delivery-tracker_delivery-network`
+
+**Контейнеры не запускаются:**
+```bash
+docker-compose -f docker-compose.prod.yml logs backend
+docker-compose -f docker-compose.prod.yml logs frontend
+docker-compose -f docker-compose.prod.yml logs postgres
+```
+
+**Frontend не подключается к backend:**
+- Проверь что frontend nginx проксирует `/api/` на `backend:8080`
+- Проверь логи frontend: `docker-compose -f docker-compose.prod.yml logs frontend`
+- Убедись что backend работает: `docker-compose -f docker-compose.prod.yml logs backend`

Makefile

@@ -0,0 +1,40 @@
+# Delivery Tracker - Local Build & Deploy
+REGISTRY = gitea.chedius.ru/chedius
+PLATFORM = linux/amd64
+
+# Build and push both services
+.PHONY: all build push deploy
+
+all: build push
+
+build:
+	docker build --platform $(PLATFORM) -t $(REGISTRY)/delivery-tracker/backend:latest ./backend
+	docker build --platform $(PLATFORM) -t $(REGISTRY)/delivery-tracker/frontend:latest ./frontend
+
+push:
+	docker push $(REGISTRY)/delivery-tracker/backend:latest
+	docker push $(REGISTRY)/delivery-tracker/frontend:latest
+
+# Quick deploy - build, push and trigger watchtower check
+deploy: build push
+	@echo "Build and push complete. Watchtower will auto-update within 60 seconds."
+	@echo "Or run 'make watchtower-now' to force immediate update"
+
+# Force watchtower to check now (run from server)
+watchtower-now:
+	docker exec delivery-tracker-watchtower-1 /watchtower --run-once delivery-tracker-backend-1 delivery-tracker-frontend-1
+
+# Update specific containers on server (if watchtower fails)
+update-server:
+	docker pull $(REGISTRY)/delivery-tracker/backend:latest
+	docker pull $(REGISTRY)/delivery-tracker/frontend:latest
+	docker-compose up -d --force-recreate backend frontend
+
+# Full workflow: commit, build, push
+release:
+	@if [ -z "$(MSG)" ]; then echo "Usage: make release MSG='commit message'"; exit 1; fi
+	git add -A
+	git commit -m "$(MSG)" || true
+	git push
+	$(MAKE) build push
+	@echo "Released! Watchtower will deploy within 60 seconds."

backend/Dockerfile

@@ -14,7 +14,8 @@ RUN go mod download
 COPY . .
 
 # Build the application
-RUN CGO_ENABLED=0 GOOS=linux go build -o api ./cmd/api
+RUN CGO_ENABLED=0 GOOS=linux go build -o api ./cmd/api && \
+    CGO_ENABLED=0 GOOS=linux go build -o seed ./cmd/seed
 
 # Stage 2: Production
 FROM alpine:latest AS production
@@ -25,6 +26,7 @@ WORKDIR /app
 
 # Copy binary from builder
 COPY --from=builder /app/api .
+COPY --from=builder /app/seed .
 
 # Copy migrations
 COPY internal/db/migrations ./migrations

backend/cmd/api/main.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/chedius/delivery-tracker/internal/auth"
 	db "github.com/chedius/delivery-tracker/internal/db/sqlc"
 	"github.com/chedius/delivery-tracker/internal/delivery"
 	"github.com/gin-contrib/cors"
@@ -15,6 +16,19 @@ import (
 	"github.com/joho/godotenv"
 )
 
+func initAuth(queries *db.Queries) (*auth.Service, *auth.Handler) {
+	secret := []byte(os.Getenv("JWT_SECRET"))
+	expiry := 24 * time.Hour
+
+	if len(secret) == 0 {
+		log.Fatal("JWT_SECRET not set")
+	}
+
+	service := auth.New(queries, secret, expiry)
+	handler := auth.NewHandler(service)
+	return service, handler
+}
+
 func main() {
 	ctx := context.Background()
 	godotenv.Load()
@@ -27,6 +41,7 @@ func main() {
 	defer pool.Close()
 
 	queries := db.New(pool)
+	_, authHandler := initAuth(queries)
 	h := delivery.NewHandler(queries)
 
 	r := gin.Default()
@@ -44,13 +59,20 @@ func main() {
 		c.JSON(http.StatusOK, gin.H{"status": "ok"})
 	})
 
-	r.GET("/api/deliveries", h.GetDeliveries)
+	r.POST("/api/auth/register", authHandler.Register)
-	r.GET("/api/deliveries/:id", h.GetDeliveryByID)
+	r.POST("/api/auth/login", authHandler.Login)
-	r.GET("/api/deliveries/count", h.GetDeliveryCount)
+
-	r.POST("/api/deliveries", h.CreateDelivery)
+	authorized := r.Group("/api")
-	r.PATCH("/api/deliveries/:id", h.UpdateDelivery)
+	authorized.Use(auth.AuthMiddleware([]byte(os.Getenv("JWT_SECRET"))))
-	r.PATCH("/api/deliveries/:id/status", h.UpdateDeliveryStatus)
+	{
-	r.DELETE("/api/deliveries/:id", h.DeleteDelivery)
+		authorized.GET("/deliveries", h.GetDeliveries)
+		authorized.GET("/deliveries/:id", h.GetDeliveryByID)
+		authorized.GET("/deliveries/count", h.GetDeliveryCount)
+		authorized.POST("/deliveries", h.CreateDelivery)
+		authorized.PATCH("/deliveries/:id", h.UpdateDelivery)
+		authorized.PATCH("/deliveries/:id/status", h.UpdateDeliveryStatus)
+		authorized.DELETE("/deliveries/:id", h.DeleteDelivery)
+	}
 
 	r.Run(":8080")
 }

backend/cmd/seed/main.go

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"context"
+	"log"
+	"os"
+
+	"github.com/chedius/delivery-tracker/internal/auth"
+	db "github.com/chedius/delivery-tracker/internal/db/sqlc"
+	"github.com/jackc/pgx/v5/pgxpool"
+	"github.com/joho/godotenv"
+)
+
+func main() {
+	ctx := context.Background()
+	godotenv.Load()
+
+	dsn := os.Getenv("DATABASE_URL")
+	pool, err := pgxpool.New(ctx, dsn)
+	if err != nil {
+		log.Fatalf("db connect: %v", err)
+	}
+	defer pool.Close()
+
+	queries := db.New(pool)
+
+	_, err = queries.GetUserByUsername(ctx, "admin")
+	if err == nil {
+		log.Println("admin user already exists, skipping seed")
+		return
+	}
+
+	secret := []byte(os.Getenv("JWT_SECRET"))
+	if len(secret) == 0 {
+		log.Fatalf("JWT_SECRET not set")
+	}
+	authService := auth.New(queries, secret, 0)
+
+	password := os.Getenv("SEED_ADMIN_PASSWORD")
+	if password == "" {
+		password = "admin123" // ⚠️ только для dev!
+	}
+
+	user, token, err := authService.Register(ctx, "admin", password)
+	if err != nil {
+		log.Fatalf("failed to create admin: %v", err)
+	}
+
+	log.Printf("created admin user: id=%s, username=%s", user.ID, user.Username)
+	log.Printf("token: %s", token)
+}

backend/go.mod

@@ -12,6 +12,8 @@ require (
 	github.com/google/uuid v1.6.0
 )
 
+require github.com/golang-jwt/jwt/v5 v5.3.1
+
 require (
 	github.com/bytedance/gopkg v0.1.3 // indirect
 	github.com/bytedance/sonic v1.15.0 // indirect
@@ -41,7 +43,7 @@ require (
 	github.com/ugorji/go/codec v1.3.1 // indirect
 	go.mongodb.org/mongo-driver/v2 v2.5.0 // indirect
 	golang.org/x/arch v0.23.0 // indirect
-	golang.org/x/crypto v0.48.0 // indirect
+	golang.org/x/crypto v0.48.0
 	golang.org/x/net v0.51.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
 	golang.org/x/sys v0.41.0 // indirect

backend/go.sum

@@ -29,6 +29,8 @@ github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
 github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
+github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=

backend/internal/auth/errors.go

@@ -0,0 +1,12 @@
+package auth
+
+import "errors"
+
+var (
+	ErrInvalidCredentials = errors.New("invalid credentials")
+	ErrUserExists         = errors.New("user already exists")
+	ErrUserNotFound       = errors.New("user not found")
+	ErrPasswordMismatch   = errors.New("passwords do not match")
+	ErrCredentialsEmpty   = errors.New("username and password cannot be empty")
+	ErrPasswordTooShort   = errors.New("password must be at least 6 characters long")
+)

backend/internal/auth/handler.go

@@ -0,0 +1,77 @@
+package auth
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+type Handler struct {
+	authService *Service
+}
+
+func NewHandler(authService *Service) *Handler {
+	return &Handler{
+		authService: authService,
+	}
+}
+
+type LoginRequest struct {
+	Username string `json:"username" binding:"required"`
+	Password string `json:"password" binding:"required"`
+}
+
+type RegisterRequest struct {
+	Username string `json:"username" binding:"required,min=3,max=50"`
+	Password string `json:"password" binding:"required,min=6"`
+}
+
+func (h *Handler) Login(c *gin.Context) {
+	var req LoginRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request", "details": err.Error()})
+		return
+	}
+
+	token, err := h.authService.Login(c.Request.Context(), req.Username, req.Password)
+	if err != nil {
+		switch err {
+		case ErrUserNotFound, ErrInvalidCredentials:
+			c.JSON(http.StatusUnauthorized, gin.H{"error": "invalid credentials"})
+		default:
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "login failed"})
+		}
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{"token": token})
+}
+
+func (h *Handler) Register(c *gin.Context) {
+	var req RegisterRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request", "details": err.Error()})
+		return
+	}
+
+	user, token, err := h.authService.Register(c.Request.Context(), req.Username, req.Password)
+	if err != nil {
+		switch err {
+		case ErrUserExists:
+			c.JSON(http.StatusConflict, gin.H{"error": "user already exists"})
+		case ErrPasswordTooShort:
+			c.JSON(http.StatusBadRequest, gin.H{"error": "password too short"})
+		default:
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "registration failed"})
+		}
+		return
+	}
+
+	c.JSON(http.StatusCreated, gin.H{
+		"user": gin.H{
+			"id":       user.ID,
+			"username": user.Username,
+		},
+		"token": token,
+	})
+}

backend/internal/auth/jwt.go

@@ -0,0 +1,50 @@
+package auth
+
+import (
+	"errors"
+	"time"
+
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/google/uuid"
+)
+
+type Claims struct {
+	UserID uuid.UUID `json:"user_id"`
+	jwt.RegisteredClaims
+}
+
+func GenerateToken(userID uuid.UUID, secret []byte, expiry time.Duration) (string, error) {
+	if userID == uuid.Nil {
+		return "", errors.New("user ID cannot be nil")
+	}
+	if secret == nil {
+		return "", errors.New("JWT secret not set")
+	}
+
+	claims := Claims{
+		UserID: userID,
+		RegisteredClaims: jwt.RegisteredClaims{
+			ExpiresAt: jwt.NewNumericDate(time.Now().Add(expiry)),
+			IssuedAt:  jwt.NewNumericDate(time.Now()),
+		},
+	}
+
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	return token.SignedString(secret)
+}
+
+func ParseToken(tokenString string, secret []byte) (*Claims, error) {
+	token, err := jwt.ParseWithClaims(tokenString, &Claims{}, func(token *jwt.Token) (interface{}, error) {
+		return secret, nil
+	}, jwt.WithValidMethods([]string{jwt.SigningMethodHS256.Alg()}))
+
+	if err != nil {
+		return nil, err
+	}
+
+	if claims, ok := token.Claims.(*Claims); ok && token.Valid {
+		return claims, nil
+	}
+
+	return nil, errors.New("invalid token claims")
+}

backend/internal/auth/middleware.go

@@ -0,0 +1,36 @@
+package auth
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+)
+
+func AuthMiddleware(secret []byte) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		authHeader := c.GetHeader("Authorization")
+		if authHeader == "" {
+			c.JSON(http.StatusUnauthorized, gin.H{"error": "missing authorization header"})
+			c.Abort()
+			return
+		}
+
+		tokenString := strings.TrimPrefix(authHeader, "Bearer ")
+		if tokenString == authHeader {
+			c.JSON(http.StatusUnauthorized, gin.H{"error": "invalid authorization header"})
+			c.Abort()
+			return
+		}
+
+		claims, err := ParseToken(tokenString, secret)
+		if err != nil {
+			c.JSON(http.StatusUnauthorized, gin.H{"error": "invalid token"})
+			c.Abort()
+			return
+		}
+
+		c.Set("userID", claims.UserID)
+		c.Next()
+	}
+}

backend/internal/auth/service.go

@@ -0,0 +1,98 @@
+package auth
+
+import (
+	"context"
+	"errors"
+	"time"
+
+	sqlc "github.com/chedius/delivery-tracker/internal/db/sqlc"
+	"github.com/google/uuid"
+
+	"github.com/jackc/pgx/v5"
+	"golang.org/x/crypto/bcrypt"
+)
+
+type Service struct {
+	queries *sqlc.Queries
+	secret  []byte
+	expiry  time.Duration
+}
+
+type User struct {
+	ID       string
+	Username string
+	// Password string
+}
+
+func New(queries *sqlc.Queries, secret []byte, expiry time.Duration) *Service {
+	return &Service{queries, secret, expiry}
+}
+
+func (s *Service) Register(ctx context.Context, username, password string) (User, string, error) {
+	if username == "" || password == "" {
+		return User{}, "", ErrCredentialsEmpty
+	}
+	if _, err := s.queries.GetUserByUsername(ctx, username); err == nil {
+		return User{}, "", ErrUserExists
+	}
+	if len(password) < 6 {
+		return User{}, "", ErrPasswordTooShort
+	}
+	hashedPassword, err := s.HashPassword(password)
+	if err != nil {
+		return User{}, "", err
+	}
+
+	user, err := s.queries.CreateUser(ctx, sqlc.CreateUserParams{
+		Username:     username,
+		PasswordHash: hashedPassword,
+	})
+	if err != nil {
+		return User{}, "", err
+	}
+
+	token, err := GenerateToken(uuid.UUID(user.ID.Bytes), s.secret, s.expiry)
+	if err != nil {
+		return User{}, "", err
+	}
+
+	return User{
+		ID:       user.ID.String(),
+		Username: user.Username,
+	}, token, nil
+}
+
+func (s *Service) Login(ctx context.Context, username, password string) (string, error) { // returns JWT
+	user, err := s.queries.GetUserByUsername(ctx, username)
+	if err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return "", ErrUserNotFound
+		}
+		return "", err
+	}
+
+	if !s.VerifyPassword(user.PasswordHash, password) {
+		return "", ErrInvalidCredentials
+	}
+
+	token, err := GenerateToken(uuid.UUID(user.ID.Bytes), s.secret, s.expiry)
+	if err != nil {
+		return "", err
+	}
+
+	return token, nil
+}
+
+func (s *Service) HashPassword(password string) (string, error) {
+	hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+	if err != nil {
+		return "", err
+	}
+
+	return string(hash), nil
+}
+func (s *Service) VerifyPassword(hash, password string) bool {
+	err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
+
+	return err == nil
+}

backend/internal/db/migrations/000003_add_delivery_fields.down.sql

@@ -0,0 +1,10 @@
+-- Revert new fields for delivery improvements
+ALTER TABLE deliveries DROP COLUMN IF EXISTS customer_name;
+ALTER TABLE deliveries DROP COLUMN IF EXISTS service_info;
+ALTER TABLE deliveries DROP COLUMN IF EXISTS pickup_location_2;
+ALTER TABLE deliveries DROP COLUMN IF EXISTS product_name_2;
+ALTER TABLE deliveries DROP COLUMN IF EXISTS street;
+ALTER TABLE deliveries DROP COLUMN IF EXISTS house;
+ALTER TABLE deliveries DROP COLUMN IF EXISTS apartment;
+ALTER TABLE deliveries DROP COLUMN IF EXISTS entrance;
+ALTER TABLE deliveries DROP COLUMN IF EXISTS floor;

backend/internal/db/migrations/000003_add_delivery_fields.up.sql

@@ -0,0 +1,18 @@
+-- Add new fields for delivery improvements
+
+-- Client information
+ALTER TABLE deliveries ADD COLUMN customer_name text NOT NULL DEFAULT '';
+
+-- Services (assembly, lifting, etc.)
+ALTER TABLE deliveries ADD COLUMN service_info text;
+
+-- Second pickup location
+ALTER TABLE deliveries ADD COLUMN pickup_location_2 varchar(20);
+ALTER TABLE deliveries ADD COLUMN product_name_2 text;
+
+-- Structured address components
+ALTER TABLE deliveries ADD COLUMN street text NOT NULL DEFAULT '';
+ALTER TABLE deliveries ADD COLUMN house text NOT NULL DEFAULT '';
+ALTER TABLE deliveries ADD COLUMN apartment text;
+ALTER TABLE deliveries ADD COLUMN entrance text;
+ALTER TABLE deliveries ADD COLUMN floor text;

backend/internal/db/queries/query.sql

@@ -1,9 +1,21 @@
+-- name: CreateUser :one
+INSERT INTO users (username, password_hash)
+VALUES ($1, $2)
+RETURNING *;
+
+-- name: GetUserByUsername :one
+SELECT * FROM users WHERE username = $1;
+
 -- name: GetDeliveriesByDate :many
 SELECT * FROM deliveries WHERE date = $1;
  
 -- name: CreateDelivery :one
-INSERT INTO deliveries (date, pickup_location, product_name, address, phone, additional_phone, has_elevator, comment)
+INSERT INTO deliveries (
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+    date, pickup_location, pickup_location_2, product_name, product_name_2,
+    customer_name, address, street, house, apartment, entrance, floor,
+    phone, additional_phone, has_elevator, service_info, comment
+)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)
 RETURNING *;
 
 -- name: GetDeliveryByID :one
@@ -13,10 +25,31 @@ SELECT * FROM deliveries WHERE id = $1;
 DELETE FROM deliveries WHERE id = $1;
 
 -- name: UpdateDelivery :exec
-UPDATE deliveries SET date = $1, pickup_location = $2, product_name = $3, address = $4, phone = $5, additional_phone = $6, has_elevator = $7, comment = $8, updated_at = NOW() WHERE id = $9;
+UPDATE deliveries SET
+    date = $1,
+    pickup_location = $2,
+    pickup_location_2 = $3,
+    product_name = $4,
+    product_name_2 = $5,
+    customer_name = $6,
+    address = $7,
+    street = $8,
+    house = $9,
+    apartment = $10,
+    entrance = $11,
+    floor = $12,
+    phone = $13,
+    additional_phone = $14,
+    has_elevator = $15,
+    service_info = $16,
+    comment = $17,
+    updated_at = NOW()
+WHERE id = $18;
 
 -- name: GetDeliveryCount :many
-SELECT COUNT(*) as count, date FROM deliveries WHERE date >= DATE_TRUNC('month', CURRENT_DATE) GROUP BY date;
+SELECT COUNT(*) as count, date FROM deliveries
+WHERE date >= CURRENT_DATE AND date < CURRENT_DATE + INTERVAL '7 days'
+GROUP BY date;
 
 -- name: UpdateDeliveryStatus :exec
 UPDATE deliveries SET status = $1, updated_at = NOW() WHERE id = $2;

backend/internal/db/sqlc/models.go

@@ -21,6 +21,15 @@ type Delivery struct {
 	Status          string             `db:"status" json:"status"`
 	CreatedAt       pgtype.Timestamptz `db:"created_at" json:"created_at"`
 	UpdatedAt       pgtype.Timestamptz `db:"updated_at" json:"updated_at"`
+	CustomerName    string             `db:"customer_name" json:"customer_name"`
+	ServiceInfo     pgtype.Text        `db:"service_info" json:"service_info"`
+	PickupLocation2 pgtype.Text        `db:"pickup_location_2" json:"pickup_location_2"`
+	ProductName2    pgtype.Text        `db:"product_name_2" json:"product_name_2"`
+	Street          string             `db:"street" json:"street"`
+	House           string             `db:"house" json:"house"`
+	Apartment       pgtype.Text        `db:"apartment" json:"apartment"`
+	Entrance        pgtype.Text        `db:"entrance" json:"entrance"`
+	Floor           pgtype.Text        `db:"floor" json:"floor"`
 }
 
 type User struct {

backend/internal/db/sqlc/querier.go

@@ -12,10 +12,12 @@ import (
 
 type Querier interface {
 	CreateDelivery(ctx context.Context, arg CreateDeliveryParams) (Delivery, error)
+	CreateUser(ctx context.Context, arg CreateUserParams) (User, error)
 	DeleteDelivery(ctx context.Context, id pgtype.UUID) error
 	GetDeliveriesByDate(ctx context.Context, date pgtype.Date) ([]Delivery, error)
 	GetDeliveryByID(ctx context.Context, id pgtype.UUID) (Delivery, error)
 	GetDeliveryCount(ctx context.Context) ([]GetDeliveryCountRow, error)
+	GetUserByUsername(ctx context.Context, username string) (User, error)
 	UpdateDelivery(ctx context.Context, arg UpdateDeliveryParams) error
 	UpdateDeliveryStatus(ctx context.Context, arg UpdateDeliveryStatusParams) error
 }

backend/internal/db/sqlc/query.sql.go

@@ -12,19 +12,32 @@ import (
 )
 
 const createDelivery = `-- name: CreateDelivery :one
-INSERT INTO deliveries (date, pickup_location, product_name, address, phone, additional_phone, has_elevator, comment)
+INSERT INTO deliveries (
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+    date, pickup_location, pickup_location_2, product_name, product_name_2,
-RETURNING id, date, pickup_location, product_name, address, phone, additional_phone, has_elevator, comment, status, created_at, updated_at
+    customer_name, address, street, house, apartment, entrance, floor,
+    phone, additional_phone, has_elevator, service_info, comment
+)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)
+RETURNING id, date, pickup_location, product_name, address, phone, additional_phone, has_elevator, comment, status, created_at, updated_at, customer_name, service_info, pickup_location_2, product_name_2, street, house, apartment, entrance, floor
 `
 
 type CreateDeliveryParams struct {
 	Date            pgtype.Date `db:"date" json:"date"`
 	PickupLocation  string      `db:"pickup_location" json:"pickup_location"`
+	PickupLocation2 pgtype.Text `db:"pickup_location_2" json:"pickup_location_2"`
 	ProductName     string      `db:"product_name" json:"product_name"`
+	ProductName2    pgtype.Text `db:"product_name_2" json:"product_name_2"`
+	CustomerName    string      `db:"customer_name" json:"customer_name"`
 	Address         string      `db:"address" json:"address"`
+	Street          string      `db:"street" json:"street"`
+	House           string      `db:"house" json:"house"`
+	Apartment       pgtype.Text `db:"apartment" json:"apartment"`
+	Entrance        pgtype.Text `db:"entrance" json:"entrance"`
+	Floor           pgtype.Text `db:"floor" json:"floor"`
 	Phone           string      `db:"phone" json:"phone"`
 	AdditionalPhone pgtype.Text `db:"additional_phone" json:"additional_phone"`
 	HasElevator     bool        `db:"has_elevator" json:"has_elevator"`
+	ServiceInfo     pgtype.Text `db:"service_info" json:"service_info"`
 	Comment         pgtype.Text `db:"comment" json:"comment"`
 }
 
@@ -32,11 +45,20 @@ func (q *Queries) CreateDelivery(ctx context.Context, arg CreateDeliveryParams)
 	row := q.db.QueryRow(ctx, createDelivery,
 		arg.Date,
 		arg.PickupLocation,
+		arg.PickupLocation2,
 		arg.ProductName,
+		arg.ProductName2,
+		arg.CustomerName,
 		arg.Address,
+		arg.Street,
+		arg.House,
+		arg.Apartment,
+		arg.Entrance,
+		arg.Floor,
 		arg.Phone,
 		arg.AdditionalPhone,
 		arg.HasElevator,
+		arg.ServiceInfo,
 		arg.Comment,
 	)
 	var i Delivery
@@ -53,6 +75,38 @@ func (q *Queries) CreateDelivery(ctx context.Context, arg CreateDeliveryParams)
 		&i.Status,
 		&i.CreatedAt,
 		&i.UpdatedAt,
+		&i.CustomerName,
+		&i.ServiceInfo,
+		&i.PickupLocation2,
+		&i.ProductName2,
+		&i.Street,
+		&i.House,
+		&i.Apartment,
+		&i.Entrance,
+		&i.Floor,
+	)
+	return i, err
+}
+
+const createUser = `-- name: CreateUser :one
+INSERT INTO users (username, password_hash)
+VALUES ($1, $2)
+RETURNING id, username, password_hash, created_at
+`
+
+type CreateUserParams struct {
+	Username     string `db:"username" json:"username"`
+	PasswordHash string `db:"password_hash" json:"password_hash"`
+}
+
+func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (User, error) {
+	row := q.db.QueryRow(ctx, createUser, arg.Username, arg.PasswordHash)
+	var i User
+	err := row.Scan(
+		&i.ID,
+		&i.Username,
+		&i.PasswordHash,
+		&i.CreatedAt,
 	)
 	return i, err
 }
@@ -67,7 +121,7 @@ func (q *Queries) DeleteDelivery(ctx context.Context, id pgtype.UUID) error {
 }
 
 const getDeliveriesByDate = `-- name: GetDeliveriesByDate :many
-SELECT id, date, pickup_location, product_name, address, phone, additional_phone, has_elevator, comment, status, created_at, updated_at FROM deliveries WHERE date = $1
+SELECT id, date, pickup_location, product_name, address, phone, additional_phone, has_elevator, comment, status, created_at, updated_at, customer_name, service_info, pickup_location_2, product_name_2, street, house, apartment, entrance, floor FROM deliveries WHERE date = $1
 `
 
 func (q *Queries) GetDeliveriesByDate(ctx context.Context, date pgtype.Date) ([]Delivery, error) {
@@ -92,6 +146,15 @@ func (q *Queries) GetDeliveriesByDate(ctx context.Context, date pgtype.Date) ([]
 			&i.Status,
 			&i.CreatedAt,
 			&i.UpdatedAt,
+			&i.CustomerName,
+			&i.ServiceInfo,
+			&i.PickupLocation2,
+			&i.ProductName2,
+			&i.Street,
+			&i.House,
+			&i.Apartment,
+			&i.Entrance,
+			&i.Floor,
 		); err != nil {
 			return nil, err
 		}
@@ -104,7 +167,7 @@ func (q *Queries) GetDeliveriesByDate(ctx context.Context, date pgtype.Date) ([]
 }
 
 const getDeliveryByID = `-- name: GetDeliveryByID :one
-SELECT id, date, pickup_location, product_name, address, phone, additional_phone, has_elevator, comment, status, created_at, updated_at FROM deliveries WHERE id = $1
+SELECT id, date, pickup_location, product_name, address, phone, additional_phone, has_elevator, comment, status, created_at, updated_at, customer_name, service_info, pickup_location_2, product_name_2, street, house, apartment, entrance, floor FROM deliveries WHERE id = $1
 `
 
 func (q *Queries) GetDeliveryByID(ctx context.Context, id pgtype.UUID) (Delivery, error) {
@@ -123,12 +186,23 @@ func (q *Queries) GetDeliveryByID(ctx context.Context, id pgtype.UUID) (Delivery
 		&i.Status,
 		&i.CreatedAt,
 		&i.UpdatedAt,
+		&i.CustomerName,
+		&i.ServiceInfo,
+		&i.PickupLocation2,
+		&i.ProductName2,
+		&i.Street,
+		&i.House,
+		&i.Apartment,
+		&i.Entrance,
+		&i.Floor,
 	)
 	return i, err
 }
 
 const getDeliveryCount = `-- name: GetDeliveryCount :many
-SELECT COUNT(*) as count, date FROM deliveries WHERE date >= DATE_TRUNC('month', CURRENT_DATE) GROUP BY date
+SELECT COUNT(*) as count, date FROM deliveries
+WHERE date >= CURRENT_DATE AND date < CURRENT_DATE + INTERVAL '7 days'
+GROUP BY date
 `
 
 type GetDeliveryCountRow struct {
@@ -156,18 +230,62 @@ func (q *Queries) GetDeliveryCount(ctx context.Context) ([]GetDeliveryCountRow,
 	return items, nil
 }
 
+const getUserByUsername = `-- name: GetUserByUsername :one
+SELECT id, username, password_hash, created_at FROM users WHERE username = $1
+`
+
+func (q *Queries) GetUserByUsername(ctx context.Context, username string) (User, error) {
+	row := q.db.QueryRow(ctx, getUserByUsername, username)
+	var i User
+	err := row.Scan(
+		&i.ID,
+		&i.Username,
+		&i.PasswordHash,
+		&i.CreatedAt,
+	)
+	return i, err
+}
+
 const updateDelivery = `-- name: UpdateDelivery :exec
-UPDATE deliveries SET date = $1, pickup_location = $2, product_name = $3, address = $4, phone = $5, additional_phone = $6, has_elevator = $7, comment = $8, updated_at = NOW() WHERE id = $9
+UPDATE deliveries SET
+    date = $1,
+    pickup_location = $2,
+    pickup_location_2 = $3,
+    product_name = $4,
+    product_name_2 = $5,
+    customer_name = $6,
+    address = $7,
+    street = $8,
+    house = $9,
+    apartment = $10,
+    entrance = $11,
+    floor = $12,
+    phone = $13,
+    additional_phone = $14,
+    has_elevator = $15,
+    service_info = $16,
+    comment = $17,
+    updated_at = NOW()
+WHERE id = $18
 `
 
 type UpdateDeliveryParams struct {
 	Date            pgtype.Date `db:"date" json:"date"`
 	PickupLocation  string      `db:"pickup_location" json:"pickup_location"`
+	PickupLocation2 pgtype.Text `db:"pickup_location_2" json:"pickup_location_2"`
 	ProductName     string      `db:"product_name" json:"product_name"`
+	ProductName2    pgtype.Text `db:"product_name_2" json:"product_name_2"`
+	CustomerName    string      `db:"customer_name" json:"customer_name"`
 	Address         string      `db:"address" json:"address"`
+	Street          string      `db:"street" json:"street"`
+	House           string      `db:"house" json:"house"`
+	Apartment       pgtype.Text `db:"apartment" json:"apartment"`
+	Entrance        pgtype.Text `db:"entrance" json:"entrance"`
+	Floor           pgtype.Text `db:"floor" json:"floor"`
 	Phone           string      `db:"phone" json:"phone"`
 	AdditionalPhone pgtype.Text `db:"additional_phone" json:"additional_phone"`
 	HasElevator     bool        `db:"has_elevator" json:"has_elevator"`
+	ServiceInfo     pgtype.Text `db:"service_info" json:"service_info"`
 	Comment         pgtype.Text `db:"comment" json:"comment"`
 	ID              pgtype.UUID `db:"id" json:"id"`
 }
@@ -176,11 +294,20 @@ func (q *Queries) UpdateDelivery(ctx context.Context, arg UpdateDeliveryParams)
 	_, err := q.db.Exec(ctx, updateDelivery,
 		arg.Date,
 		arg.PickupLocation,
+		arg.PickupLocation2,
 		arg.ProductName,
+		arg.ProductName2,
+		arg.CustomerName,
 		arg.Address,
+		arg.Street,
+		arg.House,
+		arg.Apartment,
+		arg.Entrance,
+		arg.Floor,
 		arg.Phone,
 		arg.AdditionalPhone,
 		arg.HasElevator,
+		arg.ServiceInfo,
 		arg.Comment,
 		arg.ID,
 	)

backend/internal/delivery/handler.go

@@ -16,14 +16,23 @@ type Handler struct {
 
 // DeliveryRequest represents the request body for creating or updating a delivery
 type DeliveryRequest struct {
-	Date            string `json:"date" binding:"required"` // DD-MM-YYYY
+	Date            string  `json:"date" binding:"required"` // DD-MM-YYYY
-	PickupLocation  string `json:"pickup_location" binding:"required,oneof=warehouse symbat nursaya galaktika"`
+	PickupLocation  string  `json:"pickup_location" binding:"required,oneof=warehouse symbat nursaya galaktika"`
-	ProductName     string `json:"product_name" binding:"required"`
+	PickupLocation2 *string `json:"pickup_location_2" binding:"omitempty,oneof=warehouse symbat nursaya galaktika"`
-	Address         string `json:"address" binding:"required"`
+	ProductName     string  `json:"product_name" binding:"required"`
-	Phone           string `json:"phone" binding:"required"`
+	ProductName2    *string `json:"product_name_2"`
-	AdditionalPhone string `json:"additional_phone"`
+	CustomerName    string  `json:"customer_name" binding:"required"`
-	HasElevator     bool   `json:"has_elevator"`
+	Address         string  `json:"address" binding:"required"`
-	Comment         string `json:"comment"`
+	Street          string  `json:"street" binding:"required"`
+	House           string  `json:"house" binding:"required"`
+	Apartment       *string `json:"apartment"`
+	Entrance        *string `json:"entrance"`
+	Floor           *string `json:"floor"`
+	Phone           string  `json:"phone" binding:"required"`
+	AdditionalPhone *string `json:"additional_phone"`
+	HasElevator     bool    `json:"has_elevator"`
+	ServiceInfo     *string `json:"service_info"`
+	Comment         string  `json:"comment"`
 }
 
 func NewHandler(queries *sqlc.Queries) *Handler {
@@ -99,11 +108,20 @@ func (h *Handler) CreateDelivery(c *gin.Context) {
 	params := sqlc.CreateDeliveryParams{
 		Date:            pgtype.Date{Time: t, Valid: true},
 		PickupLocation:  req.PickupLocation,
+		PickupLocation2: pgtype.Text{String: derefString(req.PickupLocation2), Valid: req.PickupLocation2 != nil},
 		ProductName:     req.ProductName,
+		ProductName2:    pgtype.Text{String: derefString(req.ProductName2), Valid: req.ProductName2 != nil},
+		CustomerName:    req.CustomerName,
 		Address:         req.Address,
+		Street:          req.Street,
+		House:           req.House,
+		Apartment:       pgtype.Text{String: derefString(req.Apartment), Valid: req.Apartment != nil},
+		Entrance:        pgtype.Text{String: derefString(req.Entrance), Valid: req.Entrance != nil},
+		Floor:           pgtype.Text{String: derefString(req.Floor), Valid: req.Floor != nil},
 		Phone:           req.Phone,
-		AdditionalPhone: pgtype.Text{String: req.AdditionalPhone, Valid: req.AdditionalPhone != ""},
+		AdditionalPhone: pgtype.Text{String: derefString(req.AdditionalPhone), Valid: req.AdditionalPhone != nil},
 		HasElevator:     req.HasElevator,
+		ServiceInfo:     pgtype.Text{String: derefString(req.ServiceInfo), Valid: req.ServiceInfo != nil},
 		Comment:         pgtype.Text{String: req.Comment, Valid: true},
 	}
 	res, err := h.queries.CreateDelivery(c.Request.Context(), params)
@@ -146,11 +164,20 @@ func (h *Handler) UpdateDelivery(c *gin.Context) {
 		ID:              pgtype.UUID{Bytes: parsedID, Valid: true},
 		Date:            pgtype.Date{Time: t, Valid: true},
 		PickupLocation:  req.PickupLocation,
+		PickupLocation2: pgtype.Text{String: derefString(req.PickupLocation2), Valid: req.PickupLocation2 != nil},
 		ProductName:     req.ProductName,
+		ProductName2:    pgtype.Text{String: derefString(req.ProductName2), Valid: req.ProductName2 != nil},
+		CustomerName:    req.CustomerName,
 		Address:         req.Address,
+		Street:          req.Street,
+		House:           req.House,
+		Apartment:       pgtype.Text{String: derefString(req.Apartment), Valid: req.Apartment != nil},
+		Entrance:        pgtype.Text{String: derefString(req.Entrance), Valid: req.Entrance != nil},
+		Floor:           pgtype.Text{String: derefString(req.Floor), Valid: req.Floor != nil},
 		Phone:           req.Phone,
-		AdditionalPhone: pgtype.Text{String: req.AdditionalPhone, Valid: req.AdditionalPhone != ""},
+		AdditionalPhone: pgtype.Text{String: derefString(req.AdditionalPhone), Valid: req.AdditionalPhone != nil},
 		HasElevator:     req.HasElevator,
+		ServiceInfo:     pgtype.Text{String: derefString(req.ServiceInfo), Valid: req.ServiceInfo != nil},
 		Comment:         pgtype.Text{String: req.Comment, Valid: true},
 	}); err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update delivery", "details": err.Error()})
@@ -231,3 +258,11 @@ func parseDate(dateStr string) (time.Time, error) {
 	}
 	return t, nil
 }
+
+// derefString safely dereferences a string pointer
+func derefString(s *string) string {
+	if s == nil {
+		return ""
+	}
+	return *s
+}

docker-compose.prod.yml

@@ -0,0 +1,66 @@
+services:
+  postgres:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    restart: unless-stopped
+    networks:
+      - delivery-network
+
+  backend:
+    image: ${GITEA_REGISTRY}/delivery-tracker/backend:latest
+    environment:
+      DATABASE_URL: postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?sslmode=disable
+      JWT_SECRET: ${JWT_SECRET}
+      SEED_ADMIN_PASSWORD: ${SEED_ADMIN_PASSWORD}
+    # Нет expose - backend доступен только внутри сети delivery-network
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO- http://localhost:8080/health || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    depends_on:
+      postgres:
+        condition: service_healthy
+    restart: unless-stopped
+    networks:
+      - delivery-network
+
+  frontend:
+    image: ${GITEA_REGISTRY}/delivery-tracker/frontend:latest
+    ports:
+      - "80:80"
+    depends_on:
+      - backend
+    restart: unless-stopped
+    networks:
+      - delivery-network
+
+  watchtower:
+    image: containrrr/watchtower
+    environment:
+      - WATCHTOWER_CLEANUP=true
+      - WATCHTOWER_POLL_INTERVAL=60
+      - WATCHTOWER_INCLUDE_STOPPED=true
+      - WATCHTOWER_REVIVE_STOPPED=false
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    command: delivery-tracker-backend-1 delivery-tracker-frontend-1 --interval 60
+    networks:
+      - delivery-network
+
+volumes:
+  postgres_data:
+
+networks:
+  delivery-network:
+    driver: bridge

frontend/.env.example

@@ -1,2 +1,4 @@
 # API Configuration
+# Leave empty to use proxy (recommended for local dev and production)
+# Or set full URL like http://localhost:8081 for direct API access
 VITE_API_URL=http://localhost:8080

frontend/nginx.conf

@@ -16,6 +16,19 @@ server {
         add_header Cache-Control "public, immutable";
     }
 
+    # Proxy API requests to backend
+    location /api/ {
+        proxy_pass http://backend:8080;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_cache_bypass $http_upgrade;
+    }
+
     # Handle client-side routing
     location / {
         try_files $uri $uri/ /index.html;

frontend/package.json

@@ -23,6 +23,7 @@
     "@types/node": "^24.12.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
+    "@types/workbox-window": "^4.3.4",
     "@vitejs/plugin-react": "^6.0.1",
     "eslint": "^9.39.4",
     "eslint-plugin-react-hooks": "^7.0.1",
@@ -30,6 +31,8 @@
     "globals": "^17.4.0",
     "typescript": "~5.9.3",
     "typescript-eslint": "^8.57.0",
-    "vite": "^8.0.1"
+    "vite": "^8.0.1",
+    "vite-plugin-pwa": "^1.2.0",
+    "workbox-window": "^7.4.0"
   }
 }

frontend/public/pwa-icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#1B263B" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="1" y="3" width="15" height="13"/><polygon points="16 8 20 8 23 11 23 16 16 16"/><circle cx="5.5" cy="18.5" r="2.5"/><circle cx="18.5" cy="18.5" r="2.5"/></svg>

frontend/src/App.tsx

@@ -1,9 +1,22 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, lazy, Suspense } from 'react';
-import { Truck } from 'lucide-react';
+import { Truck, Loader2, LogOut } from 'lucide-react';
-import { Dashboard } from './pages/Dashboard';
-import { DeliveryListPage } from './pages/DeliveryListPage';
 import { DeliveryForm } from './components/delivery/DeliveryForm';
+import { LoginForm } from './components/auth/LoginForm';
+import { ToastContainer } from './components/ui/Toast';
+import { Button } from './components/ui/Button';
 import { useDeliveryStore } from './stores/deliveryStore';
+import { useAuthStore } from './stores/authStore';
+
+// Lazy load pages for code splitting
+const Dashboard = lazy(() => import('./pages/Dashboard'));
+const DeliveryListPage = lazy(() => import('./pages/DeliveryListPage'));
+
+// Fallback loading component
+const PageLoader = () => (
+  <div className="flex items-center justify-center py-20">
+    <Loader2 className="w-8 h-8 animate-spin text-[#1B263B]" />
+  </div>
+);
 
 function App() {
   const [view, setView] = useState<'dashboard' | 'delivery-list'>('dashboard');
@@ -12,15 +25,21 @@ function App() {
   const [formDate, setFormDate] = useState<string>('');
   const [isSubmitting, setIsSubmitting] = useState(false);
 
+  const { isAuthenticated, isAuthChecking, restoreAuth, logout } = useAuthStore();
   const addDelivery = useDeliveryStore(state => state.addDelivery);
   const fetchDeliveryCounts = useDeliveryStore(state => state.fetchDeliveryCounts);
 
-  // Refresh counts when form closes
+  // Restore auth on mount
   useEffect(() => {
-    if (!isFormOpen) {
+    restoreAuth();
+  }, [restoreAuth]);
+
+  // Refresh counts when form closes (only when authenticated)
+  useEffect(() => {
+    if (isAuthenticated && !isFormOpen) {
       fetchDeliveryCounts();
     }
-  }, [isFormOpen, fetchDeliveryCounts]);
+  }, [isAuthenticated, isFormOpen, fetchDeliveryCounts]);
 
   const handleDateSelect = (date: string) => {
     setSelectedDate(date);
@@ -57,6 +76,25 @@ function App() {
     }
   };
 
+  // Show loading while checking auth
+  if (isAuthChecking) {
+    return (
+      <div className="min-h-screen flex items-center justify-center bg-[#fbf8fb]">
+        <Loader2 className="w-8 h-8 animate-spin text-[#1B263B]" />
+      </div>
+    );
+  }
+
+  // Show login form if not authenticated
+  if (!isAuthenticated) {
+    return (
+      <>
+        <LoginForm />
+        <ToastContainer />
+      </>
+    );
+  }
+
   return (
     <div className="min-h-screen bg-[#fbf8fb]">
       <header className="sticky top-0 z-40 bg-[#1B263B] text-white shadow-md">
@@ -68,25 +106,38 @@ function App() {
               </div>
               <h1 className="text-lg font-semibold hidden sm:block">Delivery Tracker</h1>
             </div>
-            <div className="text-sm text-white/70">
+            <div className="flex items-center gap-4">
-              {view === 'dashboard' ? 'Панель управления' : `Доставки на ${selectedDate}`}
+              <div className="text-sm text-white/70">
+                {view === 'dashboard' ? 'Панель управления' : `Доставки на ${selectedDate}`}
+              </div>
+              <Button
+                variant="ghost"
+                size="sm"
+                onClick={logout}
+                className="text-white hover:bg-white/10"
+              >
+                <LogOut size={18} className="mr-1" />
+                Выйти
+              </Button>
             </div>
           </div>
         </div>
       </header>
 
       <main className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
-        {view === 'dashboard' ? (
+        <Suspense fallback={<PageLoader />}>
-          <Dashboard 
+          {view === 'dashboard' ? (
-            onDateSelect={handleDateSelect}
+            <Dashboard
-            onAddDelivery={handleAddDelivery}
+              onDateSelect={handleDateSelect}
-          />
+              onAddDelivery={handleAddDelivery}
-        ) : (
+            />
-          <DeliveryListPage 
+          ) : (
-            selectedDate={selectedDate}
+            <DeliveryListPage
-            onBack={handleBackToDashboard}
+              selectedDate={selectedDate}
-          />
+              onBack={handleBackToDashboard}
-        )}
+            />
+          )}
+        </Suspense>
       </main>
 
       <DeliveryForm
@@ -96,6 +147,8 @@ function App() {
         defaultDate={formDate}
         isSubmitting={isSubmitting}
       />
+
+      <ToastContainer />
     </div>
   );
 }

frontend/src/api/auth.ts

@@ -0,0 +1,7 @@
+import { api } from './client';
+import type { LoginRequest, LoginResponse } from '../types';
+
+export const authApi = {
+  login: (credentials: LoginRequest): Promise<LoginResponse> =>
+    api.post<LoginResponse>('/api/auth/login', credentials),
+};

frontend/src/api/client.ts

@@ -1,4 +1,25 @@
-const API_BASE_URL = import.meta.env.VITE_API_URL || 'http://localhost:8080';
+import { useToastStore } from '../stores/toastStore';
+
+const API_BASE_URL = import.meta.env.VITE_API_URL || '';
+
+// Request deduplication cache
+const pendingRequests = new Map<string, Promise<unknown>>();
+// Abort controllers for cancelling requests
+const abortControllers = new Map<string, AbortController>();
+
+// Get token from localStorage
+function getAuthToken(): string | null {
+  return localStorage.getItem('auth_token');
+}
+
+// Handle 401 unauthorized
+function handleUnauthorized() {
+  localStorage.removeItem('auth_token');
+  localStorage.removeItem('auth_user');
+  useToastStore.getState().addToast('Сессия истекла, войдите снова', 'error');
+  // Reload page to trigger auth check
+  window.location.reload();
+}
 
 export class ApiError extends Error {
   status: number;
@@ -12,34 +33,79 @@ export class ApiError extends Error {
   }
 }
 
+function getRequestKey(endpoint: string, method: string, body?: unknown): string {
+  return `${method}:${endpoint}:${body ? JSON.stringify(body) : ''}`;
+}
+
 async function fetchApi<T>(
   endpoint: string,
-  options?: RequestInit
+  options?: RequestInit & { deduplicate?: boolean }
 ): Promise<T> {
   const url = `${API_BASE_URL}${endpoint}`;
+  const method = options?.method || 'GET';
+  const requestKey = getRequestKey(endpoint, method, options?.body);
 
-  const response = await fetch(url, {
+  // Cancel previous request with same key (for non-GET requests or explicit override)
-    ...options,
+  const shouldCancelPrevious = method !== 'GET' || options?.deduplicate === false;
-    headers: {
+  if (shouldCancelPrevious && abortControllers.has(requestKey)) {
-      'Content-Type': 'application/json',
+    abortControllers.get(requestKey)?.abort();
-      ...options?.headers,
-    },
-  });
-
-  if (!response.ok) {
-    const errorData = await response.json().catch(() => null);
-    throw new ApiError(
-      errorData?.error || `HTTP ${response.status}`,
-      response.status,
-      errorData?.details
-    );
   }
 
-  return response.json();
+  // Deduplicate GET requests
+  if (method === 'GET' && options?.deduplicate !== false) {
+    if (pendingRequests.has(requestKey)) {
+      return pendingRequests.get(requestKey) as Promise<T>;
+    }
+  }
+
+  // Create new abort controller
+  const controller = new AbortController();
+  abortControllers.set(requestKey, controller);
+
+  const requestPromise = (async (): Promise<T> => {
+    try {
+      const token = getAuthToken();
+      const response = await fetch(url, {
+        ...options,
+        signal: controller.signal,
+        headers: {
+          'Content-Type': 'application/json',
+          ...(token && { 'Authorization': `Bearer ${token}` }),
+          ...options?.headers,
+        },
+      });
+
+      if (!response.ok) {
+        // Handle 401 unauthorized
+        if (response.status === 401) {
+          handleUnauthorized();
+          throw new ApiError('Unauthorized', 401);
+        }
+        const errorData = await response.json().catch(() => null);
+        throw new ApiError(
+          errorData?.error || `HTTP ${response.status}`,
+          response.status,
+          errorData?.details
+        );
+      }
+
+      return response.json();
+    } finally {
+      pendingRequests.delete(requestKey);
+      abortControllers.delete(requestKey);
+    }
+  })();
+
+  if (method === 'GET' && options?.deduplicate !== false) {
+    pendingRequests.set(requestKey, requestPromise);
+  }
+
+  return requestPromise;
 }
 
 export const api = {
-  get: <T>(endpoint: string) => fetchApi<T>(endpoint, { method: 'GET' }),
+  get: <T>(endpoint: string, options?: { deduplicate?: boolean }) =>
+    fetchApi<T>(endpoint, { method: 'GET', ...options }),
 
   post: <T>(endpoint: string, data: unknown) =>
     fetchApi<T>(endpoint, {
@@ -56,3 +122,10 @@ export const api = {
   delete: <T>(endpoint: string) =>
     fetchApi<T>(endpoint, { method: 'DELETE' }),
 };
+
+// Utility to cancel all pending requests (useful on unmount)
+export function cancelAllRequests(): void {
+  abortControllers.forEach(controller => controller.abort());
+  abortControllers.clear();
+  pendingRequests.clear();
+}

frontend/src/api/deliveries.ts

@@ -1,4 +1,5 @@
 import { api } from './client';
+import { backendDateToFrontend } from '../utils/date';
 import type { Delivery, PickupLocation, DeliveryStatus } from '../types';
 
 // Types matching backend responses
@@ -6,11 +7,20 @@ interface BackendDelivery {
   id: string;
   date: string; // YYYY-MM-DD from pgtype.Date
   pickup_location: PickupLocation;
+  pickup_location_2: PickupLocation | null;
   product_name: string;
+  product_name_2: string | null;
+  customer_name: string;
   address: string;
+  street: string;
+  house: string;
+  apartment: string | null;
+  entrance: string | null;
+  floor: string | null;
   phone: string;
   additional_phone: string | null;
   has_elevator: boolean;
+  service_info: string | null;
   comment: string;
   status: DeliveryStatus;
   created_at: string; // ISO timestamp
@@ -44,29 +54,26 @@ interface UpdateDeliveryResponse {
   message: string;
 }
 
-// Convert backend date format (YYYY-MM-DD) to frontend format (DD-MM-YYYY)
-function backendDateToFrontend(dateStr: string): string {
-  const [year, month, day] = dateStr.split('-');
-  return `${day}-${month}-${year}`;
-}
-
-// Convert frontend date format (DD-MM-YYYY) to backend format (YYYY-MM-DD)
-export function frontendDateToBackend(dateStr: string): string {
-  const [day, month, year] = dateStr.split('-');
-  return `${year}-${month}-${day}`;
-}
-
 // Map backend delivery to frontend delivery
 function mapBackendToFrontend(backend: BackendDelivery): Delivery {
   return {
     id: backend.id,
     date: backendDateToFrontend(backend.date),
     pickupLocation: backend.pickup_location,
+    pickupLocation2: backend.pickup_location_2 || undefined,
     productName: backend.product_name,
+    productName2: backend.product_name_2 || undefined,
+    customerName: backend.customer_name,
     address: backend.address,
+    street: backend.street,
+    house: backend.house,
+    apartment: backend.apartment || undefined,
+    entrance: backend.entrance || undefined,
+    floor: backend.floor || undefined,
     phone: backend.phone,
     additionalPhone: backend.additional_phone || undefined,
     hasElevator: backend.has_elevator,
+    serviceInfo: backend.service_info || undefined,
     comment: backend.comment,
     status: backend.status,
     createdAt: new Date(backend.created_at).getTime(),
@@ -107,11 +114,20 @@ export const deliveriesApi = {
     const payload = {
       date: data.date,
       pickup_location: data.pickupLocation,
+      pickup_location_2: data.pickupLocation2 || null,
       product_name: data.productName,
+      product_name_2: data.productName2 || null,
+      customer_name: data.customerName,
       address: data.address,
+      street: data.street,
+      house: data.house,
+      apartment: data.apartment || null,
+      entrance: data.entrance || null,
+      floor: data.floor || null,
       phone: data.phone,
-      additional_phone: data.additionalPhone || '',
+      additional_phone: data.additionalPhone || null,
       has_elevator: data.hasElevator,
+      service_info: data.serviceInfo || null,
       comment: data.comment,
     };
     const response = await api.post<CreateDeliveryResponse>('/api/deliveries', payload);
@@ -126,11 +142,20 @@ export const deliveriesApi = {
     const payload = {
       date: data.date,
       pickup_location: data.pickupLocation,
+      pickup_location_2: data.pickupLocation2 || null,
       product_name: data.productName,
+      product_name_2: data.productName2 || null,
+      customer_name: data.customerName,
       address: data.address,
+      street: data.street,
+      house: data.house,
+      apartment: data.apartment || null,
+      entrance: data.entrance || null,
+      floor: data.floor || null,
       phone: data.phone,
-      additional_phone: data.additionalPhone || '',
+      additional_phone: data.additionalPhone || null,
       has_elevator: data.hasElevator,
+      service_info: data.serviceInfo || null,
       comment: data.comment,
     };
     await api.patch<UpdateDeliveryResponse>(`/api/deliveries/${id}`, payload);

frontend/src/api/index.ts

@@ -1,2 +1,4 @@
-export { api, ApiError } from './client';
+export { api, ApiError, cancelAllRequests } from './client';
-export { deliveriesApi, frontendDateToBackend } from './deliveries';
+export { deliveriesApi } from './deliveries';
+export { authApi } from './auth';
+export { frontendDateToBackend } from '../utils/date';

frontend/src/components/auth/LoginForm.tsx

@@ -0,0 +1,91 @@
+import { useState, type FormEvent } from 'react';
+import { Lock, User, Loader2 } from 'lucide-react';
+import { Button } from '../ui/Button';
+import { Input } from '../ui/Input';
+import { useAuthStore } from '../../stores/authStore';
+
+export const LoginForm = () => {
+  const [username, setUsername] = useState('');
+  const [password, setPassword] = useState('');
+  const { login, isLoading } = useAuthStore();
+
+  const handleSubmit = async (e: FormEvent) => {
+    e.preventDefault();
+    if (!username.trim() || !password.trim()) return;
+
+    try {
+      await login({ username: username.trim(), password });
+    } catch {
+      // Error is handled by store (toast)
+    }
+  };
+
+  return (
+    <div className="min-h-screen flex items-center justify-center bg-[#fbf8fb] p-4">
+      <div className="w-full max-w-md bg-white rounded-xl shadow-lg p-8">
+        <div className="text-center mb-8">
+          <div className="w-16 h-16 bg-[#1B263B] rounded-xl flex items-center justify-center mx-auto mb-4">
+            <Lock className="w-8 h-8 text-white" />
+          </div>
+          <h1 className="text-2xl font-bold text-[#1b1b1d]">
+            Delivery Tracker
+          </h1>
+          <p className="text-[#75777d] mt-2">
+            Войдите в систему
+          </p>
+        </div>
+
+        <form onSubmit={handleSubmit} className="space-y-5">
+          <div className="relative">
+            <div className="absolute left-3 top-1/2 -translate-y-1/2 text-[#75777d]">
+              <User size={20} />
+            </div>
+            <Input
+              type="text"
+              placeholder="Имя пользователя"
+              value={username}
+              onChange={(e) => setUsername(e.target.value)}
+              required
+              minLength={3}
+              disabled={isLoading}
+              className="pl-10"
+            />
+          </div>
+
+          <div className="relative">
+            <div className="absolute left-3 top-1/2 -translate-y-1/2 text-[#75777d]">
+              <Lock size={20} />
+            </div>
+            <Input
+              type="password"
+              placeholder="Пароль"
+              value={password}
+              onChange={(e) => setPassword(e.target.value)}
+              required
+              minLength={6}
+              disabled={isLoading}
+              className="pl-10"
+            />
+          </div>
+
+          <Button
+            type="submit"
+            variant="primary"
+            size="lg"
+            disabled={isLoading}
+            className="w-full"
+          >
+            {isLoading ? (
+              <>
+                <Loader2 className="w-5 h-5 mr-2 animate-spin" />
+                Вход...
+              </>
+            ) : (
+              'Войти'
+            )}
+          </Button>
+        </form>
+      </div>
+    </div>
+  );
+};

frontend/src/components/auth/index.ts

@@ -0,0 +1 @@
+export { LoginForm } from './LoginForm';

frontend/src/components/delivery/DeliveryCard.tsx

@@ -1,9 +1,12 @@
-import { MapPin, Phone, Package, Store, Calendar, MessageSquare, CheckCircle2, Circle, CheckSquare } from 'lucide-react';
+import { memo } from 'react';
+import { MapPin, Phone, Store, Calendar, MessageSquare, CheckCircle2, Circle, CheckSquare, User, Wrench } from 'lucide-react';
 import type { Delivery } from '../../types';
 import { pickupLocationLabels } from '../../types';
 import { StatusBadge } from './StatusBadge';
 import { Card } from '../ui/Card';
 
+const CITY = 'kokshetau';
+
 interface DeliveryCardProps {
   delivery: Delivery;
   onStatusChange: (id: string) => void;
@@ -11,10 +14,10 @@ interface DeliveryCardProps {
   onDelete: (id: string) => void;
 }
 
-export const DeliveryCard = ({ delivery, onStatusChange, onEdit, onDelete }: DeliveryCardProps) => {
+export const DeliveryCard = memo(({ delivery, onStatusChange, onEdit, onDelete }: DeliveryCardProps) => {
   const handleAddressClick = () => {
     const encodedAddress = encodeURIComponent(delivery.address);
-    window.open(`https://maps.google.com/?q=${encodedAddress}`, '_blank');
+    window.open(`https://2gis.kz/${CITY}/search/${encodedAddress}`, '_blank');
   };
 
   const handlePhoneClick = () => {
@@ -55,14 +58,23 @@ export const DeliveryCard = ({ delivery, onStatusChange, onEdit, onDelete }: Del
           <span className="text-[#1b1b1d] font-medium">{delivery.date}</span>
         </div>
 
-        <div className="flex items-center gap-2 text-sm">
+        {/* Pickup locations paired with products */}
-          <Store size={16} className="text-[#75777d]" />
+        <div className="flex items-start gap-2 text-sm">
-          <span className="text-[#1b1b1d]">{pickupLocationLabels[delivery.pickupLocation]}</span>
+          <Store size={16} className="text-[#75777d] mt-0.5 shrink-0" />
-        </div>
+          <div className="flex flex-col gap-1 min-w-0">
-
+            <div className="flex items-baseline gap-2 flex-wrap">
-        <div className="flex items-center gap-2 text-sm">
+              <span className="text-[#1b1b1d] font-medium">{pickupLocationLabels[delivery.pickupLocation]}</span>
-          <Package size={16} className="text-[#75777d]" />
+              <span className="text-[#75777d]">—</span>
-          <span className="text-[#1b1b1d]">{delivery.productName}</span>
+              <span className="text-[#1b1b1d]">{delivery.productName}</span>
+            </div>
+            {delivery.pickupLocation2 && (
+              <div className="flex items-baseline gap-2 flex-wrap">
+                <span className="text-[#1b1b1d] font-medium">{pickupLocationLabels[delivery.pickupLocation2]}</span>
+                <span className="text-[#75777d]">—</span>
+                <span className="text-[#1b1b1d]">{delivery.productName2 || '—'}</span>
+              </div>
+            )}
+          </div>
         </div>
 
         <button
@@ -70,11 +82,25 @@ export const DeliveryCard = ({ delivery, onStatusChange, onEdit, onDelete }: Del
           className="flex items-start gap-2 text-sm w-full text-left hover:bg-[#f5f3f5] -mx-1 px-1 py-0.5 rounded transition-colors"
         >
           <MapPin size={16} className="text-[#F28C28] mt-0.5 shrink-0" />
-          <span className="text-[#1B263B] underline decoration-[#F28C28]/30 underline-offset-2">
+          <div className="flex flex-col">
-            {delivery.address}
+            <span className="text-[#1B263B] underline decoration-[#F28C28]/30 underline-offset-2">
-          </span>
+              ул. {delivery.street}, д. {delivery.house}{delivery.apartment ? `, кв. ${delivery.apartment}` : ''}
+            </span>
+            {(delivery.entrance || delivery.floor) && (
+              <span className="text-[#75777d] text-xs">
+                {delivery.entrance && `Подъезд ${delivery.entrance}`}
+                {delivery.entrance && delivery.floor && ', '}
+                {delivery.floor && `этаж ${delivery.floor}`}
+              </span>
+            )}
+          </div>
         </button>
 
+        <div className="flex items-center gap-2 text-sm">
+          <User size={16} className="text-[#75777d]" />
+          <span className="text-[#1b1b1d]">{delivery.customerName}</span>
+        </div>
+
         <button
           onClick={handlePhoneClick}
           className="flex items-center gap-2 text-sm w-full text-left hover:bg-[#f5f3f5] -mx-1 px-1 py-0.5 rounded transition-colors"
@@ -104,6 +130,13 @@ export const DeliveryCard = ({ delivery, onStatusChange, onEdit, onDelete }: Del
           </span>
         </div>
 
+        {delivery.serviceInfo && (
+          <div className="flex items-start gap-2 text-sm">
+            <Wrench size={16} className="text-[#F28C28] mt-0.5 shrink-0" />
+            <span className="text-[#45474d]">{delivery.serviceInfo}</span>
+          </div>
+        )}
+
         {delivery.comment && (
           <div className="flex items-start gap-2 text-sm">
             <MessageSquare size={16} className="text-[#75777d] mt-0.5 shrink-0" />
@@ -132,4 +165,6 @@ export const DeliveryCard = ({ delivery, onStatusChange, onEdit, onDelete }: Del
       </div>
     </Card>
   );
-};
+});
+
+DeliveryCard.displayName = 'DeliveryCard';

frontend/src/components/delivery/DeliveryForm.tsx

@@ -1,7 +1,8 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import { Button, Input, Select, Modal } from '../ui';
+import { pickupOptions } from '../../constants/pickup';
+import { formatDateForInput, parseDateFromInput, getTodayFrontend } from '../../utils/date';
 import type { Delivery, PickupLocation, DeliveryStatus } from '../../types';
-import { pickupLocationLabels } from '../../types';
 
 interface DeliveryFormProps {
   isOpen: boolean;
@@ -12,72 +13,124 @@ interface DeliveryFormProps {
   isSubmitting?: boolean;
 }
 
-const pickupOptions: { value: PickupLocation; label: string }[] = [
+// Phone validation regex for Kazakhstan numbers
-  { value: 'warehouse', label: pickupLocationLabels.warehouse },
+const PHONE_REGEX = /^\+7\s?\(?\d{3}\)?\s?\d{3}[\s-]?\d{2}[\s-]?\d{2}$/;
-  { value: 'symbat', label: pickupLocationLabels.symbat },
+
-  { value: 'nursaya', label: pickupLocationLabels.nursaya },
+// City is not shown in UI but is included in the saved address (used for 2GIS search).
-  { value: 'galaktika', label: pickupLocationLabels.galaktika },
+const CITY_LABEL = 'Кокшетау';
-];
+
+const buildAddressString = (
+  street: string,
+  house: string,
+  apartment: string,
+  entrance: string,
+): string => {
+  const parts: string[] = [CITY_LABEL];
+  if (street) parts.push(`ул. ${street}`);
+  if (house) parts.push(`д. ${house}`);
+  if (apartment) parts.push(`кв. ${apartment}`);
+  if (entrance) parts.push(`подъезд ${entrance}`);
+  return parts.join(', ');
+};
 
 export const DeliveryForm = ({ isOpen, onClose, onSubmit, initialData, defaultDate, isSubmitting }: DeliveryFormProps) => {
   const [formData, setFormData] = useState({
-    date: defaultDate || new Date().toLocaleDateString('ru-RU').split('.').join('-'),
+    date: defaultDate || getTodayFrontend(),
     pickupLocation: 'warehouse' as PickupLocation,
+    pickupLocation2: null as PickupLocation | null,
     productName: '',
+    productName2: '',
+    customerName: '',
     address: '',
+    street: '',
+    house: '',
+    apartment: '',
+    entrance: '',
+    floor: '',
     phone: '',
     additionalPhone: '',
     hasElevator: false,
+    serviceInfo: '',
     comment: '',
     status: 'new' as DeliveryStatus,
   });
+  const [showSecondPickup, setShowSecondPickup] = useState(false);
 
   useEffect(() => {
     if (initialData) {
       setFormData({
         date: initialData.date,
         pickupLocation: initialData.pickupLocation,
+        pickupLocation2: initialData.pickupLocation2 || null,
         productName: initialData.productName,
+        productName2: initialData.productName2 || '',
+        customerName: initialData.customerName,
         address: initialData.address,
+        street: initialData.street,
+        house: initialData.house,
+        apartment: initialData.apartment || '',
+        entrance: initialData.entrance || '',
+        floor: initialData.floor || '',
         phone: initialData.phone,
         additionalPhone: initialData.additionalPhone || '',
         hasElevator: initialData.hasElevator,
+        serviceInfo: initialData.serviceInfo || '',
         comment: initialData.comment,
         status: initialData.status,
       });
+      setShowSecondPickup(!!initialData.pickupLocation2);
     } else if (defaultDate) {
       setFormData(prev => ({ ...prev, date: defaultDate }));
     }
   }, [initialData, defaultDate, isOpen]);
 
-  const handleSubmit = (e: React.FormEvent) => {
+  const validatePhone = useCallback((phone: string): boolean => {
+    if (!phone) return false;
+    return PHONE_REGEX.test(phone);
+  }, []);
+
+  const isPhoneValid = !formData.phone || validatePhone(formData.phone);
+  const isAdditionalPhoneValid = !formData.additionalPhone || validatePhone(formData.additionalPhone);
+  const isFormValid = formData.productName && formData.phone && isPhoneValid && formData.customerName && formData.street && formData.house;
+
+  const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
-    onSubmit(formData);
+    if (!isFormValid) return;
-    if (!initialData) {
+    try {
-      setFormData({
+      const payload = {
-        date: defaultDate || new Date().toLocaleDateString('ru-RU').split('.').join('-'),
+        ...formData,
-        pickupLocation: 'warehouse',
+        address: buildAddressString(formData.street, formData.house, formData.apartment, formData.entrance),
-        productName: '',
+      };
-        address: '',
+      await onSubmit(payload);
-        phone: '',
+      if (!initialData) {
-        additionalPhone: '',
+        setFormData({
-        hasElevator: false,
+          date: defaultDate || getTodayFrontend(),
-        comment: '',
+          pickupLocation: 'warehouse',
-        status: 'new',
+          pickupLocation2: null,
-      });
+          productName: '',
+          productName2: '',
+          customerName: '',
+          address: '',
+          street: '',
+          house: '',
+          apartment: '',
+          entrance: '',
+          floor: '',
+          phone: '',
+          additionalPhone: '',
+          hasElevator: false,
+          serviceInfo: '',
+          comment: '',
+          status: 'new',
+        });
+        setShowSecondPickup(false);
+      }
+      onClose();
+    } catch {
+      // Error is handled by parent, keep form open
     }
-    onClose();
   };
 
-  const formatDateForInput = (dateStr: string) => {
-    const [day, month, year] = dateStr.split('-');
-    return `${year}-${month}-${day}`;
-  };
-
-  const formatDateFromInput = (dateStr: string) => {
-    const [year, month, day] = dateStr.split('-');
-    return `${day}-${month}-${year}`;
-  };
 
   return (
     <Modal
@@ -89,7 +142,7 @@ export const DeliveryForm = ({ isOpen, onClose, onSubmit, initialData, defaultDa
           <Button variant="ghost" onClick={onClose} disabled={isSubmitting}>
             Отмена
           </Button>
-          <Button type="submit" form="delivery-form" disabled={isSubmitting}>
+          <Button type="submit" form="delivery-form" disabled={isSubmitting || !isFormValid}>
             {isSubmitting ? 'Сохранение...' : initialData ? 'Сохранить' : 'Создать'}
           </Button>
         </>
@@ -103,7 +156,7 @@ export const DeliveryForm = ({ isOpen, onClose, onSubmit, initialData, defaultDa
           <input
             type="date"
             value={formatDateForInput(formData.date)}
-            onChange={(e) => setFormData({ ...formData, date: formatDateFromInput(e.target.value) })}
+            onChange={(e) => setFormData({ ...formData, date: parseDateFromInput(e.target.value) })}
             className="w-full px-3 py-2 bg-[#f5f3f5] border border-[#c5c6cd] rounded-md text-[#1b1b1d] focus:outline-none focus:ring-2 focus:ring-[#1B263B] focus:border-transparent transition-colors"
             required
           />
@@ -124,16 +177,70 @@ export const DeliveryForm = ({ isOpen, onClose, onSubmit, initialData, defaultDa
           required
         />
 
+        {/* Address fields */}
+        <div className="bg-[#f5f3f5] rounded-lg p-4 space-y-3">
+          <p className="text-sm font-medium text-[#1b1b1d]">Адрес доставки</p>
+            <div className="grid grid-cols-2 gap-3">
+              <div>
+                <label className="block text-xs text-[#75777d] mb-1">Улица *</label>
+                <input
+                  type="text"
+                  value={formData.street}
+                  onChange={(e) => setFormData({ ...formData, street: e.target.value })}
+                  className="w-full px-2 py-1.5 bg-white border border-[#c5c6cd] rounded text-sm"
+                  required
+                />
+              </div>
+              <div>
+                <label className="block text-xs text-[#75777d] mb-1">Дом *</label>
+                <input
+                  type="text"
+                  value={formData.house}
+                  onChange={(e) => setFormData({ ...formData, house: e.target.value })}
+                  className="w-full px-2 py-1.5 bg-white border border-[#c5c6cd] rounded text-sm"
+                  required
+                />
+              </div>
+              <div>
+                <label className="block text-xs text-[#75777d] mb-1">Квартира</label>
+                <input
+                  type="text"
+                  value={formData.apartment}
+                  onChange={(e) => setFormData({ ...formData, apartment: e.target.value })}
+                  className="w-full px-2 py-1.5 bg-white border border-[#c5c6cd] rounded text-sm"
+                />
+              </div>
+              <div>
+                <label className="block text-xs text-[#75777d] mb-1">Подъезд</label>
+                <input
+                  type="text"
+                  value={formData.entrance}
+                  onChange={(e) => setFormData({ ...formData, entrance: e.target.value })}
+                  className="w-full px-2 py-1.5 bg-white border border-[#c5c6cd] rounded text-sm"
+                />
+              </div>
+              <div>
+                <label className="block text-xs text-[#75777d] mb-1">Этаж</label>
+                <input
+                  type="text"
+                  value={formData.floor}
+                  onChange={(e) => setFormData({ ...formData, floor: e.target.value })}
+                  className="w-full px-2 py-1.5 bg-white border border-[#c5c6cd] rounded text-sm"
+                />
+              </div>
+            </div>
+        </div>
+
         <Input
-          label="Адрес разгрузки"
+          label="ФИО клиента *"
-          value={formData.address}
+          value={formData.customerName}
-          onChange={(e) => setFormData({ ...formData, address: e.target.value })}
+          onChange={(e) => setFormData({ ...formData, customerName: e.target.value })}
-          placeholder="ул. Примерная, д. 1"
+          placeholder="Иванов Иван Иванович"
           required
         />
 
         <Input
-          label="Телефон покупателя"
+          label="Телефон покупателя *"
           type="tel"
           value={formData.phone}
           onChange={(e) => setFormData({ ...formData, phone: e.target.value })}
@@ -144,7 +251,14 @@ export const DeliveryForm = ({ isOpen, onClose, onSubmit, initialData, defaultDa
           }}
           placeholder="+7 (776)-567-89-01"
           required
+          aria-invalid={!isPhoneValid}
+          aria-describedby={!isPhoneValid ? 'phone-error' : undefined}
         />
+        {!isPhoneValid && formData.phone && (
+          <p id="phone-error" className="text-sm text-red-500 mt-1">
+            Введите корректный номер: +7 (XXX) XXX-XX-XX
+          </p>
+        )}
 
         <Input
           label="Дополнительный номер телефона"
@@ -157,7 +271,51 @@ export const DeliveryForm = ({ isOpen, onClose, onSubmit, initialData, defaultDa
             }
           }}
           placeholder="+7 (776)-567-89-01"
+          aria-invalid={!isAdditionalPhoneValid}
+          aria-describedby={!isAdditionalPhoneValid ? 'additional-phone-error' : undefined}
         />
+        {!isAdditionalPhoneValid && formData.additionalPhone && (
+          <p id="additional-phone-error" className="text-sm text-red-500 mt-1">
+            Введите корректный номер: +7 (XXX) XXX-XX-XX
+          </p>
+        )}
+
+        {/* Second pickup location */}
+        <div className="flex items-center gap-2">
+          <input
+            type="checkbox"
+            id="hasSecondPickup"
+            checked={showSecondPickup}
+            onChange={(e) => {
+              setShowSecondPickup(e.target.checked);
+              if (!e.target.checked) {
+                setFormData({ ...formData, pickupLocation2: null, productName2: '' });
+              }
+            }}
+            className="w-4 h-4 text-[#1B263B] border-[#c5c6cd] rounded focus:ring-[#1B263B]"
+          />
+          <label htmlFor="hasSecondPickup" className="text-sm text-[#1b1b1d]">
+            Добавить вторую точку загрузки
+          </label>
+        </div>
+
+        {showSecondPickup && (
+          <div className="bg-[#f5f3f5] rounded-lg p-4 space-y-3">
+            <p className="text-sm font-medium text-[#1b1b1d]">Вторая точка загрузки</p>
+            <Select
+              label="Место загрузки 2"
+              value={formData.pickupLocation2 || ''}
+              onChange={(e) => setFormData({ ...formData, pickupLocation2: e.target.value as PickupLocation })}
+              options={pickupOptions}
+            />
+            <Input
+              label="Название товара 2"
+              value={formData.productName2}
+              onChange={(e) => setFormData({ ...formData, productName2: e.target.value })}
+              placeholder="Название товара со второй точки"
+            />
+          </div>
+        )}
 
         <div className="flex items-center gap-2">
           <input
@@ -172,6 +330,13 @@ export const DeliveryForm = ({ isOpen, onClose, onSubmit, initialData, defaultDa
           </label>
         </div>
 
+        <Input
+          label="Услуги (сборка, подъём)"
+          value={formData.serviceInfo}
+          onChange={(e) => setFormData({ ...formData, serviceInfo: e.target.value })}
+          placeholder="Сборка 5000 тг, подъём на этаж 3000 тг"
+        />
+
         <Input
           label="Комментарий"
           value={formData.comment}

frontend/src/components/delivery/DeliveryList.tsx

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useState, useMemo } from 'react';
 import { Plus, LayoutGrid, Table as TableIcon } from 'lucide-react';
 import { DeliveryCard } from './DeliveryCard';
 import { DeliveryRow } from './DeliveryRow';
@@ -17,8 +17,8 @@ interface DeliveryListProps {
 export const DeliveryList = ({ deliveries, onStatusChange, onEdit, onDelete, onAdd, date }: DeliveryListProps) => {
   const [viewMode, setViewMode] = useState<'kanban' | 'table'>('kanban');
 
-  const newDeliveries = deliveries.filter(d => d.status === 'new');
+  const newDeliveries = useMemo(() => deliveries.filter(d => d.status === 'new'), [deliveries]);
-  const deliveredDeliveries = deliveries.filter(d => d.status === 'delivered');
+  const deliveredDeliveries = useMemo(() => deliveries.filter(d => d.status === 'delivered'), [deliveries]);
 
   return (
     <div className="space-y-4">
@@ -114,6 +114,7 @@ export const DeliveryList = ({ deliveries, onStatusChange, onEdit, onDelete, onA
                 <th className="px-4 py-3">Дата</th>
                 <th className="px-4 py-3">Загрузка</th>
                 <th className="px-4 py-3">Товар</th>
+                <th className="px-4 py-3">Клиент</th>
                 <th className="px-4 py-3">Адрес</th>
                 <th className="px-4 py-3">Телефон</th>
                 <th className="px-4 py-3">Комментарий</th>

frontend/src/components/delivery/DeliveryRow.tsx

@@ -1,8 +1,11 @@
+import { memo } from 'react';
 import { MapPin, Phone } from 'lucide-react';
 import type { Delivery } from '../../types';
 import { pickupLocationLabels } from '../../types';
 import { StatusBadge } from './StatusBadge';
 
+const CITY = 'kokshetau';
+
 interface DeliveryRowProps {
   delivery: Delivery;
   onStatusChange: (id: string) => void;
@@ -10,11 +13,11 @@ interface DeliveryRowProps {
   onDelete: (id: string) => void;
 }
 
-export const DeliveryRow = ({ delivery, onStatusChange, onEdit, onDelete }: DeliveryRowProps) => {
+export const DeliveryRow = memo(({ delivery, onStatusChange, onEdit, onDelete }: DeliveryRowProps) => {
   const handleAddressClick = (e: React.MouseEvent) => {
     e.stopPropagation();
     const encodedAddress = encodeURIComponent(delivery.address);
-    window.open(`https://maps.google.com/?q=${encodedAddress}`, '_blank');
+    window.open(`https://2gis.kz/${CITY}/search/${encodedAddress}`, '_blank');
   };
 
   const handlePhoneClick = (e: React.MouseEvent) => {
@@ -32,15 +35,25 @@ export const DeliveryRow = ({ delivery, onStatusChange, onEdit, onDelete }: Deli
         />
       </td>
       <td className="px-4 py-3 text-sm text-[#1b1b1d]">{delivery.date}</td>
-      <td className="px-4 py-3 text-sm text-[#1b1b1d]">{pickupLocationLabels[delivery.pickupLocation]}</td>
+      <td className="px-4 py-3 text-sm text-[#1b1b1d]">
-      <td className="px-4 py-3 text-sm text-[#1b1b1d]">{delivery.productName}</td>
+        {delivery.pickupLocation2
+          ? `${pickupLocationLabels[delivery.pickupLocation]} + ${pickupLocationLabels[delivery.pickupLocation2]}`
+          : pickupLocationLabels[delivery.pickupLocation]}
+      </td>
+      <td className="px-4 py-3 text-sm text-[#1b1b1d]">
+        {delivery.productName}
+        {delivery.productName2 && <span className="block text-xs text-[#75777d]">+ {delivery.productName2}</span>}
+      </td>
+      <td className="px-4 py-3 text-sm text-[#1b1b1d]">{delivery.customerName}</td>
       <td className="px-4 py-3">
         <button
           onClick={handleAddressClick}
           className="flex items-center gap-1.5 text-sm text-[#1B263B] hover:text-[#F28C28] transition-colors text-left"
         >
           <MapPin size={14} />
-          <span className="max-w-[200px] truncate">{delivery.address}</span>
+          <span className="max-w-[200px] truncate">
+            ул. {delivery.street}, д. {delivery.house}{delivery.apartment ? `, кв. ${delivery.apartment}` : ''}
+          </span>
         </button>
       </td>
       <td className="px-4 py-3">
@@ -75,4 +88,6 @@ export const DeliveryRow = ({ delivery, onStatusChange, onEdit, onDelete }: Deli
       </td>
     </tr>
   );
-};
+});
+
+DeliveryRow.displayName = 'DeliveryRow';

frontend/src/components/ui/Toast.tsx

@@ -0,0 +1,45 @@
+import { useToastStore } from '../../stores/toastStore';
+import { X, CheckCircle, AlertCircle, Info } from 'lucide-react';
+
+const icons = {
+  success: CheckCircle,
+  error: AlertCircle,
+  info: Info,
+};
+
+const styles = {
+  success: 'bg-green-50 border-green-200 text-green-800',
+  error: 'bg-red-50 border-red-200 text-red-800',
+  info: 'bg-blue-50 border-blue-200 text-blue-800',
+};
+
+export const ToastContainer = () => {
+  const { toasts, removeToast } = useToastStore();
+
+  if (toasts.length === 0) return null;
+
+  return (
+    <div className="fixed bottom-4 right-4 z-50 flex flex-col gap-2">
+      {toasts.map((toast) => {
+        const Icon = icons[toast.type];
+        return (
+          <div
+            key={toast.id}
+            className={`flex items-center gap-3 px-4 py-3 rounded-lg border shadow-lg min-w-[300px] animate-in slide-in-from-right ${styles[toast.type]}`}
+            role="alert"
+          >
+            <Icon size={20} />
+            <p className="flex-1 text-sm">{toast.message}</p>
+            <button
+              onClick={() => removeToast(toast.id)}
+              className="p-1 hover:bg-black/5 rounded transition-colors"
+              aria-label="Закрыть"
+            >
+              <X size={16} />
+            </button>
+          </div>
+        );
+      })}
+    </div>
+  );
+};

frontend/src/constants/pickup.ts

@@ -0,0 +1,14 @@
+import type { PickupLocation } from '../types';
+import { pickupLocationLabels } from '../types';
+
+export const pickupOptions: { value: PickupLocation; label: string }[] = [
+  { value: 'warehouse', label: pickupLocationLabels.warehouse },
+  { value: 'symbat', label: pickupLocationLabels.symbat },
+  { value: 'nursaya', label: pickupLocationLabels.nursaya },
+  { value: 'galaktika', label: pickupLocationLabels.galaktika },
+];
+
+export const pickupFilterOptions: { value: PickupLocation | 'all'; label: string }[] = [
+  { value: 'all', label: 'Все места загрузки' },
+  ...pickupOptions,
+];

frontend/src/main.tsx

@@ -3,6 +3,18 @@ import { createRoot } from 'react-dom/client'
 import './index.css'
 import App from './App.tsx'
 
+if ('serviceWorker' in navigator) {
+  window.addEventListener('load', () => {
+    navigator.serviceWorker.register('/sw.js', { scope: '/' })
+      .then((registration) => {
+        console.log('SW registered:', registration)
+      })
+      .catch((error) => {
+        console.log('SW registration failed:', error)
+      })
+  })
+}
+
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <App />

frontend/src/pages/Dashboard.tsx

@@ -1,9 +1,10 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useMemo } from 'react';
 import { Plus, Printer, ChevronRight, CalendarDays } from 'lucide-react';
-import { format, startOfMonth, endOfMonth, eachDayOfInterval, isToday } from 'date-fns';
+import { format, startOfMonth, endOfMonth, eachDayOfInterval, isToday, getDay } from 'date-fns';
 import { ru } from 'date-fns/locale';
 import { useDeliveryStore } from '../stores/deliveryStore';
 import type { Delivery } from '../types';
+import { pickupLocationLabels } from '../types';
 import { Button } from '../components/ui/Button';
 import { Card } from '../components/ui/Card';
 
@@ -12,7 +13,7 @@ interface DashboardProps {
   onAddDelivery: () => void;
 }
 
-export const Dashboard = ({ onDateSelect, onAddDelivery }: DashboardProps) => {
+const Dashboard = ({ onDateSelect, onAddDelivery }: DashboardProps) => {
   const deliveryCounts = useDeliveryStore(state => state.deliveryCounts);
   const fetchDeliveryCounts = useDeliveryStore(state => state.fetchDeliveryCounts);
   const [currentMonth, setCurrentMonth] = useState(new Date());
@@ -22,9 +23,11 @@ export const Dashboard = ({ onDateSelect, onAddDelivery }: DashboardProps) => {
     fetchDeliveryCounts();
   }, [fetchDeliveryCounts]);
 
-  const monthStart = startOfMonth(currentMonth);
+  const days = useMemo(() => {
-  const monthEnd = endOfMonth(currentMonth);
+    const monthStart = startOfMonth(currentMonth);
-  const days = eachDayOfInterval({ start: monthStart, end: monthEnd });
+    const monthEnd = endOfMonth(currentMonth);
+    return eachDayOfInterval({ start: monthStart, end: monthEnd });
+  }, [currentMonth]);
 
   const getCountForDate = (date: Date) => {
     const dateStr = format(date, 'dd-MM-yyyy');
@@ -43,7 +46,7 @@ export const Dashboard = ({ onDateSelect, onAddDelivery }: DashboardProps) => {
   };
 
   const printDeliveries = (date: Date, dayDeliveries: Delivery[]) => {
-    
+
     const printWindow = window.open('', '_blank');
     if (!printWindow) return;
 
@@ -55,31 +58,35 @@ export const Dashboard = ({ onDateSelect, onAddDelivery }: DashboardProps) => {
         <style>
           body { font-family: system-ui, sans-serif; margin: 20px; }
           h1 { font-size: 18px; margin-bottom: 16px; }
-          table { width: 100%; border-collapse: collapse; }
+          table { width: 100%; border-collapse: collapse; font-size: 12px; }
-          th, td { text-align: left; padding: 8px; border-bottom: 1px solid #ddd; }
+          th, td { text-align: left; padding: 6px; border-bottom: 1px solid #ddd; }
           th { font-weight: 600; background: #f5f5f5; }
-          .status-new { background: #ffdcc3; padding: 2px 8px; border-radius: 12px; font-size: 12px; }
+          .address-details { font-size: 11px; color: #666; }
-          .status-delivered { background: #dcfce7; padding: 2px 8px; border-radius: 12px; font-size: 12px; }
         </style>
       </head>
       <body>
         <h1>Доставки на ${format(date, 'dd MMMM yyyy', { locale: ru })}</h1>
         <table>
           <tr>
-            <th>Статус</th>
             <th>Загрузка</th>
             <th>Товар</th>
+            <th>Клиент</th>
             <th>Адрес</th>
             <th>Телефон</th>
+            <th>Услуги</th>
             <th>Комментарий</th>
           </tr>
           ${dayDeliveries.map((d: Delivery) => `
             <tr>
-              <td><span class="status-${d.status}">${d.status === 'new' ? 'Новое' : 'Доставлено'}</span></td>
+              <td>${d.pickupLocation2 ? pickupLocationLabels[d.pickupLocation] + ' + ' + pickupLocationLabels[d.pickupLocation2] : pickupLocationLabels[d.pickupLocation]}</td>
-              <td>${d.pickupLocation === 'warehouse' ? 'Склад' : d.pickupLocation === 'symbat' ? 'Сымбат' : d.pickupLocation === 'nursaya' ? 'Нурсая' : 'Галактика'}</td>
+              <td>${d.productName}${d.productName2 ? '<br><small>+ ' + d.productName2 + '</small>' : ''}</td>
-              <td>${d.productName}</td>
+              <td>${d.customerName}</td>
-              <td>${d.address}</td>
+              <td>
+                ул. ${d.street}, д. ${d.house}${d.apartment ? ', кв. ' + d.apartment : ''}
+                ${d.entrance || d.floor ? '<br><span class="address-details">' + (d.entrance ? 'Подъезд ' + d.entrance : '') + (d.entrance && d.floor ? ', ' : '') + (d.floor ? 'этаж ' + d.floor : '') + '</span>' : ''}
+              </td>
               <td>${d.phone}</td>
+              <td>${d.serviceInfo || '-'}</td>
               <td>${d.comment || '-'}</td>
             </tr>
           `).join('')}
@@ -87,7 +94,7 @@ export const Dashboard = ({ onDateSelect, onAddDelivery }: DashboardProps) => {
       </body>
       </html>
     `;
-    
+
     printWindow.document.write(html);
     printWindow.document.close();
     printWindow?.print();
@@ -118,7 +125,7 @@ export const Dashboard = ({ onDateSelect, onAddDelivery }: DashboardProps) => {
         <div className="flex items-center justify-between mb-6">
           <h2 className="text-lg font-semibold text-[#1b1b1d] flex items-center gap-2">
             <CalendarDays size={20} className="text-[#1B263B]" />
-            {format(currentMonth, 'MMMM yyyy', { locale: ru })}
+            {format(currentMonth, 'LLLL yyyy', { locale: ru })}
           </h2>
           <div className="flex gap-2">
             <Button variant="ghost" size="sm" onClick={() => navigateMonth('prev')}>
@@ -146,6 +153,9 @@ export const Dashboard = ({ onDateSelect, onAddDelivery }: DashboardProps) => {
         </div>
 
         <div className="grid grid-cols-7 gap-1">
+          {Array.from({ length: (getDay(startOfMonth(currentMonth)) + 6) % 7 }).map((_, i) => (
+            <div key={`empty-${i}`} className="p-3 min-h-[80px]" />
+          ))}
           {days.map((day) => {
             const count = getCountForDate(day);
             const isTodayDate = isToday(day);
@@ -234,3 +244,5 @@ export const Dashboard = ({ onDateSelect, onAddDelivery }: DashboardProps) => {
     </div>
   );
 };
+
+export default Dashboard;

frontend/src/pages/DeliveryListPage.tsx

@@ -1,28 +1,30 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useMemo } from 'react';
 import { ArrowLeft, Filter, Loader2, AlertCircle } from 'lucide-react';
 import { useDeliveryStore } from '../stores/deliveryStore';
 import { DeliveryList as DeliveryListComponent } from '../components/delivery/DeliveryList';
 import { DeliveryForm } from '../components/delivery/DeliveryForm';
 import { Button } from '../components/ui/Button';
 import { Select } from '../components/ui/Select';
+import { pickupFilterOptions } from '../constants/pickup';
 import type { Delivery, PickupLocation } from '../types';
-import { pickupLocationLabels } from '../types';
 
 interface DeliveryListPageProps {
   selectedDate: string;
   onBack: () => void;
 }
 
-export const DeliveryListPage = ({ selectedDate, onBack }: DeliveryListPageProps) => {
+const DeliveryListPage = ({ selectedDate, onBack }: DeliveryListPageProps) => {
-  const deliveries = useDeliveryStore(state => state.deliveries);
+  const {
-  const isLoading = useDeliveryStore(state => state.isLoading);
+    deliveries,
-  const error = useDeliveryStore(state => state.error);
+    isLoading,
-  const fetchDeliveriesByDate = useDeliveryStore(state => state.fetchDeliveriesByDate);
+    error,
-  const toggleStatus = useDeliveryStore(state => state.toggleStatus);
+    fetchDeliveriesByDate,
-  const deleteDelivery = useDeliveryStore(state => state.deleteDelivery);
+    toggleStatus,
-  const updateDelivery = useDeliveryStore(state => state.updateDelivery);
+    deleteDelivery,
-  const addDelivery = useDeliveryStore(state => state.addDelivery);
+    updateDelivery,
-  const clearError = useDeliveryStore(state => state.clearError);
+    addDelivery,
+    clearError,
+  } = useDeliveryStore();
 
   // Fetch deliveries when date changes
   useEffect(() => {
@@ -34,18 +36,10 @@ export const DeliveryListPage = ({ selectedDate, onBack }: DeliveryListPageProps
   const [pickupFilter, setPickupFilter] = useState<PickupLocation | 'all'>('all');
 
   // Use all deliveries from store (already filtered by API)
-  const dayDeliveries = deliveries;
+  const filteredDeliveries = useMemo(() => {
-  const filteredDeliveries = pickupFilter === 'all' 
+    if (pickupFilter === 'all') return deliveries;
-    ? dayDeliveries 
+    return deliveries.filter(d => d.pickupLocation === pickupFilter);
-    : dayDeliveries.filter(d => d.pickupLocation === pickupFilter);
+  }, [deliveries, pickupFilter]);
-
-  const pickupOptions: { value: PickupLocation | 'all'; label: string }[] = [
-    { value: 'all', label: 'Все места загрузки' },
-    { value: 'warehouse', label: pickupLocationLabels.warehouse },
-    { value: 'symbat', label: pickupLocationLabels.symbat },
-    { value: 'nursaya', label: pickupLocationLabels.nursaya },
-    { value: 'galaktika', label: pickupLocationLabels.galaktika },
-  ];
 
   const handleStatusChange = async (id: string) => {
     const delivery = deliveries.find(d => d.id === id);
@@ -110,7 +104,7 @@ export const DeliveryListPage = ({ selectedDate, onBack }: DeliveryListPageProps
             label=""
             value={pickupFilter}
             onChange={(e) => setPickupFilter(e.target.value as PickupLocation | 'all')}
-            options={pickupOptions}
+            options={pickupFilterOptions}
           />
         </div>
       </div>
@@ -150,3 +144,5 @@ export const DeliveryListPage = ({ selectedDate, onBack }: DeliveryListPageProps
     </div>
   );
 };
+
+export default DeliveryListPage;

frontend/src/stores/authStore.ts

@@ -0,0 +1,79 @@
+import { create } from 'zustand';
+import { authApi } from '../api/auth';
+import { useToastStore } from './toastStore';
+import type { User, LoginRequest } from '../types';
+
+interface AuthState {
+  token: string | null;
+  user: User | null;
+  isAuthenticated: boolean;
+  isLoading: boolean;
+  isAuthChecking: boolean;
+  login: (credentials: LoginRequest) => Promise<void>;
+  logout: () => void;
+  restoreAuth: () => void;
+}
+
+const TOKEN_KEY = 'auth_token';
+const USER_KEY = 'auth_user';
+
+export const useAuthStore = create<AuthState>((set) => ({
+  token: null,
+  user: null,
+  isAuthenticated: false,
+  isLoading: false,
+  isAuthChecking: true,
+
+  login: async (credentials: LoginRequest) => {
+    set({ isLoading: true });
+    try {
+      const response = await authApi.login(credentials);
+      const token = response.token;
+
+      // Extract user info from token payload (JWT)
+      const payload = JSON.parse(atob(token.split('.')[1]));
+      const user: User = {
+        id: payload.sub || '',
+        username: credentials.username,
+      };
+
+      // Save to localStorage
+      localStorage.setItem(TOKEN_KEY, token);
+      localStorage.setItem(USER_KEY, JSON.stringify(user));
+
+      set({ token, user, isAuthenticated: true, isLoading: false });
+      useToastStore.getState().addToast('Вход выполнен успешно', 'success');
+    } catch (error) {
+      set({ isLoading: false });
+      const message = error instanceof Error ? error.message : 'Ошибка входа';
+      useToastStore.getState().addToast(message, 'error');
+      throw error;
+    }
+  },
+
+  logout: () => {
+    localStorage.removeItem(TOKEN_KEY);
+    localStorage.removeItem(USER_KEY);
+    set({ token: null, user: null, isAuthenticated: false });
+    useToastStore.getState().addToast('Вы вышли из системы', 'info');
+  },
+
+  restoreAuth: () => {
+    const token = localStorage.getItem(TOKEN_KEY);
+    const userJson = localStorage.getItem(USER_KEY);
+
+    if (token && userJson) {
+      try {
+        const user = JSON.parse(userJson) as User;
+        set({ token, user, isAuthenticated: true, isAuthChecking: false });
+      } catch {
+        // Invalid stored data, clear it
+        localStorage.removeItem(TOKEN_KEY);
+        localStorage.removeItem(USER_KEY);
+        set({ isAuthChecking: false });
+      }
+    } else {
+      set({ isAuthChecking: false });
+    }
+  },
+}));

frontend/src/stores/deliveryStore.ts

@@ -1,5 +1,6 @@
 import { create } from 'zustand';
 import { deliveriesApi } from '../api';
+import { useToastStore } from './toastStore';
 import type { Delivery, DeliveryStatus } from '../types';
 
 interface DeliveryState {
@@ -40,10 +41,12 @@ export const useDeliveryStore = create<DeliveryState>()((set, get) => ({
       const deliveries = await deliveriesApi.getByDate(date);
       set({ deliveries, isLoading: false });
     } catch (err) {
+      const message = err instanceof Error ? err.message : 'Failed to fetch deliveries';
       set({
-        error: err instanceof Error ? err.message : 'Failed to fetch deliveries',
+        error: message,
         isLoading: false,
       });
+      useToastStore.getState().addToast(message, 'error');
     }
   },
 
@@ -54,10 +57,12 @@ export const useDeliveryStore = create<DeliveryState>()((set, get) => ({
       const counts = await deliveriesApi.getCounts();
       set({ deliveryCounts: counts, isLoadingCounts: false });
     } catch (err) {
+      const message = err instanceof Error ? err.message : 'Failed to fetch counts';
       set({
-        error: err instanceof Error ? err.message : 'Failed to fetch counts',
+        error: message,
         isLoadingCounts: false,
       });
+      useToastStore.getState().addToast(message, 'error');
     }
   },
 
@@ -72,10 +77,12 @@ export const useDeliveryStore = create<DeliveryState>()((set, get) => ({
       await get().fetchDeliveryCounts();
       set({ isLoading: false });
     } catch (err) {
+      const message = err instanceof Error ? err.message : 'Failed to create delivery';
       set({
-        error: err instanceof Error ? err.message : 'Failed to create delivery',
+        error: message,
         isLoading: false,
       });
+      useToastStore.getState().addToast(message, 'error');
       throw err;
     }
   },
@@ -91,10 +98,12 @@ export const useDeliveryStore = create<DeliveryState>()((set, get) => ({
       await get().fetchDeliveryCounts();
       set({ isLoading: false });
     } catch (err) {
+      const message = err instanceof Error ? err.message : 'Failed to update delivery';
       set({
-        error: err instanceof Error ? err.message : 'Failed to update delivery',
+        error: message,
         isLoading: false,
       });
+      useToastStore.getState().addToast(message, 'error');
       throw err;
     }
   },
@@ -112,10 +121,12 @@ export const useDeliveryStore = create<DeliveryState>()((set, get) => ({
       // Refresh counts
       await get().fetchDeliveryCounts();
     } catch (err) {
+      const message = err instanceof Error ? err.message : 'Failed to delete delivery';
       set({
-        error: err instanceof Error ? err.message : 'Failed to delete delivery',
+        error: message,
         isLoading: false,
       });
+      useToastStore.getState().addToast(message, 'error');
       throw err;
     }
   },
@@ -136,10 +147,12 @@ export const useDeliveryStore = create<DeliveryState>()((set, get) => ({
         isLoading: false,
       }));
     } catch (err) {
+      const message = err instanceof Error ? err.message : 'Failed to update status';
       set({
-        error: err instanceof Error ? err.message : 'Failed to update status',
+        error: message,
         isLoading: false,
       });
+      useToastStore.getState().addToast(message, 'error');
       throw err;
     }
   },

frontend/src/stores/toastStore.ts

@@ -0,0 +1,35 @@
+import { create } from 'zustand';
+
+export type ToastType = 'success' | 'error' | 'info';
+
+interface Toast {
+  id: string;
+  message: string;
+  type: ToastType;
+}
+
+interface ToastState {
+  toasts: Toast[];
+  addToast: (message: string, type: ToastType) => void;
+  removeToast: (id: string) => void;
+}
+
+export const useToastStore = create<ToastState>((set) => ({
+  toasts: [],
+  addToast: (message, type) => {
+    const id = Math.random().toString(36).substring(2, 9);
+    set((state) => ({
+      toasts: [...state.toasts, { id, message, type }],
+    }));
+    // Auto remove after 5 seconds
+    setTimeout(() => {
+      set((state) => ({
+        toasts: state.toasts.filter((t) => t.id !== id),
+      }));
+    }, 5000);
+  },
+  removeToast: (id) =>
+    set((state) => ({
+      toasts: state.toasts.filter((t) => t.id !== id),
+    })),
+}));

frontend/src/types/index.ts

@@ -5,10 +5,19 @@ export interface Delivery {
   id: string;
   date: string;              // DD-MM-YYYY
   pickupLocation: PickupLocation;
+  pickupLocation2?: PickupLocation | null;
   productName: string;
-  address: string;
+  productName2?: string | null;
+  customerName: string;
   phone: string;
   additionalPhone?: string;
+  address: string;  // full address for compatibility
+  street: string;
+  house: string;
+  apartment?: string;
+  entrance?: string;
+  floor?: string;
+  serviceInfo?: string;
   hasElevator: boolean;
   comment: string;
   status: DeliveryStatus;
@@ -28,3 +37,17 @@ export const statusLabels: Record<DeliveryStatus, string> = {
   new: 'Новое',
   delivered: 'Доставлено',
 };
+
+export interface LoginRequest {
+  username: string;
+  password: string;
+}
+
+export interface LoginResponse {
+  token: string;
+}
+
+export interface User {
+  id: string;
+  username: string;
+}

frontend/src/utils/addressParser.ts

@@ -0,0 +1,122 @@
+export interface ParsedAddress {
+  street: string;
+  house: string;
+  apartment: string;
+  entrance: string;
+  floor: string;
+  remaining: string; // unrecognized parts
+}
+
+// Common Russian/Kazakh address patterns
+const STREET_PREFIXES = ['ул\\.', 'ул', 'пр\\.', 'пр', 'пр-т', 'бульвар', 'пер\\.', 'пер', 'ш\\.', 'шоссе', 'тракт'];
+const HOUSE_PATTERNS = ['д\\.', 'дом', 'д(?=\\s*\\d)', 'строение', 'стр\\.'];
+const APARTMENT_PATTERNS = ['кв\\.', 'квартира', 'кв(?=\\s*\\d)', 'офис', 'оф\\.'];
+const ENTRANCE_PATTERNS = ['подъезд', 'под\\.', 'под(?=\\s*\\d)', 'п(?=\\s*\\d)'];
+const FLOOR_PATTERNS = ['этаж', 'эт\\.', 'эт(?=\\s*\\d)', 'э(?=\\s*\\d)'];
+
+function createPattern(prefixes: string[]): RegExp {
+  const prefixPart = prefixes.join('|');
+  // Match prefix followed by optional spaces/separators and then the value
+  // Use Unicode property \p{L} for letters to support Cyrillic
+  return new RegExp(`(?:${prefixPart})[\\s\\.]*([0-9]+[\\p{L}\\-]*|[\\p{L}][\\p{L}\\d\\-]*)`, 'iu');
+}
+
+function extractValue(text: string, patterns: string[]): { value: string; remaining: string } {
+  const regex = createPattern(patterns);
+  const match = text.match(regex);
+  if (match) {
+    // Remove the matched part from text
+    const remaining = text.replace(match[0], '').trim().replace(/^[,.\s]+/, '');
+    return { value: match[1].trim(), remaining };
+  }
+  return { value: '', remaining: text };
+}
+
+export function parseAddress(address: string): ParsedAddress {
+  let remaining = address.trim();
+
+  // Extract components in order
+  const streetResult = extractValue(remaining, STREET_PREFIXES);
+  const street = streetResult.value;
+  remaining = streetResult.remaining;
+
+  // Try to extract house: first standalone number at the start, then with prefix
+  let house = '';
+  let houseResult;
+
+  // Try standalone number first (e.g., "ул. Абая 5" - house is "5" without "д." prefix)
+  const standaloneHouseMatch = remaining.match(/^\s*(\d+[\p{L}]?)(?:\s*[,;]|\s+(?=кв|под|э|п\s|э\s|д\.|д\s|дом))/iu);
+  if (standaloneHouseMatch) {
+    house = standaloneHouseMatch[1];
+    remaining = remaining.slice(standaloneHouseMatch[0].length).trim().replace(/^[,;\s]+/, '');
+  } else {
+    // Fallback: try with prefix patterns
+    houseResult = extractValue(remaining, HOUSE_PATTERNS);
+    house = houseResult.value;
+    remaining = houseResult.remaining;
+  }
+
+  const apartmentResult = extractValue(remaining, APARTMENT_PATTERNS);
+  const apartment = apartmentResult.value;
+  remaining = apartmentResult.remaining;
+
+  const entranceResult = extractValue(remaining, ENTRANCE_PATTERNS);
+  const entrance = entranceResult.value;
+  remaining = entranceResult.remaining;
+
+  const floorResult = extractValue(remaining, FLOOR_PATTERNS);
+  const floor = floorResult.value;
+  remaining = floorResult.remaining;
+
+  // Clean up remaining - remove common separators
+  remaining = remaining
+    .replace(/^[,.\s]+/, '')
+    .replace(/[,.\s]+$/, '')
+    .trim();
+
+  return {
+    street,
+    house,
+    apartment,
+    entrance,
+    floor,
+    remaining
+  };
+}
+
+// Format address for display
+export function formatAddressShort(addr: ParsedAddress): string {
+  const parts: string[] = [];
+  if (addr.street) parts.push(addr.street);
+  if (addr.house) parts.push(`д. ${addr.house}`);
+  if (addr.apartment) parts.push(`кв. ${addr.apartment}`);
+  return parts.join(', ') || addr.remaining;
+}
+
+export function formatAddressDetails(addr: ParsedAddress): string {
+  const parts: string[] = [];
+  if (addr.entrance) parts.push(`Подъезд ${addr.entrance}`);
+  if (addr.floor) parts.push(`этаж ${addr.floor}`);
+  return parts.join(', ');
+}
+
+// Build full address from components
+export function buildFullAddress(
+  street: string,
+  house: string,
+  apartment?: string,
+  entrance?: string,
+  floor?: string
+): string {
+  const parts: string[] = [];
+  if (street) parts.push(street);
+  if (house) parts.push(`д. ${house}`);
+  if (apartment) parts.push(`кв. ${apartment}`);
+  if (entrance || floor) {
+    const details: string[] = [];
+    if (entrance) details.push(`подъезд ${entrance}`);
+    if (floor) details.push(`этаж ${floor}`);
+    parts.push(details.join(', '));
+  }
+  return parts.join(', ');
+}

frontend/src/utils/date.ts

@@ -0,0 +1,52 @@
+import { format, parse, type Locale } from 'date-fns';
+
+/**
+ * Convert backend date format (YYYY-MM-DD) to frontend format (DD-MM-YYYY)
+ */
+export function backendDateToFrontend(dateStr: string): string {
+  const [year, month, day] = dateStr.split('-');
+  return `${day}-${month}-${year}`;
+}
+
+/**
+ * Convert frontend date format (DD-MM-YYYY) to backend format (YYYY-MM-DD)
+ */
+export function frontendDateToBackend(dateStr: string): string {
+  const [day, month, year] = dateStr.split('-');
+  return `${year}-${month}-${day}`;
+}
+
+/**
+ * Format frontend date for HTML input type="date" (YYYY-MM-DD)
+ */
+export function formatDateForInput(dateStr: string): string {
+  const [day, month, year] = dateStr.split('-');
+  return `${year}-${month}-${day}`;
+}
+
+/**
+ * Parse date from HTML input type="date" to frontend format (DD-MM-YYYY)
+ */
+export function parseDateFromInput(dateStr: string): string {
+  const [year, month, day] = dateStr.split('-');
+  return `${day}-${month}-${year}`;
+}
+
+/**
+ * Get today's date in frontend format
+ */
+export function getTodayFrontend(): string {
+  return format(new Date(), 'dd-MM-yyyy');
+}
+
+/**
+ * Format frontend date for display with date-fns
+ */
+export function formatFrontendDate(
+  dateStr: string,
+  formatStr: string,
+  options?: { locale?: Locale }
+): string {
+  const date = parse(dateStr, 'dd-MM-yyyy', new Date());
+  return format(date, formatStr, options);
+}

frontend/vite.config.ts

@@ -1,15 +1,37 @@
 import { defineConfig } from 'vite'
 import react from '@vitejs/plugin-react'
 import tailwindcss from '@tailwindcss/vite'
+import { VitePWA } from 'vite-plugin-pwa'
 
 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [react(), tailwindcss()],
+  plugins: [
+    react(),
+    tailwindcss(),
+    VitePWA({
+      registerType: 'autoUpdate',
+      manifest: false, // manifest.json from public
+      workbox: {
+        globPatterns: ['**/*.{js,css,html,ico,png,svg,json}'],
+        runtimeCaching: [
+          {
+            urlPattern: /^https:\/\/.*\/api\//,
+            handler: 'NetworkFirst',
+            options: {
+              cacheName: 'api-cache',
+            },
+          },
+        ],
+      },
+    }),
+  ],
   server: {
     allowedHosts: ['delivery.loca.lt', '.loca.lt'],
-    // hmr: {
+    proxy: {
-    //   host: 'delivery.loca.lt', // Use the hostname provided by localtunnel
+      '/api': {
-    //   port: 443, // Use HTTPS port
+        target: 'http://localhost:8080',
-    // },
+        changeOrigin: true,
+      },
+    },
   },
 })