diff --git a/auctions/__pycache__/admin.cpython-37.pyc b/auctions/__pycache__/admin.cpython-37.pyc index dfd5cc2..bdfb581 100644 Binary files a/auctions/__pycache__/admin.cpython-37.pyc and b/auctions/__pycache__/admin.cpython-37.pyc differ diff --git a/auctions/__pycache__/models.cpython-37.pyc b/auctions/__pycache__/models.cpython-37.pyc index 42b56e0..41702a2 100644 Binary files a/auctions/__pycache__/models.cpython-37.pyc and b/auctions/__pycache__/models.cpython-37.pyc differ diff --git a/auctions/__pycache__/urls.cpython-37.pyc b/auctions/__pycache__/urls.cpython-37.pyc index 5933254..4a09a68 100644 Binary files a/auctions/__pycache__/urls.cpython-37.pyc and b/auctions/__pycache__/urls.cpython-37.pyc differ diff --git a/auctions/__pycache__/views.cpython-37.pyc b/auctions/__pycache__/views.cpython-37.pyc index 3539517..643b3e8 100644 Binary files a/auctions/__pycache__/views.cpython-37.pyc and b/auctions/__pycache__/views.cpython-37.pyc differ diff --git a/auctions/admin.py b/auctions/admin.py index 3fac663..796f3d3 100644 --- a/auctions/admin.py +++ b/auctions/admin.py @@ -1,8 +1,9 @@ from django.contrib import admin from .models import User -from .models import AuctionListing,Comment +from .models import AuctionListing,Comment,Bids # Register your models here. admin.site.register(User) admin.site.register(AuctionListing) admin.site.register(Comment) +admin.site.register(Bids) diff --git a/auctions/migrations/0001_initial.py b/auctions/migrations/0001_initial.py index 42b85b1..e063ad8 100644 --- a/auctions/migrations/0001_initial.py +++ b/auctions/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-10-18 16:09 +# Generated by Django 3.0.8 on 2020-10-19 17:27 from django.conf import settings import django.contrib.auth.models @@ -49,15 +49,34 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=64, primary_key=True, serialize=False)), ('price', models.DecimalField(decimal_places=2, max_digits=10)), ('desc', models.CharField(max_length=1000)), - ('picture', models.URLField(null=True)), - ('category', models.CharField(max_length=64)), + ('picture', models.URLField(default='https://www.riobeauty.co.uk/images/product_image_not_found.gif')), + ('category', models.CharField(choices=[('Fashion', 'Fashion'), ('Electronics', 'Electronics'), ('Home', 'Home'), ('Sports', 'Sports'), ('Toys', 'Toys'), ('Automobile', 'Automobile'), ('Books', 'Books'), ('Videogames', 'Videogames'), ('Other', 'Other')], max_length=64)), ('date_added', models.DateTimeField(auto_now_add=True)), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), + migrations.CreateModel( + name='Comment', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('body', models.TextField()), + ('date_added', models.DateTimeField(auto_now_add=True)), + ('listing', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='auctions.AuctionListing')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='commited_user', to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='Bids', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('bid_value', models.DecimalField(decimal_places=2, max_digits=10)), + ('listing', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bidding_listing', to='auctions.AuctionListing')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bidding_user', to=settings.AUTH_USER_MODEL)), + ], + ), migrations.AddField( model_name='user', name='watchlist', - field=models.ManyToManyField(blank=True, related_name='watchlist', to='auctions.AuctionListing'), + field=models.ManyToManyField(blank=True, related_name='watchlists', to='auctions.AuctionListing'), ), ] diff --git a/auctions/migrations/0002_remove_auctionlisting_date_added.py b/auctions/migrations/0002_remove_auctionlisting_date_added.py deleted file mode 100644 index 1a79224..0000000 --- a/auctions/migrations/0002_remove_auctionlisting_date_added.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-18 16:16 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='auctionlisting', - name='date_added', - ), - ] diff --git a/auctions/migrations/0003_auctionlisting_date_added.py b/auctions/migrations/0003_auctionlisting_date_added.py deleted file mode 100644 index c762cb7..0000000 --- a/auctions/migrations/0003_auctionlisting_date_added.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-18 16:18 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0002_remove_auctionlisting_date_added'), - ] - - operations = [ - migrations.AddField( - model_name='auctionlisting', - name='date_added', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), - preserve_default=False, - ), - ] diff --git a/auctions/migrations/0004_comment.py b/auctions/migrations/0004_comment.py deleted file mode 100644 index 87da767..0000000 --- a/auctions/migrations/0004_comment.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-18 16:42 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0003_auctionlisting_date_added'), - ] - - operations = [ - migrations.CreateModel( - name='Comment', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('body', models.TextField()), - ('date_added', models.DateTimeField(auto_now_add=True)), - ('listing', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='auctions.AuctionListing')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='commited_user', to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/auctions/migrations/0005_auto_20201018_2304.py b/auctions/migrations/0005_auto_20201018_2304.py deleted file mode 100644 index de1ed5d..0000000 --- a/auctions/migrations/0005_auto_20201018_2304.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-18 17:34 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0004_comment'), - ] - - operations = [ - migrations.RemoveField( - model_name='user', - name='watchlist', - ), - migrations.AddField( - model_name='auctionlisting', - name='watchlist', - field=models.ManyToManyField(blank=True, related_name='watchlist', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/auctions/migrations/0006_auto_20201019_1109.py b/auctions/migrations/0006_auto_20201019_1109.py deleted file mode 100644 index c2c5bae..0000000 --- a/auctions/migrations/0006_auto_20201019_1109.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-19 05:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0005_auto_20201018_2304'), - ] - - operations = [ - migrations.RemoveField( - model_name='auctionlisting', - name='watchlist', - ), - migrations.AddField( - model_name='user', - name='watchlist', - field=models.ManyToManyField(blank=True, related_name='watchlist', to='auctions.AuctionListing'), - ), - migrations.AlterField( - model_name='auctionlisting', - name='category', - field=models.CharField(choices=[('Fashion', 'Fashion'), ('Electronics', 'Electronics'), ('Home', 'Home'), ('Sports', 'Sports'), ('Toys', 'Toys'), ('Automobile', 'Automobile'), ('Books', 'Books'), ('Video Games', 'Video Games'), ('Other', 'Other')], max_length=64), - ), - ] diff --git a/auctions/migrations/0007_auto_20201019_1723.py b/auctions/migrations/0007_auto_20201019_1723.py deleted file mode 100644 index 1f886f3..0000000 --- a/auctions/migrations/0007_auto_20201019_1723.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-19 11:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0006_auto_20201019_1109'), - ] - - operations = [ - migrations.AlterField( - model_name='auctionlisting', - name='picture', - field=models.URLField(default='https://www.riobeauty.co.uk/images/product_image_not_found.gif', null=True), - ), - migrations.AlterField( - model_name='user', - name='watchlist', - field=models.ManyToManyField(blank=True, related_name='watchlists', to='auctions.AuctionListing'), - ), - migrations.CreateModel( - name='Bids', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('bid_value', models.DecimalField(decimal_places=2, max_digits=10)), - ('listing', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bidding_listing', to='auctions.AuctionListing')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bidding_user', to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/auctions/migrations/0008_auto_20201019_1725.py b/auctions/migrations/0008_auto_20201019_1725.py deleted file mode 100644 index 973a35c..0000000 --- a/auctions/migrations/0008_auto_20201019_1725.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-19 11:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0007_auto_20201019_1723'), - ] - - operations = [ - migrations.AlterField( - model_name='auctionlisting', - name='picture', - field=models.URLField(default='https://www.riobeauty.co.uk/images/product_image_not_found.gif'), - ), - ] diff --git a/auctions/migrations/0009_auto_20201019_1740.py b/auctions/migrations/0009_auto_20201019_1740.py deleted file mode 100644 index e521cb9..0000000 --- a/auctions/migrations/0009_auto_20201019_1740.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-19 12:10 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0008_auto_20201019_1725'), - ] - - operations = [ - migrations.AlterField( - model_name='auctionlisting', - name='category', - field=models.CharField(choices=[('Fashion', 'Fashion'), ('Electronics', 'Electronics'), ('Home', 'Home'), ('Sports', 'Sports'), ('Toys', 'Toys'), ('Automobile', 'Automobile'), ('Books', 'Books'), ('Video-Games', 'Video-Games'), ('Other', 'Other')], max_length=64), - ), - ] diff --git a/auctions/migrations/0010_auto_20201019_1744.py b/auctions/migrations/0010_auto_20201019_1744.py deleted file mode 100644 index bc1b26b..0000000 --- a/auctions/migrations/0010_auto_20201019_1744.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-19 12:14 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0009_auto_20201019_1740'), - ] - - operations = [ - migrations.AlterField( - model_name='auctionlisting', - name='category', - field=models.CharField(choices=[('Fashion', 'Fashion'), ('Electronics', 'Electronics'), ('Home', 'Home'), ('Sports', 'Sports'), ('Toys', 'Toys'), ('Automobile', 'Automobile'), ('Books', 'Books'), ('Videogames', 'Videogames'), ('Other', 'Other')], max_length=64), - ), - ] diff --git a/auctions/migrations/__pycache__/0001_initial.cpython-37.pyc b/auctions/migrations/__pycache__/0001_initial.cpython-37.pyc index f117439..1fe3eb0 100644 Binary files a/auctions/migrations/__pycache__/0001_initial.cpython-37.pyc and b/auctions/migrations/__pycache__/0001_initial.cpython-37.pyc differ diff --git a/auctions/models.py b/auctions/models.py index 7711a9c..3ef057c 100644 --- a/auctions/models.py +++ b/auctions/models.py @@ -40,4 +40,7 @@ class Bids(models.Model): bid_value = models.DecimalField(max_digits = 10,decimal_places = 2) user = models.ForeignKey(User,on_delete = models.CASCADE, related_name="bidding_user") listing = models.ForeignKey(AuctionListing, on_delete= models.CASCADE, related_name="bidding_listing") + + def __str__(self): + return '%s - %s - %s' % (self.bid_value, self.user, self.listing) diff --git a/auctions/templates/auctions/category.html b/auctions/templates/auctions/category.html index cb7316b..80d8bc0 100644 --- a/auctions/templates/auctions/category.html +++ b/auctions/templates/auctions/category.html @@ -24,13 +24,14 @@
{% if user.is_authenticated %} -
+ {% csrf_token %} {% if user not in list.watchlists.all %} {% else %} - + {% endif %} +
{% else %} log in to watch this listing diff --git a/auctions/templates/auctions/index.html b/auctions/templates/auctions/index.html index 2a4aa48..56c904e 100644 --- a/auctions/templates/auctions/index.html +++ b/auctions/templates/auctions/index.html @@ -4,7 +4,7 @@

Active Listings

{% for listing in Listings %} -
+
@@ -19,7 +19,7 @@ bid price : ${{listing.price}}
created by: {{listing.user}}
- created at {{listing.date_added}} + created on {{listing.date_added}}

@@ -27,13 +27,15 @@
{% if user.is_authenticated %} -
+ {% csrf_token %} {% if user not in listing.watchlists.all %} {% else %} - + {% endif %} + +
{% else %} log in to watch this listing diff --git a/auctions/templates/auctions/layout.html b/auctions/templates/auctions/layout.html index c9a147e..fb8be93 100644 --- a/auctions/templates/auctions/layout.html +++ b/auctions/templates/auctions/layout.html @@ -25,7 +25,7 @@ {% if user.is_authenticated %}
  • - WishList {{ user.watchlist.count }} + WatchList {{ user.watchlist.count }}
  • Create Listing diff --git a/auctions/templates/auctions/listing.html b/auctions/templates/auctions/listing.html index 821fd39..d972f28 100644 --- a/auctions/templates/auctions/listing.html +++ b/auctions/templates/auctions/listing.html @@ -3,39 +3,73 @@ {% block body %}

    Listing : {{ Listing.title}}

    + +
    + {% if user.username|stringformat:"s" == Listing.user|stringformat:"s" %} + + + + Close this Listing + {% endif %} +
    + {% csrf_token %} + {% if user not in Listing.watchlists.all %} + + {% else %} + + {% endif %} + +
    +
    - +

    {{Listing.desc}}

    -

    ${{Listing.price}}

    +

    ${{bids.bid_value}}

    bids so far -
    - -
    - + {% if user.is_authenticated %} +
    + {% csrf_token %} + + +
    + +
    + {% else %} +
    + Log In to bid on this Listing + {% endif %} +
    +

    Comments ...

    {% if not Listing.comments.all %} No comments Yet.... +
    +
    +
    + {% else %} {% for comment in Listing.comments.all %} {{comment.user}} - {{comment.date_added}}
    {{ comment.body }}
    +
    {% endfor %} {% endif %} {% if user.is_authenticated %} -
    add comment..
    +
    Add comment

    {% csrf_token %} +

    @@ -45,4 +79,7 @@ Log In to comment on this listing {% endif %} + + + {% endblock %} \ No newline at end of file diff --git a/auctions/templates/auctions/watchlist.html b/auctions/templates/auctions/watchlist.html index dce261d..effa4c1 100644 --- a/auctions/templates/auctions/watchlist.html +++ b/auctions/templates/auctions/watchlist.html @@ -2,6 +2,7 @@ {% block body %}

    WatchList

    + {% if Watchlistings %}
    {% for listing in Watchlistings %}
    @@ -22,13 +23,15 @@ created at {{listing.date_added}}

    -
    + {% csrf_token %} {% if user not in listing.watchlists.all %} {% else %} {% endif %} + +
    @@ -42,5 +45,9 @@
    {% endfor %}
    + {% else %} +

    There seems to be no listing you are watching !! +

    + {% endif %} {% endblock %} \ No newline at end of file diff --git a/auctions/urls.py b/auctions/urls.py index e3bb470..437e120 100644 --- a/auctions/urls.py +++ b/auctions/urls.py @@ -7,11 +7,13 @@ urlpatterns = [ path("login", views.login_view, name="login"), path("logout", views.logout_view, name="logout"), path("register", views.register, name="register"), - path("watchlist", views.watchlist, name="wishlist"), + path("watchlist", views.watchlist, name="watchlist"), path("create", views.create, name="create"), path("categories", views.category, name="categories"), path("category/",views.category,name="individual_categories"), path("listing/",views.listing,name="listing"), path("category/listing/",views.listing,name="listing"), - path("watch/",views.watch,name="watchlist"), + path("watch/",views.watch,name="watch"), + path("bid/",views.bid,name="bid"), + path("close/",views.close_bid,name="close_bid"), ] diff --git a/auctions/views.py b/auctions/views.py index 06802ff..01934f9 100644 --- a/auctions/views.py +++ b/auctions/views.py @@ -4,7 +4,7 @@ from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render from django.urls import reverse from django import forms -from .models import User,AuctionListing,Comment +from .models import User,AuctionListing,Comment,Bids categories = ['Fashion','Electronics','Home','Sports','Toys','Automobile','Books','Videogames', 'Other'] @@ -22,7 +22,9 @@ def watch(request,title): request.user.watchlist.remove(listing) else: request.user.watchlist.add(listing) - return HttpResponseRedirect(reverse("index")) + previous_url = request.POST.get('previous','/') + + return HttpResponseRedirect(previous_url) def watchlist(request): listings = request.user.watchlist.all() @@ -42,14 +44,19 @@ def listing(request,title): """ docstring """ - listings = AuctionListing.objects.get(pk = title) + listing = AuctionListing.objects.get(pk = title) + bids = Bids.objects.get(listing = listing) + print(bids) if request.method == "POST": body = request.POST["comment_body"] - comment = Comment(user=request.user,listing=listings,body = body) + comment = Comment(user=request.user,listing=listing,body = body) comment.save() + + return render(request,"auctions/listing.html",{ - "Listing": listings + "Listing": listing, + "bids" : bids }) def category(request,cat_name = None): @@ -132,11 +139,13 @@ def create(request): desc = request.POST["desc"] starting_bid = request.POST["starting_bid"] photo_url = request.POST["photo"] - if photo_url == None: + if photo_url == "": photo_url = "https://www.riobeauty.co.uk/images/product_image_not_found.gif" category = request.POST["category"] - obj = AuctionListing(title = title, desc = desc, user = request.user,price = starting_bid, picture = photo_url,category=category) - obj.save() + listing_obj = AuctionListing(title = title, desc = desc, user = request.user,price = starting_bid, picture = photo_url,category=category) + listing_obj.save() + bid_obj = Bids(bid_value = starting_bid, listing = listing_obj, user = request.user) + bid_obj.save() return render(request,"auctions/index.html",{ "Listings" : AuctionListing.objects.all() }) @@ -144,6 +153,17 @@ def create(request): return render(request,"auctions/create_listing.html",{ "categories":categories }) - +def bid(request, title): + listing = AuctionListing.objects.get(title=title) + bid = Bids.objects.get(listing = listing) + new_bid_value = request.POST["bid"] + bid.bid_value = new_bid_value + bid.user = request.user + return render(request,"auctions/listing.html",{ + "Listing": listing, + "bids" : bid + }) +def close_bid(request,title): + pass diff --git a/db.sqlite3 b/db.sqlite3 index fb3d5a2..e8457ff 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ