fix: switch language stay on the same page

thedaviddias · Jun 10, 2023 · 118b9ac · 118b9ac · vercel · Jun 10, 2023
1 parent 01524b6
commit 118b9ac
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/public/rss/feed.xml b/public/rss/feed.xml
@@ -4,7 +4,7 @@
         <title>The David Dias | Front-End Developer, podcaster &amp; content creator</title>
         <link>https://thedaviddias.dev</link>
         <description>Hey, I'm David Dias! Front-End Developer based in Toronto/Canada. I love talking about code, technology, expatriation and life.</description>
-        <lastBuildDate>Sat, 10 Jun 2023 18:41:32 GMT</lastBuildDate>
+        <lastBuildDate>Sat, 10 Jun 2023 19:02:24 GMT</lastBuildDate>
         <docs>https://validator.w3.org/feed/docs/rss2.html</docs>
         <generator>https://github.com/jpmonette/feed</generator>
         <language>en</language>

diff --git a/public/rss/fr/feed.xml b/public/rss/fr/feed.xml
@@ -4,7 +4,7 @@
         <title>The David Dias | Développeur Front-End, podcasteur &amp; créateur de contenu</title>
         <link>https://thedaviddias.dev</link>
         <description>Salut toi! Je m'appele David Dias. Je suis développeur Front-End, podcasteur, créateur de contenu numérique passioné pour résoudre les problèmes digitaux et humains! J'aime rencontrer de nouvelles personnes, bâtir des communautées et parler de tech, d'expatriation et de web.</description>
-        <lastBuildDate>Sat, 10 Jun 2023 18:41:32 GMT</lastBuildDate>
+        <lastBuildDate>Sat, 10 Jun 2023 19:02:24 GMT</lastBuildDate>
         <docs>https://validator.w3.org/feed/docs/rss2.html</docs>
         <generator>https://github.com/jpmonette/feed</generator>
         <language>fr</language>

diff --git a/src/components/ChangeLanguage/ChangeLanguage.tsx b/src/components/ChangeLanguage/ChangeLanguage.tsx
@@ -1,3 +1,4 @@
+import { useRouter } from 'next/router'
 import useTranslation from 'next-translate/useTranslation'
 
 import { CustomLink } from '@/components/CustomLink'
@@ -11,6 +12,7 @@ const { locales } = i18nConfig
 
 export const ChangeLanguage = () => {
   const { t, lang } = useTranslation('common')
+  const router = useRouter()
 
   const langSwitch = locales.map((lng: string) => {
     if (lng === lang) return null
@@ -25,7 +27,7 @@ export const ChangeLanguage = () => {
         key={lng}
         aria-label={switchLabel}
         className="w-8 h-8 bg-gray-200 rounded-lg dark:bg-gray-600 flex items-center justify-center hover:ring-2 ring-gray-300  transition-all"
-        href="/"
+        href={router.asPath}
         locale={lng}
       >
         {lng === 'en' ? (

diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
@@ -52,8 +52,8 @@ export const Header: React.FC<HeaderProps> = ({ pathname }) => {
                 {t('title')}
               </CustomLink>
             )}
-            <div className="hidden sm:flex" data-testid="desktop-menu">
-              <nav aria-label="Main navigation">
+            <div className="hidden sm:flex sm:gap-x-5" data-testid="desktop-menu">
+              <nav aria-label="Main navigation" className="flex gap-x-8">
                 {MENU_LINKS(t)
                   .filter((item) => item.menu !== false)
                   .map((item) => (
@@ -63,8 +63,8 @@ export const Header: React.FC<HeaderProps> = ({ pathname }) => {
                       aria-current={pathname === item.path ? 'page' : undefined}
                       className={
                         pathname === item.path
-                          ? 'mr-10 font-bold !no-underline'
-                          : 'mr-10 hover:text-black hover:underline dark:hover:text-white'
+                          ? 'font-bold !no-underline p-2'
+                          : 'hover:text-black hover:underline dark:hover:text-white p-2'
                       }
                     >
                       {item.label}