From 0a39df1fba9a83d52cb2e469c2b15eda1c0be2d2 Mon Sep 17 00:00:00 2001
From: peter_rabbit <pierrejarriges@gmail.com>
Date: Tue, 2 Feb 2021 15:54:27 +0100
Subject: [PATCH] try fix og:image
---
build.js | 12 ++++--------
config.js | 2 +-
public/education/education.js | 2 +-
public/education/index.html | 15 ++++++++-------
public/games/games.js | 2 +-
public/games/index.html | 15 ++++++++-------
public/index.html | 14 +++++++-------
public/main.js | 2 +-
public/software-development/index.html | 15 ++++++++-------
.../software-development/software-development.js | 2 +-
src/pages/education/meta.json | 4 ++--
src/pages/games/meta.json | 4 ++--
src/pages/software-development/meta.json | 4 ++--
13 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/build.js b/build.js
index a675f9f..6f230d7 100644
--- a/build.js
+++ b/build.js
@@ -76,7 +76,7 @@ function getPageHtml(pageName, pageMeta) {
{ key: "description", defaultValue: pageMeta.description },
{
key: "image",
- defaultValue: getDefaultOgMetaContent("image"),
+ defaultValue: pageMeta.image || getDefaultOgMetaContent("image"),
},
{
key: "url",
@@ -99,9 +99,7 @@ function getPageHtml(pageName, pageMeta) {
const { key, defaultValue } = entry;
html = html.replace(
html.match(getOgMetaSearchRegex(key)),
- `<meta property="og:${key}" content="${
- pageOgMeta[key] || defaultValue
- }" name="${key}"/>`
+ `<meta property="og:${key}" content="${pageOgMeta[key] || defaultValue}"/>`
);
});
@@ -113,15 +111,13 @@ function getPageHtml(pageName, pageMeta) {
html = html.replace(
"</head>",
`${additionalOgMeta
- .map(
- k =>
- `<meta property="og:${k}" content="${pageMeta.open_graph[k]}" name="${k}"/>`
- )
+ .map(k => `<meta property="og:${k}" content="${pageMeta.open_graph[k]}"/>`)
.join("\n")}</head>`
);
}
};
setMeta("description", pageMeta.description);
+ pageMeta.image && setMeta("image", pageMeta.image);
setTitle();
setStyleSheet();
setJs();
diff --git a/config.js b/config.js
index 30b3683..763d9d7 100644
--- a/config.js
+++ b/config.js
@@ -9,6 +9,6 @@ module.exports = {
website_title: "Kuadrado website template",
build: {
protected_dirs: ["assets", "style", "articles"],
- default_meta_keys: ["title", "description", "open_graph"],
+ default_meta_keys: ["title", "description", "image", "open_graph"],
},
};
diff --git a/public/education/education.js b/public/education/education.js
index 49c9160..96d9723 100644
--- a/public/education/education.js
+++ b/public/education/education.js
@@ -10,7 +10,7 @@ module.exports = {
website_title: "Kuadrado website template",
build: {
protected_dirs: ["assets", "style", "articles"],
- default_meta_keys: ["title", "description", "open_graph"],
+ default_meta_keys: ["title", "description", "image", "open_graph"],
},
};
diff --git a/public/education/index.html b/public/education/index.html
index f90ca61..9683037 100644
--- a/public/education/index.html
+++ b/public/education/index.html
@@ -4,15 +4,16 @@
<meta charset="utf-8" />
<title>Kuadrado Software | Pédagogie</title>
<meta name="description" content="Animations autour de la création de jeux vidéos, vulgarisation numérique. Découvrez nos initiatives pédagogiques."/>
- <meta name="author" content="Kuadrado Software">
+ <meta name="author" content="Kuadrado Software" />
+ <meta name="image" content="https://kuadrado-software.fr/assets/images/brain.svg"/>
<!-- Open Graph Protocol meta data -->
- <meta property="og:title" content="Kuadrado Software | Pédagogie" name="title"/>
- <meta property="og:description" content="Animations autour de la création de jeux vidéos, vulgarisation numérique. Découvrez nos initiatives pédagogiques." name="description"/>
- <meta property="og:type" content="website" name="type"/>
- <meta property="og:url" content="https://kuadrado-software.fr name=url/education" name="url"/>
- <meta property="og:image" content="https://kuadrado-software.fr/assets/images/brain.svg" name="image"/>
- <meta property="og:locale" content="fr_FR name=locale" name="locale"/>
+ <meta property="og:title" content="Kuadrado Software | Pédagogie"/>
+ <meta property="og:description" content="Animations autour de la création de jeux vidéos, vulgarisation numérique. Découvrez nos initiatives pédagogiques."/>
+ <meta property="og:type" content="website" />
+ <meta property="og:url" content="https://kuadrado-software.fr/education"/>
+ <meta property="og:image" content="https://kuadrado-software.fr/assets/images/brain.svg"/>
+ <meta property="og:locale" content="fr_FR"/>
<!-- English translation not ready yet -->
<!-- <meta property="og:locale:alternate" content="en_GB" /> -->
diff --git a/public/games/games.js b/public/games/games.js
index e516a66..04696c3 100644
--- a/public/games/games.js
+++ b/public/games/games.js
@@ -10,7 +10,7 @@ module.exports = {
website_title: "Kuadrado website template",
build: {
protected_dirs: ["assets", "style", "articles"],
- default_meta_keys: ["title", "description", "open_graph"],
+ default_meta_keys: ["title", "description", "image", "open_graph"],
},
};
diff --git a/public/games/index.html b/public/games/index.html
index fa540ca..f31754e 100644
--- a/public/games/index.html
+++ b/public/games/index.html
@@ -4,15 +4,16 @@
<meta charset="utf-8" />
<title>Kuadrado Software | Jeux</title>
<meta name="description" content="Création de jeux vidéos indépendants. Jeux web, PC et projets en cours de développement"/>
- <meta name="author" content="Kuadrado Software">
+ <meta name="author" content="Kuadrado Software" />
+ <meta name="image" content="https://kuadrado-software.fr/assets/images/game_controller.svg"/>
<!-- Open Graph Protocol meta data -->
- <meta property="og:title" content="Kuadrado Software | Jeux" name="title"/>
- <meta property="og:description" content="Création de jeux vidéos indépendants. Jeux web, PC et projets en cours de développement" name="description"/>
- <meta property="og:type" content="website" name="type"/>
- <meta property="og:url" content="https://kuadrado-software.fr name=url/games" name="url"/>
- <meta property="og:image" content="https://kuadrado-software.fr/assets/images/game_controller.svg" name="image"/>
- <meta property="og:locale" content="fr_FR name=locale" name="locale"/>
+ <meta property="og:title" content="Kuadrado Software | Jeux"/>
+ <meta property="og:description" content="Création de jeux vidéos indépendants. Jeux web, PC et projets en cours de développement"/>
+ <meta property="og:type" content="website" />
+ <meta property="og:url" content="https://kuadrado-software.fr/games"/>
+ <meta property="og:image" content="https://kuadrado-software.fr/assets/images/game_controller.svg"/>
+ <meta property="og:locale" content="fr_FR"/>
<!-- English translation not ready yet -->
<!-- <meta property="og:locale:alternate" content="en_GB" /> -->
diff --git a/public/index.html b/public/index.html
index 601323f..539cb3c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,23 +7,23 @@
name="description"
content="Créations numériques, jeux vidéos, web, software et pédagogie. Made in Ardèche, Vernoux en Vivarais."
/>
- <meta name="author" content="Kuadrado Software">
+ <meta name="author" content="Kuadrado Software" />
+ <meta name="image" content="https://kuadrado-software.fr/assets/images/logo_kuadrado.svg"/>
<!-- Open Graph Protocol meta data -->
- <meta property="og:title" content="Kuadrado Software" name="title"/>
+ <meta property="og:title" content="Kuadrado Software" />
<meta
property="og:description"
content="Créations numériques, jeu vidéo, web, software et pédagogie. Made in Ardèche, Vernoux en Vivarais."
- name="description"
/>
- <meta property="og:type" content="website" name="type"/>
- <meta property="og:url" content="https://kuadrado-software.fr" name="url"/>
+ <meta property="og:type" content="website" />
+ <meta property="og:url" content="https://kuadrado-software.fr" />
<meta
property="og:image"
content="https://kuadrado-software.fr/assets/images/logo_kuadrado.svg"
- name="image"
/>
- <meta property="og:locale" content="fr_FR" name="locale"/>
+ <meta property="og:locale" content="fr_FR" />
+ <meta property="og:site_name" content="Kuadrado Software"/>
<!-- English translation not ready yet -->
<!-- <meta property="og:locale:alternate" content="en_GB" /> -->
diff --git a/public/main.js b/public/main.js
index 4438268..b9f7aa1 100644
--- a/public/main.js
+++ b/public/main.js
@@ -10,7 +10,7 @@ module.exports = {
website_title: "Kuadrado website template",
build: {
protected_dirs: ["assets", "style", "articles"],
- default_meta_keys: ["title", "description", "open_graph"],
+ default_meta_keys: ["title", "description", "image", "open_graph"],
},
};
diff --git a/public/software-development/index.html b/public/software-development/index.html
index d9b2a6b..26bea0e 100644
--- a/public/software-development/index.html
+++ b/public/software-development/index.html
@@ -4,15 +4,16 @@
<meta charset="utf-8" />
<title>Kuadrado Software | Software</title>
<meta name="description" content="Développement web, moteur de jeux, outillage logiciel, retrouvez nos projets en détail."/>
- <meta name="author" content="Kuadrado Software">
+ <meta name="author" content="Kuadrado Software" />
+ <meta name="image" content="https://kuadrado-software.fr/assets/images/meca_proc.svg"/>
<!-- Open Graph Protocol meta data -->
- <meta property="og:title" content="Kuadrado Software | Software" name="title"/>
- <meta property="og:description" content="Développement web, moteur de jeux, outillage logiciel, retrouvez nos projets en détail." name="description"/>
- <meta property="og:type" content="website" name="type"/>
- <meta property="og:url" content="https://kuadrado-software.fr name=url/software-development" name="url"/>
- <meta property="og:image" content="https://kuadrado-software.fr/assets/images/meca_proc.svg" name="image"/>
- <meta property="og:locale" content="fr_FR name=locale" name="locale"/>
+ <meta property="og:title" content="Kuadrado Software | Software"/>
+ <meta property="og:description" content="Développement web, moteur de jeux, outillage logiciel, retrouvez nos projets en détail."/>
+ <meta property="og:type" content="website" />
+ <meta property="og:url" content="https://kuadrado-software.fr/software-development"/>
+ <meta property="og:image" content="https://kuadrado-software.fr/assets/images/meca_proc.svg"/>
+ <meta property="og:locale" content="fr_FR"/>
<!-- English translation not ready yet -->
<!-- <meta property="og:locale:alternate" content="en_GB" /> -->
diff --git a/public/software-development/software-development.js b/public/software-development/software-development.js
index 3e2d647..d6dbbd5 100644
--- a/public/software-development/software-development.js
+++ b/public/software-development/software-development.js
@@ -10,7 +10,7 @@ module.exports = {
website_title: "Kuadrado website template",
build: {
protected_dirs: ["assets", "style", "articles"],
- default_meta_keys: ["title", "description", "open_graph"],
+ default_meta_keys: ["title", "description", "image", "open_graph"],
},
};
diff --git a/src/pages/education/meta.json b/src/pages/education/meta.json
index 3e1fe1f..40f2d53 100644
--- a/src/pages/education/meta.json
+++ b/src/pages/education/meta.json
@@ -1,9 +1,9 @@
{
"title": "Kuadrado Software | Pédagogie",
"description": "Animations autour de la création de jeux vidéos, vulgarisation numérique. Découvrez nos initiatives pédagogiques.",
+ "image": "https://kuadrado-software.fr/assets/images/brain.svg",
"open_graph": {
"title": "Kuadrado Software | Pédagogie",
- "description": "Animations autour de la création de jeux vidéos, vulgarisation numérique. Découvrez nos initiatives pédagogiques.",
- "image": "https://kuadrado-software.fr/assets/images/brain.svg"
+ "description": "Animations autour de la création de jeux vidéos, vulgarisation numérique. Découvrez nos initiatives pédagogiques."
}
}
diff --git a/src/pages/games/meta.json b/src/pages/games/meta.json
index 5651a6f..af8da3c 100644
--- a/src/pages/games/meta.json
+++ b/src/pages/games/meta.json
@@ -1,9 +1,9 @@
{
"title": "Kuadrado Software | Jeux",
"description": "Création de jeux vidéos indépendants. Jeux web, PC et projets en cours de développement",
+ "image": "https://kuadrado-software.fr/assets/images/game_controller.svg",
"open_graph": {
"title": "Kuadrado Software | Jeux",
- "description": "Création de jeux vidéos indépendants. Jeux web, PC et projets en cours de développement",
- "image": "https://kuadrado-software.fr/assets/images/game_controller.svg"
+ "description": "Création de jeux vidéos indépendants. Jeux web, PC et projets en cours de développement"
}
}
diff --git a/src/pages/software-development/meta.json b/src/pages/software-development/meta.json
index 12ff687..356be30 100644
--- a/src/pages/software-development/meta.json
+++ b/src/pages/software-development/meta.json
@@ -1,9 +1,9 @@
{
"title": "Kuadrado Software | Software",
"description": "Développement web, moteur de jeux, outillage logiciel, retrouvez nos projets en détail.",
+ "image": "https://kuadrado-software.fr/assets/images/meca_proc.svg",
"open_graph": {
"title": "Kuadrado Software | Software",
- "description": "Développement web, moteur de jeux, outillage logiciel, retrouvez nos projets en détail.",
- "image": "https://kuadrado-software.fr/assets/images/meca_proc.svg"
+ "description": "Développement web, moteur de jeux, outillage logiciel, retrouvez nos projets en détail."
}
}
--
GitLab