Modified settings to work with heroku
This commit is contained in:
parent
ffa49895e7
commit
54d556f565
4 changed files with 5 additions and 4 deletions
|
|
@ -8,11 +8,11 @@ DEBUG = False
|
||||||
|
|
||||||
ALLOWED_HOSTS = [
|
ALLOWED_HOSTS = [
|
||||||
'csmb-housewars.c4patino.com',
|
'csmb-housewars.c4patino.com',
|
||||||
'172.234.16.137',
|
'collegiate-housewars-02810c3f29dc.herokuapp.com',
|
||||||
]
|
]
|
||||||
|
|
||||||
CSRF_TRUSTED_ORIGINS = [
|
CSRF_TRUSTED_ORIGINS = [
|
||||||
'http://172.234.16.137/',
|
'http://collegiate-housewars-02810c3f29dc.herokuapp.com/'
|
||||||
]
|
]
|
||||||
|
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,6 @@ class UserEntryForm(Form):
|
||||||
# Verify that the email is unique
|
# Verify that the email is unique
|
||||||
if UserEntry.objects.filter(email=email).exists():
|
if UserEntry.objects.filter(email=email).exists():
|
||||||
raise ValidationError(
|
raise ValidationError(
|
||||||
"A signup with this email already exists, if you want to change your signups, please email cpatino8605@slps.org.")
|
"A signup with this email already exists, if you want to change your signups, please email ipatino3341@slps.org.")
|
||||||
|
|
||||||
return email
|
return email
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ charset-normalizer==3.3.2
|
||||||
Django==4.2.10
|
Django==4.2.10
|
||||||
django-formtools==2.5.1
|
django-formtools==2.5.1
|
||||||
django-smart-selects==1.6.0
|
django-smart-selects==1.6.0
|
||||||
|
gunicorn==21.2.0
|
||||||
h11==0.14.0
|
h11==0.14.0
|
||||||
idna==3.6
|
idna==3.6
|
||||||
mysqlclient==2.2.4
|
mysqlclient==2.2.4
|
||||||
|
|
|
||||||
|
|
@ -123,7 +123,7 @@ class UserEntryCreatePageTest(StaticLiveServerTestCase):
|
||||||
error_text = self.browser.find_element(
|
error_text = self.browser.find_element(
|
||||||
By.CSS_SELECTOR, 'div.alert.alert-danger').text
|
By.CSS_SELECTOR, 'div.alert.alert-danger').text
|
||||||
self.assertEquals(
|
self.assertEquals(
|
||||||
error_text, 'A signup with this email already exists, if you want to change your signups, please email cpatino8605@slps.org.')
|
error_text, 'A signup with this email already exists, if you want to change your signups, please email ipatino3341@slps.org.')
|
||||||
|
|
||||||
def test_invalid_activities_are_not_visible(self):
|
def test_invalid_activities_are_not_visible(self):
|
||||||
UserEntry.objects.create(first_name='Test', last_name='User', email='user.exist@slps.org', grade=9, house=self.house,
|
UserEntry.objects.create(first_name='Test', last_name='User', email='user.exist@slps.org', grade=9, house=self.house,
|
||||||
|
|
|
||||||
Reference in a new issue