From 6cd33d29c3ca34d2164a5b4e45e4bc01cd96ef09 Mon Sep 17 00:00:00 2001 From: Chirag Trivedi Date: Mon, 23 Feb 2026 11:17:27 +0530 Subject: [PATCH 1/2] feat: global search API & navbar integration; fixes ordering & templates --- ...alter_goods_options_alter_order_options.py | 21 + web/models.py | 6 + web/templates/base.html | 2038 +++++++++-------- web/urls.py | 1 + web/views.py | 35 + 5 files changed, 1100 insertions(+), 1001 deletions(-) create mode 100644 web/migrations/0064_alter_goods_options_alter_order_options.py diff --git a/web/migrations/0064_alter_goods_options_alter_order_options.py b/web/migrations/0064_alter_goods_options_alter_order_options.py new file mode 100644 index 000000000..e9d7cd91a --- /dev/null +++ b/web/migrations/0064_alter_goods_options_alter_order_options.py @@ -0,0 +1,21 @@ +# Generated by Django 5.1.15 on 2026-02-23 05:38 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('web', '0063_virtualclassroom_virtualclassroomcustomization_and_more'), + ] + + operations = [ + migrations.AlterModelOptions( + name='goods', + options={'ordering': ['-created_at']}, + ), + migrations.AlterModelOptions( + name='order', + options={'ordering': ['-created_at']}, + ), + ] diff --git a/web/models.py b/web/models.py index 6b8ea8ef4..3a26948e3 100644 --- a/web/models.py +++ b/web/models.py @@ -1318,6 +1318,9 @@ def save(self, *args, **kwargs): self.slug = slug super().save(*args, **kwargs) + class Meta: + ordering = ["-created_at"] + def __str__(self): return f"{self.name} (${self.price})" @@ -1636,6 +1639,9 @@ def save(self, *args, **kwargs): def generate_tracking_number(self): return f"TRACK-{self.pk}-{int(time.time())}-{uuid.uuid4().hex[:6].upper()}" + class Meta: + ordering = ["-created_at"] + def __str__(self): return f"Order #{self.id} ({self.user.email})" diff --git a/web/templates/base.html b/web/templates/base.html index d869af45a..ff60c1fc9 100644 --- a/web/templates/base.html +++ b/web/templates/base.html @@ -3,1133 +3,1169 @@ - - - - - - - - - - {% block title %} - Alpha One Labs - Open Source Education Platform - {% endblock title %} - - - - - + + - - - - - + + + + + - - {% block extra_head %} - {% endblock extra_head %} - - - -
-
- - - Alpha One Labs Logo - Alpha One Labs - - - - - - - -
- {% if messages %} -
- {% for message in messages %} -
-
- {% if message.tags == 'error' %} - - {% elif message.tags == 'success' %} - - {% elif message.tags == 'warning' %} - - {% else %} - - {% endif %} -
-

{{ message }}

- -
- {% endfor %} +
+ + {% if messages %} +
+ {% for message in messages %} +
+
+ {% if message.tags == 'error' %} + + {% elif message.tags == 'success' %} + + {% elif message.tags == 'warning' %} + + {% else %} + + {% endif %}
- {% endif %} - {% block extra_body %} - {% block content %} - {% endblock content %} - {% endblock extra_body %} - -