From 686e900d4ec11d086b57f7388fe0a6c0826f593f Mon Sep 17 00:00:00 2001 From: Horacio Gonzalez Date: Fri, 7 May 2021 03:09:27 +0200 Subject: [PATCH] Fixing basePath --- .eleventy.js | 6 +++--- _data/site.js | 5 ++--- _includes/layouts/episodes.11ty.js | 6 +++--- _includes/layouts/home.11ty.js | 5 +++++ _includes/layouts/person.11ty.js | 2 +- _includes/shortcodes/archive.js | 4 ++-- _includes/shortcodes/jumbo.js | 2 ++ _includes/shortcodes/nav.js | 4 ++-- _includes/shortcodes/site-header.js | 2 +- _includes/shortcodes/team.js | 4 ++-- content/episodes.11ty.js | 9 ++++++--- content/guests.11ty.js | 9 ++++++--- content/team.11ty.js | 9 ++++++--- css/home.css | 19 +++++++++++++++++-- img/guests/cecile_freyd-foucault.jpg | Bin 0 -> 16667 bytes img/guests/fanny_demey.jpg | Bin 0 -> 42630 bytes img/guests/francois_beaufort.jpg | Bin 0 -> 53142 bytes img/guests/greg_quinio.jpg | Bin 0 -> 15690 bytes img/guests/greg_quinio.jpg:Zone.Identifier | 0 img/guests/laurent_thiebault.jpg | Bin 0 -> 24731 bytes img/next/card.png | Bin 0 -> 1200713 bytes 21 files changed, 58 insertions(+), 28 deletions(-) create mode 100644 img/guests/cecile_freyd-foucault.jpg create mode 100644 img/guests/fanny_demey.jpg create mode 100644 img/guests/francois_beaufort.jpg create mode 100644 img/guests/greg_quinio.jpg create mode 100644 img/guests/greg_quinio.jpg:Zone.Identifier create mode 100644 img/guests/laurent_thiebault.jpg create mode 100644 img/next/card.png diff --git a/.eleventy.js b/.eleventy.js index 00f87ef..5457bb5 100644 --- a/.eleventy.js +++ b/.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', } - */ + } diff --git a/_data/site.js b/_data/site.js index f50ec1b..5e51921 100644 --- a/_data/site.js +++ b/_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) diff --git a/_includes/layouts/episodes.11ty.js b/_includes/layouts/episodes.11ty.js index 3309915..20ffd93 100644 --- a/_includes/layouts/episodes.11ty.js +++ b/_includes/layouts/episodes.11ty.js @@ -42,7 +42,7 @@ export function render(data) {

${data.subtitle}

- +

Au programme de l'émission

@@ -61,7 +61,7 @@ export function render(data) { ${item.presenters ? `

Présenté par ${item.presenters .map((presenter) =>{ - return `${ + return `${ teamMembers .find((member) => member.key == presenter) ? teamMembers @@ -73,7 +73,7 @@ export function render(data) { ${item.guests ? `

Avec ${item.guests .map((aGuest) =>{ - return `${ + return `${ guestList .find((guest) => guest.key == aGuest) ? guestList diff --git a/_includes/layouts/home.11ty.js b/_includes/layouts/home.11ty.js index e24de3b..a916018 100644 --- a/_includes/layouts/home.11ty.js +++ b/_includes/layouts/home.11ty.js @@ -24,5 +24,10 @@ export var data = { export function render(data) { return ` ${this.jumbo(data)} + +

` } diff --git a/_includes/layouts/person.11ty.js b/_includes/layouts/person.11ty.js index 2a56ac2..8476f26 100644 --- a/_includes/layouts/person.11ty.js +++ b/_includes/layouts/person.11ty.js @@ -24,7 +24,7 @@ export function render(data) { return `
- +
diff --git a/_includes/shortcodes/jumbo.js b/_includes/shortcodes/jumbo.js index 8268ff6..c9187a3 100644 --- a/_includes/shortcodes/jumbo.js +++ b/_includes/shortcodes/jumbo.js @@ -40,12 +40,14 @@ export default (eleventyConfig) => + `; } diff --git a/_includes/shortcodes/nav.js b/_includes/shortcodes/nav.js index 1fb80c5..3a5b29a 100644 --- a/_includes/shortcodes/nav.js +++ b/_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 =>