Skip to content

Commit

Permalink
Merge branch 'api_routes-implementation' of github.com:SELab-2/UGent-…
Browse files Browse the repository at this point in the history
…1 into api_routes-implementation
  • Loading branch information
ReinhardDP committed Mar 11, 2024
2 parents a0f5a92 + 6da1e6d commit 2bd063a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.env
django/db.sqlite3
backend/db.sqlite3
backend/uploads
venv/
.venv/

Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ stop:

lint:
docker exec pigeonhole-backend flake8 .
docker exec pigeonhole-frontend npm run lint
docker exec pigeonhole-frontend npm run lint

backendshell:
docker exec -it pigeonhole-backend sh
4 changes: 3 additions & 1 deletion backend/pigeonhole/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from django.contrib import admin
from django.urls import include, path
from django.conf import settings
from django.conf.urls.static import static
from drf_yasg import openapi
from drf_yasg.views import get_schema_view
from rest_framework import routers, permissions
Expand Down Expand Up @@ -38,6 +40,6 @@
path('swagger/', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
path('redoc/', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
path("admin/", admin.site.urls),
]
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

urlpatterns += router.urls

0 comments on commit 2bd063a

Please sign in to comment.