Index: DjangoProject3/settings.py =================================================================== --- DjangoProject3/settings.py (revision 09a55ba56c74813273c03182cd01e2f8d3314915) +++ DjangoProject3/settings.py (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -16,4 +16,5 @@ from dotenv import load_dotenv + # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -39,31 +40,74 @@ # Application definition # Tuka ja dodavame kreiranata aplikacija main.apps.MainConfig da znae django deka postoi. sega mora da se ran migrate comandata +# INSTALLED_APPS = [ +# 'django.contrib.auth', +# 'django.contrib.contenttypes', +# 'django.contrib.sessions', +# 'django.contrib.messages', +# 'django.contrib.staticfiles', +# 'main.apps.MainConfig', +# 'social_django', +# "django.contrib.sites", +# ] INSTALLED_APPS = [ - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'main.apps.MainConfig', - 'social_django', -] + # Django built-in apps + "django.contrib.admin", + "django.contrib.auth", + "django.contrib.contenttypes", + "django.contrib.sessions", + "django.contrib.messages", + "django.contrib.staticfiles", + + # Required for allauth + "django.contrib.sites", + + # Your app + "main.apps.MainConfig", + + # Allauth core + "allauth", + "allauth.account", + "allauth.socialaccount", + + # Providers + "allauth.socialaccount.providers.google", + "allauth.socialaccount.providers.facebook", +] + AUTHENTICATION_BACKENDS = [ + # Default backend (required for admin login) '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 + + # Django Allauth backend (handles social logins) + 'allauth.account.auth_backends.AuthenticationBackend', +] + + +SITE_ID = 7 +LOGIN_REDIRECT_URL = "/" +LOGOUT_REDIRECT_URL = "/" + +ACCOUNT_EMAIL_REQUIRED = True +ACCOUNT_USERNAME_REQUIRED = False +ACCOUNT_AUTHENTICATION_METHOD = "username_email" +# ACCOUNT_EMAIL_VERIFICATION = "optional" +# SOCIALACCOUNT_QUERY_EMAIL = True + + +SOCIALACCOUNT_PROVIDERS = { + "google": {"SCOPE": ["profile", "email"], "AUTH_PARAMS": {"access_type": "online"}}, + "facebook": {"METHOD": "oauth2", "SCOPE": ["email"], "FIELDS": ["id","email","name","first_name","last_name"]}, +} +SOCIALACCOUNT_AUTO_SIGNUP = True # Automatically create user without showing signup page +SOCIALACCOUNT_LOGIN_ON_GET = True # Optional: login immediately on GET request + +ACCOUNT_EMAIL_VERIFICATION = "none" +SOCIALACCOUNT_QUERY_EMAIL = True +# SOCIALACCOUNT_AUTO_SIGNUP = True + + + +# LOGIN_REDIRECT_URL = 'home' # Redirect to home after login LOGIN_URL = 'login' @@ -74,7 +118,9 @@ 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'allauth.account.middleware.AccountMiddleware', # <<< ADD THIS LINE 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] + ROOT_URLCONF = 'DjangoProject3.urls' Index: main/migrations/0011_alter_shoppinglistitem_unique_together_and_more.py =================================================================== --- main/migrations/0011_alter_shoppinglistitem_unique_together_and_more.py (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) +++ main/migrations/0011_alter_shoppinglistitem_unique_together_and_more.py (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -0,0 +1,30 @@ +# Generated by Django 5.1.7 on 2025-09-16 12:15 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0010_subcategory_products2_subcategory'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='shoppinglistitem', + unique_together={('shopping_list', 'product')}, + ), + migrations.CreateModel( + name='ProductHistory', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('price', models.DecimalField(decimal_places=2, max_digits=10)), + ('date', models.DateField()), + ('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.products2')), + ], + options={ + 'db_table': 'product_history2', + }, + ), + ] Index: main/models.py =================================================================== --- main/models.py (revision 09a55ba56c74813273c03182cd01e2f8d3314915) +++ main/models.py (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -82,4 +82,7 @@ added_at = models.DateTimeField(auto_now_add=True) + class Meta: + unique_together = ('shopping_list', 'product') + Index: main/templates/main/favorites.html =================================================================== --- main/templates/main/favorites.html (revision 09a55ba56c74813273c03182cd01e2f8d3314915) +++ main/templates/main/favorites.html (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -16,5 +16,5 @@
- {% if favorite.product.image_url %} + {% if favorite.product.image_url and favorite.product.store != 'Vero' %} {{ favorite.product.name }} {% else %} Index: main/templates/main/header.html =================================================================== --- main/templates/main/header.html (revision 09a55ba56c74813273c03182cd01e2f8d3314915) +++ main/templates/main/header.html (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -512,4 +512,7 @@ width: 96%; } + } + .header-search input{ + width: 100%; } @@ -566,4 +569,6 @@
  • Статистика
  • Листи
    • +
  • Најблиски Продавници
    • +
    @@ -610,4 +615,5 @@ Статистика Листи + Најблиски Продавници {% if user.is_authenticated %} Index: main/templates/main/index.html =================================================================== --- main/templates/main/index.html (revision 09a55ba56c74813273c03182cd01e2f8d3314915) +++ main/templates/main/index.html (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -5,1149 +5,1155 @@ {% block content %} - - - - - - - Home - - - - - -
    - {% if messages %} - {% for message in messages %} -
    - {{ message }} - × -
    - {% endfor %} - {% endif %} -
    - - -
    -
    -
    - +
    + + + - - - - - -
    -
    -
    -

    За нас

    -

    Ние сме водечка онлајн продавница со најдобри цени и квалитетни производи.

    +
    + © 2023 Нашата Продавница. Сите права се задржани.
    -
    -

    Контакт

    -

    Телефон: +389 70 123 456

    -

    Email: kontakt@nasataprodavnica.com

    -

    Адреса: Улица ББ, Скопје

    -
    -
    -

    Брзи линкови

    - Дома - Каталог - Услови на користење - Политика на приватност -
    - -
    -
    - © 2023 Нашата Продавница. Сите права се задржани. -
    -
    - - - - + + + {% endblock %} Index: main/templates/main/login.html =================================================================== --- main/templates/main/login.html (revision 09a55ba56c74813273c03182cd01e2f8d3314915) +++ main/templates/main/login.html (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -1,3 +1,4 @@ {% load static %} +{% load socialaccount %} @@ -177,4 +178,30 @@ + +
    +

    Или најави се преку:

    + Google + + Facebook +
    +
    Index: main/templates/main/nearby_stores.html =================================================================== --- main/templates/main/nearby_stores.html (revision 09a55ba56c74813273c03182cd01e2f8d3314915) +++ main/templates/main/nearby_stores.html (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -3,418 +3,118 @@ {% block content %} - - - - - - - Најблиски продавници - - - - -
    -

    Најблиски продавници

    +
    +

    Најблиски продавници

    +

    Пронајди ги најблиските продавници и заштеди гориво

    +
    +
    + + Назад кон почетна + +
    -
    - - Назад кон почетна - + +
    +
    +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + + +
    +
    + + +
    +
    + +
    + + +
    +
    - -
    -
    -
    - - -
    -
    - - + {% if calculating %} +
    + +
    +

    Пресметуваме растојанија и времиња на патување...

    +

    Ова може да потрае неколку секунди.

    - -
    -
    - - -
    -
    - - + {% elif nearest_stores %} +
    +

    Најблиски продавници

    +
    + {% for store in nearest_stores|slice:":5" %} +
    +
    +

    {{ store.store }}

    + {{ store.distance_km|floatformat:2 }} km +
    +
    +
    + + {{ store.duration }} +
    +
    + + {{ store.gas_used|floatformat:2 }} L +
    +
    +
    + {{ request.GET.store_chain }} +
    +
    + {% endfor %}
    -
    - - + +
    +

    Мапа на локации

    +
    +
    +
    +
    + +
    - - - {% if nearest_stores %} -

    Најблиски продавници

    -
    - {% for store in nearest_stores|slice:":5" %} -
    -

    {{ store.store }}

    -
    - Растојание: {{ store.distance_km }} km - Време: {{ store.duration }} - Гориво: {{ store.gas_used }} L -
    -
    - {% endfor %} -
    - - -
    -
    -
    - -{# #} -{#
    #} -{# #} -{#
    #} {% else %}
    - -

    Нема пронајдени продавници.

    +
    + +
    +

    Нема пронајдени продавници

    Внесете ги вашите координати за да ги видите најблиските продавници.

    @@ -422,16 +122,29 @@ {% if least_gas_stores %} -

    Продавници со најмало користење на гориво

    -
    - {% for store in least_gas_stores|slice:":5" %} -
    -

    {{ store.store }}

    -
    - Растојание: {{ store.distance_km }} km - Време: {{ store.duration }} - Гориво: {{ store.gas_used }} L +
    +

    Продавници со најмало користење на гориво

    +
    + {% for store in least_gas_stores|slice:":5" %} +
    +
    +

    {{ store.store }}

    + {{ store.distance_km|floatformat:2 }} km +
    +
    +
    + + {{ store.duration }} +
    +
    + + {{ store.gas_used|floatformat:2 }} L +
    +
    +
    + {{ request.GET.store_chain }} +
    -
    - {% endfor %} + {% endfor %} +
    {% endif %} @@ -439,7 +152,6 @@
    - + + - + + {% endblock %} - Index: main/templates/main/product_list.html =================================================================== --- main/templates/main/product_list.html (revision 09a55ba56c74813273c03182cd01e2f8d3314915) +++ main/templates/main/product_list.html (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -27,4 +27,8 @@ padding: 0 20px; margin-top: 20px; + } + + .header-search input { + width: 97%; } @@ -585,4 +589,7 @@ .product-image { height: 160px; + } + .pagination{ + margin-bottom: 50px; } } @@ -1764,5 +1771,5 @@ for="sort">Сортирај по: +
    + + + +
    +
    + +
    + +
    + + +
    +
    + + + + + {% if similar_products %} +
    +
    + +

    Препорачани производи:

    +
    +
    + {% for p, similarity in similar_products %} +
    + {{ p }} +{# {{ similarity|floatformat:0 }}%#} +
    + {% endfor %} +
    - -
    - - + {% endif %} +
    + + +
    +
    + +

    Графикон на цени

    - - - - {% if similar_products %} -
    -

    Слични производи:

    -
      - {% for p, similarity in similar_products %} -
    • {{ p }}
      • - {% endfor %} -
    +
    +
    +

    Изберете производ за да ја видите ценовната историја

    + +
    + +
    +
    +
    + +
    +

    Нема податоци за приказ

    +

    Изберете производ од листата за да ја видите неговата ценовна историја

    +
    +
    +
    + + +
    - {% endif %} +
    -
    -
    -
    -

    График за ценовната историја на производот

    - -
    - -
    -
    - -

    Нема податоци за приказ. Избери производ од листата.

    -
    -
    -
    -
    -
    - -
    - + + + + + + + - - + {% endblock %} Index: main/templates/socialaccount/1.html =================================================================== --- main/templates/socialaccount/1.html (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) +++ main/templates/socialaccount/1.html (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -0,0 +1,11 @@ +{% extends "main/index.html" %} +{% block content %} +
    +

    Welcome! Almost done...

    +

    Your Google account is about to be connected to our site.

    +
    + {% csrf_token %} + +
    +
    +{% endblock %} Index: main/urls.py =================================================================== --- main/urls.py (revision 09a55ba56c74813273c03182cd01e2f8d3314915) +++ main/urls.py (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -4,4 +4,6 @@ from . import views from django.contrib.auth import views as auth_views +from django.urls import path, include +from django.contrib import admin from .views import custom_logout, remove_from_list, get_store_products, stats_view @@ -44,4 +46,7 @@ path('get-favorites/', views.get_favorites, name='get_favorites'), path('api/product-history/', views.product_history_api, name='product_history_api'), + path("accounts/", include("allauth.urls")), + path('admin/', admin.site.urls), # <<< Add this line + # provides login, logout, callbacks ] Index: main/views.py =================================================================== --- main/views.py (revision 09a55ba56c74813273c03182cd01e2f8d3314915) +++ main/views.py (revision 35577210e2892b3cb3b24bb561e3f46989f9a05e) @@ -86,14 +86,14 @@ popust_filtered = store_filtered.filter(popust=True) - print(f"Store: {cleaned}") - print(f"Products after store filter: {store_filtered.count()}") - print(f"Products after popust filter: {popust_filtered.count()}") + # print(f"Store: {cleaned}") + # print(f"Products after store filter: {store_filtered.count()}") + # print(f"Products after popust filter: {popust_filtered.count()}") products = popust_filtered.order_by('-price')[:3] - if not products: - print(f"No discounted products for {cleaned}") - else: - print(f"Found {len(products)} products for {cleaned}") + # if not products: + # print(f"No discounted products for {cleaned}") + # else: + # print(f"Found {len(products)} products for {cleaned}") stores_with_products.append({ @@ -388,4 +388,8 @@ def add_to_list(request): try: + # Only allow POST + if request.method != "POST": + return JsonResponse({'success': False, 'message': 'Invalid request'}, status=405) + # Extract data from POST request data = json.loads(request.body) @@ -393,8 +397,4 @@ list_id = data.get('list_id') - # Debugging: Log received values - print(f"Product ID: {product_id}, List ID: {list_id}, User: {request.user}") - - # Validate inputs if not product_id or not list_id: return JsonResponse({'success': False, 'message': 'Missing product or list ID'}, status=400) @@ -404,8 +404,5 @@ product = get_object_or_404(Products2, id=product_id) - # Debugging: Confirm the product and list are found - print(f"Shopping List: {shopping_list}, Product: {product}") - - # Get or create the list item + # Get or create the item item, created = ShoppingListItem.objects.get_or_create( shopping_list=shopping_list, @@ -414,18 +411,17 @@ ) - # Check if item is created or updated if not created: item.quantity += 1 item.save() - # Debugging: Confirm the item was saved - print(f"Item: {item}, Created: {created}") - - return JsonResponse({'success': True, 'message': 'Product added to list'}) + return JsonResponse({ + 'success': True, + 'message': f'{product.name} added to list', + 'quantity': item.quantity + }) except Exception as e: - print(f"Error: {e}") # Log error details + print(f"Error: {e}") return JsonResponse({'success': False, 'message': str(e)}, status=400) - def get_user_lists(request): if not request.user.is_authenticated: @@ -625,5 +621,5 @@ # Debug output - remove in production - print("Context being sent to template:") + # print("Context being sent to template:") for key, value in context.items(): print(f"{key}: {value}") @@ -698,9 +694,26 @@ stores = [ - {"name": "Reptil Market Ruzveltova", "lat": 41.9980, "lon": 21.4250, "chain": "reptil"}, - {"name": "Reptil Market Crniche", "lat": 41.9840, "lon": 21.4400, "chain": "reptil"}, - {"name": "Reptil Market Kisela Voda", "lat": 41.9510, "lon": 21.4460, "chain": "reptil"}, + {"name": "Reptil Market Ruzveltova", "lat": 42.0040878561334, "lon": 21.41538436528707, "chain": "reptil"}, + {"name": "Reptil Market Crniche", "lat": 41.98424985514346, "lon": 21.42854499185496, "chain": "reptil"}, + {"name": "Reptil Market Butel", "lat": 42.03151299550568, "lon": 21.44460271127004, "chain": "reptil"}, + {"name": "Reptil Market Avtokomanda", "lat": 42.00314285371043, "lon": 21.464809841955148, "chain": "reptil"}, + {"name": "Reptil Market Radishani", "lat": 42.05659527027985, "lon": 21.451523714968985, "chain": "reptil"}, + {"name": "Reptil Market Madzari", "lat": 42.00080136926024, "lon": 21.488524284283873, "chain": "reptil"}, + {"name": "Reptil Market Lisice", "lat": 41.975386066287584, "lon": 21.472738657297704, "chain": "reptil"}, + {"name": "Reptil Market Ardorom bul.Jane Sandanski", "lat": 41.98410917961027, "lon": 21.46690158428389, "chain": "reptil"}, + {"name": "Reptil Market Bardovci", "lat": 42.025668068096394, "lon": 21.37584645411437, "chain": "reptil"}, + {"name": "Reptil Market Aerodrom", "lat": 41.985188473060354, "lon": 21.453380984283882, "chain": "reptil"}, + {"name": "Reptil Market Shop & Go", "lat": 41.99948987076041, "lon": 21.423976899626428, "chain": "reptil"}, + {"name": "Reptil Market Zelen Pazar", "lat": 41.991862538872645, "lon": 21.433574943394476, "chain": "reptil"}, + {"name": "Reptil Market Drzhavna Bolnica", "lat": 41.99082095885179, "lon": 21.424983018422854, "chain": "reptil"}, + {"name": "Reptil Market Kisela Voda", "lat": 41.98173349419106, "lon": 21.43810738428388, "chain": "reptil"}, {"name": "Reptil Market Aerodrom", "lat": 41.9780, "lon": 21.4680, "chain": "reptil"}, - {"name": "Reptil Market Karposh", "lat": 41.9980, "lon": 21.3930, "chain": "reptil"}, + {"name": "Reptil Market Karposh 3 br.9", "lat": 42.007022300132036, "lon": 21.400571526550074, "chain": "reptil"}, + {"name": "Reptil Market Karposh br.6", "lat": 42.00112199222344, "lon": 21.41212279925285, "chain": "reptil"}, + {"name": "Reptil Market Karposh br.5", "lat": 42.007478018986724, "lon": 21.395736283910317, "chain": "reptil"}, + {"name": "Reptil Market Porta Vlae", "lat": 42.00816321194575, "lon": 21.370438003817473, "chain": "reptil"}, + {"name": "Reptil Market Nerezi", "lat": 41.995647756137735, "lon": 21.39414196856774, "chain": "reptil"}, + {"name": "Reptil Market Vlae", "lat": 42.011056469322966, "lon": 21.374480029937953, "chain": "reptil"}, + {"name": "Reptil Market Centar Pestaloci", "lat": 41.99836555442384, "lon": 21.421861676512417, "chain": "reptil"}, {"name": "Ramstore Vardar", "lat": 41.9981, "lon": 21.4325, "chain": "ramstore"}, {"name": "Ramstore City Mall", "lat": 42.0045, "lon": 21.3919, "chain": "ramstore"},