diff --git a/.vscode/settings.json b/.vscode/settings.json index 3c89cbc..f514ed3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { - "python.pythonPath": "C:\\Users\\bncha\\AppData\\Local\\Programs\\Python\\Python38-32\\python.exe", + "python.pythonPath": "C:\\ProgramData\\Anaconda3\\python.exe", "python.dataScience.jupyterServerURI": "local" } \ No newline at end of file diff --git a/auctions/__pycache__/admin.cpython-37.pyc b/auctions/__pycache__/admin.cpython-37.pyc index b0e0c7a..84f54ed 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 54580b6..3a29ecc 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 bbc4d5e..8f0d091 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 263f813..57c37f1 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 9c3b6e4..466ccb9 100644 --- a/auctions/admin.py +++ b/auctions/admin.py @@ -1,9 +1,8 @@ from django.contrib import admin from .models import User from .models import AuctionListing -from .models import Comments # Register your models here. admin.site.register(User) admin.site.register(AuctionListing) -admin.site.register(Comments) \ No newline at end of file + diff --git a/auctions/migrations/0001_initial.py b/auctions/migrations/0001_initial.py index 21a43b6..42b85b1 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-11 16:42 +# Generated by Django 3.0.8 on 2020-10-18 16:09 from django.conf import settings import django.contrib.auth.models @@ -50,15 +50,14 @@ class Migration(migrations.Migration): ('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)), + ('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='Comments', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('comment', models.CharField(max_length=1000)), - ('title', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='auction_title', to='auctions.AuctionListing')), - ], + migrations.AddField( + model_name='user', + name='watchlist', + field=models.ManyToManyField(blank=True, related_name='watchlist', to='auctions.AuctionListing'), ), ] diff --git a/auctions/migrations/0002_auto_20201011_2323.py b/auctions/migrations/0002_auto_20201011_2323.py deleted file mode 100644 index 20fee1c..0000000 --- a/auctions/migrations/0002_auto_20201011_2323.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-11 17:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='auctionlisting', - name='user', - field=models.ForeignKey(default=' ', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/auctions/migrations/0002_remove_auctionlisting_date_added.py b/auctions/migrations/0002_remove_auctionlisting_date_added.py new file mode 100644 index 0000000..1a79224 --- /dev/null +++ b/auctions/migrations/0002_remove_auctionlisting_date_added.py @@ -0,0 +1,17 @@ +# 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 new file mode 100644 index 0000000..c762cb7 --- /dev/null +++ b/auctions/migrations/0003_auctionlisting_date_added.py @@ -0,0 +1,20 @@ +# 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/0003_auto_20201012_0007.py b/auctions/migrations/0003_auto_20201012_0007.py deleted file mode 100644 index 4131ec2..0000000 --- a/auctions/migrations/0003_auto_20201012_0007.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-11 18:37 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0002_auto_20201011_2323'), - ] - - operations = [ - migrations.AlterField( - model_name='auctionlisting', - name='picture', - field=models.ImageField(null=True, upload_to=''), - ), - ] diff --git a/auctions/migrations/0004_auto_20201013_0925.py b/auctions/migrations/0004_auto_20201013_0925.py deleted file mode 100644 index 8d060dd..0000000 --- a/auctions/migrations/0004_auto_20201013_0925.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-13 03:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0003_auto_20201012_0007'), - ] - - operations = [ - migrations.AlterField( - model_name='auctionlisting', - name='picture', - field=models.URLField(null=True), - ), - ] diff --git a/auctions/migrations/0005_auto_20201016_1630.py b/auctions/migrations/0005_auto_20201016_1630.py deleted file mode 100644 index ba500a4..0000000 --- a/auctions/migrations/0005_auto_20201016_1630.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-16 11:00 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0004_auto_20201013_0925'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='watchlist', - field=models.ManyToManyField(blank=True, related_name='watchlist', to='auctions.AuctionListing'), - ), - migrations.CreateModel( - name='bidding', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('bid', models.DecimalField(decimal_places=2, max_digits=10)), - ('bidder', models.ForeignKey(default=' ', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/auctions/migrations/0006_auctionlisting_category.py b/auctions/migrations/0006_auctionlisting_category.py deleted file mode 100644 index 4deb039..0000000 --- a/auctions/migrations/0006_auctionlisting_category.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-16 16:29 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0005_auto_20201016_1630'), - ] - - operations = [ - migrations.AddField( - model_name='auctionlisting', - name='category', - field=models.CharField(default=' ', max_length=64), - ), - ] diff --git a/auctions/migrations/__pycache__/0001_initial.cpython-37.pyc b/auctions/migrations/__pycache__/0001_initial.cpython-37.pyc index 3b45368..f117439 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/migrations/__pycache__/0002_auctionlisting_username.cpython-37.pyc b/auctions/migrations/__pycache__/0002_auctionlisting_username.cpython-37.pyc deleted file mode 100644 index df04c72..0000000 Binary files a/auctions/migrations/__pycache__/0002_auctionlisting_username.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0002_auto_20201003_2319.cpython-37.pyc b/auctions/migrations/__pycache__/0002_auto_20201003_2319.cpython-37.pyc deleted file mode 100644 index 090008f..0000000 Binary files a/auctions/migrations/__pycache__/0002_auto_20201003_2319.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0002_auto_20201011_2158.cpython-37.pyc b/auctions/migrations/__pycache__/0002_auto_20201011_2158.cpython-37.pyc deleted file mode 100644 index 5dcd719..0000000 Binary files a/auctions/migrations/__pycache__/0002_auto_20201011_2158.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0002_auto_20201011_2206.cpython-37.pyc b/auctions/migrations/__pycache__/0002_auto_20201011_2206.cpython-37.pyc deleted file mode 100644 index 6079e9a..0000000 Binary files a/auctions/migrations/__pycache__/0002_auto_20201011_2206.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0002_auto_20201011_2323.cpython-37.pyc b/auctions/migrations/__pycache__/0002_auto_20201011_2323.cpython-37.pyc deleted file mode 100644 index 4521577..0000000 Binary files a/auctions/migrations/__pycache__/0002_auto_20201011_2323.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0002_remove_auctionlisting_date_added.cpython-37.pyc b/auctions/migrations/__pycache__/0002_remove_auctionlisting_date_added.cpython-37.pyc new file mode 100644 index 0000000..d727c80 Binary files /dev/null and b/auctions/migrations/__pycache__/0002_remove_auctionlisting_date_added.cpython-37.pyc differ diff --git a/auctions/migrations/__pycache__/0002_remove_comments_title.cpython-37.pyc b/auctions/migrations/__pycache__/0002_remove_comments_title.cpython-37.pyc deleted file mode 100644 index adefe7c..0000000 Binary files a/auctions/migrations/__pycache__/0002_remove_comments_title.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0003_auctionlisting_date_added.cpython-37.pyc b/auctions/migrations/__pycache__/0003_auctionlisting_date_added.cpython-37.pyc new file mode 100644 index 0000000..fd96d76 Binary files /dev/null and b/auctions/migrations/__pycache__/0003_auctionlisting_date_added.cpython-37.pyc differ diff --git a/auctions/migrations/__pycache__/0003_auto_20201003_2349.cpython-37.pyc b/auctions/migrations/__pycache__/0003_auto_20201003_2349.cpython-37.pyc deleted file mode 100644 index ec24f91..0000000 Binary files a/auctions/migrations/__pycache__/0003_auto_20201003_2349.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0003_auto_20201011_2155.cpython-37.pyc b/auctions/migrations/__pycache__/0003_auto_20201011_2155.cpython-37.pyc deleted file mode 100644 index 919b313..0000000 Binary files a/auctions/migrations/__pycache__/0003_auto_20201011_2155.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0003_auto_20201011_2208.cpython-37.pyc b/auctions/migrations/__pycache__/0003_auto_20201011_2208.cpython-37.pyc deleted file mode 100644 index 6f66a25..0000000 Binary files a/auctions/migrations/__pycache__/0003_auto_20201011_2208.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0003_auto_20201011_2211.cpython-37.pyc b/auctions/migrations/__pycache__/0003_auto_20201011_2211.cpython-37.pyc deleted file mode 100644 index 9fd22af..0000000 Binary files a/auctions/migrations/__pycache__/0003_auto_20201011_2211.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0003_auto_20201012_0007.cpython-37.pyc b/auctions/migrations/__pycache__/0003_auto_20201012_0007.cpython-37.pyc deleted file mode 100644 index f1ff107..0000000 Binary files a/auctions/migrations/__pycache__/0003_auto_20201012_0007.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0004_auto_20201013_0925.cpython-37.pyc b/auctions/migrations/__pycache__/0004_auto_20201013_0925.cpython-37.pyc deleted file mode 100644 index 2d75cef..0000000 Binary files a/auctions/migrations/__pycache__/0004_auto_20201013_0925.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0004_remove_auctionlisting_username.cpython-37.pyc b/auctions/migrations/__pycache__/0004_remove_auctionlisting_username.cpython-37.pyc deleted file mode 100644 index 196e7fb..0000000 Binary files a/auctions/migrations/__pycache__/0004_remove_auctionlisting_username.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0005_auto_20201016_1630.cpython-37.pyc b/auctions/migrations/__pycache__/0005_auto_20201016_1630.cpython-37.pyc deleted file mode 100644 index 133f2d7..0000000 Binary files a/auctions/migrations/__pycache__/0005_auto_20201016_1630.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/0006_auctionlisting_category.cpython-37.pyc b/auctions/migrations/__pycache__/0006_auctionlisting_category.cpython-37.pyc deleted file mode 100644 index bad5db8..0000000 Binary files a/auctions/migrations/__pycache__/0006_auctionlisting_category.cpython-37.pyc and /dev/null differ diff --git a/auctions/migrations/__pycache__/__init__.cpython-37.pyc b/auctions/migrations/__pycache__/__init__.cpython-37.pyc index 4b5437e..72625fe 100644 Binary files a/auctions/migrations/__pycache__/__init__.cpython-37.pyc and b/auctions/migrations/__pycache__/__init__.cpython-37.pyc differ diff --git a/auctions/models.py b/auctions/models.py index 02b447a..655ce55 100644 --- a/auctions/models.py +++ b/auctions/models.py @@ -2,24 +2,20 @@ from django.contrib.auth.models import AbstractUser from django.db import models class User(AbstractUser): - watchlist = models.ManyToManyField('AuctionListing',blank = True,related_name="watchlist") + watchlist = models.ManyToManyField('AuctionListing',blank = True,related_name="watchlist") class AuctionListing(models.Model): title = models.CharField(max_length = 64,primary_key = True) - user = models.ForeignKey(User,on_delete = models.CASCADE,default = " ") + 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,default = " ") + category = models.CharField(max_length = 64) + date_added = models.DateTimeField(auto_now_add=True) - - def __str__(self): - return f"{self.title}: {self.price},{self.desc},{self.picture}" -class Comments(models.Model): - title = models.ForeignKey(AuctionListing,on_delete = models.CASCADE,related_name="auction_title") - comment = models.CharField(max_length = 1000) + return f"{self.title}: {self.price},{self.desc},{self.picture},{self.category},{self.date_added}" + + + -class bidding(models.Model): - bidder = models.ForeignKey(User,on_delete = models.CASCADE,default = " ") - bid = models.DecimalField(max_digits = 10,decimal_places = 2) \ No newline at end of file diff --git a/auctions/templates/auctions/category.html b/auctions/templates/auctions/category.html index 60c5d44..d4340fd 100644 --- a/auctions/templates/auctions/category.html +++ b/auctions/templates/auctions/category.html @@ -12,12 +12,12 @@
-

{{ listing.title }}


+

{{ list.title }}


- bid price : ${{listing.price}}
- created by: {{listing.user}} + bid price : ${{list.price}}
+ created by: {{list.user}}

diff --git a/auctions/templates/auctions/index.html b/auctions/templates/auctions/index.html index f7a7ae3..3ab8196 100644 --- a/auctions/templates/auctions/index.html +++ b/auctions/templates/auctions/index.html @@ -20,8 +20,12 @@ created by: {{listing.user}}

- - +
+ {% csrf_token %} + {{ watch_form }} +
+ +
diff --git a/auctions/templates/auctions/layout.html b/auctions/templates/auctions/layout.html index b707942..975338e 100644 --- a/auctions/templates/auctions/layout.html +++ b/auctions/templates/auctions/layout.html @@ -25,7 +25,7 @@ {% if user.is_authenticated %}
  • - WishList{% block watch %}def{% endblock %} + WishList
  • Create Listing diff --git a/auctions/templates/auctions/listing.html b/auctions/templates/auctions/listing.html index ff8b0e1..5fee189 100644 --- a/auctions/templates/auctions/listing.html +++ b/auctions/templates/auctions/listing.html @@ -1,3 +1,4 @@ + {% extends "auctions/layout.html" %} {% block body %} diff --git a/auctions/urls.py b/auctions/urls.py index daee9da..2a59bbc 100644 --- a/auctions/urls.py +++ b/auctions/urls.py @@ -11,5 +11,5 @@ urlpatterns = [ path("create", views.create, name="create"), path("categories", views.category, name="categories"), path("category/",views.category,name="indiv_categories"), - path("listing/",views.listing,name="listing") + path("listing/",views.listing,name="listing") ] diff --git a/auctions/views.py b/auctions/views.py index 4269f53..27d0486 100644 --- a/auctions/views.py +++ b/auctions/views.py @@ -3,28 +3,43 @@ from django.db import IntegrityError from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render from django.urls import reverse -from django.core.files import File -from django.core.files.temp import NamedTemporaryFile -from django.core.files.base import ContentFile -import requests -from .models import User,AuctionListing,Comments +from django import forms +from .models import User,AuctionListing categories = ['Fashion','Electronics','Home','Sports','Toys','Automobile','Books','Video Games', 'Other'] +class Watch_Form(forms.Form): + watch_this = forms.BooleanField(required=False) +class Bid_Form(forms.Form): + bid = 0.0 + def __init__(self,bid_value): + self.bid = bid_value + + bid_value = forms.DecimalField(decimal_places=2,min_value= bid + 1) + + def index(request): listings = AuctionListing.objects.all() + watch_form = Watch_Form(request.POST) + if watch_form.is_valid(): + print("asdf") + watch = watch_form.cleaned_data["watch_this"] + print(watch) + + return render(request, "auctions/index.html",{ - "Listings":listings + "Listings":listings, + "watch_form": Watch_Form() }) def listing(request,title): """ docstring """ - listing = AuctionListing.objects.get(pk = title) + listings = AuctionListing.objects.get(pk = title) return render(request,"auctions/listing.html",{ - "Listing": listing + "Listing": listings }) def category(request,cat_name = None): """ @@ -33,11 +48,12 @@ def category(request,cat_name = None): if( cat_name != None): if cat_name.capitalize() in categories: - listings = AuctionListing.objects.get(category=cat_name.capitalize()) + listings = AuctionListing.objects.filter(category=cat_name.capitalize()) print(listings) return render(request, "auctions/category.html",{ - "listings":listings + "listings":listings, + "cat_name": cat_name }) @@ -109,7 +125,6 @@ def create(request): obj.save() return render(request,"auctions/index.html") else: - categories = ['Fashion','Electronics','Home','Sports','Toys','Automobile','Books','Video Games', 'Other'] return render(request,"auctions/create_listing.html",{ "categories":categories }) diff --git a/db.sqlite3 b/db.sqlite3 index 306d0fe..28f0b19 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ