diff --git a/auctions/__pycache__/models.cpython-37.pyc b/auctions/__pycache__/models.cpython-37.pyc index 6d09c6e..42b56e0 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 d413074..5933254 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 6b111cb..3539517 100644 Binary files a/auctions/__pycache__/views.cpython-37.pyc and b/auctions/__pycache__/views.cpython-37.pyc differ diff --git a/auctions/migrations/0006_auto_20201019_1109.py b/auctions/migrations/0006_auto_20201019_1109.py new file mode 100644 index 0000000..c2c5bae --- /dev/null +++ b/auctions/migrations/0006_auto_20201019_1109.py @@ -0,0 +1,27 @@ +# 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 new file mode 100644 index 0000000..1f886f3 --- /dev/null +++ b/auctions/migrations/0007_auto_20201019_1723.py @@ -0,0 +1,34 @@ +# 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 new file mode 100644 index 0000000..973a35c --- /dev/null +++ b/auctions/migrations/0008_auto_20201019_1725.py @@ -0,0 +1,18 @@ +# 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 new file mode 100644 index 0000000..e521cb9 --- /dev/null +++ b/auctions/migrations/0009_auto_20201019_1740.py @@ -0,0 +1,18 @@ +# 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 new file mode 100644 index 0000000..bc1b26b --- /dev/null +++ b/auctions/migrations/0010_auto_20201019_1744.py @@ -0,0 +1,18 @@ +# 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__/0006_auto_20201019_1109.cpython-37.pyc b/auctions/migrations/__pycache__/0006_auto_20201019_1109.cpython-37.pyc new file mode 100644 index 0000000..034785c Binary files /dev/null and b/auctions/migrations/__pycache__/0006_auto_20201019_1109.cpython-37.pyc differ diff --git a/auctions/migrations/__pycache__/0007_auto_20201019_1723.cpython-37.pyc b/auctions/migrations/__pycache__/0007_auto_20201019_1723.cpython-37.pyc new file mode 100644 index 0000000..9b71298 Binary files /dev/null and b/auctions/migrations/__pycache__/0007_auto_20201019_1723.cpython-37.pyc differ diff --git a/auctions/migrations/__pycache__/0008_auto_20201019_1725.cpython-37.pyc b/auctions/migrations/__pycache__/0008_auto_20201019_1725.cpython-37.pyc new file mode 100644 index 0000000..e2bb230 Binary files /dev/null and b/auctions/migrations/__pycache__/0008_auto_20201019_1725.cpython-37.pyc differ diff --git a/auctions/migrations/__pycache__/0009_auto_20201019_1740.cpython-37.pyc b/auctions/migrations/__pycache__/0009_auto_20201019_1740.cpython-37.pyc new file mode 100644 index 0000000..838d4ce Binary files /dev/null and b/auctions/migrations/__pycache__/0009_auto_20201019_1740.cpython-37.pyc differ diff --git a/auctions/migrations/__pycache__/0010_auto_20201019_1744.cpython-37.pyc b/auctions/migrations/__pycache__/0010_auto_20201019_1744.cpython-37.pyc new file mode 100644 index 0000000..13a0c25 Binary files /dev/null and b/auctions/migrations/__pycache__/0010_auto_20201019_1744.cpython-37.pyc differ diff --git a/auctions/models.py b/auctions/models.py index 414cd00..7711a9c 100644 --- a/auctions/models.py +++ b/auctions/models.py @@ -2,17 +2,27 @@ from django.contrib.auth.models import AbstractUser from django.db import models class User(AbstractUser): - pass + watchlist = models.ManyToManyField('AuctionListing',blank = True,related_name="watchlists") class AuctionListing(models.Model): + category_choices = ( + ('Fashion','Fashion'), + ('Electronics','Electronics'), + ('Home','Home'), + ('Sports','Sports'), + ('Toys','Toys'), + ('Automobile','Automobile'), + ('Books','Books'), + ('Videogames','Videogames'), + ('Other','Other'), + ) title = models.CharField(max_length = 64,primary_key = True) user = models.ForeignKey(User,on_delete = models.CASCADE) price = models.DecimalField(max_digits = 10,decimal_places = 2) 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(max_length = 64,choices=category_choices) date_added = models.DateTimeField(auto_now_add=True) - watchlist = models.ManyToManyField(User,blank = True,related_name="watchlist") def __str__(self): return f"{self.title}: {self.price},{self.desc},{self.picture},{self.category},{self.date_added}" @@ -26,3 +36,8 @@ class Comment(models.Model): def __str__(self): return '%s - %s' % (self.listing.title, self.user) +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") + diff --git a/auctions/templates/auctions/category.html b/auctions/templates/auctions/category.html index d4340fd..05a1988 100644 --- a/auctions/templates/auctions/category.html +++ b/auctions/templates/auctions/category.html @@ -1,11 +1,13 @@ {% extends "auctions/layout.html"%} {% block body %} -

Listings under category: {{ cat_name }}

+

Listings under category "{{ cat_name }}"

+ {% if listings %}
+ {% for list in listings %}
- +
Preview not found @@ -20,8 +22,19 @@ created by: {{list.user}}

- - + + {% if user.is_authenticated %} +
+ {% csrf_token %} + {% if user not in list.watchlists.all %} + + {% else %} + + {% endif %} +
+ {% else %} + log in to watch this listing + {% endif %}
@@ -33,4 +46,13 @@ {% endfor %}
+ + {% else %} +
+
+
+
+

Seems to be no listings in this category

+
+ {% endif %} {% endblock %} \ No newline at end of file diff --git a/auctions/templates/auctions/index.html b/auctions/templates/auctions/index.html index e46d39d..2a4aa48 100644 --- a/auctions/templates/auctions/index.html +++ b/auctions/templates/auctions/index.html @@ -21,12 +21,24 @@ created at {{listing.date_added}}

+
+ +
-
- {% csrf_token %} - -
- + {% if user.is_authenticated %} + +
+ {% csrf_token %} + {% if user not in listing.watchlists.all %} + + {% else %} + + {% endif %} +
+ {% else %} + log in to watch this listing + + {% endif %}
diff --git a/auctions/templates/auctions/layout.html b/auctions/templates/auctions/layout.html index 975338e..c9a147e 100644 --- a/auctions/templates/auctions/layout.html +++ b/auctions/templates/auctions/layout.html @@ -25,7 +25,7 @@ {% if user.is_authenticated %}
  • - WishList + WishList {{ user.watchlist.count }}
  • Create Listing diff --git a/auctions/templates/auctions/listing.html b/auctions/templates/auctions/listing.html index 1bdcb7d..821fd39 100644 --- a/auctions/templates/auctions/listing.html +++ b/auctions/templates/auctions/listing.html @@ -2,12 +2,14 @@ {% extends "auctions/layout.html" %} {% block body %} -

    Listing:{{ Listing.title}}

    - - +

    Listing : {{ Listing.title}}

    + +
    +

    {{Listing.desc}}

    +

    ${{Listing.price}}

    bids so far
    @@ -30,11 +32,17 @@ {% endif %} {% if user.is_authenticated %}
    add comment..
    +

    {% csrf_token %}
    +

    + {% else %} +
    +
    + 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 new file mode 100644 index 0000000..dce261d --- /dev/null +++ b/auctions/templates/auctions/watchlist.html @@ -0,0 +1,46 @@ +{% extends "auctions/layout.html" %} + +{% block body %} +

    WatchList

    +
    + {% for listing in Watchlistings %} +
    + +
    +
    + Preview not found + +
    +
    +

    {{ listing.title }}


    + + +

    + bid price : ${{listing.price}}
    + created by: {{listing.user}}
    + + created at {{listing.date_added}} +

    +
    +
    + {% csrf_token %} + {% if user not in listing.watchlists.all %} + + {% else %} + + {% endif %} +
    + + + +
    + +
    +
    +
    +     +
    + {% endfor %} +
    + +{% endblock %} \ No newline at end of file diff --git a/auctions/urls.py b/auctions/urls.py index 71953be..e3bb470 100644 --- a/auctions/urls.py +++ b/auctions/urls.py @@ -7,10 +7,11 @@ urlpatterns = [ path("login", views.login_view, name="login"), path("logout", views.logout_view, name="logout"), path("register", views.register, name="register"), - path("wishlist", views.register, name="wishlist"), + path("watchlist", views.watchlist, name="wishlist"), 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("watch/",views.watch,name="watchlist") + path("category/listing/",views.listing,name="listing"), + path("watch/",views.watch,name="watchlist"), ] diff --git a/auctions/views.py b/auctions/views.py index 8fa8bca..06802ff 100644 --- a/auctions/views.py +++ b/auctions/views.py @@ -7,7 +7,7 @@ from django import forms from .models import User,AuctionListing,Comment -categories = ['Fashion','Electronics','Home','Sports','Toys','Automobile','Books','Video Games', 'Other'] +categories = ['Fashion','Electronics','Home','Sports','Toys','Automobile','Books','Videogames', 'Other'] class Bid_Form(forms.Form): bid = 0.0 def __init__(self,bid_value): @@ -15,11 +15,24 @@ class Bid_Form(forms.Form): bid_value = forms.DecimalField(decimal_places=2,min_value= bid + 1) +def watch(request,title): + if request.method =="POST": + listing = AuctionListing.objects.get(title=title) + if request.user in listing.watchlists.all(): + request.user.watchlist.remove(listing) + else: + request.user.watchlist.add(listing) + return HttpResponseRedirect(reverse("index")) +def watchlist(request): + listings = request.user.watchlist.all() + return render(request,"auctions/watchlist.html",{ + "Watchlistings": listings + }) + def index(request): listings = AuctionListing.objects.all() - if request.method == "POST": - + return render(request, "auctions/index.html",{ "Listings":listings, @@ -119,10 +132,14 @@ def create(request): desc = request.POST["desc"] starting_bid = request.POST["starting_bid"] photo_url = request.POST["photo"] + if photo_url == None: + 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() - return render(request,"auctions/index.html") + return render(request,"auctions/index.html",{ + "Listings" : AuctionListing.objects.all() + }) else: return render(request,"auctions/create_listing.html",{ "categories":categories diff --git a/db.sqlite3 b/db.sqlite3 index 7b8a4b3..3245925 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ