From 975bc4ee611bca2fdad8e69c74c123679a0cf89e Mon Sep 17 00:00:00 2001
From: "Andrey K. Choi" <a.choi@smartsoltech.kr>
Date: Tue, 25 Nov 2025 13:06:48 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20FIX:=20=D0=98=D1=81=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20URL=20pattern=20'about=5Fview'?=
 =?UTF-8?q?=20=E2=86=92=20'about'=20+=20=D0=94=D0=B8=D0=BD=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B9=20=D1=84=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8C=D1=82=D1=80=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B8=D0=B9=20=D1=83=D1=81=D0=BB=D1=83=D0=B3=20=D0=B8=D0=B7=20?=
 =?UTF-8?q?=D0=91=D0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 smartsoltech/web/templates/web/navbar.html    |  2 +-
 .../web/templates/web/services_modern.html    | 58 +++----------------
 smartsoltech/web/views.py                     | 21 ++++++-
 3 files changed, 28 insertions(+), 53 deletions(-)

diff --git a/smartsoltech/web/templates/web/navbar.html b/smartsoltech/web/templates/web/navbar.html
index 8f67d03..711d9ad 100644
--- a/smartsoltech/web/templates/web/navbar.html
+++ b/smartsoltech/web/templates/web/navbar.html
@@ -7,7 +7,7 @@
         <div id="navcol-5" class="collapse navbar-collapse">
             <ul class="navbar-nav ms-auto">
                 <li class="nav-item"><a class="nav-link active" href="{% url 'services' %}">Услуги</a></li>
-                <li class="nav-item"><a class="nav-link" href="{% url 'about_view' %}">О нас</a></li>
+                <li class="nav-item"><a class="nav-link" href="{% url 'about' %}">О нас</a></li>
             </ul>
         </div>
     </div>
diff --git a/smartsoltech/web/templates/web/services_modern.html b/smartsoltech/web/templates/web/services_modern.html
index 3f39025..c69b19a 100644
--- a/smartsoltech/web/templates/web/services_modern.html
+++ b/smartsoltech/web/templates/web/services_modern.html
@@ -27,28 +27,21 @@
     <div class="container-modern">
         <!-- Service Categories Filter -->
         <div class="text-center mb-5">
-            <div class="btn-group" role="group" aria-label="Категории услуг">
-                <button type="button" class="btn btn-outline-primary active" data-filter="all">
+            <div class="btn-group flex-wrap justify-content-center" role="group" aria-label="Категории услуг">
+                <a href="?category=all" class="btn btn-outline-primary {% if selected_category == 'all' %}active{% endif %} mb-2">
                     Все услуги
-                </button>
-                <button type="button" class="btn btn-outline-primary" data-filter="web">
-                    Веб-разработка
-                </button>
-                <button type="button" class="btn btn-outline-primary" data-filter="mobile">
-                    Мобильные приложения
-                </button>
-                <button type="button" class="btn btn-outline-primary" data-filter="design">
-                    Дизайн
-                </button>
-                <button type="button" class="btn btn-outline-primary" data-filter="other">
-                    Другое
-                </button>
+                </a>
+                {% for category in categories %}
+                <a href="?category={{ category.name|lower }}" class="btn btn-outline-primary {% if selected_category == category.name|lower %}active{% endif %} mb-2">
+                    {{ category.name }}
+                </a>
+                {% endfor %}
             </div>
         </div>
 
         <div class="row g-4" id="services-container">
             {% for service in services %}
-            <div class="col-lg-4 col-md-6 service-item" data-category="{{ service.category.name|lower }}">
+            <div class="col-lg-4 col-md-6 service-item">
                 <div class="card-modern h-100">
                     <div class="position-relative overflow-hidden" style="height: 200px;">
                         {% if service.video %}
@@ -383,39 +376,6 @@
 
 {% block extra_scripts %}
 <script>
-// Service filtering
-document.addEventListener('DOMContentLoaded', function() {
-    const filterButtons = document.querySelectorAll('[data-filter]');
-    const serviceItems = document.querySelectorAll('.service-item');
-    
-    filterButtons.forEach(button => {
-        button.addEventListener('click', function() {
-            const filter = this.getAttribute('data-filter');
-            
-            // Update active button
-            filterButtons.forEach(btn => btn.classList.remove('active'));
-            this.classList.add('active');
-            
-            // Filter services
-            serviceItems.forEach(item => {
-                if (filter === 'all' || item.getAttribute('data-category').includes(filter)) {
-                    item.style.display = 'block';
-                    setTimeout(() => {
-                        item.style.opacity = '1';
-                        item.style.transform = 'translateY(0)';
-                    }, 50);
-                } else {
-                    item.style.opacity = '0';
-                    item.style.transform = 'translateY(20px)';
-                    setTimeout(() => {
-                        item.style.display = 'none';
-                    }, 300);
-                }
-            });
-        });
-    });
-});
-
 // Service modal
 function openServiceModal(serviceId, serviceName) {
     document.getElementById('serviceId').value = serviceId;
diff --git a/smartsoltech/web/views.py b/smartsoltech/web/views.py
index c306429..9de0489 100644
--- a/smartsoltech/web/views.py
+++ b/smartsoltech/web/views.py
@@ -1,5 +1,5 @@
 from django.shortcuts import render, get_object_or_404, redirect
-from .models import Service, Project, Client, BlogPost, Review, Order, ServiceRequest, HeroBanner
+from .models import Service, Project, Client, BlogPost, Review, Order, ServiceRequest, HeroBanner, Category
 from django.db.models import Avg
 from comunication.models import TelegramSettings
 import qrcode
@@ -76,8 +76,23 @@ def blog_post_detail(request, pk):
     return render(request, 'web/blog_post_detail.html', {'blog_post': blog_post})
 
 def services_view(request):
-    services = Service.objects.all()
-    return render(request, 'web/services_modern.html', {'services': services})
+    # Получаем выбранную категорию из GET параметра
+    selected_category = request.GET.get('category', 'all')
+    
+    # Получаем все категории для фильтра
+    categories = Category.objects.all().order_by('name')
+    
+    # Фильтруем услуги по категории
+    if selected_category == 'all' or not selected_category:
+        services = Service.objects.all().order_by('name')
+    else:
+        services = Service.objects.filter(category__name__icontains=selected_category).order_by('name')
+    
+    return render(request, 'web/services_modern.html', {
+        'services': services,
+        'categories': categories,
+        'selected_category': selected_category
+    })
 
 def about_view(request):
     return render(request, 'web/about_modern.html')