From 5f9aca20c4906a044a72cebf8982e0b912c2ac64 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Tue, 12 Jun 2018 12:27:35 +1000 Subject: [PATCH] Throw out support for AMP, because AMP sucks anyway --- entries/kinds.py | 4 - entries/models.py | 8 -- entries/templates/entries/entry.html | 1 - entries/templates/entries/entry_amp.html | 157 ----------------------- entries/templates/entries/h-entry.html | 4 - entries/urls.py | 4 - entries/views/perma.py | 8 -- lemoncurry/settings/base.py | 6 - 8 files changed, 192 deletions(-) delete mode 100644 entries/templates/entries/entry_amp.html diff --git a/entries/kinds.py b/entries/kinds.py index 5fb9528..4e25466 100644 --- a/entries/kinds.py +++ b/entries/kinds.py @@ -23,10 +23,6 @@ class Entry: def entry(self): return self.plural + '_entry' - @property - def entry_amp(self): - return self.entry + '_amp' - @property def atom(self): return reverse('entries:atom_by_kind', kwargs={'kind': self}) diff --git a/entries/models.py b/entries/models.py index 7a0a2ef..52bb73d 100644 --- a/entries/models.py +++ b/entries/models.py @@ -152,14 +152,6 @@ class Entry(ModelMeta, TimeStampedModel): args.append(self.slug) return reverse('entries:entry', args=args) - @property - def amp_url(self): - kind = kinds.from_id[self.kind] - args = [kind, self.id] - if kind.slug: - args.append(self.slug) - return reverse('entries:entry_amp', args=args) - @property def short_url(self): return short_url(self) diff --git a/entries/templates/entries/entry.html b/entries/templates/entries/entry.html index 9bf4bcb..a620f55 100644 --- a/entries/templates/entries/entry.html +++ b/entries/templates/entries/entry.html @@ -2,7 +2,6 @@ {% load absolute_url static %} {% block head %} - {% endblock %} diff --git a/entries/templates/entries/entry_amp.html b/entries/templates/entries/entry_amp.html deleted file mode 100644 index 68ea5d0..0000000 --- a/entries/templates/entries/entry_amp.html +++ /dev/null @@ -1,157 +0,0 @@ -{% load absolute_url favicon friendly_url humanize jsonify lemoncurry_tags markdown theme_colour %} - - - - {{ entry.title }} ~ {% site_name %} - - - - - {% get_favicons 'favicon/' %} - - - - - - - -
- {% site_name %} -
- -
-
- {% if entry.photo %} - - - - {% endif %} - {% if entry.name %} -

{{ entry.name }}

- {% endif %} - -
- {{ entry.content | markdown }} -
- - -
-
- - diff --git a/entries/templates/entries/h-entry.html b/entries/templates/entries/h-entry.html index 8031da4..a3740a9 100644 --- a/entries/templates/entries/h-entry.html +++ b/entries/templates/entries/h-entry.html @@ -35,10 +35,6 @@ {{ entry.updated | naturaltime }} {% endif %} - - - amp - {{ entry.short_url | friendly_url }} diff --git a/entries/urls.py b/entries/urls.py index 19952f3..f40bceb 100644 --- a/entries/urls.py +++ b/entries/urls.py @@ -32,10 +32,6 @@ urlpatterns = ( path('/atom', feeds.AtomByKind(), name='atom_by_kind'), path('/rss', feeds.RssByKind(), name='rss_by_kind'), - path('//amp', perma.entry_amp, name='entry_amp'), - path('///amp', - perma.entry_amp, name='entry_amp'), - path('/', perma.entry, name='entry'), path('//', perma.entry, name='entry'), ) diff --git a/entries/views/perma.py b/entries/views/perma.py index ef03050..345f5c7 100644 --- a/entries/views/perma.py +++ b/entries/views/perma.py @@ -13,11 +13,3 @@ def entry(request, kind, id, slug=None): 'title': entry.title, 'meta': entry.as_meta(request) } - - -@render_to('entries/entry_amp.html') -def entry_amp(request, kind, id, slug=None): - entry = get_object_or_404(Entry, pk=id) - if request.path != entry.amp_url: - return redirect(entry.amp_url, permanent=True) - return {'entry': entry} diff --git a/lemoncurry/settings/base.py b/lemoncurry/settings/base.py index 911f2b2..38ccee7 100644 --- a/lemoncurry/settings/base.py +++ b/lemoncurry/settings/base.py @@ -252,12 +252,6 @@ AGENT_COOKIE_SECURE = True CORS_ORIGIN_ALLOW_ALL = True CORS_URLS_REGEX = r'^/(?!admin|auth/(?:login|logout|indie)).*$' -# django-debug-toolbar -# https://django-debug-toolbar.readthedocs.io/en/stable/configuration.html -DEBUG_TOOLBAR_CONFIG = { - 'SHOW_TOOLBAR_CALLBACK': 'lemoncurry.debug.show_toolbar', -} - # lemonshort SHORT_BASE_URL = '/s/' SHORTEN_MODELS = {