New search all page

backend/cic/settings/base.py

@@ -73,7 +73,10 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(os.path.dirname(BASE_DIR), 'templates')],
+        'DIRS': [
+            os.path.join(os.path.dirname(BASE_DIR), 'templates'),
+            os.path.join(os.path.dirname(BASE_DIR), 'grants/templates')
+        ],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [

backend/cic/urls.py

@@ -23,8 +23,8 @@
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('grants/', index, name='index'),
-    path('grants/<int:grant_id>', detail),
-    path('grants/pi/<int:pi_id>', pi_detail),
+    path('search/grants/<int:grant_id>', detail),
+    path('search/pi/<int:pi_id>', pi_detail),
     path('v1/', include('apis.urls')),
     path('survey/', include('pi_survey.urls')),
     path('o/', include('oauth2_provider.urls', namespace='oauth2_provider')),

backend/cic/views.py

@@ -61,7 +61,7 @@
 
 def index(request):
     """Home view callable, for the home page."""
-    return render(request, 'index.html', {'keywords': request.GET.get('keywords', '')})
+    return render(request, 'grants/index.html', {'keywords': request.GET.get('keywords', '')})
 
 
 def detail(request, grant_id):

backend/search/documents/publication.py

@@ -88,7 +88,7 @@ def prepare_affiliations(self, instance):
                 )
             return people
 
-    authors = fields.ObjectField(
+    authors = fields.NestedField(
         properties = get_person_properties.__func__())
     # grants = fields.NestedField(
     #     properties = get_grant_properties.__func__())

backend/search/urls.py

@@ -1,11 +1,17 @@
 from django.urls import path
 from . import views
+from search.views import index, pi_detail
 
 urlpatterns = [
+    path('', index),
     path('grants', views.search_grants, name='search_grants'),
     path('facets', views.get_facet_by_field, name='search_grants'),
+    path('facets/people', views.get_people_facet_by_field, name='people_facet'),
+    path('facets/publications/authors', views.get_pub_author_facet, name='pub_author_facet'),
+    path('facets/datasets/authors', views.get_dataset_author_facet, name='dataset_author_facet'),
     path('publications', views.search_publications, name='search_publications'),
     path('people', views.search_people, name='search_people'),
+    path('people/pi/<int:pi_id>', pi_detail),
     path('datasets', views.search_datasets, name='search_datasets'),
     path('assets', views.search_assets, name='search_assets')
 ]