diff --git a/components/blog/BlogListModelByYear.vue b/components/blog/BlogListModelByYear.vue
index c88d2d3c78..7d4efffc98 100644
--- a/components/blog/BlogListModelByYear.vue
+++ b/components/blog/BlogListModelByYear.vue
@@ -6,7 +6,6 @@
class="no-underline"
:to="{
path: `/blog/${inThatYear[0]}`,
- query: { q: q ? q : undefined },
}"
>
<h2 class="my-4 font-serif text-2xl italic">{{ inThatYear[0] }}</h2>
@@ -76,7 +75,6 @@
}
export interface Props {
contents: INuxtContentResult[]
- q: string
showYear: boolean
}
export default Vue.extend<Data, Methods, Computed, Props>({
@@ -86,10 +84,6 @@
type: Array,
default: () => [],
},
- q: {
- type: String,
- default: '',
- },
showYear: {
type: Boolean,
default: true,
diff --git a/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-2.md b/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-2.md
deleted file mode 100644
index 4dcf809b68..0000000000
--- a/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-2.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: Installer VMWare sur Ubuntu server avec le repositoire de Canonical
-locale: fr-CA
-redirect: installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical
-status: publish
-revising: false
-categories: []
-tags: []
-excerpt: ''
----
-
-<NuxtLink to="/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical">Cet article date de 2006, il avait été écrit avec un navigateur maintenant mort appelé Flock, qui permettait d'écrire des billets de blogue. Il semble qu'il y ait crée 5 articles avec le même contenu. Allez consulter l’article.</NuxtLink>
-
-<!--
-https://web.archive.org/web/20060916043739/http://www.flock.com/
-https://web.archive.org/web/20071109134548/http://www.flock.com/blogged-with-flock
--->
diff --git a/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-3.md b/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-3.md
deleted file mode 100644
index 4dcf809b68..0000000000
--- a/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-3.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: Installer VMWare sur Ubuntu server avec le repositoire de Canonical
-locale: fr-CA
-redirect: installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical
-status: publish
-revising: false
-categories: []
-tags: []
-excerpt: ''
----
-
-<NuxtLink to="/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical">Cet article date de 2006, il avait été écrit avec un navigateur maintenant mort appelé Flock, qui permettait d'écrire des billets de blogue. Il semble qu'il y ait crée 5 articles avec le même contenu. Allez consulter l’article.</NuxtLink>
-
-<!--
-https://web.archive.org/web/20060916043739/http://www.flock.com/
-https://web.archive.org/web/20071109134548/http://www.flock.com/blogged-with-flock
--->
diff --git a/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-4.md b/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-4.md
deleted file mode 100644
index 4dcf809b68..0000000000
--- a/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-4.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: Installer VMWare sur Ubuntu server avec le repositoire de Canonical
-locale: fr-CA
-redirect: installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical
-status: publish
-revising: false
-categories: []
-tags: []
-excerpt: ''
----
-
-<NuxtLink to="/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical">Cet article date de 2006, il avait été écrit avec un navigateur maintenant mort appelé Flock, qui permettait d'écrire des billets de blogue. Il semble qu'il y ait crée 5 articles avec le même contenu. Allez consulter l’article.</NuxtLink>
-
-<!--
-https://web.archive.org/web/20060916043739/http://www.flock.com/
-https://web.archive.org/web/20071109134548/http://www.flock.com/blogged-with-flock
--->
diff --git a/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-5.md b/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-5.md
deleted file mode 100644
index 4dcf809b68..0000000000
--- a/content/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-5.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: Installer VMWare sur Ubuntu server avec le repositoire de Canonical
-locale: fr-CA
-redirect: installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical
-status: publish
-revising: false
-categories: []
-tags: []
-excerpt: ''
----
-
-<NuxtLink to="/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical">Cet article date de 2006, il avait été écrit avec un navigateur maintenant mort appelé Flock, qui permettait d'écrire des billets de blogue. Il semble qu'il y ait crée 5 articles avec le même contenu. Allez consulter l’article.</NuxtLink>
-
-<!--
-https://web.archive.org/web/20060916043739/http://www.flock.com/
-https://web.archive.org/web/20071109134548/http://www.flock.com/blogged-with-flock
--->
diff --git a/content/blog/2007/08/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-10.md b/content/blog/2007/08/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-10.md
deleted file mode 100644
index c4b2f0a746..0000000000
--- a/content/blog/2007/08/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical-10.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Installer VMWare sur Ubuntu version Server
-locale: fr-CA
-redirect: /blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical
-status: publish
----
-
-
-<NuxtLink to="/blog/2006/12/installer-vmware-sur-ubuntu-server-avec-le-repositoire-de-canonical">Moved</NuxtLink>
\ No newline at end of file
diff --git a/content/blog/2009/08/inexis-net-2004-sur-flickr.md b/content/blog/2009/08/inexis-net-2004-sur-flickr.md
deleted file mode 100644
index 7f5c03a038..0000000000
--- a/content/blog/2009/08/inexis-net-2004-sur-flickr.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Réalisation Du Site Web de ma propre agence, Inexis Solution Web [2004]
-locale: fr-CA
-redirect: realisation-site-web-inexis-solution-web-2004
-status: publish
-revising: false
-categories: []
-tags: []
-excerpt: ''
----
-
-<NuxtLink to="/blog/2009/08/realisation-site-web-inexis-solution-web-2004">Moved</NuxtLink>
diff --git a/content/blog/2009/11/realisation-du-site-et-de-limage-%c2%abbranding%c2%bb-de-beebox-2008.md b/content/blog/2009/11/realisation-du-site-et-de-limage-%c2%abbranding%c2%bb-de-beebox-2008.md
deleted file mode 100644
index 8255ae86a4..0000000000
--- a/content/blog/2009/11/realisation-du-site-et-de-limage-%c2%abbranding%c2%bb-de-beebox-2008.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Réalisation du site et de l’Image «branding» de Beebox [2008]
-locale: fr-CA
-redirect: realisation-du-site-et-de-image-produit-de-beebox
-status: publish
----
-
-<NuxtLink to="/blog/2009/11/realisation-du-site-et-de-image-produit-de-beebox">Déplacé</NuxtLink>
-
diff --git "a/content/blog/2009/11/realisation-du-site-et-de-limage-\302\253branding\302\273-de-beebox-2008.md" "b/content/blog/2009/11/realisation-du-site-et-de-limage-\302\253branding\302\273-de-beebox-2008.md"
deleted file mode 100644
index 8255ae86a4..0000000000
--- "a/content/blog/2009/11/realisation-du-site-et-de-limage-\302\253branding\302\273-de-beebox-2008.md"
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Réalisation du site et de l’Image «branding» de Beebox [2008]
-locale: fr-CA
-redirect: realisation-du-site-et-de-image-produit-de-beebox
-status: publish
----
-
-<NuxtLink to="/blog/2009/11/realisation-du-site-et-de-image-produit-de-beebox">Déplacé</NuxtLink>
-
diff --git a/content/blog/2010/01/le-defi-%c2%abproject52%c2%bb-un-billet-par-semaine-minimum.md b/content/blog/2010/01/le-defi-%c2%abproject52%c2%bb-un-billet-par-semaine-minimum.md
deleted file mode 100644
index 6767bbaa3d..0000000000
--- a/content/blog/2010/01/le-defi-%c2%abproject52%c2%bb-un-billet-par-semaine-minimum.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Le Défi «Project52» un billet par semaine (minimum)
-locale: fr-CA
-redirect: le-defi-project52-un-billet-par-semaine
-status: publish
----
-
-<NuxtLink to="/blog/2010/01/le-defi-project52-un-billet-par-semaine">Déplacé</NuxtLink>
diff --git "a/content/blog/2010/01/le-defi-\302\253project52\302\273-un-billet-par-semaine-minimum.md" "b/content/blog/2010/01/le-defi-\302\253project52\302\273-un-billet-par-semaine-minimum.md"
deleted file mode 100644
index 6767bbaa3d..0000000000
--- "a/content/blog/2010/01/le-defi-\302\253project52\302\273-un-billet-par-semaine-minimum.md"
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Le Défi «Project52» un billet par semaine (minimum)
-locale: fr-CA
-redirect: le-defi-project52-un-billet-par-semaine
-status: publish
----
-
-<NuxtLink to="/blog/2010/01/le-defi-project52-un-billet-par-semaine">Déplacé</NuxtLink>
diff --git a/content/blog/2010/01/le-manifeste-open-cloud-pour-standardiser-linformatique-%c2%abdans-les-nuages%c2%bb.md b/content/blog/2010/01/le-manifeste-open-cloud-pour-standardiser-linformatique-%c2%abdans-les-nuages%c2%bb.md
deleted file mode 100644
index 935239a34e..0000000000
--- a/content/blog/2010/01/le-manifeste-open-cloud-pour-standardiser-linformatique-%c2%abdans-les-nuages%c2%bb.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Le Manifeste "Open Cloud" pour standardiser l'informatique «dans les nuages»
-locale: fr-CA
-redirect: le-manifeste-open-cloud-pour-standardiser-info-nuagique
-status: publish
----
-
-<NuxtLink to="/blog/2010/01/le-manifeste-open-cloud-pour-standardiser-info-nuagique">Déplacé</NuxtLink>
diff --git "a/content/blog/2010/01/le-manifeste-open-cloud-pour-standardiser-linformatique-\302\253dans-les-nuages\302\273.md" "b/content/blog/2010/01/le-manifeste-open-cloud-pour-standardiser-linformatique-\302\253dans-les-nuages\302\273.md"
deleted file mode 100644
index 935239a34e..0000000000
--- "a/content/blog/2010/01/le-manifeste-open-cloud-pour-standardiser-linformatique-\302\253dans-les-nuages\302\273.md"
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Le Manifeste "Open Cloud" pour standardiser l'informatique «dans les nuages»
-locale: fr-CA
-redirect: le-manifeste-open-cloud-pour-standardiser-info-nuagique
-status: publish
----
-
-<NuxtLink to="/blog/2010/01/le-manifeste-open-cloud-pour-standardiser-info-nuagique">Déplacé</NuxtLink>
diff --git a/content/blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence-le-%c2%abclub-echangiste%c2%bb-2009.md b/content/blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence-le-%c2%abclub-echangiste%c2%bb-2009.md
deleted file mode 100644
index 6d8af68c05..0000000000
--- a/content/blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence-le-%c2%abclub-echangiste%c2%bb-2009.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: >-
- Réalisation d'une application d'échange de cadeau avec RED L'agence le «club
- échangiste» [2009]
-locale: fr-CA
-redirect: realisation-dune-application-dechange-de-cadeau-avec-red-lagence
-status: publish
----
-
-<NuxtLink to="/blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence">Déplacé</NuxtLink>
diff --git "a/content/blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence-le-\302\253club-echangiste\302\273-2009.md" "b/content/blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence-le-\302\253club-echangiste\302\273-2009.md"
deleted file mode 100644
index 6d8af68c05..0000000000
--- "a/content/blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence-le-\302\253club-echangiste\302\273-2009.md"
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: >-
- Réalisation d'une application d'échange de cadeau avec RED L'agence le «club
- échangiste» [2009]
-locale: fr-CA
-redirect: realisation-dune-application-dechange-de-cadeau-avec-red-lagence
-status: publish
----
-
-<NuxtLink to="/blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence">Déplacé</NuxtLink>
diff --git a/content/blog/2013/07/i-am-joining-w3c-to-work-on-the-webplatform-project.md b/content/blog/2013/07/i-am-joining-w3c-to-work-on-the-webplatform-project.md
deleted file mode 100644
index ff72d4fb72..0000000000
--- a/content/blog/2013/07/i-am-joining-w3c-to-work-on-the-webplatform-project.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title:
- Managing Email Aliases with ProtonMail and SimpleLogin to sort automatically
- into inbox folders based local part
-locale: en-CA
-redirect: /blog/2013/08/i-am-joining-w3c-to-work-on-the-webplatform-project
-status: publish
----
-
-<NuxtLink to="/blog/2013/08/i-am-joining-w3c-to-work-on-the-webplatform-project">Moved</NuxtLink>
diff --git a/content/blog/2024/03/managing-email-aliases-with-protonmail-and-simplelogin-to-sort-automatically-into-inbox-folders-based-local-part.md b/content/blog/2024/03/managing-email-aliases-with-protonmail-and-simplelogin-to-sort-automatically-into-inbox-folders-based-local-part.md
deleted file mode 100644
index 7c28ad077d..0000000000
--- a/content/blog/2024/03/managing-email-aliases-with-protonmail-and-simplelogin-to-sort-automatically-into-inbox-folders-based-local-part.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title:
- Managing Email Aliases with ProtonMail and SimpleLogin to sort automatically
- into inbox folders based local part
-locale: en-CA
-redirect: managing-email-aliases-with-protonmail-automatic-sorting
-status: publish
----
-
-<NuxtLink to="/blog/2024/03/managing-email-aliases-with-protonmail-automatic-sorting">Moved</NuxtLink>
diff --git a/lib/model/content/model.ts b/lib/model/content/model.ts
index 19229258c6..a216460c26 100644
--- a/lib/model/content/model.ts
+++ b/lib/model/content/model.ts
@@ -136,14 +136,11 @@ export const isNuxtContentResult = (
export const queryNuxtContent = async (
$content: Context['$content'],
- route: Context['route'],
year?: string,
month?: string,
): Promise<INuxtContentResult[]> => {
let contents: INuxtContentResult[] = []
- const { query = {} as Context['route']['query'] } = route
- let { q = '' } = query
- q = typeof q === 'string' ? q : ''
+ let db: INuxtContentInstance
/**
* Bookmarks:
* - https://github.com/techfort/LokiJS/wiki/Query-Examples#find-queries
@@ -155,7 +152,14 @@ export const queryNuxtContent = async (
* - http://localhost:3000/_content/blog?deep=true
* - http://localhost:3000/_content/blog?deep=true&created_defined=asdf
*/
- const db = $content('blog', { deep: true })
+ if (year && month) {
+ db = $content('blog', year, month, { deep: true })
+ } else if (year) {
+ db = $content('blog', year, { deep: true })
+ } else {
+ db = $content('blog', { deep: true })
+ }
+ db = db
.sortBy('createdAt', 'desc')
.only([
'createdAt',
@@ -171,9 +175,6 @@ export const queryNuxtContent = async (
])
contents = await db.fetch()
- contents = contents.filter((a) =>
- findExcludingRedirectPredicate(a as INuxtContentResult),
- )
return contents
}
diff --git a/pages/blog/_year/_month/_slug.vue b/pages/blog/_year/_month/_slug.vue
index 3239534d99..1161703639 100644
--- a/pages/blog/_year/_month/_slug.vue
+++ b/pages/blog/_year/_month/_slug.vue
@@ -72,7 +72,6 @@
class="my-10"
:prev="prev"
:next="next"
- style="display: none"
/>
</div>
</div>
diff --git a/pages/blog/_year/_month/index.vue b/pages/blog/_year/_month/index.vue
index e4aa16867a..ccd0f3d9e2 100644
--- a/pages/blog/_year/_month/index.vue
+++ b/pages/blog/_year/_month/index.vue
@@ -35,12 +35,11 @@
components: {
'blog-list-model-by-year': BlogListModelByYear,
},
- async asyncData({ $content, route, params }) {
+ async asyncData({ $content, params }) {
let contents: INuxtContentIndexResult[] = []
try {
contents = await queryNuxtContent(
$content,
- route,
params.year,
params.month,
)
diff --git a/pages/blog/_year/index.vue b/pages/blog/_year/index.vue
index 9901a3ca05..f3ca79178d 100644
--- a/pages/blog/_year/index.vue
+++ b/pages/blog/_year/index.vue
@@ -35,10 +35,10 @@
components: {
'blog-list-model-by-year': BlogListModelByYear,
},
- async asyncData({ $content, route, params }) {
+ async asyncData({ $content, params }) {
let contents: INuxtContentIndexResult[] = []
try {
- contents = await queryNuxtContent($content, route, params.year)
+ contents = await queryNuxtContent($content, params.year)
} catch (_) {
// ..
}
diff --git a/pages/blog/index.vue b/pages/blog/index.vue
index 65f9c6f98a..b571d29b26 100644
--- a/pages/blog/index.vue
+++ b/pages/blog/index.vue
@@ -43,9 +43,9 @@
components: {
'blog-list-model-by-year': BlogListModelByYear,
},
- async asyncData({ $content, route }) {
+ async asyncData({ $content }) {
let contents: INuxtContentIndexResult[] = []
- contents = await queryNuxtContent($content, route)
+ contents = await queryNuxtContent($content)
return {
contents,
pageTitle: 'Blog',
diff --git a/static/_redirects b/static/_redirects
index 7e21fe9fb4..bd766430b5 100644
--- a/static/_redirects
+++ b/static/_redirects
@@ -62,8 +62,9 @@
/blog/2010/01/le-manifeste-open-cloud-pour-standardiser-linformatique-%c2%abdans-les-nuages%c2%bb/ /blog/2010/01/le-manifeste-open-cloud-pour-standardiser-info-nuagique/ 301
/blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence-le-«club-echangiste»-2009/ /blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence/ 301
/blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence-le-%c2%abclub-echangiste%c2%bb-2009/ /blog/2010/02/realisation-dune-application-dechange-de-cadeau-avec-red-lagence/ 301
-/blog/2024/03/managing-email-aliases-with-protonmail-and-simplelogin-to-sort-automatically-into-inbox-folders-based-local-part/ /blog/2024/03/managing-email-aliases-with-protonmail-automatic-sorting/ 301
+/blog/2013/07/i-am-joining-w3c-to-work-on-the-webplatform-project/ /blog/2013/08/i-am-joining-w3c-to-work-on-the-webplatform-project/ 301
/blog/2013/07/i-am-joining-w3c-to-work-on-the-webplatform-project-2/ /blog/2013/08/i-am-joining-w3c-to-work-on-the-webplatform-project/ 301
+/blog/2024/03/managing-email-aliases-with-protonmail-and-simplelogin-to-sort-automatically-into-inbox-folders-based-local-part/ /blog/2024/03/managing-email-aliases-with-protonmail-automatic-sorting/ 301
#
# PAGES THAT HAPPENED TO HAVE MANY URLS FOR THE SAME ARTICLE BECAUSE OF FLOCK BROWSER ----------
#