everything working except geocoder

Author: Isaac

Pipfile.lock

@@ -70,7 +70,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [os.path.join(BASE_DIR, "templates")],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -149,6 +149,13 @@
 
 STATIC_URL = '/static/'
 
+# STATICFILES_DIRS = [
+#   # Tell Django where to look for React's static files (css, js)
+#   os.path.join(BASE_DIR, "templates/static"),
+# ]
+
+STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
+STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles")
 CORS_ORIGIN_ALLOW_ALL = False
 CORS_ORIGIN_WHITELIST = (
     'http://localhost:8081',

database/MATchMapper/settings.py

@@ -15,26 +15,24 @@
 """
 import os
 from django.contrib import admin
-from django.urls import path, include
+from django.urls import path, include, re_path
 from django.conf.urls import url
+from django.shortcuts import render
 from bupehandler import views
 
 from django.views.decorators.cache import cache_page
 cache_duration = 60
 
+def render_react(request):
+    return render(request, "index.html")
+
 urlpatterns = [
-    path('', views.about_page, name="about_page"),
+    path(r"", render_react),
     path('admin/', admin.site.urls),
     url('api-auth/', include('rest_framework.urls')),
     url('api/', include('bupehandler.urls')),
-    url(r'^table/(?P<table_name>.+)/(?P<param_values>.+)/(?P<excluded_values>.+)/(?P<keyword>.+)$', views.filtered_table, name="filtered_table"),
-    url(r'^table/(?P<table_name>.+)/(?P<param_values>.+)/(?P<excluded_values>.+)$', views.filtered_table, name="filtered_table"),
-    url(r'^table/(?P<table_name>.+)/(?P<param_values>.+)/$', views.filtered_table, name="filtered_table"),
-    url(r'^table/(?P<table_name>.+)/$',views.filtered_table, name = "filtered_table"),
-    url(r'^map/(?P<table_name>.+)/(?P<param_values>.+)/(?P<excluded_values>.+)/(?P<keyword>.+)$', views.filtered_map, name="filtered_map"),
-    url(r'^map/(?P<table_name>.+)/(?P<param_values>.+)/(?P<excluded_values>.+)$', views.filtered_map, name="filtered_map"),
-    url(r'^map/(?P<table_name>.+)/(?P<param_values>.+)/$', views.filtered_map, name="filtered_map"),
-    url(r'^map/(?P<table_name>.+)/$', views.filtered_map, name="filtered_map"), 
+    re_path(r"table\/", render_react),
+    re_path(r"map\/", render_react),
     url(r'^headless/(?P<table_name>.+)/(?P<param_values>.+)/(?P<excluded_values>.+)/(?P<keyword>.+)$', views.headless_query, name="headless"),
     url(r'^headless/(?P<table_name>.+)/(?P<param_values>.+)/(?P<excluded_values>.+)$', views.headless_query, name="headless"),
     url(r'^headless/(?P<table_name>.+)/(?P<param_values>.+)/$', views.headless_query, name="headless"),