Index: main/migrations/0010_subcategory_products2_subcategory.py =================================================================== --- main/migrations/0010_subcategory_products2_subcategory.py (revision f84285e7b16852eab969772ebde9afe1b04fc8ae) +++ main/migrations/0010_subcategory_products2_subcategory.py (revision f84285e7b16852eab969772ebde9afe1b04fc8ae) @@ -0,0 +1,28 @@ +# Generated by Django 5.1.7 on 2025-07-04 11:35 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0009_alter_favorite_user'), + ] + + operations = [ + migrations.CreateModel( + name='Subcategory', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100)), + ('name_mk', models.CharField(max_length=100)), + ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.category')), + ], + ), + migrations.AddField( + model_name='products2', + name='subcategory', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='main.subcategory'), + ), + ] Index: main/models.py =================================================================== --- main/models.py (revision cd9f2f4e4afae458d5578788c887892d76ca8947) +++ main/models.py (revision f84285e7b16852eab969772ebde9afe1b04fc8ae) @@ -22,4 +22,21 @@ return self.text + + +class Category(models.Model): + name = models.CharField(max_length=100) + name_mk = models.CharField(max_length=100) # Macedonian name + + def __str__(self): + return self.name_mk # or self.name depending on context + +class Subcategory(models.Model): + name = models.CharField(max_length=100) # English + name_mk = models.CharField(max_length=100) # Macedonian + category = models.ForeignKey(Category, on_delete=models.CASCADE) + + def __str__(self): + return self.name_mk + #sega odime so komanda python manage.py makemigrations class Products2(models.Model): @@ -38,4 +55,5 @@ popust_date = models.DateField(null=True, blank=True) embedding = models.BinaryField() + subcategory = models.ForeignKey(Subcategory, on_delete=models.SET_NULL, null=True, blank=True) @@ -66,12 +84,4 @@ -class Category(models.Model): - name = models.CharField(max_length=100) # English name - name_mk = models.CharField(max_length=100) # Macedonian name - - def __str__(self): - return self.name_mk # or self.name depending on context - - from django.utils import timezone # Correct import for timezone.now Index: main/templates/main/base.html =================================================================== --- main/templates/main/base.html (revision cd9f2f4e4afae458d5578788c887892d76ca8947) +++ main/templates/main/base.html (revision f84285e7b16852eab969772ebde9afe1b04fc8ae) @@ -15,4 +15,23 @@ @@ -756,19 +838,46 @@