jrnl: re-arranged to make Range a repository for everything.

3 files changed, 19 insertions, 15 deletions

diff --git a/app/posts/urls/guide_urls.py b/app/posts/urls/guide_urls.py
index f3891e3..5e2b37e 100644
--- a/app/posts/urls/guide_urls.py
+++ b/app/posts/urls/guide_urls.py
@@ -10,16 +10,20 @@ urlpatterns = [
         r'',
         views.GuideListView.as_view(),
         {'page':1}, 
-        name="guide-base"
+        name="guide-list"
     ),
     path(
-        r'<str:topic>/',
-        views.GuideTopicListView.as_view(),
-        {'page':1}, 
-        name="guides-by-topic"
+        r'<int:page>/',
+        views.GuideListView.as_view(),
+        name="guide-list"
     ),
     path(
         r'<str:topic>/<str:slug>',
+        views.GuidePostDetailView.as_view(),
+        name="guide-post-detail"
+    ),
+    path(
+        r'<str:slug>/',
         views.GuideDetailView.as_view(),
         name="guide-detail"
     ),
diff --git a/app/posts/urls/range_urls.py b/app/posts/urls/range_urls.py
index 16655d6..e035a25 100644
--- a/app/posts/urls/range_urls.py
+++ b/app/posts/urls/range_urls.py
@@ -12,14 +12,14 @@ urlpatterns = [
         name="feed"
     ),
     path(
-        r'<int:issue>/<str:slug>',
-        views.RangeDetailView.as_view(),
-        name="range-detail"
-    ),
-    path(
         r'',
         views.RangeListView.as_view(),
         {'page':1}, 
         name="range-list"
     ),
+    path(
+        r'<int:page>',
+        views.RangeListView.as_view(),
+        name="range-list"
+    ),
 ]
diff --git a/app/posts/urls/review_urls.py b/app/posts/urls/review_urls.py
index 6b78e43..3c8368d 100644
--- a/app/posts/urls/review_urls.py
+++ b/app/posts/urls/review_urls.py
@@ -1,28 +1,28 @@
 from django.urls import path, re_path
 
-from ..views import guide_views as views
+from ..views import review_views as views
 
 app_name = "reviews"
 
 urlpatterns = [
     path(
         r'<str:slug>',
-        views.PostDetailView.as_view(),
+        views.ReviewDetailView.as_view(),
         name="review-detail"
     ),
     path(
         r'<str:slug>.txt',
-        views.PostDetailViewTXT.as_view(),
+        views.ReviewDetailViewTXT.as_view(),
         name="review-detail-txt"
     ),
     path(
         r'<int:page>/',
-        views.ReviewsListView.as_view(),
+        views.ReviewListView.as_view(),
         name="review-list"
     ),
     path(
         r'',
-        views.ReviewsListView.as_view(),
+        views.ReviewListView.as_view(),
         {'page':1}, 
         name="review-list"
     ),