Skip to content

Commit

Permalink
Install psycopg2 and dj-database; connection made with Postgres
Browse files Browse the repository at this point in the history
  • Loading branch information
Edb83 committed May 12, 2021
1 parent 3324a21 commit 8430da0
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 0 deletions.
4 changes: 4 additions & 0 deletions TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ Solution: use a signal on Review creation/update/delete to call calculate_rating

Bug 6: review save/delete signal would not fire as expected
Solution: import the signal in the product/apps.py

Bug 7: if product is deleted while exists in cart, 404 across all pages
Solution (immediate): set cart contexts to equal 0 across the board and delete session cookies
Solution (long-term):
1 change: 1 addition & 0 deletions db.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions moose_juice/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import os
from pathlib import Path
import dj_database_url

if os.path.exists('env.py'):
import env # noqa: F401
Expand Down Expand Up @@ -132,6 +133,9 @@
}
}

# DATABASES = {
# 'default': dj_database_url.parse('postgres://<INSERT URL HERE>')
# }

# Password validation
# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators
Expand Down
1 change: 1 addition & 0 deletions products.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"model": "products.size", "pk": 1, "fields": {"label": "10ml", "price": "3.50", "sale_price": "2.50"}}, {"model": "products.size", "pk": 2, "fields": {"label": "50ml", "price": "7.99", "sale_price": "6.99"}}, {"model": "products.size", "pk": 3, "fields": {"label": "100ml", "price": "9.99", "sale_price": "8.99"}}, {"model": "products.nicotine", "pk": 1, "fields": {"strength": "0mg", "type": "freebase"}}, {"model": "products.nicotine", "pk": 2, "fields": {"strength": "3mg", "type": "freebase"}}, {"model": "products.nicotine", "pk": 3, "fields": {"strength": "6mg", "type": "freebase"}}, {"model": "products.nicotine", "pk": 4, "fields": {"strength": "12mg", "type": "freebase"}}, {"model": "products.nicotine", "pk": 5, "fields": {"strength": "10mg", "type": "salt"}}, {"model": "products.nicotine", "pk": 6, "fields": {"strength": "20mg", "type": "salt"}}, {"model": "products.brand", "pk": 1, "fields": {"name": "minimoose", "friendly_name": "Mini Moose", "description": "Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose Mini Moose.", "available_sizes": [1], "available_nics": [1, 2, 3, 4]}}, {"model": "products.brand", "pk": 2, "fields": {"name": "bigmoose", "friendly_name": "Big Moose", "description": "Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose Big Moose.", "available_sizes": [2, 3], "available_nics": [1]}}, {"model": "products.brand", "pk": 3, "fields": {"name": "saltymoose", "friendly_name": "Salty Moose", "description": "Our Salty Moose range uses salt-base nicotine to provide a quicker nicotine hit on the draw, mimicking the effect of those cigarettes you're glad you quit. Available in our hassle-free 10ml bottles, choose either 10mg or 20mg nicotine concentration depending on your needs.\r\n\r\nOur flavours have been blended to provide the smoothest, tastiest vape.\r\n\r\nIf you're using a mouth-to-lung device, Salty Moose is the perfect compliment.", "available_sizes": [1], "available_nics": [5, 6]}}, {"model": "products.category", "pk": 1, "fields": {"name": "bakery", "friendly_name": "Bakery", "description": "Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery Bakery.", "image": "doughnut_lAMsY2O.bmp"}}, {"model": "products.category", "pk": 2, "fields": {"name": "desserts", "friendly_name": "Desserts", "description": "Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert Dessert.", "image": "ice-cream.bmp"}}, {"model": "products.category", "pk": 3, "fields": {"name": "drinks", "friendly_name": "Drinks", "description": "Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks Drinks.", "image": "coffee.bmp"}}, {"model": "products.category", "pk": 4, "fields": {"name": "fruits", "friendly_name": "Fruits", "description": "Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!! Fruits!!!", "image": "fruit.bmp"}}, {"model": "products.category", "pk": 5, "fields": {"name": "sweets", "friendly_name": "Sweets", "description": "SWEEEEEEEEEEEEEEEEEEEEEEETS!!! SWEEEEEEEEEEEEEEEEEEEEEEETS!!! SWEEEEEEEEEEEEEEEEEEEEEEETS!!! SWEEEEEEEEEEEEEEEEEEEEEEETS!!! SWEEEEEEEEEEEEEEEEEEEEEEETS!!! SWEEEEEEEEEEEEEEEEEEEEEEETS!!! SWEEEEEEEEEEEEEEEEEEEEEEETS!!!", "image": "sweet.bmp"}}, {"model": "products.category", "pk": 7, "fields": {"name": "tobacco", "friendly_name": "Tobacco", "description": "These are all about tobacco!", "image": "tobacco-leaf.png"}}, {"model": "products.tag", "pk": 1, "fields": {"name": "apple", "friendly_name": null}}, {"model": "products.tag", "pk": 2, "fields": {"name": "pear", "friendly_name": null}}, {"model": "products.tag", "pk": 3, "fields": {"name": "peach", "friendly_name": null}}, {"model": "products.tag", "pk": 4, "fields": {"name": "toffee", "friendly_name": null}}, {"model": "products.tag", "pk": 5, "fields": {"name": "cream", "friendly_name": null}}, {"model": "products.tag", "pk": 6, "fields": {"name": "cinnamon", "friendly_name": null}}, {"model": "products.tag", "pk": 7, "fields": {"name": "pastry", "friendly_name": null}}, {"model": "products.tag", "pk": 8, "fields": {"name": "blueberry", "friendly_name": null}}, {"model": "products.tag", "pk": 9, "fields": {"name": "lemon", "friendly_name": null}}, {"model": "products.tag", "pk": 10, "fields": {"name": "whisky", "friendly_name": null}}, {"model": "products.tag", "pk": 11, "fields": {"name": "tobacco", "friendly_name": null}}, {"model": "products.tag", "pk": 12, "fields": {"name": "caramel", "friendly_name": null}}, {"model": "products.tag", "pk": 13, "fields": {"name": "strawberry", "friendly_name": null}}, {"model": "products.tag", "pk": 14, "fields": {"name": "melon", "friendly_name": null}}, {"model": "products.tag", "pk": 15, "fields": {"name": "pineapple", "friendly_name": null}}, {"model": "products.tag", "pk": 16, "fields": {"name": "cherry", "friendly_name": null}}]
19 changes: 19 additions & 0 deletions profiles/migrations/0002_alter_userprofile_favourites.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 3.2 on 2021-05-12 10:38

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('products', '0028_category_image'),
('profiles', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='userprofile',
name='favourites',
field=models.ManyToManyField(blank=True, to='products.Product'),
),
]
19 changes: 19 additions & 0 deletions profiles/migrations/0003_alter_userprofile_favourites.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 3.2 on 2021-05-12 10:49

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('products', '0028_category_image'),
('profiles', '0002_alter_userprofile_favourites'),
]

operations = [
migrations.AlterField(
model_name='userprofile',
name='favourites',
field=models.ManyToManyField(to='products.Product'),
),
]
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
asgiref==3.3.4
dj-database-url==0.5.0
Django==3.2
django-allauth==0.44.0
django-countries==7.1
django-crispy-forms==1.11.2
oauthlib==3.1.0
Pillow==8.2.0
psycopg2-binary==2.8.6
PyJWT==2.0.1
python3-openid==3.2.0
pytz==2021.1
Expand Down

0 comments on commit 8430da0

Please sign in to comment.