From 6e637e3663d3af225b768c4e773560cef40b0829 Mon Sep 17 00:00:00 2001 From: "Craig M. Stimmel" Date: Thu, 12 Dec 2024 16:03:30 -0800 Subject: [PATCH 1/4] Fix imporoperly formatted urlpattern --- scout/urls.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scout/urls.py b/scout/urls.py index 0cbc0ce8..ca1d40af 100644 --- a/scout/urls.py +++ b/scout/urls.py @@ -51,8 +51,7 @@ name="discover", ), re_path( - r"^(?P[^/]+)/discover_card/(?P[a-zA-Z]+" - ")/$", + r"^(?P[^/]+)/discover_card/(?P[a-zA-Z]+)/$", DiscoverCardView.as_view(), {"template_name": "scout/discover_card.html"}, name="discovercard", @@ -126,8 +125,7 @@ name="hybriddiscover", ), re_path( - r"^h/(?P[^/]+)/discover_card/" - "(?P[a-zA-Z]+)/$", + r"^h/(?P[^/]+)/discover_card/(?P[a-zA-Z]+)/$", DiscoverCardView.as_view(), {"template_name": "hybridize/discover_card.html"}, name="hybriddiscovercard", From 557f9ea8c0d1e78ef3c5f9cbbe3e307a39492a55 Mon Sep 17 00:00:00 2001 From: "Craig M. Stimmel" Date: Fri, 13 Dec 2024 16:17:37 -0800 Subject: [PATCH 2/4] Add basic robots.txt to be served --- scout/templates/robots.txt | 2 ++ scout/urls.py | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 scout/templates/robots.txt diff --git a/scout/templates/robots.txt b/scout/templates/robots.txt new file mode 100644 index 00000000..1f53798b --- /dev/null +++ b/scout/templates/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / diff --git a/scout/urls.py b/scout/urls.py index ca1d40af..a48836b9 100644 --- a/scout/urls.py +++ b/scout/urls.py @@ -37,6 +37,12 @@ ] else: urlpatterns = [ + re_path( + r"^robots.txt$", + TemplateView.as_view( + template_name="robots.txt", content_type="text/plain" + ), + ), # home re_path( r"^$", @@ -115,7 +121,9 @@ ), # hybrid home re_path( - r"^h/$", RedirectView.as_view(url="/h/seattle"), name="hybridhome" + r"^h/$", + RedirectView.as_view(url="/h/seattle"), + name="hybridhome", ), # hybrid discover re_path( @@ -134,7 +142,10 @@ re_path( r"^h/(?P[^/]+)/food/$", PlaceHolderView.as_view(), - {"template_name": "hybridize/food/list.html", "app_type": "food"}, + { + "template_name": "hybridize/food/list.html", + "app_type": "food", + }, name="hybridfoodlist", ), re_path( @@ -193,7 +204,10 @@ re_path( r"^h/(?P[^/]+)/tech/$", PlaceHolderView.as_view(), - {"template_name": "hybridize/tech/list.html", "app_type": "tech"}, + { + "template_name": "hybridize/tech/list.html", + "app_type": "tech", + }, name="hybridtechlist", ), re_path( From 82bc34a0e6a7b670fbecfea5f894e2f710c92c2a Mon Sep 17 00:00:00 2001 From: "Craig M. Stimmel" Date: Fri, 13 Dec 2024 17:00:43 -0800 Subject: [PATCH 3/4] Try #noqa even though my pre-commit hook doesn't honor it --- scout/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scout/urls.py b/scout/urls.py index a48836b9..d6ca0a6a 100644 --- a/scout/urls.py +++ b/scout/urls.py @@ -57,7 +57,7 @@ name="discover", ), re_path( - r"^(?P[^/]+)/discover_card/(?P[a-zA-Z]+)/$", + r"^(?P[^/]+)/discover_card/(?P[a-zA-Z]+)/$", # noqa DiscoverCardView.as_view(), {"template_name": "scout/discover_card.html"}, name="discovercard", @@ -133,7 +133,7 @@ name="hybriddiscover", ), re_path( - r"^h/(?P[^/]+)/discover_card/(?P[a-zA-Z]+)/$", + r"^h/(?P[^/]+)/discover_card/(?P[a-zA-Z]+)/$", # noqa DiscoverCardView.as_view(), {"template_name": "hybridize/discover_card.html"}, name="hybriddiscovercard", From e764d3a0663d7254e411078024c5d03834f833f7 Mon Sep 17 00:00:00 2001 From: "Craig M. Stimmel" Date: Thu, 2 Jan 2025 12:49:05 -0800 Subject: [PATCH 4/4] Yep, it's 2025 now --- scout/context_processors.py | 2 +- scout/dao/image.py | 2 +- scout/dao/item.py | 2 +- scout/dao/space.py | 2 +- scout/templatetags/scout_filters.py | 2 +- scout/test/__init__.py | 2 +- scout/test/dao/test_item_dao.py | 2 +- scout/test/dao/test_space_dao.py | 2 +- scout/test/pageflow/test_content.py | 2 +- scout/test/pageflow/test_navigation.py | 2 +- scout/test/pageflow/test_page_load_status.py | 2 +- scout/urls.py | 2 +- scout/views.py | 2 +- scout/wsgi.py | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/scout/context_processors.py b/scout/context_processors.py index d5f6307b..fa1c7878 100644 --- a/scout/context_processors.py +++ b/scout/context_processors.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 from django.conf import settings diff --git a/scout/dao/image.py b/scout/dao/image.py index da2f5060..a66917cd 100644 --- a/scout/dao/image.py +++ b/scout/dao/image.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 from uw_spotseeker import Spotseeker diff --git a/scout/dao/item.py b/scout/dao/item.py index 3c3adad1..58b1ae52 100644 --- a/scout/dao/item.py +++ b/scout/dao/item.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 from scout.dao.space import ( diff --git a/scout/dao/space.py b/scout/dao/space.py index c750e3a8..717950d6 100644 --- a/scout/dao/space.py +++ b/scout/dao/space.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 from django.conf import settings diff --git a/scout/templatetags/scout_filters.py b/scout/templatetags/scout_filters.py index 16152dfc..c2abc779 100644 --- a/scout/templatetags/scout_filters.py +++ b/scout/templatetags/scout_filters.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 from django import template diff --git a/scout/test/__init__.py b/scout/test/__init__.py index ceb02b48..9555981a 100644 --- a/scout/test/__init__.py +++ b/scout/test/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 from django.test import TestCase diff --git a/scout/test/dao/test_item_dao.py b/scout/test/dao/test_item_dao.py index 1b31db50..90b940f3 100644 --- a/scout/test/dao/test_item_dao.py +++ b/scout/test/dao/test_item_dao.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 import copy diff --git a/scout/test/dao/test_space_dao.py b/scout/test/dao/test_space_dao.py index 91593fb2..31d94db8 100644 --- a/scout/test/dao/test_space_dao.py +++ b/scout/test/dao/test_space_dao.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 import datetime diff --git a/scout/test/pageflow/test_content.py b/scout/test/pageflow/test_content.py index 4cb0d254..2e868633 100644 --- a/scout/test/pageflow/test_content.py +++ b/scout/test/pageflow/test_content.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 """ diff --git a/scout/test/pageflow/test_navigation.py b/scout/test/pageflow/test_navigation.py index ddc19b6e..5c319503 100644 --- a/scout/test/pageflow/test_navigation.py +++ b/scout/test/pageflow/test_navigation.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 """ diff --git a/scout/test/pageflow/test_page_load_status.py b/scout/test/pageflow/test_page_load_status.py index 8c85e9d8..a32b8476 100644 --- a/scout/test/pageflow/test_page_load_status.py +++ b/scout/test/pageflow/test_page_load_status.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 """ diff --git a/scout/urls.py b/scout/urls.py index d6ca0a6a..b08023cc 100644 --- a/scout/urls.py +++ b/scout/urls.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 from django.conf import settings diff --git a/scout/views.py b/scout/views.py index dd1914e3..1456f763 100644 --- a/scout/views.py +++ b/scout/views.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 from django.http import Http404, HttpResponse diff --git a/scout/wsgi.py b/scout/wsgi.py index a93fcc32..7c3e33ff 100644 --- a/scout/wsgi.py +++ b/scout/wsgi.py @@ -1,4 +1,4 @@ -# Copyright 2024 UW-IT, University of Washington +# Copyright 2025 UW-IT, University of Washington # SPDX-License-Identifier: Apache-2.0 import os