diff --git a/backend/metagenedb/apps/catalog/urls.py b/backend/metagenedb/apps/catalog/urls.py index 6bda4c1bdaf619669d8cd65bef02738b9dd48948..e6afebce42ac31952d0704162e9b8a3150e529a6 100644 --- a/backend/metagenedb/apps/catalog/urls.py +++ b/backend/metagenedb/apps/catalog/urls.py @@ -1,9 +1,8 @@ -from django.urls import path, re_path +from django.urls import re_path from . import views urlpatterns = [ - path('', views.index, name='index'), re_path(r'^api/genes/$', views.gene_list, name='genes'), re_path(r'^api/genes/(?P<gene_id>.*)$', views.gene_detail), ] diff --git a/backend/metagenedb/apps/catalog/views/__init__.py b/backend/metagenedb/apps/catalog/views/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..2f2e38f98a0b440d789c220f638cdd112e7b613d --- /dev/null +++ b/backend/metagenedb/apps/catalog/views/__init__.py @@ -0,0 +1 @@ +from .genes import gene_detail, gene_list # noqa \ No newline at end of file diff --git a/backend/metagenedb/apps/catalog/views.py b/backend/metagenedb/apps/catalog/views/genes.py similarity index 89% rename from backend/metagenedb/apps/catalog/views.py rename to backend/metagenedb/apps/catalog/views/genes.py index 0868f0b7db0b4c19b846273b9dc6c3be3d3b91b5..f3c08235cd19bdf0037ea660c1eb38f33575f922 100644 --- a/backend/metagenedb/apps/catalog/views.py +++ b/backend/metagenedb/apps/catalog/views/genes.py @@ -2,14 +2,9 @@ from rest_framework import status from rest_framework.decorators import api_view from rest_framework.response import Response from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger -from django.http import HttpResponse -from .models import Gene -from .serializers import GeneSerializer - - -def index(request): - return HttpResponse(f"Welcome to the catalog page.") +from metagenedb.apps.catalog.models import Gene +from metagenedb.apps.catalog.serializers import GeneSerializer @api_view(['GET']) diff --git a/backend/requirements.txt b/backend/requirements.txt index 1ab39b2b3ab6d0faa1ca24f421621d092e9861cc..6100e13d6e68f09fbec770af30380e126a042bc7 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -5,8 +5,10 @@ django-extensions==2.1.7 django-filter==2.1.0 djangorestframework==3.9.4 djangorestframework-jwt==1.11.0 +numpy==1.16.4 +pandas==0.24.2 psycopg2==2.8.2 PyJWT==1.7.1 pytz==2019.1 six==1.12.0 -sqlparse==0.3.0 +sqlparse==0.3.0 \ No newline at end of file diff --git a/backend/requirements_dev.txt b/backend/requirements_dev.txt index 01571fc5b59e2927ca0a660d8f447e6e45895405..b25b312be90e41606de0fe0783f65acc3a1be4d3 100644 --- a/backend/requirements_dev.txt +++ b/backend/requirements_dev.txt @@ -1,6 +1,7 @@ atomicwrites==1.3.0 attrs==19.1.0 coverage==4.5.3 +cycler=0.10.0 Django==2.2.1 django-cors-headers==3.0.2 django-environ==0.4.5 @@ -11,6 +12,7 @@ djangorestframework-jwt==1.11.0 entrypoints==0.3 flake8==3.7.7 importlib-metadata==0.18 +kiwisolver=1.1.0 mccabe==0.6.1 more-itertools==7.0.0 packaging==19.0 @@ -28,4 +30,4 @@ pytz==2019.1 six==1.12.0 sqlparse==0.3.0 wcwidth==0.1.7 -zipp==0.5.1 +zipp==0.5.1 \ No newline at end of file