From dc1b76b20f3af484d79516f130e7586f3a921aaa Mon Sep 17 00:00:00 2001
From: Emil Gulamov <125820963+mearashadowfax@users.noreply.github.com>
Date: Tue, 23 Apr 2024 23:49:47 +0400
Subject: [PATCH] Update logic for loading blog posts in different languages

The changes in this commit involve updates to the logic that drives loading of blog posts. Further changes were made to various components to pass the locale as a prop, which is then used for URL formation in these components.
---
 src/components/ui/LanguagePicker.astro       | 19 +++++++++++--
 src/components/ui/cards/CardBlog.astro       |  5 ++--
 src/components/ui/cards/CardBlogRecent.astro |  7 +++--
 src/content/blog/post-1.md                   | 19 -------------
 src/content/blog/post-2.md                   | 20 --------------
 src/content/blog/post-3.md                   | 19 -------------
 src/pages/blog/[...slug].astro               | 16 +++++++----
 src/pages/blog/index.astro                   | 29 ++++++++++++--------
 src/pages/fr/blog/index.astro                | 21 ++++++++------
 9 files changed, 64 insertions(+), 91 deletions(-)
 delete mode 100644 src/content/blog/post-1.md
 delete mode 100644 src/content/blog/post-2.md
 delete mode 100644 src/content/blog/post-3.md

diff --git a/src/components/ui/LanguagePicker.astro b/src/components/ui/LanguagePicker.astro
index 5325c8f..4696129 100644
--- a/src/components/ui/LanguagePicker.astro
+++ b/src/components/ui/LanguagePicker.astro
@@ -25,10 +25,11 @@ import Icon from "./icons/Icon.astro";
   </button>
 
   <div
-    class="hs-dropdown-menu duration mt-2 hidden rounded-lg bg-neutral-50 p-2 opacity-0 shadow-md transition-[opacity,margin] before:absolute before:-top-4 before:start-0 before:h-4 before:w-full after:absolute after:-bottom-4 after:start-0 after:h-4 after:w-full hs-dropdown-open:opacity-100 dark:divide-neutral-700 dark:border dark:border-neutral-700 dark:bg-neutral-800 !transform-none !top-[98%] !left-[20%] md:!top-[80%] md:!left-[90%]"
+    class="hs-dropdown-menu duration !left-[20%] !top-[98%] mt-2 hidden !transform-none rounded-lg bg-neutral-50 p-2 opacity-0 shadow-md transition-[opacity,margin] before:absolute before:-top-4 before:start-0 before:h-4 before:w-full after:absolute after:-bottom-4 after:start-0 after:h-4 after:w-full hs-dropdown-open:opacity-100 dark:divide-neutral-700 dark:border dark:border-neutral-700 dark:bg-neutral-800 md:!left-[90%] md:!top-[80%]"
     aria-labelledby="hs-dropdown-hover-event"
   >
     {
+      // Map through the list of languages, creating a link for each language
       Object.entries(languages).map(([lang, label]) => (
         <a
           class="flex items-center gap-x-3.5 rounded-lg px-3 py-2 text-sm text-neutral-800 hover:bg-neutral-100 focus:bg-neutral-100 focus:outline-none dark:text-neutral-400 dark:hover:bg-neutral-700 dark:hover:text-neutral-300 dark:focus:bg-neutral-700"
@@ -46,7 +47,9 @@ import Icon from "./icons/Icon.astro";
 <script is:inline src="/scripts/vendor/preline/dropdown/index.js"></script>
 
 <script>
+  // Type alias for supported languages
   type TLanguage = "en" | "fr";
+  // array of supported languages
   const languages: TLanguage[] = ["en", "fr"];
 
   document.addEventListener("DOMContentLoaded", function () {
@@ -68,8 +71,18 @@ import Icon from "./icons/Icon.astro";
 
         if (lang === url.pathname.split("/")[1]) return;
 
-        if (lang !== "en") {
-          pathParts.unshift(lang);
+        if (url.pathname.includes("/post")) {
+          if (url.pathname.includes("en")) {
+            pathParts.unshift(lang);
+            pathParts.splice(2, 0, lang);
+          } else {
+            pathParts.unshift(lang);
+            pathParts.splice(2, 0, "en");
+          }
+        } else {
+          if (lang !== "en") {
+            pathParts.unshift(lang);
+          }
         }
 
         url.pathname = pathParts.join("/");
diff --git a/src/components/ui/cards/CardBlog.astro b/src/components/ui/cards/CardBlog.astro
index 902afd0..3d6439d 100644
--- a/src/components/ui/cards/CardBlog.astro
+++ b/src/components/ui/cards/CardBlog.astro
@@ -5,10 +5,11 @@ import { Image } from "astro:assets";
 import { formatDate } from "@utils/utils";
 import type { CollectionEntry } from "astro:content";
 
-const { blogEntry } = Astro.props;
+const { blogEntry, blogLocale = "" } = Astro.props;
 
 interface Props {
   blogEntry: CollectionEntry<"blog">;
+  blogLocale?: string;
 }
 ---
 
@@ -18,7 +19,7 @@ interface Props {
      which automatically prefetches the linked page to speed up navigation. -->
 <a
   class="group relative block rounded-xl outline-none ring-zinc-500 transition duration-500 focus-visible:ring dark:ring-zinc-200 dark:focus:outline-none"
-  href={`/blog/${blogEntry.slug}/`}
+  href={blogLocale !== "" ? `/${blogLocale}/blog/${blogEntry.slug}/` : `/blog/${blogEntry.slug}/`}
   data-astro-prefetch
 >
   <!-- The container for the blog post's cover image. Uses astro:assets' Image for image source -->
diff --git a/src/components/ui/cards/CardBlogRecent.astro b/src/components/ui/cards/CardBlogRecent.astro
index a935c61..ce6f573 100644
--- a/src/components/ui/cards/CardBlogRecent.astro
+++ b/src/components/ui/cards/CardBlogRecent.astro
@@ -5,10 +5,11 @@ import type { CollectionEntry } from "astro:content";
 import AvatarBlogLarge from "@components/ui/avatars/AvatarBlogLarge.astro";
 import PrimaryCTA from "@components/ui/buttons/PrimaryCTA.astro";
 
-const { blogEntry } = Astro.props;
+const { blogEntry, recentBlogLocale = "" } = Astro.props;
 
 interface Props {
   blogEntry: CollectionEntry<"blog">;
+  recentBlogLocale?: string;
 }
 ---
 
@@ -35,7 +36,7 @@ interface Props {
     >
       <a
         class="outline-none ring-zinc-500 transition duration-300 hover:text-orange-400 focus-visible:ring dark:text-neutral-300 dark:ring-zinc-200 dark:hover:text-neutral-50 dark:focus:outline-none"
-        href={`/blog/${blogEntry.slug}/`}
+        href={recentBlogLocale !== "" ? `/${recentBlogLocale}/blog/${blogEntry.slug}/` : `/blog/${blogEntry.slug}/`}
       >
         {blogEntry.data.description}
       </a>
@@ -56,7 +57,7 @@ interface Props {
     <!-- Read More button which is a link to the blog post detailed page -->
     <div class="mt-5">
       <PrimaryCTA
-        url={`/blog/${blogEntry.slug}/`}
+        url={recentBlogLocale !== "" ? `/${recentBlogLocale}/blog/${blogEntry.slug}/` : `/blog/${blogEntry.slug}/`}
         title="Read More"
         data-astro-prefetch
       />
diff --git a/src/content/blog/post-1.md b/src/content/blog/post-1.md
deleted file mode 100644
index b4c3aaa..0000000
--- a/src/content/blog/post-1.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: "Maximizing Efficiency with ScrewFast's Cutting-Edge Tools"
-description: "Innovating Construction Efficiency with Precision Tools & Support"
-author: "Jacob"
-authorImage: "@/images/blog/jacob.avif"
-authorImageAlt: "Avatar Description"
-pubDate: 2024-02-06
-cardImage: "@/images/blog/post-1.avif"
-cardImageAlt: "Top view mechanical tools arrangement"
-readTime: 4
-tags: ["tools", "construction", "workflow" ]
-contents: [
-        "In today's fast-paced construction industry, efficiency is key to success. At ScrewFast, we understand the importance of optimizing your project workflow to meet deadlines and stay within budget. That's why we're thrilled to introduce our cutting-edge tools designed to empower your projects like never before.",
-        "Our range of hardware tools combines precision engineering with user-centric design, ensuring maximum productivity on every job site. From power drills to advanced fastening solutions, ScrewFast's tools are built to withstand the rigors of construction while streamlining your workflow.",
-        "One of our standout offerings is our intuitive dashboards, which provide real-time insights into project progress, resource allocation, and more. With user-friendly interfaces, navigating and overseeing your projects has never been easier.",
-        "But efficiency isn't just about the tools you use—it's also about the support you receive. That's why ScrewFast offers comprehensive documentation and expert guidance every step of the way. Our dedicated teams are committed to your success, providing personalized assistance to ensure you get the most out of our products.",
-        "Join the countless industry leaders who have already experienced the difference ScrewFast tools can make. With our cutting-edge solutions, you can fast-track your projects to success and stay ahead of the competition."
-]
----
diff --git a/src/content/blog/post-2.md b/src/content/blog/post-2.md
deleted file mode 100644
index 17d80ce..0000000
--- a/src/content/blog/post-2.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-title: "Enhancing Safety and Workmanship with ScrewFast Construction Services"
-description: "Quality construction services for lasting results"
-author: "Brad"
-authorImage: "@/images/blog/brad.avif"
-authorImageAlt: "Avatar Description"
-pubDate: 2024-02-10
-cardImage: "@/images/blog/post-2.avif"
-cardImageAlt: "Man in black sweatpants using DEWALT circular saw and cutting a wood plank"
-readTime: 5
-tags: ["safety", "craftsmanship", "management" ]
-contents: [
-        "When it comes to construction, safety and quality workmanship are non-negotiable. At ScrewFast, we're proud to offer a range of construction services that prioritize both, ensuring your projects are built to last.",
-        "Our team of skilled craftsmen brings precision and expertise to every job, from minor installations to large-scale structural work. With top-quality tools and materials from our extensive inventory, we guarantee the highest standards of safety and craftsmanship on every project.",
-        "But our commitment to excellence doesn't end there. We also provide thorough project management services to keep your build on track and within budget. From workflow coordination to stakeholder communication, ScrewFast handles the complexities so you can focus on your vision.",
-        "What sets ScrewFast apart is our dedication to ongoing support. We don't just finish the job and walk away—we're here for the long haul. Our maintenance services ensure that your construction remains in optimal condition, providing peace of mind for years to come.",
-        "For larger enterprise clients, we offer custom solutions tailored to your unique challenges. By understanding your specific needs, we engineer strategies aimed at maximizing efficiency and driving your business forward.",
-        "With ScrewFast construction services, you can trust that your projects are in good hands. Experience the difference today and see why so many clients choose ScrewFast for their construction needs."
-]
----
diff --git a/src/content/blog/post-3.md b/src/content/blog/post-3.md
deleted file mode 100644
index 7f6add0..0000000
--- a/src/content/blog/post-3.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: "Simplify Procurement and Stay Within Budget with ScrewFast"
-description: "Affordable, durable tools for efficient construction projects"
-author: "Olga Zabegina"
-role: "Strategic Marketing Manager"
-authorImage: "@/images/blog/anna.avif"
-authorImageAlt: "Avatar Description"
-pubDate: 2024-02-18
-cardImage: "@/images/blog/post-3.avif"
-cardImageAlt: "Side view worker wearing gloves"
-readTime: 3
-tags: ["procurement", "affordable", "efficiency" ]
-contents: [
-        "Managing a construction project can be overwhelming, especially when it comes to procurement. That's why ScrewFast is committed to simplifying the process and keeping your projects within budget.",
-        "With our line of affordable tools and equipment, you can find everything you need without breaking the bank. Our user-centric design ensures that our products are easy to use, saving you time and frustration on the job site.",
-        "But affordability doesn't mean sacrificing quality. ScrewFast products are built to last, providing reliable performance and durability when you need it most. And with our comprehensive documentation and tutorials, you can integrate our products seamlessly into your workflow, maximizing efficiency and productivity.",
-        "Whether you're a DIY enthusiast or a seasoned contractor, ScrewFast has the solutions you need to succeed. Experience the difference for yourself and see why ScrewFast is the trusted choice for hardware and construction needs."
-]
----
diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro
index d8ccc24..d84ea5f 100644
--- a/src/pages/blog/[...slug].astro
+++ b/src/pages/blog/[...slug].astro
@@ -14,7 +14,9 @@ import { SITE } from "@data/constants";
 
 // getStaticPaths is used to pre-render all routes based on the blog posts
 export async function getStaticPaths() {
-  const blogPosts = await getCollection("blog");
+  const blogPosts = await getCollection("blog", ({ id }) => {
+    return id.startsWith("en/");
+  });
   return blogPosts.map((post) => ({
     params: { slug: post.slug },
     props: { post },
@@ -24,7 +26,12 @@ export async function getStaticPaths() {
 const { post } = Astro.props;
 
 // Get all blog posts
-const blogPosts: CollectionEntry<"blog">[] = await getCollection("blog");
+const blogPosts: CollectionEntry<"blog">[] = await getCollection(
+  "blog",
+  ({ id }) => {
+    return id.startsWith("en/");
+  }
+);
 
 // Filter out the current post to get related posts
 // Note: This is a very basic way of choosing related posts, just for the purpose of the example.
@@ -35,12 +42,9 @@ const relatedPosts: CollectionEntry<"blog">[] = blogPosts.filter(
 );
 
 const pageTitle: string = `${post.data.title} | ${SITE.title}`;
-
 ---
 
-<MainLayout
-  title={pageTitle}
->
+<MainLayout title={pageTitle}>
   <section class="mx-auto max-w-3xl px-4 pb-12 pt-6 sm:px-6 lg:px-8 lg:pt-10">
     <div class="max-w-2xl">
       <div class="mb-6 flex items-center justify-between">
diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro
index 2f051e8..c41e0f0 100644
--- a/src/pages/blog/index.astro
+++ b/src/pages/blog/index.astro
@@ -8,10 +8,15 @@ import { getCollection } from "astro:content";
 import type { CollectionEntry } from "astro:content";
 import { SITE } from "@data/constants";
 
-// Get all blogs post and sort them based on publish date
-const blogPosts: CollectionEntry<"blog">[] = (await getCollection("blog")).sort(
+// Get all blogs post in English and sort them based on publish date
+
+const englishBlogEntries = await getCollection("blog", ({ id }) => {
+  return id.startsWith("en/");
+});
+
+const blogPosts: CollectionEntry<"blog">[] = englishBlogEntries.sort(
   (a: CollectionEntry<"blog">, b: CollectionEntry<"blog">) =>
-    b.data.pubDate.valueOf() - a.data.pubDate.valueOf(),
+    b.data.pubDate.valueOf() - a.data.pubDate.valueOf()
 );
 // Get all insights posts
 const insightPosts: CollectionEntry<"insights">[] =
@@ -38,16 +43,18 @@ const pageTitle: string = `Blog | ${SITE.title}`;
     "@context": "https://schema.org",
     "@type": "WebPage",
     "@id": "https://screwfast.uk/blog",
-    "url": "https://screwfast.uk/blog",
-    "name": "Blog | ScrewFast",
-    "description": "Stay up-to-date with the latest trends and developments in the construction industry with insights from ScrewFast's team of industry experts.",
-    "isPartOf": {
+    url: "https://screwfast.uk/blog",
+    name: "Blog | ScrewFast",
+    description:
+      "Stay up-to-date with the latest trends and developments in the construction industry with insights from ScrewFast's team of industry experts.",
+    isPartOf: {
       "@type": "WebSite",
-      "url": "https://screwfast.uk",
-      "name": "ScrewFast",
-      "description": "ScrewFast offers top-tier hardware tools and expert construction services to meet all your project needs."
+      url: "https://screwfast.uk",
+      name: "ScrewFast",
+      description:
+        "ScrewFast offers top-tier hardware tools and expert construction services to meet all your project needs.",
     },
-    "inLanguage": "en-US"
+    inLanguage: "en-US",
   }}
 >
   <section
diff --git a/src/pages/fr/blog/index.astro b/src/pages/fr/blog/index.astro
index 2f051e8..8f0ec21 100644
--- a/src/pages/fr/blog/index.astro
+++ b/src/pages/fr/blog/index.astro
@@ -8,8 +8,13 @@ import { getCollection } from "astro:content";
 import type { CollectionEntry } from "astro:content";
 import { SITE } from "@data/constants";
 
-// Get all blogs post and sort them based on publish date
-const blogPosts: CollectionEntry<"blog">[] = (await getCollection("blog")).sort(
+// Get all blogs post in French and sort them based on publish date
+
+const frenchBlogEntries = await getCollection("blog", ({ id }) => {
+  return id.startsWith("fr/");
+});
+
+const blogPosts: CollectionEntry<"blog">[] = frenchBlogEntries.sort(
   (a: CollectionEntry<"blog">, b: CollectionEntry<"blog">) =>
     b.data.pubDate.valueOf() - a.data.pubDate.valueOf(),
 );
@@ -22,12 +27,12 @@ const mostRecentPost: CollectionEntry<"blog"> = blogPosts[0];
 const otherPosts: CollectionEntry<"blog">[] = blogPosts.slice(1);
 
 // Define variables for page content
-const title: string = "Your Gateway to Construction Excellence";
+const title: string = "Votre Passerelle vers l'Excellence en Construction";
 const subTitle: string =
-  "Explore the latest news, tips, and insights from ScrewFast to enhance your construction projects. From product spotlights to project management strategies, our blog is your go-to resource for all things hardware and construction.";
+  "Explorez les dernières actualités, astuces et analyses de ScrewFast pour améliorer vos projets de construction. Des mises en avant de produits aux stratégies de gestion de projet, notre blog est votre ressource incontournable pour tout ce qui concerne les outils et la construction.";
 const secondTitle: string = "Insights";
 const secondSubTitle: string =
-  "Stay up-to-date with the latest trends and developments in the construction industry with insights from ScrewFast's team of industry experts. ";
+  "Restez à jour avec les dernières tendances et évolutions de l'industrie de la construction grâce aux analyses de l'équipe d'experts de ScrewFast.";
 
 const pageTitle: string = `Blog | ${SITE.title}`;
 ---
@@ -47,7 +52,7 @@ const pageTitle: string = `Blog | ${SITE.title}`;
       "name": "ScrewFast",
       "description": "ScrewFast offers top-tier hardware tools and expert construction services to meet all your project needs."
     },
-    "inLanguage": "en-US"
+    "inLanguage": "fr"
   }}
 >
   <section
@@ -74,14 +79,14 @@ const pageTitle: string = `Blog | ${SITE.title}`;
   >
     <!--Blog posts grid-->
     <div class="grid gap-6 lg:grid-cols-2">
-      {otherPosts.map((blogEntry) => <CardBlog blogEntry={blogEntry} />)}
+      {otherPosts.map((blogEntry) => <CardBlog blogEntry={blogEntry} blogLocale="fr"/>)}
     </div>
   </section>
   <!--Most recent blog post-->
   <section
     class="mx-auto max-w-[85rem] px-4 py-10 sm:px-6 lg:px-8 lg:py-14 2xl:max-w-full"
   >
-    <CardBlogRecent blogEntry={mostRecentPost} />
+    <CardBlogRecent blogEntry={mostRecentPost} recentBlogLocale="fr" />
   </section>
   <!--Insights section-->
   <section