From 5758fad11889a54ba877d4f3e8ba2d14b9aa42f4 Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf>
Date: Sun, 21 Mar 2021 10:34:58 -0400
Subject: lttr: removed /newsletter/ from the url path.

---
 app/lttr/templates/lttr/friends_list.html |  2 +-
 app/lttr/templates/lttr/range_list.html   |  4 ++--
 app/lttr/urls.py                          | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'app/lttr')

diff --git a/app/lttr/templates/lttr/friends_list.html b/app/lttr/templates/lttr/friends_list.html
index 4e94c4d..3318a08 100644
--- a/app/lttr/templates/lttr/friends_list.html
+++ b/app/lttr/templates/lttr/friends_list.html
@@ -12,7 +12,7 @@
             <h2 class="list-subhed">Say what? </h2>
             <p><em>Friends of a Long Year</em> is a monthly letter about living outdoors, travel, literature, music, vintage vehicles, and other ephemera. It's written in the spirit of Mary Austin. And Mike’s emails. A more detailed explaination can be found <a href="/jrnl/2020/11/invitation">here</a>.</p>
             <p>Unsubscribing is easy. It's all <a href="/src/building-your-own-mailing-list-software">self-hosted</a> and designed to <a href="/privacy" title="My privacy policy">respect your privacy</a>.</p>
-            <p>There's also the <em><a href="/newsletter/range/">Range</a></em> newsletter if you'd like a photo in your inbox once a week.</p>
+            <p>There's also the <em><a href="/range/">Range</a></em> newsletter if you'd like a photo in your inbox once a week.</p>
         </div>
         <h3 class="archive-sans">Letters</h3>
         <ul class="archive-list">{% for object in object_list %}
diff --git a/app/lttr/templates/lttr/range_list.html b/app/lttr/templates/lttr/range_list.html
index a2b16fc..c6875e9 100644
--- a/app/lttr/templates/lttr/range_list.html
+++ b/app/lttr/templates/lttr/range_list.html
@@ -21,8 +21,8 @@
             <p><em>Range</em> is a weekly mailing of a single photograph. </p>
             <p>If you're interested there is also a link to a video of the RAW image processing in <a href="https://www.darktable.org/">darktable</a>, and sometimes a few words about the process. But the primary purpose is to deliver a single photo to your inbox. Simple and fun.</p>
             <p>Yes, I know about Instagram. This is an attempt to reclaim that space, sharing photos with friends, but without all the distractions of the corporate social web, without the endless scroll of photos, likes, stories, comments, whatever. This is just an image delivered once a week to your inbox. I've been trying to think of a way to make it reciprocal, so you can send a picture to my inbox. If you have ideas, <a href="mailto:comments@luxagraf.net">email me</a>.</p>
-            <p>Unsubscribing is easy. It's <a href="/src/building-your-own-mailing-list-software">self-hosted</a> and <a href="/privacy" title="My privacy policy">respects your privacy</a>. If you don't want an email, there's also <a href="/newsletter/range/feed.xml">an RSS feed</a>, and it's all archived below.</p>
-            <p>There's also the <em><a href="/newsletter/friends/">Friends of a Long Year</a></em> newsletter if you want some stories in your inbox.</p>
+            <p>Unsubscribing is easy. It's <a href="/src/building-your-own-mailing-list-software">self-hosted</a> and <a href="/privacy" title="My privacy policy">respects your privacy</a>. If you don't want an email, there's also <a href="/range/feed.xml">an RSS feed</a>, and it's all archived below.</p>
+            <p>There's also the <em><a href="/friends/">Friends of a Long Year</a></em> newsletter if you want some stories in your inbox.</p>
         </div>
         <h3 class="archive-sans">Images</h3>
         <div class="archive-grid">{% for object in object_list %}
diff --git a/app/lttr/urls.py b/app/lttr/urls.py
index 9186ed1..b470431 100644
--- a/app/lttr/urls.py
+++ b/app/lttr/urls.py
@@ -6,32 +6,32 @@ app_name = "lttr"
 
 urlpatterns = [
     path(
-        r'<str:slug>/feed.xml',
+        r'feed.xml',
         views.NewsletterRSSFeedView(),
         name="feed"
     ),
     path(
-        '<str:slug>/unsubscribe/<str:activation_code>',
+        'unsubscribe/<str:activation_code>',
         views.UnsubscribeRequestView.as_view(),
         name='newsletter_unsubscribe'
     ),
     path(
-        r'<str:slug>/<int:issue>/<str:mailing>',
+        r'<int:issue>/<str:mailing>',
         views.NewsletterMailingDetail.as_view(),
         name="detail"
     ),
     path(
-        r'<str:slug>/subscribe',
+        r'subscribe',
         views.NewsletterSubscribeView.as_view(),
         name="subscribe"
     ),
     path(
-        r'<str:slug>/<int:page>',
+        r'<int:page>',
         views.NewsletterListView.as_view(),
         name="list"
     ),
     path(
-        '<str:slug>/activate/<str:activation_code>/',
+        'activate/<str:activation_code>/',
         views.ConfirmSubscriptionView.as_view(), name='newsletter_activate'
     ),
     path(
@@ -40,7 +40,7 @@ urlpatterns = [
         name="subscribed"
     ),
     path(
-        r'<str:slug>/',
+        r'',
         views.NewsletterListView.as_view(),
         {'page': 1},
         name="list"
-- 
cgit v1.2.3-70-g09d2