diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..2248dd0 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,7 @@ +certifi==2018.4.16 +chardet==3.0.4 +Django==2.0.5 +idna==2.6 +pytz==2018.4 +requests==2.18.4 +urllib3==1.22 diff --git a/sgawebsite/apps/main/urls.py b/sgawebsite/apps/main/urls.py index 1d7e9c2..c9ae138 100644 --- a/sgawebsite/apps/main/urls.py +++ b/sgawebsite/apps/main/urls.py @@ -5,5 +5,7 @@ from .views import * urlpatterns = [ url(r'^$', index, name='index'), url(r'about', about, name='about'), + url(r'resources', resources, name='resources'), + url(r'events', events, name='events'), ] diff --git a/sgawebsite/apps/main/views.py b/sgawebsite/apps/main/views.py index 1b46a74..664f7ee 100644 --- a/sgawebsite/apps/main/views.py +++ b/sgawebsite/apps/main/views.py @@ -5,3 +5,9 @@ def index(request): def about(request): return render(request, "about.html") + +def resources(request): + return render(request, "resources.html") + +def events(request): + return render(request, "events.html") diff --git a/sgawebsite/templates/about.html b/sgawebsite/templates/about.html index 2f9a7b7..742cf25 100644 --- a/sgawebsite/templates/about.html +++ b/sgawebsite/templates/about.html @@ -1,12 +1,13 @@ +{% load static %} - - {% include head.html %} + + {% include 'head.html' %} About - TJSGA - {% include header.html %} + {% include 'header.html' %}

Contact Us!

@@ -63,6 +64,6 @@
{% endfor %}
- {% include footer.html %} + {% include 'footer.html' %} diff --git a/sgawebsite/templates/header.html b/sgawebsite/templates/header.html index b829232..239c360 100644 --- a/sgawebsite/templates/header.html +++ b/sgawebsite/templates/header.html @@ -19,8 +19,8 @@ - - + +
diff --git a/sgawebsite/templates/resources.html b/sgawebsite/templates/resources.html index 2bf4cf6..f9b4048 100644 --- a/sgawebsite/templates/resources.html +++ b/sgawebsite/templates/resources.html @@ -1,11 +1,12 @@ +{% load static %} - {% include head.html %} + {% include 'head.html' %} Resources - TJSGA - {% include header.html %} + {% include 'header.html' %}
@@ -84,6 +85,6 @@
- {% include footer.html %} + {% include 'footer.html' %} diff --git a/sgawebsite/urls.py b/sgawebsite/urls.py index 38f3eb6..089887e 100644 --- a/sgawebsite/urls.py +++ b/sgawebsite/urls.py @@ -16,6 +16,15 @@ Including another URLconf from django.conf.urls import include, url from django.contrib import admin from .apps.main import urls as main +import requests + +about = requests.get("https://sgawebsite-e30e2.firebaseio.com/about.json") +forms = requests.get("https://sgawebsite-e30e2.firebaseio.com/forms.json") +with open("about.json", 'w') as f: + f.write(about.json()) +with open("forms.json", 'w') as f: + f.write(forms.json()) + urlpatterns = [ url(r'^admin/', admin.site.urls),