From 2fbd3fd18609cbf50edb09c0e76dc580f615e833 Mon Sep 17 00:00:00 2001 From: Joonas Somero Date: Fri, 7 Mar 2025 10:45:25 +0200 Subject: [PATCH 1/9] Remove footer link as Minimal Mistakes is no longer used --- src/components/Footer.jsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index 1f7a4adce8f0..eb1339b0d028 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -37,11 +37,7 @@ export const Footer = () => { © 2024 The FiQCI Consortium. Powered by{" "} Jekyll - {" "} - &{" "} - - Minimal Mistakes - . +

From c6e410087526903d48bfbe512f91b1ce7db73d09 Mon Sep 17 00:00:00 2001 From: Joonas Somero Date: Fri, 7 Mar 2025 15:58:46 +0200 Subject: [PATCH 2/9] Fix some urls Rename content/*.js to *.js.liquid --- .vscode/settings.json | 2 +- content/_data/site-constants.yml | 2 ++ content/_includes/head.html | 3 ++- content/properties.css.liquid | 9 +++++++++ content/{site.js => site.js.liquid} | 28 +++++++++++++++++---------- content/{store.js => store.js.liquid} | 1 + src/components/Footer.jsx | 18 ++++++++++++----- src/components/NavigationHeader.jsx | 2 +- tailwind.config.js | 2 +- 9 files changed, 48 insertions(+), 19 deletions(-) create mode 100644 content/properties.css.liquid rename content/{site.js => site.js.liquid} (72%) rename content/{store.js => store.js.liquid} (98%) diff --git a/.vscode/settings.json b/.vscode/settings.json index 972819d29020..5b77d076a8f4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { "files.associations": { - "**/content/**/*.{html,js}": "liquid", + "**/content/**/*.{html}": "liquid", } } diff --git a/content/_data/site-constants.yml b/content/_data/site-constants.yml index f69808419725..276b5065fba3 100644 --- a/content/_data/site-constants.yml +++ b/content/_data/site-constants.yml @@ -2,6 +2,8 @@ title: FiQCI author: The FiQCI Consortium logo: assets/images/FiQCI-logo.png favicon: assets/images/favicon.png +footer-icons: assets/footer-icons +funder-logos: assets/images/funders description: >- Web presence of the Finnish Quantum-Computing Infrastructure. We provide state-of-the-art quantum-computing services to Finnish RDI communities. excerpt_max_length: 250 diff --git a/content/_includes/head.html b/content/_includes/head.html index 0aad975304ba..e19de8a04b29 100644 --- a/content/_includes/head.html +++ b/content/_includes/head.html @@ -5,7 +5,8 @@ - + + {%- include external/mathjax.html -%} diff --git a/content/properties.css.liquid b/content/properties.css.liquid new file mode 100644 index 000000000000..6ca655ab6011 --- /dev/null +++ b/content/properties.css.liquid @@ -0,0 +1,9 @@ +--- +permalink: properties.css +--- + +@layer components { + :root { + --fiqci-banner-image: url({{ '/assets/images/FiQCI-banner.jpg' | absolute_url }}); + } +} diff --git a/content/site.js b/content/site.js.liquid similarity index 72% rename from content/site.js rename to content/site.js.liquid index 9a6a2fe57d21..79f2c0c7aff2 100644 --- a/content/site.js +++ b/content/site.js.liquid @@ -1,22 +1,30 @@ --- +permalink: site.js --- + {%- assign values = site.data.site-constants -%} {%- capture constants -%} { - "logo": "{{ values.logo | relative_url }}", "baseUrl": "{{ site.baseurl }}", + "feedbackEmail": "{{ values.feedback_email }}", + "images": { + "logo": "{{ values.logo | absolute_url }}", + "funderLogosPath": "{{ values.funder-logos | absolute_url }}", + "footerIconsPath": "{{ values.footer-icons | absolute_url }}" + }, "topNav": [ { "title": "Home", "href": "{{ site.baseurl }}", "key": 0 }, - { "title": "Blogs and instructions", "href": "{{ '/publications' | relative_url }}", "key": 1 }, - { "title": "Status", "href": "{{ '/status' | relative_url }}", "key": 2 }, - { "title": "Events", "href": "{{ '/events' | relative_url }}", "key": 3 }, - { "title": "Search", "href": "{{ '/search' | relative_url }}", "key": 4 } + { "title": "Get access", "href": "{{ '/access' | absolute_url }}", "key": 1 }, + { "title": "Blogs and instructions", "href": "{{ '/publications' | absolute_url }}", "key": 2 }, + { "title": "Status", "href": "{{ '/status' | absolute_url }}", "key": 3 }, + { "title": "Events", "href": "{{ '/events' | absolute_url }}", "key": 4 }, + { "title": "Search", "href": "{{ '/search' | absolute_url }}", "key": 5 } ], "cardNav": [ - { "title": "How to get access", "href": "{{ '/access' | relative_url }}", "key": 5 }, - { "title": "Blogs and instructions", "href": "{{ '/publications' | relative_url }}", "key": 6 }, - { "title": "About FiQCI", "href": "{{ '/about' | relative_url }}", "key": 7 } + { "title": "How to get access", "href": "{{ '/access' | absolute_url }}", "key": 0 }, + { "title": "Blogs and instructions", "href": "{{ '/publications' | absolute_url }}", "key": 1 }, + { "title": "About FiQCI", "href": "{{ '/about' | absolute_url }}", "key": 2 } ] } {%- endcapture -%} @@ -28,9 +36,9 @@ "key": "{{ forloop.index }}", "type": "{{ publication.type | default: 'News' }}", "title": "{{ publication.title }}", - "url": "{{ publication.url | relative_url }}", + "url": "{{ publication.url }}", "date": "{{ publication.date | date: '%-d.%-m.%Y' }}", - "teaser": "{{publication.header.teaser | relative_url}}", + "teaser": "{{ publication.header.teaser }}", "filters": { {%- for category in publication.filters %} {%- if category[0] == "Theme" -%} diff --git a/content/store.js b/content/store.js.liquid similarity index 98% rename from content/store.js rename to content/store.js.liquid index b516c5834cb6..eb158d051588 100644 --- a/content/store.js +++ b/content/store.js.liquid @@ -1,4 +1,5 @@ --- +permalink: store.js --- {%- capture blogs -%} diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index eb1339b0d028..82de790b59f7 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -1,6 +1,14 @@ import React from 'react'; export const Footer = () => { + const { + feedbackEmail, + images: { + footerIconsPath, + funderLogosPath + } + } = SITE.constants + return (