Fixing basePath

.eleventy.js

@@ -80,7 +80,7 @@ export default function (eleventyConfig) {
   // then you can uncomment this return statement
   // and change the values for one or more of these directories
   // (defaults shown).
-  /*
+  
   return {
     dir: {
       input: '.',
@@ -88,7 +88,7 @@ export default function (eleventyConfig) {
       data: '_data',
       output: '_site'
     },
-    pathPrefix: '/',
+    pathPrefix: '/les-briques-du-web',
   }
-  */
+  
 }

_data/site.js

@@ -17,9 +17,8 @@
  */
 export default {
   // The root for the site domain (without a trailing slash)
-  baseUrl: (process.env.ELEVENTY_ENV == 'production') 
-      ? '/les-briques-du-web/'
-      : '/',
+  baseUrl: 'https://rdv-speakers.fr/les-briques-du-web',
+  pathPrefix: '/les-briques-du-web',
   // Uses this locale when one is not set in content/content.11tydata.js
   defaultLocale: 'fr',
   // Localized strings and other options for Spanish (es)

_includes/layouts/episodes.11ty.js

@@ -42,7 +42,7 @@ export function render(data) {
         <h2>${data.subtitle}</h2>
       </header>
       <div class="card">
-        <img src="${data.site.baseUrl}img/${data.name}/card.png">
+        <img src="${this.url(`/img/${data.name}/card.png`)}">
       </div>
       <div class="chronicles">
         <p>Au programme de l'émission</p>
@@ -61,7 +61,7 @@ export function render(data) {
                   ${item.presenters ? 
                   `<p>Présenté par ${item.presenters
                     .map((presenter) =>{
-                      return `<a href="${data.baseUrl}${l10n.team.url}/${presenter}/">${
+                      return `<a href="${this.url(`/${l10n.team.url}/${presenter}/`)}">${
                         teamMembers
                           .find((member) => member.key == presenter) ?
                         teamMembers
@@ -73,7 +73,7 @@ export function render(data) {
                   ${item.guests ? 
                   `<p>Avec ${item.guests
                     .map((aGuest) =>{
-                      return `<a href="${data.baseUrl}${l10n.guests.url}/${aGuest}/">${
+                      return `<a href="${this.url(`${l10n.guests.url}/${aGuest}/`)}">${
                         guestList
                           .find((guest) => guest.key == aGuest) ?
                         guestList

_includes/layouts/home.11ty.js

@@ -24,5 +24,10 @@ export var data = {
 export function render(data) {
   return `
     ${this.jumbo(data)}
+
+    <div class="nextEpisode">    
+      <h2 >Prochain épisode:</h2>
+      <img class="nextEpisode" src="${this.url(`/img/next/card.png`)}" alt="Prochain épisode" />
+    </div>
   `
 }

_includes/layouts/person.11ty.js

@@ -24,7 +24,7 @@ export function render(data) {
   return `
     <article class="person_details">
       <div class="photo">
-        <img class="team_member" src="${data.site.baseUrl}img/${data.photoURL}">
+        <img class="team_member" src="${this.url(`/img/${data.photoURL}`)}">
       </div>
       <div class="person_data">
         <h1>${data.name}</h1>

_includes/shortcodes/archive.js

@@ -36,7 +36,7 @@ export default eleventyConfig =>
               <time>${this.pageDate(item.data)}</time>
             </div>
             <h2 class="no-margin">
-              <a href="${item.data.page.url}"> 
+              <a href="${this.url(`${item.data.page.url}`)}"> 
                  ${item.data.title}
               </a>
             </h2>
@@ -44,7 +44,7 @@ export default eleventyConfig =>
           </div>
           <div class="filler">          
             <a href="${item.data.page.url}">
-              <img src="${data.site.baseUrl}img/${item.data.name}/card.png">
+              <img src="${this.url(`/img/${item.data.name}/card.png`)}">
             </a>
           </div>
         </div>

_includes/shortcodes/jumbo.js

@@ -40,12 +40,14 @@ export default (eleventyConfig) =>
             </h3>
           </div>
         </div>
+        <!--
         <div class="scroll-down" aria-hidden="true">
           <svg class="icon icon-scroll-down" id="scroll-down" viewBox="0 0 25.166666 37.8704414">
             <path fill="none" stroke="currentColor" stroke-width="2.5" stroke-miterlimit="10" d="M12.5833445 36.6204414h-0.0000229C6.3499947 36.6204414 1.25 31.5204487 1.25 25.2871208V12.5833216C1.25 6.3499947 6.3499951 1.25 12.5833216 1.25h0.0000229c6.2333269 0 11.3333216 5.0999947 11.3333216 11.3333216v12.7037992C23.916666 31.5204487 18.8166714 36.6204414 12.5833445 36.6204414z"></path>
             <path style="animation: scrollDownMove .8s ease-in-out alternate infinite;" fill="currentColor" d="M13.0833359 19.2157116h-0.9192753c-1.0999985 0-1.9999971-0.8999996-1.9999971-1.9999981v-5.428606c0-1.0999994 0.8999987-1.9999981 1.9999971-1.9999981h0.9192753c1.0999985 0 1.9999981 0.8999987 1.9999981 1.9999981v5.428606C15.083334 18.315712 14.1833344 19.2157116 13.0833359 19.2157116z"></path>
           </svg>
         </div>
+        -->
       </div>
       `;
     }

_includes/shortcodes/nav.js

@@ -25,7 +25,7 @@ export default eleventyConfig =>
    * @see {@link https://www.11ty.dev/docs/data/ Using data in 11ty}
    * @see {@link https://www.w3.org/TR/wai-aria/#aria-label WAI-ARIA specification for `aria-label` property}
    */
-  eleventyConfig.addShortcode('nav', (collection, page, classes, ariaLabel) => {
+  eleventyConfig.addShortcode('nav', function(collection, page, classes, ariaLabel) {
     var classList = []
     if (classes !== undefined) {
       if (typeof classes === 'string') {
@@ -42,7 +42,7 @@ export default eleventyConfig =>
           <ul>
             ${collection
               .sort((a, b) => a.data.weight - b.data.weight)
-              .map(item => `<li><a href="${item.data.url ? item.data.url : item.url}" 
+              .map(item => `<li><a href="${this.url(`${item.data.url ? item.data.url : item.url}`)}" 
                 ${page.url === item.url ? 'aria-current="page"' : ''}>${item.data.navTitle
                   ? item.data.navTitle
                   : item.data.title

_includes/shortcodes/site-header.js

@@ -30,7 +30,7 @@ export default eleventyConfig =>
       <div class="top-content">
         <div class="logo">
           <a href="${data.site.baseUrl}">
-            <img src="${data.site.baseUrl}${data.site.logo.url}" alt="logo">
+            <img src="${data.site.pathPrefix}/${data.site.logo.url}" alt="logo">
           </a>
         </div>
 

_includes/shortcodes/team.js

@@ -31,7 +31,7 @@ export default eleventyConfig =>
         <div class="card_content">
           <div class="card_header">
             <h2 class="no-margin">
-              <a href="${data.site.baseUrl}${item.data.tags && item.data.tags.indexOf('guests') >= 0 ? l10n.guests.url : l10n.team.url}/${item.data.key}/">
+              <a href="${this.url(`/${item.data.tags && item.data.tags.indexOf('guests') >= 0 ? l10n.guests.url : l10n.team.url}/${item.data.key}/`)}">
                 ${item.data.name}
               </a>
             </h2>
@@ -43,7 +43,7 @@ export default eleventyConfig =>
           </div>
           <div class="filler">   
             <a href="${data.site.baseUrl}${item.data.tags && item.data.tags.indexOf('guests') >= 0 ? l10n.guests.url : l10n.team.url}/${item.data.key}/"> 
-              <img class="team_member" src="${data.site.baseUrl}img/${item.data.photoURL}">
+              <img class="team_member" src="${this.url(`/img/${item.data.photoURL}`)}">
             </a>
           </div>
           ${item.data.socials ? `  

content/episodes.11ty.js

@@ -22,9 +22,12 @@
     alias: 'posts',
     reverse: true,
   },
-  permalink: data => `${data.site[data.locale].episodesArchive.url }/${data.pagination.pageNumber > 0
-    ? `page-${data.pagination.pageNumber}/` 
-    : ''}index.html`,
+  permalink: function(data) {
+    return this.url(
+      `${data.site[data.locale].episodesArchive.url }/${data.pagination.pageNumber > 0
+      ? `page-${data.pagination.pageNumber}/` 
+      : ''}index.html`);
+  }
 }
 
 /**

content/guests.11ty.js

@@ -22,9 +22,12 @@
     alias: 'member',
     reverse: false,
   },
-  permalink: data => `${data.site[data.locale].guests.url }/${data.pagination.pageNumber > 0
-    ? `page-${data.pagination.pageNumber}/` 
-    : ''}index.html`,
+  permalink: function(data) {
+    return this.url(
+      `${data.site[data.locale].guests.url }/${data.pagination.pageNumber > 0
+      ? `page-${data.pagination.pageNumber}/` 
+      : ''}index.html`);
+  }
 }
 
 /**

content/team.11ty.js

@@ -22,9 +22,12 @@
     alias: 'member',
     reverse: false,
   },
-  permalink: data => `${data.site[data.locale].team.url }/${data.pagination.pageNumber > 0
-    ? `page-${data.pagination.pageNumber}/` 
-    : ''}index.html`,
+  permalink: function(data) {
+    return this.url(
+      `${data.site[data.locale].team.url }/${data.pagination.pageNumber > 0
+      ? `page-${data.pagination.pageNumber}/` 
+      : ''}index.html`);
+  }
 }
 
 /**

css/home.css

@@ -7,7 +7,7 @@
 
 .jumbo {
   position: relative;
-  height: 25em;
+  height: 20em;
   width: 100%;
   display: flex;
   flex-flow: column;
@@ -83,7 +83,7 @@
 }
 
 .jumbo img.jumbo-logo {
-  width: min(350px, 80%);
+  width: min(350px, 60%);
 }
 
 @keyframes scrollDownMove {
@@ -103,4 +103,19 @@
   display: inline-block;
   background-repeat: no-repeat;
   margin-right: var(--space-1);
+}
+
+.nextEpisode {
+  margin-top: 2rem;
+  margin-bottom: 2rem;
+  display: flex;
+  flex-flow: column;
+  align-items: center;
+}
+.nextEpisode h2 {
+  margin-bottom: 2rem;
+}
+.nextEpisode img {
+  max-width: min(90%, 1200px);
+  margin: 0;
 }