Fix Baseurl to match github pages path.

useiteurope · Jul 13, 2024 · 37e4454 · 37e4454
1 parent 9d7f1ec
commit 37e4454
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 31 deletions.
diff --git a/.github/workflows/jekyll-docker.yml b/.github/workflows/jekyll-docker.yml
@@ -34,7 +34,7 @@ jobs:
       run: |
         docker run \
         -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \
-        jvconseil/jekyll-docker:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future"
+        jvconseil/jekyll-docker:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --baseurl /fund-it-website --future"
     - name: Upload artifact
       # Automatically uploads an artifact from the './_site' directory by default
       uses: actions/upload-pages-artifact@v3

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,7 @@
+{
+    "recommendations": [
+        "ginfuru.ginfuru-vscode-jekyll-syntax",
+        "ginfuru.vscode-jekyll-snippets",
+        "syler.sass-indented"
+    ]
+}
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,5 +1,5 @@
 <footer>
-    {%- if page.url != "/toolkit/" -%}
+    {%- if page.url != "{{site.baseurl}}/toolkit/" -%}
     <div id="footer__call-to-action">
         <svg width="0" height="0">
             <defs>
@@ -14,7 +14,7 @@
         <div class="width--wide">
             <h4>{{ site.data.footer.title }}</h4>
             <p>{{ site.data.footer.body }}</p>
-            <a class="text-link--negative" href="/toolkit">Enjoy the kit !</a>
+            <a class="text-link--negative" href="{{site.baseurl}}/toolkit">Enjoy the kit !</a>
         </div>
     </div>
     {%- endif -%}
@@ -38,7 +38,7 @@ <h4>Pages</h4>
                     {%- if site_page.url != "/" -%}
                     {%- if site_page.title -%}
                     <li><a class="navigation-link page-link {% if page.path == site_page.path %}current{% endif %}"
-                            href="{% if page.path == site_page.path %}#{% else %}{{ site_page.url | relative_url }}{% endif %}">{{
+                            href="{% if page.path == site_page.path %}#{% else %}{{site.baseurl}}{{ site_page.url }}{% endif %}">{{
                             site_page.title | escape }}</a></li>
                     {%- endif -%}
                     {%- endif -%}
@@ -52,7 +52,8 @@ <h4>Follow us</h4>
                     {% for social_network in site.data.social_networks %}
                     <li>
                         <a href="{{social_network.url}}" target="_blank">
-                            <img src="{{social_network.image.url}}" alt="{{ social_network.image.description }}" />
+                            <img src="{{site.baseurl}}{{social_network.image.url}}"
+                                alt="{{ social_network.image.description }}" />
                         </a>
                     </li>
                     {% endfor %}

diff --git a/_includes/header.html b/_includes/header.html
@@ -1,6 +1,6 @@
 <header class="width--wide">
     <div class="logo">
-        <a href="/">{%- picture /assets/global/img/logo_fundit.png --alt 'Logo FundIt' -%}</a>
+        <a href="{{site.baseurl}}/">{%- picture /assets/global/img/logo_fundit.png --alt 'Logo FundIt' -%}</a>
     </div>
 
     <input type="checkbox" id="menu-toggle" class="menu-toggle">
@@ -13,14 +13,14 @@
         {%- if site_page.url != "/" -%}
         {%- if site_page.title -%}
         <li><a class="navigation-link page-link {% if page.path == site_page.path %}current{% endif %}"
-                href="{% if page.path == site_page.path %}#{% else %}{{ site_page.url | relative_url }}{% endif %}">{{
+                href="{% if page.path == site_page.path %}#{% else %}{{site.baseurl}}{{ site_page.url }}{% endif %}">{{
                 site_page.title | escape }}</a></li>
         {%- endif -%}
         {%- endif -%}
         {%- endif -%}
         {%- endfor -%}
         <li><a class="page-link page-link--outlined {% if page.url == '/profile/' %}current{% endif %}"
-                href="/profile">My
+                href="{{site.baseurl}}/profile">My
                 profile</a></li>
     </ul>
 </header>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8">
     <title>{{ page.title }}</title>
-    <link rel="stylesheet" href="/assets/global/css/style.css">
+    <link rel="stylesheet" href="{{site.baseurl}}/assets/global/css/style.css">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     {%- include header.html -%}

diff --git a/_sass/_fonts.sass b/_sass/_fonts.sass
@@ -14,66 +14,66 @@ $font-other: "Roboto", Arial
   font-style: normal
   font-weight: 400
   font-display: swap
-  src: url('/assets/global/fonts/Inter-Regular-LatinExt.woff') format('woff')
+  src: url('{{site.baseurl}}/assets/global/fonts/Inter-Regular-LatinExt.woff') format('woff')
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF
 
 @font-face
   font-family: 'Inter'
   font-style: normal
   font-weight: 400
   font-display: swap
-  src: url('/assets/global/fonts/Inter-Regular-Latin.woff') format('woff')
+  src: url('{{site.baseurl}}/assets/global/fonts/Inter-Regular-Latin.woff') format('woff')
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD
 
 @font-face
   font-family: 'Inter'
   font-style: normal
   font-weight: 500
   font-display: swap
-  src: url('/assets/global/fonts/Inter-Bold-LatinExt.woff') format('woff')
+  src: url('{{site.baseurl}}/assets/global/fonts/Inter-Bold-LatinExt.woff') format('woff')
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF
 
 @font-face
   font-family: 'Inter'
   font-style: normal
   font-weight: 500
   font-display: swap
-  src: url('/assets/global/fonts/Inter-Bold-Latin.woff') format('woff')
+  src: url('{{site.baseurl}}/assets/global/fonts/Inter-Bold-Latin.woff') format('woff')
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD
 
 @font-face
   font-family: 'Inter'
   font-style: normal
   font-weight: 900
   font-display: swap
-  src: url('/assets/global/fonts/Inter-Black-LatinExt.woff') format('woff')
+  src: url('{{site.baseurl}}/assets/global/fonts/Inter-Black-LatinExt.woff') format('woff')
   unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF
 
 @font-face
   font-family: 'Inter'
   font-style: normal
   font-weight: 900
   font-display: swap
-  src: url('/assets/global/fonts/Inter-Black-Latin.woff') format('woff')
+  src: url('{{site.baseurl}}/assets/global/fonts/Inter-Black-Latin.woff') format('woff')
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD
 
 @font-face
   font-family: 'ClashDisplay'
-  src: url('/assets/global/fonts/ClashDisplay-Light.woff') format('woff')
+  src: url('{{site.baseurl}}/assets/global/fonts/ClashDisplay-Light.woff') format('woff')
   font-weight: 300
   font-display: swap
   font-style: normal,
 
 @font-face
   font-family: 'ClashDisplay'
-  src: url('/assets/global/fonts/ClashDisplay-Semibold.woff') format('woff')
+  src: url('{{site.baseurl}}/assets/global/fonts/ClashDisplay-Semibold.woff') format('woff')
   font-weight: 600
   font-display: swap
   font-style: normal,
 
 @font-face
   font-family: 'ClashDisplay'
-  src: url('/assets/global/fonts/ClashDisplay-Bold.woff') format('woff')
+  src: url('{{site.baseurl}}/assets/global/fonts/ClashDisplay-Bold.woff') format('woff')
   font-weight: 700
   font-display: swap
   font-style: normal,
diff --git a/about/index.html b/about/index.html
@@ -23,12 +23,12 @@ <h1>{{ site.data.about.title }}</h1>
 </div>
 
 <script type="module">
-    import PhotoSwipeLightbox from '/assets/global/libs/photoswipe/photoswipe-lightbox.esm.min.js';
+    import PhotoSwipeLightbox from '{{site.baseurl}}/assets/global/libs/photoswipe/photoswipe-lightbox.esm.min.js';
     const lightbox = new PhotoSwipeLightbox({
         gallery: '.gallery',
         children: 'a',
-        pswpModule: () => import('/assets/global/libs/photoswipe/photoswipe.esm.min.js')
+        pswpModule: () => import('{{site.baseurl}}/assets/global/libs/photoswipe/photoswipe.esm.min.js')
     });
     lightbox.init();
 </script>
-<link rel="stylesheet" href="/assets/global/libs/photoswipe/photoswipe.css">
+<link rel="stylesheet" href="{{site.baseurl}}/assets/global/libs/photoswipe/photoswipe.css">
diff --git a/case_studies/index.html b/case_studies/index.html
@@ -28,7 +28,8 @@ <h3>{{ resource.title }}</h3>
                 <div class="layout-one-column">
                     {% picture {{ resource.image.url }} --alt {{ resource.image.description }} --parent
                     class="layout-two-columns__left picture--square"%}
-                    <a href="{{ resource.url }}" target="_blank" class="text-link">{{ resource.action_title }}</a>
+                    <a href="{{site.baseurl}}{{ resource.url }}" target="_blank" class="text-link">{{
+                        resource.action_title }}</a>
                 </div>
             </div>
             {%- endfor -%}

diff --git a/index.html b/index.html
@@ -7,7 +7,7 @@
   <div class="width--wide page__top-content">
     <h1>{{ site.data.home.title }}</h1>
     <p>{{ site.data.home.subtitle }}</p>
-    <a class="text-link" href="/question">Get started !</a>
+    <a class="text-link" href="{{site.baseurl}}/question">Get started !</a>
   </div>
 </section>
 
@@ -46,7 +46,7 @@ <h2>{{ site.data.home.part3.title }}</h2>
       <div class="layout-two-columns__right">
         <p>{{ site.data.home.part3.testimony.title }}</p>
         <div class="caption">{{ site.data.home.part3.testimony.footer }}</div>
-        <a class="text-link" href="/about">Discover more !</a>
+        <a class="text-link" href="{{site.baseurl}}/about">Discover more !</a>
       </div>
     </div>
   </div>

diff --git a/question/do_map.html b/question/do_map.html
@@ -29,6 +29,6 @@ <h2>STEP 2 : Check our map of initiatives to see what our community tried in you
     </section>
 
     <div class="question__domap__actions">
-        <a class="text-link--wide" href="/toolkit">I'll browse alone</a>
+        <a class="text-link--wide" href="{{site.baseurl}}/toolkit">I'll browse alone</a>
     </div>
 </div>
diff --git a/question/index.html b/question/index.html
@@ -32,10 +32,10 @@ <h2>Are you working on a USE-IT map or something else ?</h2>
     }
     document.querySelector("#do_map").addEventListener('change', function () {
         if (!this.checked) return
-        _updateProjectLink('/question/do_map.html')
+        _updateProjectLink('{{site.baseurl}}/question/do_map.html')
     });
     document.querySelector("#other_project").addEventListener('change', function () {
         if (!this.checked) return
-        _updateProjectLink('/question/other_project.html')
+        _updateProjectLink('{{site.baseurl}}/question/other_project.html')
     });
 </script>
diff --git a/question/other_project.html b/question/other_project.html
@@ -55,7 +55,8 @@ <h3>{{ resource.title }}</h3>
                     class="layout-two-columns__left picture--square"%}
                     <div class="layout-two-columns__right">
                         <p>{{ resource.description }}</p>
-                        <a href="{{ resource.url }}" target="_blank" class="text-link">{{ resource.action_title }}</a>
+                        <a href="{{site.baseurl}}{{ resource.url }}" target="_blank" class="text-link">{{
+                            resource.action_title }}</a>
                     </div>
                 </div>
             </div>
@@ -66,6 +67,6 @@ <h3>{{ resource.title }}</h3>
     </section>
 
     <div class="question__domap__actions">
-        <a class="text-link--wide" href="/toolkit">I'll browse alone</a>
+        <a class="text-link--wide" href="{{site.baseurl}}/toolkit">I'll browse alone</a>
     </div>
 </div>
diff --git a/research/index.html b/research/index.html
@@ -31,7 +31,8 @@ <h3>{{ resource.title }}</h3>
                     class="layout-two-columns__left picture--square"%}
                     <div class="layout-two-columns__right">
                         <p>{{ resource.description }}</p>
-                        <a href="{{ resource.url }}" target="_blank" class="text-link">{{ resource.action_title }}</a>
+                        <a href="{{site.baseurl}}{{ resource.url }}" target="_blank" class="text-link">{{
+                            resource.action_title }}</a>
                     </div>
                 </div>
             </div>

diff --git a/toolkit/index.html b/toolkit/index.html
@@ -19,7 +19,8 @@ <h3>{{ resource.title }}</h3>
                     class="layout-two-columns__left picture--square"%}
                     <div class="layout-two-columns__right">
                         <p>{{ resource.description }}</p>
-                        <a href="{{ resource.url }}" target="_blank" class="text-link">{{ resource.action_title }}</a>
+                        <a href="{{site.baseurl}}{{ resource.url }}" target="_blank" class="text-link">{{
+                            resource.action_title }}</a>
                     </div>
                 </div>
             </div>