diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5c29dce --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# Environmental Variables +.env +spaza-env + +#Python +*.pyc + +#Database +db.sqlite3 + +#IDE +.vs + +#backupdata +data.json +db.sqlite3.backup \ No newline at end of file diff --git a/spaza_online/db.sqlite3 b/spaza_online/db.sqlite3 index ac74bc8..0bd6ad7 100644 Binary files a/spaza_online/db.sqlite3 and b/spaza_online/db.sqlite3 differ diff --git a/spaza_online/media/product/BannerImage.png b/spaza_online/media/product/BannerImage.png new file mode 100644 index 0000000..5f275bb Binary files /dev/null and b/spaza_online/media/product/BannerImage.png differ diff --git a/spaza_online/spaza_app/admin.py b/spaza_online/spaza_app/admin.py index 975b36d..6fa8f26 100644 --- a/spaza_online/spaza_app/admin.py +++ b/spaza_online/spaza_app/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from . models import Cart, Customer, OrderPlaced, Payment, Product, Wishlist +from . models import Cart, Customer, OrderPlaced, Payment, Product, Wishlist, ContactMessage from django.utils.html import format_html from django.urls import reverse from django.contrib.auth.models import Group @@ -47,7 +47,10 @@ class WishlistModelAdmin(admin.ModelAdmin): def products(self, obj): link = reverse("admin:spaza_app_product_change", args=[obj.product.pk]) return format_html('{}', link, obj.product.title) - + +@admin.register(ContactMessage) +class ContactMessageAdmin(admin.ModelAdmin): + list_display = ['created_at','name', 'email', 'message'] admin.site.unregister(Group) diff --git a/spaza_online/spaza_app/templates/spaza_app/category.html b/spaza_online/spaza_app/templates/spaza_app/category.html index 3780e58..82e265b 100644 --- a/spaza_online/spaza_app/templates/spaza_app/category.html +++ b/spaza_online/spaza_app/templates/spaza_app/category.html @@ -27,8 +27,7 @@
{{prod.title}}
R{{prod.discounted_price}}/- - {{prod.selling_price - }} + {{prod.selling_price}}
diff --git a/spaza_online/spaza_online/settings.py b/spaza_online/spaza_online/settings.py index e569b2d..b200471 100644 --- a/spaza_online/spaza_online/settings.py +++ b/spaza_online/spaza_online/settings.py @@ -11,6 +11,7 @@ """ from pathlib import Path +from decouple import config # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -76,8 +77,14 @@ DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', + # 'ENGINE': 'django.db.backends.sqlite3', + # 'NAME': BASE_DIR/ 'db.sqlite3', + 'ENGINE': 'django.db.backends.mysql', + 'NAME': config('DB_NAME'), + 'USER': config('DB_USER'), + 'PASSWORD': config('DB_PASSWORD'), + 'HOST': config('DB_HOST'), + 'PORT': config('DB_PORT'), } }