From 456bddbdfef3abad99c5711c8ce2a82877dee2e6 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Mon, 9 Jun 2025 11:17:28 +0100 Subject: [PATCH 1/4] settings: Add settings_dev Usage: DJANGO_SETTINGS_MODULE=settings.settings_dev --- README.md | 2 +- registry/settings/settings_dev.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 registry/settings/settings_dev.py diff --git a/README.md b/README.md index ff7384b..77ec5e0 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ $ pip install -r requirements_dev.txt Development server ``` -$ ./registry/manage.py runserver +$ DJANGO_SETTINGS_MODULE=settings.settings_dev ./registry/manage.py runserver ``` ## Tests diff --git a/registry/settings/settings_dev.py b/registry/settings/settings_dev.py new file mode 100644 index 0000000..08f68b5 --- /dev/null +++ b/registry/settings/settings_dev.py @@ -0,0 +1,31 @@ +# flake8: noqa +import os +from settings.settings import * # noqa F401, F403 + +DEBUG = True + +ALLOWED_HOSTS = [".localhost", "127.0.0.1", "[::1]"] + +LOGGING = { + "version": 1, + "disable_existing_loggers": False, + "formatters": { + "simple": { + "format": "{levelname} [{module}] {message}", + "style": "{", + }, + }, + "handlers": { + "console": { + "class": "logging.StreamHandler", + }, + }, + "loggers": { + "": { + "handlers": ["console"], + "level": os.getenv("DJANGO_LOG_LEVEL", "INFO"), + "formatter": "simple", + "propagate": True, + }, + }, +} From b29635b92782804894d96395757d1e841bdfde2d Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Mon, 9 Jun 2025 11:35:11 +0100 Subject: [PATCH 2/4] runtime: Update to python3.12 --- runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime.txt b/runtime.txt index 1e480ce..4ddc7cd 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.10.12 +python-3.12.3 From addc0a11dd9c15f8f12fa7f9098ba966e9bdff8d Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Mon, 9 Jun 2025 11:37:31 +0100 Subject: [PATCH 3/4] workflows: Update python version remove deprecated actions cache --- .github/workflows/lint.yml | 6 +----- .github/workflows/test.yml | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f8366da..091478f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,12 +9,8 @@ jobs: - name: Setup python uses: actions/setup-python@v2 with: - python-version: 3.10.12 + python-version: 3.12.3 architecture: x64 - - uses: actions/cache@v1 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/requirements_dev.txt') }} - run: pip install -r requirements.txt - run: pip install -r requirements_dev.txt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 352d723..abf0472 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,12 +9,8 @@ jobs: - name: Setup python uses: actions/setup-python@v2 with: - python-version: 3.10.12 + python-version: 3.12.3 architecture: x64 - - uses: actions/cache@v1 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/requirements_dev.txt') }} - run: pip install -r requirements.txt - run: pip install -r requirements_dev.txt From 8032fefbf1bd2c3689dd09b4068980b91499f7cd Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Mon, 9 Jun 2025 11:38:43 +0100 Subject: [PATCH 4/4] templates: index page updates - Fix broken image links - Update companies house/charity com links - Add linkedin logo - Replace data.three.. with qualitydashboard link - Fix cookie delimiter formatting --- registry/static/images/linkedin-logo.svg | 40 ++++++++++++++++++++++++ registry/ui/templates/index.html | 16 +++++----- 2 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 registry/static/images/linkedin-logo.svg diff --git a/registry/static/images/linkedin-logo.svg b/registry/static/images/linkedin-logo.svg new file mode 100644 index 0000000..e149999 --- /dev/null +++ b/registry/static/images/linkedin-logo.svg @@ -0,0 +1,40 @@ + + + + + + + diff --git a/registry/ui/templates/index.html b/registry/ui/templates/index.html index cdbea87..635c3d5 100644 --- a/registry/ui/templates/index.html +++ b/registry/ui/templates/index.html @@ -263,7 +263,7 @@

} function noCookieConsent() { - document.cookie = "noEnhancedAnalytics=1 ;max-age=2592000 ;domain=threesixtygiving.org"; + document.cookie = "noEnhancedAnalytics=1; max-age=2592000; domain=threesixtygiving.org"; } @@ -307,12 +307,12 @@

Allow analytics cookies? <