diff --git a/src/jakecharman/__init__.py b/src/jakecharman/__init__.py index bd7c8fa..b4ec27d 100644 --- a/src/jakecharman/__init__.py +++ b/src/jakecharman/__init__.py @@ -90,6 +90,12 @@ def inject_branding() -> dict: return {'branding': brand, 'url': req_domain} +@app.context_processor +def inject_globals(): + return { + 'canonical_url': f"https://jakec.tech{request.path}" + } + @app.route('/') def index() -> str: ''' Load the homepage ''' diff --git a/src/jakecharman/templates/article.html b/src/jakecharman/templates/article.html index 3475519..9369c6d 100755 --- a/src/jakecharman/templates/article.html +++ b/src/jakecharman/templates/article.html @@ -17,14 +17,14 @@ "@type": "BlogPosting", "headline": {{ metadata.title | tojson }}, "datePublished": "{{ metadata.date }}", - "image": "https://{{ url }}/image/{{ metadata.image }}", + "image": "https://jakec.tech/image/{{ metadata.image }}", "timeRequired": "PT{{ get_readtime_mins(post) }}M", "author": { "@type": "Person", "name": "Jake Charman", - "url": "https://{{ url }}/" + "url": "https://jakec.tech/" }, - "mainEntityOfPage": "https://{{ url }}/projects/{{ metadata.id }}" + "mainEntityOfPage": "https://jakec.tech/projects/{{ metadata.id }}" } diff --git a/src/jakecharman/templates/index.html b/src/jakecharman/templates/index.html index 26a1935..e676ee0 100755 --- a/src/jakecharman/templates/index.html +++ b/src/jakecharman/templates/index.html @@ -63,7 +63,7 @@

When I'm not at work, I can often be found at Santa Pod Raceway with Nitro Junkie Racing

We run a Top Fuel motorcycle purpose built for drag racing. The engine is loosely based on a Kawasaki Z 1000, but supercharged, and nitromethane injected to produce around 1,000 horsepower.

-

I've also had the opportunity to work on a 10,000 horsepower Top Fuel Dragster. I wrote about this on the Nitro Junkie website, and later extended that post here.

+

I've also had the opportunity to work on a 10,000 horsepower Top Fuel Dragster. I wrote about this on the Nitro Junkie website, and later extended that post here.

Jake working on a Top Fuel Dragster in the pits at Santa Pod Raceway diff --git a/src/jakecharman/templates/main.html b/src/jakecharman/templates/main.html index 9f0be65..bdf6a74 100644 --- a/src/jakecharman/templates/main.html +++ b/src/jakecharman/templates/main.html @@ -1,9 +1,11 @@ + {{ page_title }}{{branding}} + @@ -49,7 +51,7 @@ "@context": "https://schema.org", "@type": "WebSite", "name": "{{ branding }}", - "url": "https://{{ url }}/" + "url": "https://jakec.tech/" } {% block head %}{% endblock %} diff --git a/src/jakecharman/templates/post.html b/src/jakecharman/templates/post.html index c5b973f..67b2660 100755 --- a/src/jakecharman/templates/post.html +++ b/src/jakecharman/templates/post.html @@ -22,22 +22,22 @@ {% if metadata.updated %} "dateModified": "{{ metadata.updated }}", {% endif %} - "image": "https://{{ url }}/image/{{ metadata.image }}", + "image": "https://jakec.tech/image/{{ metadata.image }}", "author": { "@type": "Person", "name": "Jake Charman", - "url": "https://{{ url }}/" + "url": "https://jakec.tech/" }, "publisher": { "@type": "Person", "name": "Jake Charman", - "url": "https://{{ url }}/" + "url": "https://jakec.tech/" }, "mainEntityOfPage": { "@type": "WebPage", - "@id": "https://{{ url }}/blog/{{ metadata.id }}" + "@id": "https://jakec.tech/blog/{{ metadata.id }}" }, - "url": "https://{{ url }}/blog/{{ metadata.id }}", + "url": "https://jakec.tech/blog/{{ metadata.id }}", "inLanguage": "en-GB" } @@ -46,8 +46,8 @@ "@context": "https://schema.org", "@type": "BreadcrumbList", "itemListElement": [ - {"@type": "ListItem", "position": 1, "name": "Projects", "item": "https://{{url}}/projects/"}, - {"@type": "ListItem", "position": 2, "name": {{ metadata.title | tojson }}, "item": "https://{{url}}/projects/{{ metadata.id }}"} + {"@type": "ListItem", "position": 1, "name": "Projects", "item": "https://jakec.tech/projects/"}, + {"@type": "ListItem", "position": 2, "name": {{ metadata.title | tojson }}, "item": "https://jakec.tech/projects/{{ metadata.id }}"} ] }