From 4d44b4c907a9b777e6d150c34248c3fa9096b8f3 Mon Sep 17 00:00:00 2001
From: Tim-Oliver Husser <thusser@uni-goettingen.de>
Date: Fri, 13 Nov 2020 11:37:22 +0100
Subject: [PATCH] moved "frames/" part of the URL from api app to main url

---
 pyobs_archive/api/urls.py | 22 +++++++++++-----------
 pyobs_archive/urls.py     |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pyobs_archive/api/urls.py b/pyobs_archive/api/urls.py
index 0f8a0c5..c8d0d36 100644
--- a/pyobs_archive/api/urls.py
+++ b/pyobs_archive/api/urls.py
@@ -3,15 +3,15 @@
 from . import views
 
 urlpatterns = [
-    path('frames/', views.frames_view, name='frames'),
-    path('frames/<int:frame_id>/', views.frame_view, name='frame'),
-    path('frames/<int:frame_id>/download/', views.download_view, name='download'),
-    path('frames/<int:frame_id>/related/', views.related_view, name='related'),
-    path('frames/<int:frame_id>/headers/', views.headers_view, name='headers'),
-    path('frames/<int:frame_id>/preview/', views.preview_view, name='preview'),
-    path('frames/<int:frame_id>/catalog/', views.catalog_view, name='catalog'),
-    path('frames/<int:frame_id>/delete/', views.delete_view, name='delete'),
-    path('frames/create/', views.create_view, name='create'),
-    path('frames/aggregate/', views.aggregate_view, name='options'),
-    path('frames/zip/', views.zip_view, name='zip')
+    path('', views.frames_view, name='frames'),
+    path('<int:frame_id>/', views.frame_view, name='frame'),
+    path('<int:frame_id>/download/', views.download_view, name='download'),
+    path('<int:frame_id>/related/', views.related_view, name='related'),
+    path('<int:frame_id>/headers/', views.headers_view, name='headers'),
+    path('<int:frame_id>/preview/', views.preview_view, name='preview'),
+    path('<int:frame_id>/catalog/', views.catalog_view, name='catalog'),
+    path('<int:frame_id>/delete/', views.delete_view, name='delete'),
+    path('create/', views.create_view, name='create'),
+    path('aggregate/', views.aggregate_view, name='options'),
+    path('zip/', views.zip_view, name='zip')
 ]
diff --git a/pyobs_archive/urls.py b/pyobs_archive/urls.py
index ffe650b..d8a7bab 100644
--- a/pyobs_archive/urls.py
+++ b/pyobs_archive/urls.py
@@ -29,7 +29,7 @@
 
 urlpatterns = [
     path(root_url, include('pyobs_archive.frontend.urls')),
-    path(root_url, include('pyobs_archive.api.urls')),
+    path(root_url + 'frames/', include('pyobs_archive.api.urls')),
     path(root_url + 'admin/', admin.site.urls),
     path(root_url + 'api-token-auth/', views.obtain_auth_token)
 ]