From c62456f18ffba114f67cfc8fab34e1fe5b9e8f3c Mon Sep 17 00:00:00 2001 From: joeperkinspt Date: Mon, 30 Dec 2024 11:10:49 -0500 Subject: [PATCH 01/10] Adding temporary changes to Github --- server/djangoproj/settings.py | 12 ++-- server/djangoproj/urls.py | 2 + server/frontend/static/About.html | 32 +++++---- server/frontend/static/Contact.html | 95 +++++++++++++++++++++++++ server/frontend/static/beetle temp.png | Bin 0 -> 8743406 bytes server/frontend/static/person copy.png | Bin 0 -> 138137 bytes server/frontend/static/person.png | Bin 138137 -> 1126331 bytes 7 files changed, 123 insertions(+), 18 deletions(-) create mode 100644 server/frontend/static/Contact.html create mode 100644 server/frontend/static/beetle temp.png create mode 100644 server/frontend/static/person copy.png diff --git a/server/djangoproj/settings.py b/server/djangoproj/settings.py index e0b1092a5c..39700c79d1 100644 --- a/server/djangoproj/settings.py +++ b/server/djangoproj/settings.py @@ -28,8 +28,8 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] -CSRF_TRUSTED_ORIGINS = [] +ALLOWED_HOSTS=['localhost','https://joeperkinspt-8000.theianext-1-labs-prod-misc-tools-us-east-0.proxy.cognitiveclass.ai'] +CSRF_TRUSTED_ORIGINS=['https://joeperkinspt-8000.theianext-1-labs-prod-misc-tools-us-east-0.proxy.cognitiveclass.ai'] REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [], @@ -61,7 +61,9 @@ TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': [ + os.path.join(BASE_DIR,'frontend/static') + ], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -134,5 +136,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' -STATICFILES_DIRS = [] +STATICFILES_DIRS = [ os.path.join(BASE_DIR,'frontend/static') +] + diff --git a/server/djangoproj/urls.py b/server/djangoproj/urls.py index 6808da9141..5825f366ef 100644 --- a/server/djangoproj/urls.py +++ b/server/djangoproj/urls.py @@ -23,4 +23,6 @@ path('admin/', admin.site.urls), path('djangoapp/', include('djangoapp.urls')), path('', TemplateView.as_view(template_name="Home.html")), + path('about/', TemplateView.as_view(template_name="About.html")), + path('contact/', TemplateView.as_view(template_name="Contact.html")), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/server/frontend/static/About.html b/server/frontend/static/About.html index 484efd960f..3c53408d7d 100644 --- a/server/frontend/static/About.html +++ b/server/frontend/static/About.html @@ -1,6 +1,8 @@ - + + +