Spaces:

tddschn
/

mq-quiz

Runtime error

Pamela Fox commited on Sep 15, 2022

Commit

74f4314

1 Parent(s): f85cf8e

Changes for Azure deployment

Files changed (8) hide show

.env ADDED Viewed

+FLASK_ENV=development
+DBNAME=quizsite
+DBHOST=localhost
+DBUSER=pamelafox
+DBPASS=

.vscode/settings.json ADDED Viewed

+{
+    "appService.defaultWebAppToDeploy": "/subscriptions/74feb6f3-f646-478d-a99b-37fafee75e29/microsoft.web/sites/subscriptions/74feb6f3-f646-478d-a99b-37fafee75e29/resourceGroups/django-example-quizsite/providers/Microsoft.Web/sites/django-example-quizsite",
+    "appService.deploySubpath": "."
+}

manage.py CHANGED Viewed

@@ -3,10 +3,22 @@
 import os
 import sys
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "quizsite.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
@@ -18,5 +30,5 @@ def main():
     execute_from_command_line(sys.argv)
-if __name__ == "__main__":
-    main()

 import os
 import sys
+from dotenv import load_dotenv
 def main():
     """Run administrative tasks."""
+    # If WEBSITE_HOSTNAME is defined as an environment variable, then we're running on Azure App Service
+    # Only for Local Development - Load environment variables from the .env file
+    if not 'WEBSITE_HOSTNAME' in os.environ:
+        print("Loading environment variables for .env file")
+        load_dotenv('./.env')
+    # When running on Azure App Service you should use the production settings.
+    settings_module = "quizsite.production" if 'WEBSITE_HOSTNAME' in os.environ else 'quizsite.settings'
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', settings_module)
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
     execute_from_command_line(sys.argv)
+if __name__ == '__main__':
+    main()

quizsite/production.py ADDED Viewed

+from .settings import *
+import os
+# Configure the domain name using the environment variable
+# that Azure automatically creates for us.
+ALLOWED_HOSTS = [os.environ['WEBSITE_HOSTNAME']] if 'WEBSITE_HOSTNAME' in os.environ else []
+CSRF_TRUSTED_ORIGINS = ['https://'+ os.environ['WEBSITE_HOSTNAME']] if 'WEBSITE_HOSTNAME' in os.environ else []
+DEBUG = False
+# DBHOST is only the server name, not the full URL
+hostname = os.environ['DBHOST']
+# Configure Postgres database; the full username for PostgreSQL flexible server is
+# username (not @sever-name).
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': os.environ['DBNAME'],
+        'HOST': hostname + ".postgres.database.azure.com",
+        'USER': os.environ['DBUSER'],
+        'PASSWORD': os.environ['DBPASS']
+    }
+}

quizsite/settings.py CHANGED Viewed

@@ -11,6 +11,8 @@ https://docs.djangoproject.com/en/4.1/ref/settings/
 """
 from pathlib import Path
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -77,11 +79,10 @@ WSGI_APPLICATION = "quizsite.wsgi.application"
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql_psycopg2",
-        "NAME": "quizsite",
-        "USER": "pamelafox",
-        "PASSWORD": "",
-        "HOST": "localhost",
-        "PORT": "",
     }
 }

 """
 from pathlib import Path
+import os
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql_psycopg2",
+        'NAME': os.environ['DBNAME'],
+        'HOST': os.environ['DBHOST'],
+        'USER': os.environ['DBUSER'],
+        'PASSWORD': os.environ['DBPASS']
     }
 }

quizsite/wsgi.py CHANGED Viewed

@@ -11,6 +11,7 @@ import os
 from django.core.wsgi import get_wsgi_application
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "quizsite.settings")
 application = get_wsgi_application()

 from django.core.wsgi import get_wsgi_application
+settings_module = 'quizsite.production' if 'WEBSITE_HOSTNAME' in os.environ else 'quizsite.settings'
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", settings_module)
 application = get_wsgi_application()

quizzes/templates/quizzes/index.html CHANGED Viewed

@@ -4,16 +4,21 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
   <title>Quizzes</title>
 </head>
 <body>
 {% if quiz_list %}
     <ul>
     {% for quiz in quiz_list %}
-        <li><a href="{% url 'quizzes:display' quiz.id %}">{{ quiz.name }}</a></li>
     {% endfor %}
     </ul>
 {% else %}
     <p>No quizzes are available.</p>
 {% endif %}
 </body>
 </html>

   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
   <title>Quizzes</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
 </head>
 <body>
+    <div class="container">
+        <h1>Quizzes</h1>
 {% if quiz_list %}
     <ul>
     {% for quiz in quiz_list %}
+        <li><a href="{% url 'quizzes:display_quiz' quiz.id %}">{{ quiz.name }}</a></li>
     {% endfor %}
     </ul>
 {% else %}
     <p>No quizzes are available.</p>
 {% endif %}
+    </div>
 </body>
 </html>

requirements.txt CHANGED Viewed

@@ -1,2 +1,3 @@
 Django==4.1.1
-psycopg2

 Django==4.1.1
+psycopg2
+python-dotenv