diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index e3c8001..e0aacac 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -41,6 +41,7 @@ jobs: platform: linux/amd64,linux/arm64/v8 username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + draft: runs-on: ubuntu-latest needs: test diff --git a/CollegiateHouseWars/settings/prod.py b/CollegiateHouseWars/settings/prod.py index 9de3904..82732ba 100644 --- a/CollegiateHouseWars/settings/prod.py +++ b/CollegiateHouseWars/settings/prod.py @@ -8,10 +8,11 @@ DEBUG = False ALLOWED_HOSTS = [ 'csmb-housewars.c4patino.com', + 'collegiate-housewars-02810c3f29dc.herokuapp.com', ] CSRF_TRUSTED_ORIGINS = [ - 'https://csmb-housewars.c4patino.com/' + 'http://collegiate-housewars-02810c3f29dc.herokuapp.com/' ] DATABASES = { diff --git a/docker-compose.yml b/docker-compose.yml index 2d0b8c4..652e598 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,6 @@ services: - 8000:8000 volumes: - ./:/app - networks: - housewars environment: @@ -27,7 +26,6 @@ services: - 3306:3306 volumes: - housewars-mysql:/var/lib/mysql - networks: - housewars environment: diff --git a/housewars/forms/UserEntryForm.py b/housewars/forms/UserEntryForm.py index d9dc596..dcdfdf2 100644 --- a/housewars/forms/UserEntryForm.py +++ b/housewars/forms/UserEntryForm.py @@ -40,6 +40,6 @@ class UserEntryForm(Form): # Verify that the email is unique if UserEntry.objects.filter(email=email).exists(): 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 diff --git a/requirements.txt b/requirements.txt index f7037d3..2576958 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ charset-normalizer==3.3.2 Django==4.2.10 django-formtools==2.5.1 django-smart-selects==1.6.0 +gunicorn==21.2.0 h11==0.14.0 idna==3.6 mysqlclient==2.2.4 diff --git a/tests/test_user_entry_create.py b/tests/test_user_entry_create.py index 699ba8e..3491203 100644 --- a/tests/test_user_entry_create.py +++ b/tests/test_user_entry_create.py @@ -123,7 +123,7 @@ class UserEntryCreatePageTest(StaticLiveServerTestCase): error_text = self.browser.find_element( By.CSS_SELECTOR, 'div.alert.alert-danger').text 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): UserEntry.objects.create(first_name='Test', last_name='User', email='user.exist@slps.org', grade=9, house=self.house,