Index: .env
===================================================================
--- .env (revision fef3b4d766831b584534962ac137a311239ecc91)
+++ .env (revision fef3b4d766831b584534962ac137a311239ecc91)
@@ -0,0 +1,3 @@
+GOOGLE_MAPS_API_KEY=AIzaSyDxr8vc4j8iJ7ZTPP2Z9TuaiKupvgofqbI
+OPENAI_API_KEY = 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
+HUGGINGFACE_TOKEN=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
Index: DjangoProject3/settings.py
===================================================================
--- DjangoProject3/settings.py (revision 52c9c87d52fd2d6be3621074ff2ed6eac3c913be)
+++ DjangoProject3/settings.py (revision fef3b4d766831b584534962ac137a311239ecc91)
@@ -12,4 +12,7 @@
from pathlib import Path
+import os
+from decouple import config
+from dotenv import load_dotenv
# Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -21,4 +24,11 @@
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'django-insecure-y5s^rl54gumkkg1m&uwin81&#jb2uy712ai$1tvrt*190+fpo8'
+
+load_dotenv() # loads .env
+GOOGLE_MAPS_API_KEY = os.getenv("GOOGLE_MAPS_API_KEY")
+# HUGGINGFACE_TOKEN = config('HUGGINGFACE_TOKEN')
+HUGGINGFACE_TOKEN="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"
+
+
# SECURITY WARNING: don't run with debug turned on in production!
@@ -36,9 +46,22 @@
'django.contrib.staticfiles',
'main.apps.MainConfig',
+ 'social_django',
]
AUTHENTICATION_BACKENDS = [
'django.contrib.auth.backends.ModelBackend',
+ 'social_core.backends.google.GoogleOAuth2',
+ 'social_core.backends.facebook.FacebookOAuth2',
+ 'django.contrib.auth.backends.ModelBackend',
]
+# Add to bottom of settings.py
+SOCIAL_AUTH_FACEBOOK_KEY = 'your-facebook-app-id' # App ID
+SOCIAL_AUTH_FACEBOOK_SECRET = 'your-facebook-app-secret' # App Secret
+SOCIAL_AUTH_FACEBOOK_SCOPE = ['email', 'public_profile']
+SOCIAL_AUTH_FACEBOOK_PROFILE_EXTRA_PARAMS = {'fields': 'id, name, email'}
+
+SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = 'your-google-client-id'
+SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = 'your-google-client-secret'
+SOCIAL_AUTH_GOOGLE_OAUTH2_SCOPE = ['email', 'profile']
LOGIN_REDIRECT_URL = 'home' # Redirect to home after login
Index: main/forms.py
===================================================================
--- main/forms.py (revision 52c9c87d52fd2d6be3621074ff2ed6eac3c913be)
+++ main/forms.py (revision fef3b4d766831b584534962ac137a311239ecc91)
@@ -9,2 +9,8 @@
model = User
fields = ["username", "email", "password1", "password2"]
+
+class IngredientForm(forms.Form):
+ ingredients = forms.CharField(
+ label="Што имаш во фрижидерот?",
+ widget=forms.Textarea(attrs={"placeholder": "Јајца, млеко, брашно...", "rows": 5})
+ )
Index: main/migrations/0005_remove_shoppinglistitem_checked_and_more.py
===================================================================
--- main/migrations/0005_remove_shoppinglistitem_checked_and_more.py (revision fef3b4d766831b584534962ac137a311239ecc91)
+++ main/migrations/0005_remove_shoppinglistitem_checked_and_more.py (revision fef3b4d766831b584534962ac137a311239ecc91)
@@ -0,0 +1,21 @@
+# Generated by Django 5.1.7 on 2025-06-25 06:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('main', '0004_remove_product_store_shoppinglistitem_checked_and_more'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='shoppinglistitem',
+ name='checked',
+ ),
+ migrations.RemoveField(
+ model_name='shoppinglistitem',
+ name='completed',
+ ),
+ ]
Index: main/models.py
===================================================================
--- main/models.py (revision 52c9c87d52fd2d6be3621074ff2ed6eac3c913be)
+++ main/models.py (revision fef3b4d766831b584534962ac137a311239ecc91)
@@ -22,10 +22,10 @@
class Products2(models.Model):
name = models.CharField(max_length=255)
- price = models.DecimalField(max_digits=10, decimal_places=2) # This will be the "old_price"
+ price = models.DecimalField(max_digits=10, decimal_places=2)
actual_price = models.DecimalField(
max_digits=10,
decimal_places=2,
default=0.00 # Add this line
- ) # Current price (discounted if applicable)
+ )
category = models.CharField(max_length=100)
image_url = models.CharField(max_length=255)
@@ -34,5 +34,5 @@
popust = models.BooleanField(default=False)
popust_date = models.DateField(null=True, blank=True)
- embedding = models.BinaryField() # Make sure this is a BinaryField to store pickled embeddings
+ embedding = models.BinaryField()
@@ -52,4 +52,6 @@
name = models.CharField(max_length=100)
created_at = models.DateTimeField(auto_now_add=True)
+ db_collation = 'utf8mb4_unicode_ci'
+
class ShoppingListItem(models.Model):
Index: main/templates/main/base.html
===================================================================
--- main/templates/main/base.html (revision 52c9c87d52fd2d6be3621074ff2ed6eac3c913be)
+++ main/templates/main/base.html (revision fef3b4d766831b584534962ac137a311239ecc91)
@@ -1,2 +1,3 @@
+{% load category_filters %}
{% load custom_filters %}
{% load static %}
@@ -5,5 +6,4 @@
- {% load static %}
@@ -12,5 +12,5 @@
@@ -985,173 +1113,179 @@
{% endif %}
-
-{% load static %}
-
-
+ 
-{# 
#}
-
+ 
+ {% elif product.store == "Reptil" %}
+ 
+ {% elif product.store == "Ramstore" %}
+ 
+ {% endif %}
+ {# {{ product.store }}#}
+ 
+ {% endif %}
+ 
- {% elif similar.store == "Reptil" %}
-