Skip to content

Develop #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 310 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
310 commits
Select commit Hold shift + click to select a range
5f5f223
suit it
savagecarol Dec 4, 2021
8bb5ee6
chaged
AlankarSaxena2712 Dec 4, 2021
c6a0e91
Merge branch 'testadmin' into testadmin2
AlankarSaxena2712 Dec 4, 2021
62c02e2
icon and cover image preview
AlankarSaxena2712 Dec 4, 2021
913b9fc
contact email ready
savagecarol Dec 6, 2021
ca01158
Merge branch 'testadmin2' of https://github.com/triangular-opensource…
savagecarol Dec 6, 2021
07bde95
lets do it
savagecarol Dec 6, 2021
0b160cb
we will do it
savagecarol Dec 6, 2021
2776ba5
changes in user model & serialzer for registration
AlankarSaxena2712 Dec 7, 2021
ea4586e
test admin 2
savagecarol Dec 7, 2021
fa29a99
user view
savagecarol Dec 7, 2021
dbd87f2
check backend view
savagecarol Dec 7, 2021
3fb4ee0
tast admin 2
savagecarol Dec 8, 2021
2d15bb5
test admin 2
savagecarol Dec 8, 2021
d787ae2
edit in subscritpion view
savagecarol Dec 8, 2021
4b48669
news letter error
savagecarol Dec 8, 2021
42a666d
user profile and admin changes
AlankarSaxena2712 Dec 9, 2021
6c19bb1
Merge branch 'testadmin3' into testadmin2
AlankarSaxena2712 Dec 9, 2021
ceba8da
old migrations deleted
AlankarSaxena2712 Dec 9, 2021
ece3f86
requirement.txt updated
AlankarSaxena2712 Dec 9, 2021
f834a1a
serailzer error fixed
AlankarSaxena2712 Dec 9, 2021
527b3cd
contact and product added
savagecarol Dec 9, 2021
13add01
Merge branch 'testadmin2' of https://github.com/triangular-opensource…
savagecarol Dec 9, 2021
40f16c8
lets do it
savagecarol Dec 9, 2021
6e91db1
user api permission added
AlankarSaxena2712 Dec 9, 2021
4a56244
register api changes
AlankarSaxena2712 Dec 9, 2021
3a2b745
user creation fields added
AlankarSaxena2712 Dec 9, 2021
7a141ce
user image deleted at register
AlankarSaxena2712 Dec 9, 2021
857d514
validations and admin customization
AlankarSaxena2712 Dec 10, 2021
51738fc
edited test admin 2
savagecarol Dec 15, 2021
1385b62
conflict resolved
savagecarol Dec 15, 2021
5530947
payment gateway backend
AlankarSaxena2712 Dec 15, 2021
4096714
change model type
AlankarSaxena2712 Dec 15, 2021
9fbe8bf
run migrations
AlankarSaxena2712 Dec 15, 2021
5064de4
added url linking
AlankarSaxena2712 Dec 15, 2021
7bd6757
urls
AlankarSaxena2712 Dec 15, 2021
42aed85
payment error fixed
AlankarSaxena2712 Dec 16, 2021
220331f
user number and gst characters
AlankarSaxena2712 Dec 16, 2021
ec027d2
activation email html changes
AlankarSaxena2712 Dec 16, 2021
e8ed40d
taiyo email
savagecarol Dec 17, 2021
aef558e
email otp send
savagecarol Dec 17, 2021
a0dbed7
product category
savagecarol Dec 18, 2021
885a4b4
category product edit
savagecarol Dec 18, 2021
1f6b903
Merge branch 'payment' into testadmin2
AlankarSaxena2712 Dec 18, 2021
d3691bc
admin url changed
AlankarSaxena2712 Dec 19, 2021
f7de704
admin url
AlankarSaxena2712 Dec 19, 2021
71b89cf
admin url restored
AlankarSaxena2712 Dec 19, 2021
15301ac
urls configured
AlankarSaxena2712 Dec 19, 2021
b5cfea9
url configured
AlankarSaxena2712 Dec 19, 2021
1294fd2
created a view to redirect to admin panel
AlankarSaxena2712 Dec 19, 2021
63ebb00
added permissions to advertisement views
AlankarSaxena2712 Dec 19, 2021
beb8df7
ad view fixes
AlankarSaxena2712 Dec 19, 2021
8f43021
some fixes
AlankarSaxena2712 Dec 20, 2021
8d1397a
user urls deleted
AlankarSaxena2712 Dec 20, 2021
c64a195
added time stamp field to advertisement
AlankarSaxena2712 Dec 20, 2021
e8ea18d
REMOVED TIMESTAMP FROM ADMIN
AlankarSaxena2712 Dec 20, 2021
b699278
lets do it
savagecarol Dec 21, 2021
c205a9b
error of serializer
savagecarol Dec 21, 2021
f4df97c
lets do it
savagecarol Dec 21, 2021
dbd8a96
lets do it
savagecarol Dec 21, 2021
2365016
lets do it
savagecarol Dec 21, 2021
79a1f3a
advertisement serailzers changed
AlankarSaxena2712 Dec 21, 2021
24f03d2
ads error
savagecarol Dec 25, 2021
59880dd
admin ui and newsletter auto email
AlankarSaxena2712 Dec 25, 2021
0b40eb4
Merge branch 'testadmin2' of https://github.com/triangular-opensource…
AlankarSaxena2712 Dec 25, 2021
defb99e
requirement.txt changed
AlankarSaxena2712 Dec 25, 2021
3790db6
ready function commented
AlankarSaxena2712 Dec 25, 2021
32a56b0
scheduler days changed
AlankarSaxena2712 Dec 25, 2021
fdf0050
newsletter started
AlankarSaxena2712 Dec 25, 2021
13298fb
ad user show
AlankarSaxena2712 Dec 25, 2021
6124ee1
lets do it
savagecarol Dec 26, 2021
4d316a7
again deploy
savagecarol Dec 26, 2021
f37304d
sd
savagecarol Dec 26, 2021
36f4768
payment csv
savagecarol Dec 26, 2021
879d3ea
payment
savagecarol Dec 26, 2021
8e3f753
friends portal
savagecarol Dec 26, 2021
5a059c1
friends serializer
savagecarol Dec 26, 2021
60f0b3a
lets do it
savagecarol Dec 26, 2021
c702b51
bid view changes
AlankarSaxena2712 Dec 26, 2021
8641fa2
bid view changes
AlankarSaxena2712 Dec 26, 2021
d04217d
bid view changes
AlankarSaxena2712 Dec 26, 2021
63017a1
files removed
AlankarSaxena2712 Dec 26, 2021
6ce52d6
bid model changes
AlankarSaxena2712 Dec 26, 2021
b46913d
ad changes api fixed
AlankarSaxena2712 Dec 26, 2021
b141aa3
ad changes serialzer changes
AlankarSaxena2712 Dec 26, 2021
d220876
ad changes serialzer changes
AlankarSaxena2712 Dec 26, 2021
58e87f5
bidding date
savagecarol Dec 26, 2021
52b71b1
timestamp
savagecarol Dec 26, 2021
d3c81e6
sd
savagecarol Dec 26, 2021
7cc6c3f
lets do it
savagecarol Dec 27, 2021
f0816bc
payment history view and ads filter view
AlankarSaxena2712 Dec 28, 2021
94c7cd2
model issue fixed
AlankarSaxena2712 Dec 28, 2021
db00985
created new migrations
AlankarSaxena2712 Dec 28, 2021
8542f20
ad detail url fixed
AlankarSaxena2712 Dec 28, 2021
8807ee4
ad serialzer fixed
AlankarSaxena2712 Dec 28, 2021
aaa3a70
payment api changes
AlankarSaxena2712 Dec 28, 2021
a1f790d
middle name issue fixed
AlankarSaxena2712 Dec 28, 2021
5275d05
some migrations
AlankarSaxena2712 Dec 28, 2021
28f4b3e
some error fixed
AlankarSaxena2712 Dec 28, 2021
680feb6
middle name issue fixed
AlankarSaxena2712 Dec 28, 2021
8f7f718
activate email styling
AlankarSaxena2712 Dec 28, 2021
5a794a3
email template
AlankarSaxena2712 Dec 28, 2021
69e7983
email function changed
AlankarSaxena2712 Dec 28, 2021
38936fe
email; function changes
AlankarSaxena2712 Dec 28, 2021
d4525f1
frontend redirection
AlankarSaxena2712 Dec 28, 2021
662bf61
some model configurations
AlankarSaxena2712 Dec 29, 2021
9ebd7be
notification backend created
AlankarSaxena2712 Dec 29, 2021
a689d5c
download csvs
AlankarSaxena2712 Dec 29, 2021
10f67d1
ads serializer changes
AlankarSaxena2712 Dec 30, 2021
b46beb1
payment working and bidding changes
AlankarSaxena2712 Dec 30, 2021
d587206
basic price added to ad serializer
AlankarSaxena2712 Dec 30, 2021
188035c
null values fixed
AlankarSaxena2712 Dec 30, 2021
845db06
bid serialzer
AlankarSaxena2712 Dec 30, 2021
0432bd0
ads serialzer
AlankarSaxena2712 Dec 30, 2021
ca6614c
wrong import removed
AlankarSaxena2712 Dec 30, 2021
f6acc77
notification delete api
AlankarSaxena2712 Dec 31, 2021
09ba8fa
notification delete view changed
AlankarSaxena2712 Dec 31, 2021
6130a4e
lets do it
savagecarol Jan 1, 2022
eacc354
Merge branch 'testadmin4' of https://github.com/triangular-opensource…
savagecarol Jan 1, 2022
6434ca2
df
savagecarol Jan 1, 2022
868779f
send news email
savagecarol Jan 1, 2022
bdb8c9a
changing migration files
savagecarol Jan 1, 2022
1914f62
dfddfdf
savagecarol Jan 1, 2022
74d2c4d
payment updation
AlankarSaxena2712 Jan 1, 2022
408a1fd
some changes in payment
AlankarSaxena2712 Jan 1, 2022
9c8d97c
Merge branch 'testadmin4' of https://github.com/triangular-opensource…
AlankarSaxena2712 Jan 1, 2022
f5f42ca
order amount changed to int
AlankarSaxena2712 Jan 1, 2022
a09ad1b
changes
AlankarSaxena2712 Jan 1, 2022
b5c3f50
somc hanges
AlankarSaxena2712 Jan 1, 2022
01fb04f
changfes
AlankarSaxena2712 Jan 1, 2022
09d4267
changes
AlankarSaxena2712 Jan 1, 2022
2264062
mail settings
AlankarSaxena2712 Jan 1, 2022
10957c2
admin theme changes and notifications
AlankarSaxena2712 Jan 8, 2022
c650f4c
migrations changed
AlankarSaxena2712 Jan 8, 2022
84fe7bf
notification migrations
AlankarSaxena2712 Jan 8, 2022
257baf1
notification text changes
AlankarSaxena2712 Jan 8, 2022
68c6584
notification model changes
AlankarSaxena2712 Jan 8, 2022
cafa870
notification serializer
AlankarSaxena2712 Jan 8, 2022
ac65883
notification serailzers changes
AlankarSaxena2712 Jan 8, 2022
faa71bd
adding new features
savagecarol Jan 14, 2022
430d4bf
admin fixes
AlankarSaxena2712 Jan 14, 2022
14ee34b
Merge branch 'fixes-1' of https://github.com/triangular-opensource/Ta…
AlankarSaxena2712 Jan 14, 2022
2c680a9
delete migrations
savagecarol Jan 14, 2022
178253a
all conflict resolved
savagecarol Jan 14, 2022
6f0cb8f
migration files added
savagecarol Jan 14, 2022
6f494c1
migration files added
savagecarol Jan 14, 2022
f0e63c7
product id
savagecarol Jan 14, 2022
c5132cc
add error
savagecarol Jan 14, 2022
de1b32f
changes in the addd
savagecarol Jan 14, 2022
29c8fcb
email field added
savagecarol Jan 14, 2022
4fa30b0
api change in fixes
savagecarol Jan 15, 2022
326e746
changeing to location
savagecarol Jan 15, 2022
14c7464
change dimension spelling
savagecarol Jan 15, 2022
4c699f7
changes in the product field api
savagecarol Jan 15, 2022
8cf1cca
serializer and get api errror
savagecarol Jan 15, 2022
8646db9
sd
savagecarol Jan 15, 2022
4a3be54
edited some field
savagecarol Jan 16, 2022
52a7e24
migration files addded
savagecarol Jan 16, 2022
181e6cb
firebase error and ad create error
AlankarSaxena2712 Jan 16, 2022
aff425d
new migrations generaated
savagecarol Jan 16, 2022
9aebee4
serializer
savagecarol Jan 16, 2022
80c2e5c
changes added
savagecarol Jan 16, 2022
2e0589e
deleting product fields
savagecarol Jan 16, 2022
5b5cde4
location lat long
savagecarol Jan 16, 2022
40a933d
serializere of add post
savagecarol Jan 16, 2022
410f0ff
serializer data
savagecarol Jan 16, 2022
18eb0f9
email edited
savagecarol Jan 16, 2022
4c241bb
lets do it
savagecarol Jan 16, 2022
82507fd
visiblity error
savagecarol Jan 16, 2022
c276f15
lat long float field
savagecarol Jan 16, 2022
797a2f2
image field
savagecarol Jan 16, 2022
e6bb5ba
df
savagecarol Jan 16, 2022
181c9ac
change the main url
savagecarol Jan 17, 2022
8c6f1db
ad serializer changes
AlankarSaxena2712 Jan 17, 2022
3ee9c57
serialzer fixes
AlankarSaxena2712 Jan 17, 2022
e923f83
adding another url
savagecarol Jan 18, 2022
2635ab5
Merge branch 'testadmin4' of https://github.com/triangular-opensource…
savagecarol Jan 18, 2022
48c4bb0
changes in the api
savagecarol Jan 18, 2022
0529dfc
changed in add put req
savagecarol Jan 18, 2022
64854e9
changes in the api
savagecarol Jan 18, 2022
cc1893c
adding email service in save button add
savagecarol Jan 18, 2022
e0c0455
changes
savagecarol Jan 26, 2022
3f8b59d
changes
savagecarol Jan 26, 2022
4e826a2
user changes
savagecarol Jan 26, 2022
2d9687e
change it
savagecarol Jan 26, 2022
975398e
changes in sub category
savagecarol Jan 26, 2022
a711404
changes i product
savagecarol Jan 26, 2022
c8c9f53
changes in sub category
savagecarol Jan 26, 2022
73b37a2
subCategory changes
AlankarSaxena2712 Jan 26, 2022
e9fdf4f
some issues fixed
AlankarSaxena2712 Jan 26, 2022
289145f
ad admin changes
AlankarSaxena2712 Jan 26, 2022
8f04828
ad timestamp error fixes
AlankarSaxena2712 Jan 26, 2022
db07df4
ad filter changes
AlankarSaxena2712 Jan 26, 2022
ec09ab1
category filter fixes
AlankarSaxena2712 Jan 26, 2022
00a933e
ads admin changes
AlankarSaxena2712 Jan 26, 2022
016d413
ad admin changes
AlankarSaxena2712 Jan 26, 2022
475ba73
ad admin changes
AlankarSaxena2712 Jan 26, 2022
7db8292
ad admin changes
AlankarSaxena2712 Jan 26, 2022
e8010fe
api changes
savagecarol Jan 27, 2022
80fa2a1
Merge branch 'testadmin4' of https://github.com/triangular-opensource…
savagecarol Jan 27, 2022
c490aa7
Any field added in temper
savagecarol Jan 27, 2022
848dfb2
sub category
savagecarol Feb 6, 2022
2782377
df
savagecarol Feb 6, 2022
f51fd10
search api
AlankarSaxena2712 Feb 6, 2022
0d27111
added subscription serailzer
AlankarSaxena2712 Feb 6, 2022
120bc50
search error fixed
AlankarSaxena2712 Feb 6, 2022
bba179e
some fixes
AlankarSaxena2712 Feb 6, 2022
3cf4da5
union changed
AlankarSaxena2712 Feb 6, 2022
e672159
serach api changes
AlankarSaxena2712 Feb 6, 2022
293a845
changes in the serializer
savagecarol Feb 6, 2022
1276251
sdds
loliess Mar 20, 2022
e1fb8d8
restarting the projec
savagecarol May 15, 2023
25db08d
lets do it
savagecarol May 15, 2023
380db5d
vercel deploy
savagecarol May 15, 2023
44c03ad
again
savagecarol May 15, 2023
d876bae
again try
savagecarol May 15, 2023
0da5913
sd
savagecarol May 15, 2023
2229c9e
aa
savagecarol May 15, 2023
02a37a3
sd
savagecarol May 15, 2023
26b77ed
sdf
savagecarol May 15, 2023
1893a24
sdf
savagecarol May 15, 2023
342b916
sf
savagecarol May 15, 2023
0984460
changea
savagecarol May 15, 2023
2773e7d
changea
savagecarol May 15, 2023
1b22c5b
python
savagecarol May 15, 2023
421faad
normal db
savagecarol May 17, 2023
96c5195
doing work
savagecarol May 17, 2023
b54ad75
doing installation
savagecarol May 17, 2023
df69f0e
sd
savagecarol May 17, 2023
d604aa9
version isue
savagecarol May 17, 2023
a049b6f
sd
savagecarol May 17, 2023
52d9681
version isye
savagecarol May 17, 2023
1f48716
changes
savagecarol May 17, 2023
01d89be
version of pillow
savagecarol May 17, 2023
4f50690
more changes in db
savagecarol May 21, 2023
4e38def
changes in db
savagecarol May 21, 2023
9b0a121
changes in db
savagecarol May 21, 2023
97e7659
changes in db
savagecarol May 21, 2023
6fdaa90
sd
savagecarol May 21, 2023
c67b53a
changes in requirements
savagecarol May 21, 2023
0cb14da
changes in requirements
savagecarol May 21, 2023
2ff0605
changes in requirements
savagecarol May 21, 2023
4c8a3ea
changes in the code
savagecarol Feb 20, 2024
31da6c9
changes in the code
savagecarol Feb 20, 2024
00d7c9f
changes
savagecarol Feb 20, 2024
154f097
static folder created
savagecarol Feb 20, 2024
c2a74af
changes in the static
savagecarol Feb 20, 2024
9220951
changing local db
savagecarol Feb 20, 2024
8511867
changing local db
savagecarol Feb 20, 2024
fd9d7ad
static files root
savagecarol Feb 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ share/python-wheels/
.installed.cfg
*.egg
MANIFEST
.idea/
.idea
.vscode/

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down
6 changes: 4 additions & 2 deletions .idea/Taiyo.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

601 changes: 550 additions & 51 deletions .idea/workspace.xml

Large diffs are not rendered by default.

Empty file added Ads/__init__.py
Empty file.
109 changes: 109 additions & 0 deletions Ads/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
from django.contrib import admin

from Ads.models import Advertisement, Bid

class AdAdmin(admin.ModelAdmin):
list_display = ['__str__', 'product', 'category', 'sub_category', 'timestamp', 'user', 'visible']
list_display_links = ["__str__", "product"]
list_filter = ['user', 'visible']

readonly_fields = [
'category',
'sub_category',
'image_1_display',
'image_2_display',
'image_3_display',
'image_4_display',
"bidding_close_date",
]


fieldsets = (
(None, {
"fields": (
"buy_or_sell",
'product',
'category',
'sub_category',
"product_description",
"basic_price",
"user"
),
}),

("Files", {
"fields": (
"image_1",
"image_1_link",
"image_1_display",
"image_2",
"image_2_link",
"image_2_display",
"image_3",
"image_3_link",
"image_3_display",
"image_4",
"image_4_link",
"image_4_display",
"excel_file",
"excel_file_link",
"pdf_file",
"pdf_file_link",
),
}),

("Product Specification", {
"fields": (
"quality",
"dimensions",
"grade",
"temper",
"specification_number",
"quantity",
"coating_in_gsm",
"color"
)
}),

("Bidding Data", {
"fields": (
"bidding",
"bidding_close_date",
"selected_bid",
"approval"
)
}),


("Author Details", {
"fields": (
"name",
"mobile_number",
"business_address",
"location"
)
}),

("Approval", {
"fields": (
"visible",
)
}),

("DisApproval Email", {
"fields": (
"subject",
"message"
)
})

)


class BidAdmin(admin.ModelAdmin):
list_display = ['id', 'amount', 'user', 'advertisement', 'selected']
list_display_links = ['id', 'amount']
list_filter = ['advertisement', 'selected']

admin.site.register(Advertisement, AdAdmin)
admin.site.register(Bid, BidAdmin)
6 changes: 6 additions & 0 deletions Ads/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class AdsConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'Ads'
68 changes: 68 additions & 0 deletions Ads/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Generated by Django 3.2.3 on 2022-01-16 05:33

import datetime
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
from django.utils.timezone import utc
import services.validators


class Migration(migrations.Migration):

initial = True

dependencies = [
]

operations = [
migrations.CreateModel(
name='Advertisement',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('product_description', models.TextField()),
('buy_or_sell', models.CharField(choices=[('Buy', 'Buy'), ('Sell', 'Sell')], max_length=4)),
('basic_price', models.FloatField(validators=[django.core.validators.MinValueValidator(9999)])),
('excel_file', models.FileField(blank=True, null=True, upload_to='')),
('excel_file_link', models.URLField(blank=True, max_length=300, null=True)),
('pdf_file', models.FileField(blank=True, null=True, upload_to='')),
('pdf_file_link', models.URLField(blank=True, max_length=300, null=True)),
('image_1', models.FileField(upload_to='')),
('image_1_link', models.URLField(max_length=300)),
('image_2', models.FileField(blank=True, null=True, upload_to='')),
('image_2_link', models.URLField(blank=True, max_length=300, null=True)),
('image_3', models.FileField(blank=True, null=True, upload_to='')),
('image_3_link', models.URLField(blank=True, max_length=300, null=True)),
('image_4', models.FileField(blank=True, null=True, upload_to='')),
('image_4_link', models.URLField(blank=True, max_length=300, null=True)),
('quality', models.CharField(blank=True, choices=[('Prime', 'Prime'), ('Defective', 'Defective')], max_length=10, null=True)),
('temper', models.CharField(blank=True, choices=[('Hard', 'Hard'), ('Soft', 'Soft')], max_length=4, null=True)),
('dimensions', models.CharField(blank=True, max_length=100, null=True)),
('grade', models.CharField(blank=True, max_length=50, null=True)),
('specification_number', models.CharField(blank=True, max_length=20, null=True)),
('quantity', models.IntegerField(blank=True, null=True)),
('coating_in_gsm', models.CharField(blank=True, max_length=30, null=True)),
('color', models.CharField(blank=True, max_length=20, null=True)),
('bidding', models.BooleanField(default=True)),
('bidding_close_date', models.DateTimeField(default=datetime.datetime(2022, 1, 31, 5, 33, 13, 170198, tzinfo=utc))),
('approval', models.BooleanField(blank=True, default=False, null=True)),
('name', models.CharField(max_length=40)),
('mobile_number', models.CharField(max_length=10, validators=[services.validators.validate_phone_number])),
('business_address', models.CharField(max_length=100)),
('location', models.CharField(max_length=100)),
('latitude', models.CharField(blank=True, max_length=15, null=True)),
('longitude', models.CharField(blank=True, max_length=15, null=True)),
('visible', models.BooleanField(default=False)),
('timestamp', models.DateTimeField(auto_now=True)),
],
),
migrations.CreateModel(
name='Bid',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('amount', models.FloatField()),
('selected', models.BooleanField(default=False)),
('advertisement', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='Ads.advertisement')),
],
),
]
39 changes: 39 additions & 0 deletions Ads/migrations/0002_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Generated by Django 3.2.3 on 2022-01-16 05:33

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
('Ads', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('features', '0001_initial'),
]

operations = [
migrations.AddField(
model_name='bid',
name='user',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AddField(
model_name='advertisement',
name='product',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='features.product'),
),
migrations.AddField(
model_name='advertisement',
name='selected_bid',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='winning_bid', to='Ads.bid'),
),
migrations.AddField(
model_name='advertisement',
name='user',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='created_by', to=settings.AUTH_USER_MODEL),
),
]
20 changes: 20 additions & 0 deletions Ads/migrations/0003_alter_advertisement_bidding_close_date.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 3.2.3 on 2022-01-16 05:35

import datetime
from django.db import migrations, models
from django.utils.timezone import utc


class Migration(migrations.Migration):

dependencies = [
('Ads', '0002_initial'),
]

operations = [
migrations.AlterField(
model_name='advertisement',
name='bidding_close_date',
field=models.DateTimeField(default=datetime.datetime(2022, 1, 31, 5, 35, 18, 113659, tzinfo=utc)),
),
]
20 changes: 20 additions & 0 deletions Ads/migrations/0004_alter_advertisement_bidding_close_date.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 3.2.3 on 2022-01-16 06:07

import datetime
from django.db import migrations, models
from django.utils.timezone import utc


class Migration(migrations.Migration):

dependencies = [
('Ads', '0003_alter_advertisement_bidding_close_date'),
]

operations = [
migrations.AlterField(
model_name='advertisement',
name='bidding_close_date',
field=models.DateTimeField(default=datetime.datetime(2022, 1, 31, 6, 7, 3, 6959, tzinfo=utc)),
),
]
20 changes: 20 additions & 0 deletions Ads/migrations/0005_alter_advertisement_bidding_close_date.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 3.2.3 on 2022-01-16 06:13

import datetime
from django.db import migrations, models
from django.utils.timezone import utc


class Migration(migrations.Migration):

dependencies = [
('Ads', '0004_alter_advertisement_bidding_close_date'),
]

operations = [
migrations.AlterField(
model_name='advertisement',
name='bidding_close_date',
field=models.DateTimeField(default=datetime.datetime(2022, 1, 31, 6, 13, 13, 486274, tzinfo=utc)),
),
]
30 changes: 30 additions & 0 deletions Ads/migrations/0006_auto_20220117_0021.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Generated by Django 3.2.3 on 2022-01-16 18:51

import datetime
from django.db import migrations, models
from django.utils.timezone import utc


class Migration(migrations.Migration):

dependencies = [
('Ads', '0005_alter_advertisement_bidding_close_date'),
]

operations = [
migrations.AddField(
model_name='advertisement',
name='message',
field=models.TextField(blank=True, null=True),
),
migrations.AddField(
model_name='advertisement',
name='subject',
field=models.CharField(blank=True, max_length=100, null=True),
),
migrations.AlterField(
model_name='advertisement',
name='bidding_close_date',
field=models.DateTimeField(default=datetime.datetime(2022, 1, 31, 18, 51, 0, 368555, tzinfo=utc)),
),
]
30 changes: 30 additions & 0 deletions Ads/migrations/0007_auto_20220117_0037.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Generated by Django 3.2.3 on 2022-01-16 19:07

import datetime
from django.db import migrations, models
from django.utils.timezone import utc


class Migration(migrations.Migration):

dependencies = [
('Ads', '0006_auto_20220117_0021'),
]

operations = [
migrations.AlterField(
model_name='advertisement',
name='bidding_close_date',
field=models.DateTimeField(default=datetime.datetime(2022, 1, 31, 19, 7, 19, 533811, tzinfo=utc)),
),
migrations.AlterField(
model_name='advertisement',
name='latitude',
field=models.FloatField(blank=True, max_length=50, null=True),
),
migrations.AlterField(
model_name='advertisement',
name='longitude',
field=models.FloatField(blank=True, max_length=50, null=True),
),
]
Loading