{{Listing.desc}}
diff --git a/auctions/views.py b/auctions/views.py index 817f0ac..8ddbe45 100644 --- a/auctions/views.py +++ b/auctions/views.py @@ -5,19 +5,11 @@ from django.shortcuts import render from django.urls import reverse from django import forms from .models import User,AuctionListing,Comment,Bids +from .forms import BidForm,CreateForm -categories = ['Fashion','Electronics','Home','Sports','Toys','Automobile','Books','Videogames', 'Other'] -class BidForm(forms.Form): - bid_value = 0.00 - def __init__(self, bid_value,*args,**kwargs ): - super().__init__(*args,**kwargs) - self.bid_value = bid_value + 1 - self.fields['bid'].widget.attrs['min'] = self.bid_value - - bid = forms.DecimalField(decimal_places=2) def watch(request,title): """ @@ -170,27 +162,21 @@ def create(request): """ Used to create a Listing """ - if request.method == "POST": - title = request.POST["title"] - desc = request.POST["desc"] - starting_bid = request.POST["starting_bid"] - photo_url = request.POST["photo"] - - # alternate photo to display - if photo_url == "": - photo_url = "https://upload.wikimedia.org/wikipedia/commons/thumb/1/15/No_image_available_600_x_450.svg/1280px-No_image_available_600_x_450.svg.png" - category_value = request.POST["category"] - listing_obj = AuctionListing(title = title, desc = desc, user = request.user,price = starting_bid, picture = photo_url,category=category_value) - listing_obj.save() - bid_obj = Bids(bid_value = starting_bid, listing = listing_obj, user = request.user) - bid_obj.save() + if request.method == 'POST': + form = CreateForm(request.POST, request.FILES) + if form.is_valid(): + listing_obj = AuctionListing(title = form.cleaned_data["title"], desc =form.cleaned_data["desc"], user = request.user,price = form.cleaned_data["starting_bid"], picture = form.cleaned_data["photo"],category= form.cleaned_data["category"]) + listing_obj.save() + bid_obj = Bids(bid_value = form.cleaned_data["starting_bid"], listing = listing_obj, user = request.user) + bid_obj.save() return render(request,"auctions/index.html",{ "Listings" : AuctionListing.objects.all() }) - else: + + else: return render(request,"auctions/create_listing.html",{ - "categories":categories - }) + "Form": CreateForm() + }) def bid(request, title): """ Used to bid on a listing diff --git a/commerce/__pycache__/settings.cpython-39.pyc b/commerce/__pycache__/settings.cpython-39.pyc index 95a27fa..4948a24 100644 Binary files a/commerce/__pycache__/settings.cpython-39.pyc and b/commerce/__pycache__/settings.cpython-39.pyc differ diff --git a/commerce/__pycache__/urls.cpython-39.pyc b/commerce/__pycache__/urls.cpython-39.pyc index 19651cf..18ba202 100644 Binary files a/commerce/__pycache__/urls.cpython-39.pyc and b/commerce/__pycache__/urls.cpython-39.pyc differ diff --git a/commerce/s3_storage.py b/commerce/s3_storage.py new file mode 100644 index 0000000..4325cbf --- /dev/null +++ b/commerce/s3_storage.py @@ -0,0 +1,5 @@ +from storages.backends.s3boto3 import S3Boto3Storage + +class MediaStorage(S3Boto3Storage): + location = 'media' + file_overwrite = False \ No newline at end of file diff --git a/commerce/settings.py b/commerce/settings.py index 016409a..7dcbf90 100644 --- a/commerce/settings.py +++ b/commerce/settings.py @@ -38,6 +38,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'storages', ] MIDDLEWARE = [ @@ -120,3 +121,6 @@ USE_TZ = True # https://docs.djangoproject.com/en/3.0/howto/static-files/ STATIC_URL = '/static/' + +MEDIA_URL = '/media/' +MEDIA_ROOT = os.path.join(BASE_DIR, 'media') diff --git a/commerce/urls.py b/commerce/urls.py index 2f7a9e0..0bdde9d 100644 --- a/commerce/urls.py +++ b/commerce/urls.py @@ -15,8 +15,13 @@ Including another URLconf """ from django.contrib import admin from django.urls import include, path +from django.conf import settings +from django.conf.urls.static import static urlpatterns = [ path("admin/", admin.site.urls), path("", include("auctions.urls")) -] \ No newline at end of file +] + +if settings.DEBUG: # new + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff --git a/db.sqlite3 b/db.sqlite3 index a2180ed..c5c6ef9 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/media/Screenshot_2021-01-12_121010.png b/media/Screenshot_2021-01-12_121010.png new file mode 100644 index 0000000..ffe0c71 Binary files /dev/null and b/media/Screenshot_2021-01-12_121010.png differ diff --git a/media/Screenshot_2021-01-12_121010_fohlCLJ.png b/media/Screenshot_2021-01-12_121010_fohlCLJ.png new file mode 100644 index 0000000..ffe0c71 Binary files /dev/null and b/media/Screenshot_2021-01-12_121010_fohlCLJ.png differ