-
-
-
- {% block page_heading %}{% endblock page_heading %}
- {% block main_content %}
+
+
+
+
+ {% block page_heading %}{% endblock page_heading %}
+ {% block main_content %}
- {% endblock main_content %}
+ {% endblock main_content %}
- {% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/democracy_club/apps/wheredoivote_user_feedback/templates/wheredoivote_user_feedback/report_base.html b/democracy_club/apps/wheredoivote_user_feedback/templates/wheredoivote_user_feedback/report_base.html
index a97c6fd2..05bc390c 100644
--- a/democracy_club/apps/wheredoivote_user_feedback/templates/wheredoivote_user_feedback/report_base.html
+++ b/democracy_club/apps/wheredoivote_user_feedback/templates/wheredoivote_user_feedback/report_base.html
@@ -1,11 +1,11 @@
{% extends "report_base.html" %}
{% block extra_page_css %}
-
+
{% endblock %}
\ No newline at end of file
diff --git a/democracy_club/templates/account/login.html b/democracy_club/templates/account/login.html
index 6ceccc35..2f723231 100644
--- a/democracy_club/templates/account/login.html
+++ b/democracy_club/templates/account/login.html
@@ -8,36 +8,36 @@
{% block content %}
-
-
-
{% trans "Sign In" %}
-
-
+
+
+
{% trans "Sign In" %}
+
+
-
+
-
+
- {% get_providers as socialaccount_providers %}
+ {% get_providers as socialaccount_providers %}
- {% if socialaccount_providers %}
-
{% blocktrans with site.name as site_name %}Please sign in with one
- of of the following:{% endblocktrans %}
+ {% if socialaccount_providers %}
+
{% blocktrans with site.name as site_name %}Please sign in with one
+ of of the following:{% endblocktrans %}
-
+
-
- {% include "socialaccount/snippets/provider_list.html" with process="login" %}
-
-
+
+ {% include "socialaccount/snippets/provider_list.html" with process="login" %}
+
+
- {% include "socialaccount/snippets/login_extra.html" %}
- {% endif %}
+ {% include "socialaccount/snippets/login_extra.html" %}
+ {% endif %}
- {% endblock %}
+{% endblock %}
-
+
\ No newline at end of file
diff --git a/democracy_club/templates/base.html b/democracy_club/templates/base.html
index e09813f2..1cacb4cb 100644
--- a/democracy_club/templates/base.html
+++ b/democracy_club/templates/base.html
@@ -93,6 +93,6 @@
{% block extra_javascript %}
+ async src="//gc.zgo.at/count.js">
{% endblock extra_javascript %}
{% endblock extra_site_js %}
diff --git a/democracy_club/templates/dc_members/base.html b/democracy_club/templates/dc_members/base.html
index e583e8d5..7ebc23e1 100644
--- a/democracy_club/templates/dc_members/base.html
+++ b/democracy_club/templates/dc_members/base.html
@@ -1,11 +1,11 @@
{% extends "base.html" %}
{% block content %}
-{% block member_menu %}
-
-{% endblock member_menu %}
-{% block member_content %}{% endblock member_content %}
+ {% block member_menu %}
+
+ {% endblock member_menu %}
+ {% block member_content %}{% endblock member_content %}
{% endblock content %}
\ No newline at end of file
diff --git a/democracy_club/templates/dc_members/detail.html b/democracy_club/templates/dc_members/detail.html
index 93270560..5bb1c25f 100644
--- a/democracy_club/templates/dc_members/detail.html
+++ b/democracy_club/templates/dc_members/detail.html
@@ -1,7 +1,7 @@
{% extends "dc_members/base.html" %}
{% block member_content %}
-{{ object.name }}
+ {{ object.name }}
-you live in {{ object.constituency }}
+ you live in {{ object.constituency }}
{% endblock member_content %}
\ No newline at end of file
diff --git a/democracy_club/templates/dc_members/edit.html b/democracy_club/templates/dc_members/edit.html
index 21ade271..2ddcb6b1 100644
--- a/democracy_club/templates/dc_members/edit.html
+++ b/democracy_club/templates/dc_members/edit.html
@@ -3,39 +3,39 @@
{% block member_content %}
-Your details
-
+ Your details
+
-{% if linked_accounts %}
-
- Linked accounts
- Accounts that you have linked to Democracy Club - use these to log
- in to your account. We will never use these account to post
- messages, read your information or anything else. They are simply
- for logging in.
-
- Add new accounts
- {% for provider in socialaccount.providers %}
- {% if provider.name not in linked_accounts.keys %}
- {{provider.name}}
+ {% if linked_accounts %}
+
+ Linked accounts
+ Accounts that you have linked to Democracy Club - use these to log
+ in to your account. We will never use these account to post
+ messages, read your information or anything else. They are simply
+ for logging in.
+
+ Add new accounts
+ {% for provider in socialaccount.providers %}
+ {% if provider.name not in linked_accounts.keys %}
+ {{provider.name}}
+ {% endif %}
+ {% endfor %}
+
{% endif %}
- {% endfor %}
-
-{% endif %}
{% endblock member_content %}
\ No newline at end of file
diff --git a/democracy_club/templates/home.html b/democracy_club/templates/home.html
index e1ee9ce2..e8c2be85 100644
--- a/democracy_club/templates/home.html
+++ b/democracy_club/templates/home.html
@@ -124,30 +124,30 @@ We make our impact by enabling others to work better
The Telegraph
- Log in with {{brand.name}}
-
-{% endfor %}
-{% endif %}
-Log in with {{provider.name}}
+ {% if provider.id == "openid" %}
+ {% for brand in provider.get_brands %}
+
+ Log in with {{brand.name}}
+
+ {% endfor %}
+ {% endif %}
+ Log in with {{provider.name}}
{% endfor %}
\ No newline at end of file
diff --git a/democracy_club/templates/thanks.html b/democracy_club/templates/thanks.html
index d0c94d8e..c4fe807d 100644
--- a/democracy_club/templates/thanks.html
+++ b/democracy_club/templates/thanks.html
@@ -1,13 +1,13 @@
{% extends "base.html" %}
{% block page_content %}
-Thanks for signing up.
+ Thanks for signing up.
- We've emailed you more details.
+ We've emailed you more details.
-Want to do something useful right now?
+ Want to do something useful right now?
-
- We've a range of 10-minute tasks that you can do right now!
+
+ We've a range of 10-minute tasks that you can do right now!
{% endblock %}
\ No newline at end of file
diff --git a/democracy_club/templates/thanks_finished.html b/democracy_club/templates/thanks_finished.html
index ef16d4cb..e3abf161 100644
--- a/democracy_club/templates/thanks_finished.html
+++ b/democracy_club/templates/thanks_finished.html
@@ -1,12 +1,12 @@
{% extends "base.html" %}
{% block page_content %}
-Thanks for joining Democracy Club!
+ Thanks for joining Democracy Club!
-Great, you're added to the list!
+ Great, you're added to the list!
-Right now, we need your help to find the details of candidates for May 2016.
-
- Get adding candidates! (You'll need to sign up if you have not done so already!)
+ Right now, we need your help to find the details of candidates for May 2016.
+
+ Get adding candidates! (You'll need to sign up if you have not done so already!)
{% endblock %}
\ No newline at end of file
diff --git a/democracy_club/wsgi.py b/democracy_club/wsgi.py
index d557d940..a86fad68 100644
--- a/democracy_club/wsgi.py
+++ b/democracy_club/wsgi.py
@@ -13,6 +13,7 @@
framework.
"""
+
import os
from os.path import abspath, dirname
from sys import path
diff --git a/deploy.sh b/deploy.sh
deleted file mode 100755
index 404daf50..00000000
--- a/deploy.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-die () {
- echo >&2 "$@"
- exit 1
-}
-
-if [ $# -eq 0 ]
- then
- die "No env supplied. Call with ./deploy [dev|prod]"
-fi
-
-
-DEPLOY_ENV=$1
-[ $DEPLOY_ENV == "dev" ] || [ $DEPLOY_ENV == "prod" ] || die "Env not valid. Must be dev or prod"
-export STAGE=$1
-
-echo "Performing Django checks"
-FRAMEWORK="Zappa" python manage.py check
-
-echo "Running collectstatic locally to check for errors"
-FRAMEWORK="Zappa" python manage.py collectstatic --noinput
-
-echo "Deploying to $DEPLOY_ENV"
-
-# Set up paths needed for deploy
-# See README for why we have to do this.
-mkdir -p `echo $VIRTUAL_ENV `/lib/python3.6/site-packages/{pillow,libsass}
-
-# Update Zappa
-zappa update $DEPLOY_ENV
-
-# Migrate the Django DB
-zappa manage $DEPLOY_ENV "migrate --noinput"
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 48e341a0..00000000
--- a/package-lock.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "lockfileVersion": 1
-}
diff --git a/pyproject.toml b/pyproject.toml
index 37c28317..c74a04b3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,4 +31,5 @@ addopts =[
"--ignore=democracy_club/settings/local.py",
"--ignore=lib",
"--ruff",
+ "--ruff-format",
]
diff --git a/sam-template.yaml b/sam-template.yaml
index 8294cba0..e3703250 100644
--- a/sam-template.yaml
+++ b/sam-template.yaml
@@ -86,7 +86,7 @@ Resources:
Properties:
ContentUri: ./lambda-layers/DependenciesLayer/
CompatibleRuntimes:
- - python3.10
+ - python3.12
Metadata:
BuildMethod: makefile
RetentionPolicy: Delete
@@ -101,7 +101,7 @@ Resources:
Handler: democracy_club.lambda_wsgi.handler
Layers:
- !Ref DependenciesLayer
- Runtime: python3.10
+ Runtime: python3.12
MemorySize: 512
Environment:
Variables:
@@ -138,7 +138,7 @@ Resources:
Handler: democracy_club.lambda_manage.management_handler
Layers:
- !Ref DependenciesLayer
- Runtime: python3.10
+ Runtime: python3.12
MemorySize: 512
Environment:
Variables:
diff --git a/zappa_settings.json b/zappa_settings.json
deleted file mode 100644
index 4df06d25..00000000
--- a/zappa_settings.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
- "dev": {
- "aws_region": "eu-west-1",
- "domain": "staging.democracyclub.org.uk",
- "memory_size": 1536,
- "keep_warm": false,
- "django_settings": "democracy_club.settings.zappa",
- "project_name": "democracy-club",
- "manage_roles": false,
- "runtime": "python3.6",
- "exclude": [
- "*.csv",
- "*.gz",
- "*.log",
- "*.pyc",
- "*.rar",
- "babel",
- "boto3*",
- "botocore*",
- "bower_components",
- "faker",
- "foundation-sites",
- "IPython",
- "local.py",
- "pygments",
- "sphinx",
- "__pycache__",
- ],
- "environment_variables": {
- "REQUESTS_CA_BUNDLE": "/var/task/cacert.pem"
- },
- "s3_bucket": "dc-website-test-dev",
- "extra_permissions": [
- {
- "Effect": "Allow",
- "Action": ["s3:*"],
- "Resource": "arn:aws:s3:::static.dev.democracyclub.org.uk"
- },
- {
- "Effect": "Allow",
- "Action": ["cloudfront:CreateInvalidation"],
- "Resource": ["*"]
- }
- ],
- "timeout_seconds": 300,
- "events": [
- {
- "function": "zappa_commands.sync_to_sendgrid",
- "expression": "rate(2 hours)"
- }
- ]
- },
- "prod": {
- "extends": "dev",
- "domain": "democracyclub.org.uk",
- "s3_bucket": "dc-website-prod",
- "extra_permissions": [
- {
- "Effect": "Allow",
- "Action": ["s3:*"],
- "Resource": "arn:aws:s3:::static.democracyclub.org.uk"
- },
- {
- "Effect": "Allow",
- "Action": ["cloudfront:CreateInvalidation"],
- "Resource": ["*"]
- }
- ]
- }
-
-}
