use SimpleRouter instead of DefaultRouter

2 files changed, 18 insertions, 32 deletions

diff --git a/blocks/blocks/xcosblocks/urls.py b/blocks/blocks/xcosblocks/urls.py
index 9a08e996..a17259d7 100644
--- a/blocks/blocks/xcosblocks/urls.py
+++ b/blocks/blocks/xcosblocks/urls.py
@@ -1,16 +1,18 @@
 from django.urls import path
-from rest_framework.routers import DefaultRouter
+from rest_framework.routers import SimpleRouter
 
 from .views import CategoryViewSet, \
     NewBlockViewSet, NewBlockParameterViewSet, \
     get_block_images, set_block_parameter
 
-router = DefaultRouter()
+router = SimpleRouter()
+
 router.register(r'categories', CategoryViewSet)
 router.register(r'newblocks', NewBlockViewSet)
 router.register(r'newblockparameters', NewBlockParameterViewSet)
-urlpatterns = router.urls
-urlpatterns += [
+
+urlpatterns = router.urls + [
+    path(r'block_images', get_block_images),
+
     path(r'setblockparameter', set_block_parameter),
-    path(r'block_images', get_block_images)
 ]
diff --git a/blocks/saveAPI/urls.py b/blocks/saveAPI/urls.py
index 2703a714..a08f26a0 100644
--- a/blocks/saveAPI/urls.py
+++ b/blocks/saveAPI/urls.py
@@ -1,34 +1,18 @@
 from django.urls import path
 from saveAPI import views as saveAPI_views
-from rest_framework.routers import DefaultRouter
+from rest_framework.routers import SimpleRouter
 
-router = DefaultRouter()
-router.register(r'search', saveAPI_views.SaveSearchViewSet,
-                basename='SaveSearch')
+router = SimpleRouter()
 
-urlpatterns = [
-    path('diagram', saveAPI_views.StateSaveView.as_view(),
-         name='saveState'),
+router.register(r'search', saveAPI_views.SaveSearchViewSet, basename='SaveSearch')
 
-    path('list', saveAPI_views.UserSavesView.as_view(),
-         name='listSaves'),
-
-    path("gallery", saveAPI_views.GalleryListView.as_view(),
-         name="getGallery"),
-
-    path('gallery/<str:save_id>',
-         saveAPI_views.GalleryDetailView.as_view(),
-         name='fetchGallerySchematic'),
-
-    path("diagram/<uuid:save_id>", saveAPI_views.FetchSaveDiagram.as_view(),
-         name="getDiagram"),
-
-    path('categories', saveAPI_views.BookCategoryView.as_view(),
-         name='categories'),
-
-    path('books', saveAPI_views.BookView.as_view(),
-         name='books'),
+urlpatterns = router.urls + [
+    path('categories', saveAPI_views.BookCategoryView.as_view(), name='categories'),
+    path('books', saveAPI_views.BookView.as_view(), name='books'),
+    path("gallery", saveAPI_views.GalleryListView.as_view(), name="getGallery"),
+    path('gallery/<str:save_id>', saveAPI_views.GalleryDetailView.as_view(), name='fetchGallerySchematic'),
 
+    path('list', saveAPI_views.UserSavesView.as_view(), name='listSaves'),
+    path('diagram', saveAPI_views.StateSaveView.as_view(), name='saveState'),
+    path("diagram/<uuid:save_id>", saveAPI_views.FetchSaveDiagram.as_view(), name="getDiagram"),
 ]
-
-urlpatterns += router.urls