Add intercepted blog post

PleatherStarfish · PleatherStarfish · commit af6b6a7e5ade · 2025-02-22T13:49:39.000+08:00
diff --git a/backend/blog/templates/blog/blog_detail_diy_savings.html b/backend/blog/templates/blog/blog_detail_diy_savings.html
diff --git a/backend/blog/urls.py b/backend/blog/urls.py
@@ -1,12 +1,17 @@
-from django.urls import path
-from . import views
+from django.urls import path, register_converter
+from blog import views
 
 app_name = "blog"
 
 urlpatterns = [
     path("", views.blog_list, name="blog_list"),  # Blog list page
     path(
-        "category/<slug:category_slug>/", views.blog_list, name="category_posts"
-    ),  # Category-filtered posts
-    path("<slug:slug>/", views.blog_detail, name="blog_detail"),  # Blog detail page
+        "how-much-cheaper-is-diy/",
+        views.blog_detail_diy_savings,
+        name="blog_detail_diy_savings",
+    ),  # Custom route
+    path("category/<slug:category_slug>/", views.blog_list, name="category_posts"),
+    path(
+        "<slug:slug>/", views.blog_detail, name="blog_detail"
+    ),  # Catch-all for other blog posts
 ]
diff --git a/backend/blog/views.py b/backend/blog/views.py
@@ -1,6 +1,10 @@
+from collections import namedtuple
+from types import SimpleNamespace
 from django.shortcuts import render, get_object_or_404
 from .models import BlogPost, Category
 from django.core.paginator import Paginator
+from core.calculate_diy_savings_stats import calculate_diy_savings_stats
+from django.http import HttpResponse
 
 
 def blog_list(request, category_slug=None):
@@ -53,3 +57,31 @@ def blog_detail(request, slug):
             "categories": categories,  # Pass the categories
         },
     )
+
+
+def blog_detail_diy_savings(request):
+    # Fetch DIY savings stats
+    diy_savings_stats = calculate_diy_savings_stats()
+
+    post = get_object_or_404(BlogPost, slug="how-much-cheaper-is-diy")
+
+    # Get related posts based on shared categories, excluding the current post
+    related_posts = (
+        BlogPost.objects.filter(categories__in=post.categories.all())
+        .exclude(id=post.id)
+        .distinct()[:3]
+    )
+
+    # Get categories associated with the current post
+    categories = post.categories.all()
+
+    return render(
+        request,
+        "blog/blog_detail_diy_savings.html",
+        {
+            "post": post,
+            "related_posts": related_posts,
+            "categories": categories,  # Pass the categories
+            "diy_savings_stats": diy_savings_stats,  # Pass the DIY savings stats
+        },
+    )
diff --git a/backend/core/calculate_diy_savings_stats.py b/backend/core/calculate_diy_savings_stats.py
@@ -0,0 +1,133 @@
+import statistics
+from decimal import Decimal
+from django.db.models import Sum, F, Avg
+from modules.models import (
+    Module,
+    ModuleBomListItem,
+)
+
+
+def calculate_diy_savings_stats():
+    """Calculate cost savings when building a DIY module compared to buying assembled, as a kit, or as a partial kit."""
+
+    modules_with_costs = Module.objects.filter(
+        cost_built__isnull=False, cost_built__gt=0
+    ).values(
+        "id",
+        "cost_built",
+        "cost_kit",
+        "cost_partial_kit",
+        "cost_pcb_only",
+        "cost_pcb_plus_front",
+    )
+
+    cost_differences = {
+        "pcb_only_vs_assembled": [],
+        "pcb_plus_front_vs_assembled": [],
+        "pcb_only_vs_kit": [],
+        "pcb_plus_front_vs_kit": [],
+        "pcb_only_vs_partial_kit": [],
+        "pcb_plus_front_vs_partial_kit": [],
+        "partial_kit_vs_assembled": [],
+        "partial_kit_vs_full_kit": [],
+    }
+
+    for module in modules_with_costs:
+        module_id = module["id"]
+        cost_built = module["cost_built"] or Decimal("0")
+        cost_kit = module["cost_kit"] or Decimal("0")
+        cost_partial_kit = module["cost_partial_kit"] or Decimal("0")
+        cost_pcb_only = module["cost_pcb_only"] or Decimal("0")
+        cost_pcb_plus_front = module["cost_pcb_plus_front"] or Decimal("0")
+
+        # Calculate DIY cost from BOM (typically representing the DIY kit build)
+        bom_stats = (
+            ModuleBomListItem.objects.filter(module_id=module_id)
+            .annotate(
+                diy_cost=Sum(
+                    F("components_options__supplier_items__unit_price") * F("quantity")
+                )
+            )
+            .aggregate(avg_diy=Avg("diy_cost"))
+        )
+        diy_cost = bom_stats["avg_diy"] or Decimal("0")
+        if diy_cost == 0:
+            continue  # Skip modules where DIY cost is missing
+
+        # Comparisons to Assembled cost
+        if cost_built > 0:
+            if cost_pcb_only > 0:
+                cost_differences["pcb_only_vs_assembled"].append(
+                    float((cost_built - cost_pcb_only) / cost_built * 100)
+                )
+            if cost_pcb_plus_front > 0:
+                cost_differences["pcb_plus_front_vs_assembled"].append(
+                    float((cost_built - cost_pcb_plus_front) / cost_built * 100)
+                )
+            if cost_partial_kit > 0:
+                cost_differences["partial_kit_vs_assembled"].append(
+                    float((cost_built - cost_partial_kit) / cost_built * 100)
+                )
+
+        # Comparisons to Full Kit cost
+        if cost_kit > 0:
+            if cost_pcb_only > 0:
+                cost_differences["pcb_only_vs_kit"].append(
+                    float((cost_kit - cost_pcb_only) / cost_kit * 100)
+                )
+            if cost_pcb_plus_front > 0:
+                cost_differences["pcb_plus_front_vs_kit"].append(
+                    float((cost_kit - cost_pcb_plus_front) / cost_kit * 100)
+                )
+            if cost_partial_kit > 0:
+                cost_differences["partial_kit_vs_full_kit"].append(
+                    float((cost_kit - cost_partial_kit) / cost_kit * 100)
+                )
+
+        # Comparisons to Partial Kit cost
+        if cost_partial_kit > 0:
+            if cost_pcb_only > 0:
+                cost_differences["pcb_only_vs_partial_kit"].append(
+                    float((cost_partial_kit - cost_pcb_only) / cost_partial_kit * 100)
+                )
+            if cost_pcb_plus_front > 0:
+                cost_differences["pcb_plus_front_vs_partial_kit"].append(
+                    float(
+                        (cost_partial_kit - cost_pcb_plus_front)
+                        / cost_partial_kit
+                        * 100
+                    )
+                )
+
+    # Compute median and average savings safely
+    def compute_stats(values):
+        values = list(filter(None, values))  # Remove None values
+        return {
+            "average_savings": round(sum(values) / len(values), 2) if values else "N/A",
+            "median_savings": round(statistics.median(values), 2) if values else "N/A",
+        }
+
+    return {
+        "pcb_only_vs_assembled": compute_stats(
+            cost_differences["pcb_only_vs_assembled"]
+        ),
+        "pcb_plus_front_vs_assembled": compute_stats(
+            cost_differences["pcb_plus_front_vs_assembled"]
+        ),
+        "pcb_only_vs_kit": compute_stats(cost_differences["pcb_only_vs_kit"]),
+        "pcb_plus_front_vs_kit": compute_stats(
+            cost_differences["pcb_plus_front_vs_kit"]
+        ),
+        "pcb_only_vs_partial_kit": compute_stats(
+            cost_differences["pcb_only_vs_partial_kit"]
+        ),
+        "pcb_plus_front_vs_partial_kit": compute_stats(
+            cost_differences["pcb_plus_front_vs_partial_kit"]
+        ),
+        "partial_kit_vs_assembled": compute_stats(
+            cost_differences["partial_kit_vs_assembled"]
+        ),
+        "partial_kit_vs_full_kit": compute_stats(
+            cost_differences["partial_kit_vs_full_kit"]
+        ),
+    }
diff --git a/backend/core/views.py b/backend/core/views.py
@@ -2,6 +2,7 @@
 import statistics
 from django.http import HttpResponse
 from django.shortcuts import render
+from core.calculate_diy_savings_stats import calculate_diy_savings_stats
 from blog.models import BlogPost
 from modules.models import Module, Manufacturer, ModuleBomListItem
 from django.views.decorators.cache import cache_page
@@ -173,86 +174,8 @@ def homepage(request):
     manufacturer_count = Module.objects.values("manufacturer").distinct().count()
     component_count_display = f"{(component_count // 5) * 5}+"
 
-    # Compute DIY vs Assembled/Kit Savings
-
-    modules_with_costs = Module.objects.filter(
-        cost_built__isnull=False, cost_built__gt=0
-    ).values("id", "cost_built", "cost_kit", "cost_pcb_only", "cost_pcb_plus_front")
-
-    cost_differences = {
-        "pcb_only_vs_assembled": [],
-        "pcb_plus_front_vs_assembled": [],
-        "pcb_only_vs_kit": [],
-        "pcb_plus_front_vs_kit": [],
-    }
-
-    for module in modules_with_costs:
-        module_id = module["id"]
-        cost_built = module["cost_built"] or Decimal("0")
-        cost_kit = module["cost_kit"] or Decimal("0")
-        cost_pcb_only = module["cost_pcb_only"] or Decimal("0")
-        cost_pcb_plus_front = module["cost_pcb_plus_front"] or Decimal("0")
-
-        # Calculate DIY cost from BOM (typically representing the DIY kit build)
-        bom_stats = (
-            ModuleBomListItem.objects.filter(module_id=module_id)
-            .annotate(
-                diy_cost=Sum(
-                    F("components_options__supplier_items__unit_price") * F("quantity")
-                )
-            )
-            .aggregate(avg_diy=Avg("diy_cost"))
-        )
-        diy_cost = bom_stats["avg_diy"] or Decimal("0")
-        if diy_cost == 0:
-            continue  # Skip modules where DIY cost is missing
-
-        # For Assembled comparisons, use cost_built as the baseline.
-        if cost_built > 0:
-            # PCB Only vs Assembled: How much cheaper is PCB Only compared to the assembled cost?
-            if cost_pcb_only > 0:
-                cost_differences["pcb_only_vs_assembled"].append(
-                    float((cost_built - cost_pcb_only) / cost_built * 100)
-                )
-            # PCB + Front Panel vs Assembled: How much cheaper is PCB + Front Panel compared to assembled?
-            if cost_pcb_plus_front > 0:
-                cost_differences["pcb_plus_front_vs_assembled"].append(
-                    float((cost_built - cost_pcb_plus_front) / cost_built * 100)
-                )
-
-        # For Kit comparisons, use cost_kit as the baseline.
-        if cost_kit > 0:
-            # PCB Only vs Kit: How much cheaper is PCB Only compared to the kit cost?
-            if cost_pcb_only > 0:
-                cost_differences["pcb_only_vs_kit"].append(
-                    float((cost_kit - cost_pcb_only) / cost_kit * 100)
-                )
-            # PCB + Front Panel vs Kit: How much cheaper is PCB + Front Panel compared to the kit cost?
-            if cost_pcb_plus_front > 0:
-                cost_differences["pcb_plus_front_vs_kit"].append(
-                    float((cost_kit - cost_pcb_plus_front) / cost_kit * 100)
-                )
-
-    # Compute median and average savings safely
-    def compute_stats(values):
-        values = list(filter(None, values))  # Remove None values
-        return {
-            "average_savings": round(sum(values) / len(values), 2) if values else "N/A",
-            "median_savings": round(statistics.median(values), 2) if values else "N/A",
-        }
-
-    diy_savings_stats = {
-        "pcb_only_vs_assembled": compute_stats(
-            cost_differences["pcb_only_vs_assembled"]
-        ),
-        "pcb_plus_front_vs_assembled": compute_stats(
-            cost_differences["pcb_plus_front_vs_assembled"]
-        ),
-        "pcb_only_vs_kit": compute_stats(cost_differences["pcb_only_vs_kit"]),
-        "pcb_plus_front_vs_kit": compute_stats(
-            cost_differences["pcb_plus_front_vs_kit"]
-        ),
-    }
+    # Use the extracted function to compute DIY savings statistics
+    diy_savings_stats = calculate_diy_savings_stats()
 
     context = {
         "user": request.user,
diff --git a/backend/static/css/tailwind.css b/backend/static/css/tailwind.css
@@ -94,6 +94,55 @@
     #table__wrapper > div:first-child {
         max-height: none !important;
     }
+
+    .savings-section {
+        position: relative;
+        background-image: url("{% static 'images/electronics_diagram_background_square.jpeg' %}");
+        background-size: cover;
+        background-position: center;
+      }
+    
+      .savings-section::before {
+        content: "";
+        position: absolute;
+        inset: 0;
+        background: rgba(255, 255, 255, 0.8);
+        z-index: 1;
+      }
+    
+      .savings-content {
+        position: relative;
+        z-index: 2;
+        background: rgba(255, 255, 255);
+        border-radius: 8px;
+      }
+      /* Initial state for left and right elements */
+      .slide-in-left,
+      .slide-in-right {
+        opacity: 0;
+        transform: translateX(-500px);
+        transition: opacity 0.8s ease-out, transform 0.8s cubic-bezier(0.25, 1, 0.5, 1);
+      }
+    
+      .slide-in-right {
+        transform: translateX(500px);
+      }
+    
+      /* When in view, animate into position */
+      .show {
+        opacity: 1;
+        transform: translateX(0);
+      }
+    
+      /* Hover effect: Grow slightly */
+      .slide-in-left:hover,
+      .slide-in-right:hover,
+      .left-info-box-text:hover,
+      .middle-info-box-text:hover
+       {
+        transform: scale(1.05); /* Slight enlargement */
+        transition: transform 0.4s ease-out; /* Smooth transition */
+      }
 }
 
 @layer components {
diff --git a/backend/templates/pages/home.html b/backend/templates/pages/home.html
