Merge branch 'heroku'
This commit is contained in:
@@ -12,6 +12,7 @@ https://docs.djangoproject.com/en/3.2/ref/settings/
|
||||
|
||||
from pathlib import Path
|
||||
import os
|
||||
import django_heroku
|
||||
|
||||
# Build paths inside the project like this: BASE_DIR / 'subdir'.
|
||||
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||
@@ -26,7 +27,7 @@ SECRET_KEY = 'django-insecure-qib_j&47o$5l3*gi7y#8#3pjh_88sfdqn@dmp&gx+2)&1nzmor
|
||||
# SECURITY WARNING: don't run with debug turned on in production!
|
||||
DEBUG = True
|
||||
|
||||
ALLOWED_HOSTS = ["smithers-ii.local", "127.0.0.1", "10.0.1.4", "benchcoach.ascorrea.com"]
|
||||
ALLOWED_HOSTS = ["smithers-ii.local", "127.0.0.1", "10.0.1.4", "benchcoach.ascorrea.com", "fast-wildwood-43711.herokuapp.com"]
|
||||
|
||||
# Application definition
|
||||
|
||||
@@ -50,6 +51,7 @@ MIDDLEWARE = [
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
'django.contrib.messages.middleware.MessageMiddleware',
|
||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||
'whitenoise.middleware.WhiteNoiseMiddleware',
|
||||
]
|
||||
|
||||
ROOT_URLCONF = 'benchcoachproject.urls'
|
||||
@@ -121,7 +123,7 @@ USE_TZ = True
|
||||
|
||||
# Static files (CSS, JavaScript, Images)
|
||||
# https://docs.djangoproject.com/en/3.2/howto/static-files/
|
||||
|
||||
STATIC_ROOT = os.path.join(BASE_DIR, 'benchcoachproject/static')
|
||||
STATIC_URL = '/static/'
|
||||
|
||||
# Default primary key field type
|
||||
@@ -133,4 +135,6 @@ MEDIA_URL = '/media/'
|
||||
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
|
||||
|
||||
LOGIN_URL = "/login"
|
||||
LOGIN_REDIRECT_URL = "/"
|
||||
LOGIN_REDIRECT_URL = "/"
|
||||
|
||||
django_heroku.settings(locals())
|
||||
@@ -15,4 +15,7 @@ sqlparse==0.4.1
|
||||
urllib3==1.26.6
|
||||
zipp==3.5.0
|
||||
psycopg2
|
||||
api-client
|
||||
api-client
|
||||
gunicorn
|
||||
whitenoise
|
||||
django-heroku
|
||||
50
teamsnap/migrations/0005_auto_20211224_1042.py
Normal file
50
teamsnap/migrations/0005_auto_20211224_1042.py
Normal file
@@ -0,0 +1,50 @@
|
||||
# Generated by Django 3.2.6 on 2021-12-24 16:42
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('benchcoach', '0002_alter_player_jersey_number'),
|
||||
('teamsnap', '0004_auto_20211222_0957'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='availability',
|
||||
name='benchcoach_object',
|
||||
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='teamsnap_availability', to='benchcoach.availability'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='event',
|
||||
name='benchcoach_object',
|
||||
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='teamsnap_event', to='benchcoach.event'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='lineupentry',
|
||||
name='benchcoach_object',
|
||||
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='teamsnap_lineupentry', to='benchcoach.positioning'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='location',
|
||||
name='benchcoach_object',
|
||||
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='teamsnap_location', to='benchcoach.venue'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='member',
|
||||
name='benchcoach_object',
|
||||
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='teamsnap_member', to='benchcoach.player'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='opponent',
|
||||
name='benchcoach_object',
|
||||
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='teamsnap_opponent', to='benchcoach.team'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='team',
|
||||
name='benchcoach_object',
|
||||
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='teamsnap_team', to='benchcoach.team'),
|
||||
),
|
||||
]
|
||||
Reference in New Issue
Block a user