Skip to content

Commit

Permalink
Merge branch 'main' into stage
Browse files Browse the repository at this point in the history
  • Loading branch information
MelissaAutumn committed Nov 13, 2023
2 parents 3340ec7 + a42446e commit b8f30a7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
1 change: 1 addition & 0 deletions backend/src/appointment/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ def server():
# Work around for now :)
allow_origins=[
os.getenv("FRONTEND_URL", "http://localhost:8080"),
"https://appointment.day", # Temp for now!
"https://accounts.google.com",
"https://www.googleapis.com/auth/calendar",
],
Expand Down
19 changes: 10 additions & 9 deletions frontend/.env.staging.example
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Production env config, do not put secrets in here !!
VUE_APP_API_URL=stage.appointment.day/api/v1/
VUE_APP_BASE_URL=stage.appointment.day
VUE_APP_API_SECURE=true
VUE_APP_SHORT_BASE_URL=https://stage.apmt.day

VUE_APP_AUTH0_DOMAIN=thunderbird.eu.auth0.com
VUE_APP_AUTH0_CLIENT_ID=Dvw6O6hPwXg7jZD7p7yAAnLXR2PXiQHF
VUE_APP_AUTH0_AUDIENCE=http://127.0.0.1:8000/
# Production env config, do not put secrets in here !!
# This is pointing to prod as a temp fix !
VUE_APP_API_URL=appointment.day/api/v1/
VUE_APP_BASE_URL=appointment.day
VUE_APP_API_SECURE=true
VUE_APP_SHORT_BASE_URL=https://stage.apmt.day

VUE_APP_AUTH0_DOMAIN=thunderbird.eu.auth0.com
VUE_APP_AUTH0_CLIENT_ID=Dvw6O6hPwXg7jZD7p7yAAnLXR2PXiQHF
VUE_APP_AUTH0_AUDIENCE=http://127.0.0.1:8000/

0 comments on commit b8f30a7

Please sign in to comment.