From d7dae99529809e5ec99b8aa3c6f4415f51542c57 Mon Sep 17 00:00:00 2001 From: Yves Gatesoupe Date: Fri, 26 Jun 2020 16:23:50 +0200 Subject: [PATCH] changed preprod url and removed /preprod prefix --- .eleventy.js | 2 +- src/_data/site.json | 2 +- src/_includes/partials/components/contact-form.njk | 6 +++--- src/form/contact-form-handler.php | 4 ++-- src/robots.txt | 4 ++-- src/scss/_typography.scss | 12 ++++++------ src/transforms/parse-transform.js | 8 ++++---- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.eleventy.js b/.eleventy.js index e1bc8b8..adb0cf1 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -86,6 +86,6 @@ module.exports = function(config) { output: 'dist' }, passthroughFileCopy: true, - pathPrefix: '/preprod' //TODO remove when prod + // pathPrefix: '/preprod' //TODO remove when prod }; }; diff --git a/src/_data/site.json b/src/_data/site.json index 973c7b1..51f8a5b 100644 --- a/src/_data/site.json +++ b/src/_data/site.json @@ -2,7 +2,7 @@ "showThemeCredit": true, "name": "Astrolabe CAE", "shortDesc": "Site web de la coopérative Astrolabe CAE", - "url": "https://astrolabe.coop/preprod", + "url": "https:/preprod.astrolabe.coop", "authorEmail": "contacte@astrolabe.coop", "authorHandle": "@AstrolabeCae", "authorName": "Astrolabe CAE", diff --git a/src/_includes/partials/components/contact-form.njk b/src/_includes/partials/components/contact-form.njk index 8a577c9..1a7915c 100644 --- a/src/_includes/partials/components/contact-form.njk +++ b/src/_includes/partials/components/contact-form.njk @@ -4,7 +4,7 @@

Nous contacter

-
+
    {#
  1. {{ label("Prénom", "forename") }} @@ -31,9 +31,9 @@ {{ label("Votre message", "message") }} {{ textarea( "message", { required: true, autocapitalize: "sentences", spellcheck: "true" } ) }}
    2. -
  2. + {#
  3. {{ checkboxes("", "field-checkbox-name", [ "Je souhaite être tenu au courant de l’actualité Astrolabe"], { description: "" } ) }} -
    4. + #} {# #} diff --git a/src/form/contact-form-handler.php b/src/form/contact-form-handler.php index 7feba80..512e5eb 100644 --- a/src/form/contact-form-handler.php +++ b/src/form/contact-form-handler.php @@ -1,6 +1,6 @@ diff --git a/src/robots.txt b/src/robots.txt index 873751b..ffa42a5 100644 --- a/src/robots.txt +++ b/src/robots.txt @@ -1,3 +1,3 @@ User-agent: * -Disallow: /preprod/ -Noindex: /preprod/ +Disallow: / +Noindex: / diff --git a/src/scss/_typography.scss b/src/scss/_typography.scss index df5ad91..e8b7f17 100644 --- a/src/scss/_typography.scss +++ b/src/scss/_typography.scss @@ -5,7 +5,7 @@ font-weight: 400; font-display: swap; src: local('Varela Round Regular'), local('VarelaRound-Regular'), - url('/preprod/fonts/varela-round-v12-latin-regular.woff') format('woff'); + url('/fonts/varela-round-v12-latin-regular.woff') format('woff'); } /* varela-regular - latin */ @@ -14,7 +14,7 @@ font-style: normal; font-weight: 400; src: local('Varela'), - url('/preprod/fonts/varela-v10-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('/fonts/varela-v10-latin-regular.woff') format('woff'), /* Modern Browsers */ } /* open-sans-300 - latin */ @@ -23,7 +23,7 @@ font-style: normal; font-weight: 300; src: local('Open Sans Light'), local('OpenSans-Light'), - url('/preprod/fonts/open-sans-v17-latin-300.woff') format('woff'), /* Modern Browsers */ + url('/fonts/open-sans-v17-latin-300.woff') format('woff'), /* Modern Browsers */ } /* open-sans-regular - latin */ @@ -32,7 +32,7 @@ font-style: normal; font-weight: 400; src: local('Open Sans Regular'), local('OpenSans-Regular'), - url('/preprod/fonts/open-sans-v17-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('/fonts/open-sans-v17-latin-regular.woff') format('woff'), /* Modern Browsers */ } /* open-sans-600 - latin */ @font-face { @@ -40,7 +40,7 @@ font-style: normal; font-weight: 600; src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), - url('/preprod/fonts/open-sans-v17-latin-600.woff') format('woff'), /* Modern Browsers */ + url('/fonts/open-sans-v17-latin-600.woff') format('woff'), /* Modern Browsers */ } /* open-sans-700 - latin */ @font-face { @@ -48,7 +48,7 @@ font-style: normal; font-weight: 700; src: local('Open Sans Bold'), local('OpenSans-Bold'), - url('/preprod/fonts/open-sans-v17-latin-700.woff') format('woff'), /* Modern Browsers */ + url('/fonts/open-sans-v17-latin-700.woff') format('woff'), /* Modern Browsers */ } body { diff --git a/src/transforms/parse-transform.js b/src/transforms/parse-transform.js index 3f0f61b..78a2c04 100644 --- a/src/transforms/parse-transform.js +++ b/src/transforms/parse-transform.js @@ -24,10 +24,10 @@ module.exports = function(value, outputPath) { const file = image.getAttribute('src'); // if preprod env TODO remove when prod - if(this.config.pathPrefix.localeCompare('/')) { // pathPrefix is different from '/' - // if(process.env.ELEVENTY_ENV == "preprod") { // not working - image.setAttribute('src', this.config.pathPrefix + file); - } + // if(this.config.pathPrefix.localeCompare('/')) { // pathPrefix is different from '/' + // // if(process.env.ELEVENTY_ENV == "preprod") { // not working + // image.setAttribute('src', this.config.pathPrefix + file); + // } if (file.indexOf('http') < 0) { const dimensions = getSize('src' + file);