Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/GTZ-STUDIO/LvlUp.gg
Browse files Browse the repository at this point in the history
  • Loading branch information
Verzaccii committed Mar 15, 2024
2 parents 14226f0 + 5dba969 commit 4e3afa3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/AzureDeployBackend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
with:
name: python-app
path: |
release.zip
lvlgg_backend/release.zip
!venv/
deploy:
Expand Down
6 changes: 3 additions & 3 deletions lvlgg_backend/lvlgg_backend/deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
ALLOWED_HOSTS = [os.environ['WEBSITE_HOSTNAME']]
CSRF_TRUSTED_ORIGINS = ['https://' + os.environ['WEBSITE_HOSTNAME']]
DEBUG = False
SECRET_KEY = os.environ['MY_SEECRET_KEY']
SECRET_KEY = os.environ['MY_SECRET_KEY']

MIDDLEWARE = [
"django.middleware.security.SecurityMiddleware",
Expand All @@ -19,8 +19,8 @@
"django.middleware.clickjacking.XFrameOptionsMiddleware",
]

# CORS_ALLOWED_ORIGINS = ['http://localhost:3000'
# ]
CORS_ALLOWED_ORIGINS = ['http://localhost:3000',
'lvlupgg-backend.azurewebsites.net']

STORAGES = {
"default": {
Expand Down
2 changes: 2 additions & 0 deletions lvlgg_backend/lvlgg_backend/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
},
]

STATIC_ROOT = BASE_DIR/'staticfiles'

WSGI_APPLICATION = "lvlgg_backend.wsgi.application"


Expand Down

0 comments on commit 4e3afa3

Please sign in to comment.