From ddeab06b451929ee45cb70709f48982a46acf034 Mon Sep 17 00:00:00 2001
From: poyrazavsever <poyrazavsever@hotmail.com>
Date: Mon, 31 Aug 2026 20:08:11 +0300
Subject: [PATCH] fix(seo): correct canonicals and navigation semantics

---
 app/[locale]/layout.tsx           |  5 ++--
 app/robots.ts                     |  3 +-
 app/rss.xml/route.ts              |  2 +-
 components/json-ld.tsx            |  2 +-
 components/layout-promo-rails.tsx | 15 ++++++----
 components/site-navbar.tsx        | 48 +++++++++++++++++--------------
 lib/seo.ts                        | 18 ++++++++++--
 7 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx
index f2349a7..8a6ce2c 100644
--- a/app/[locale]/layout.tsx
+++ b/app/[locale]/layout.tsx
@@ -10,6 +10,7 @@ import { GoogleAnalytics } from "@/components/google-analytics";
 import { PoyrazBottomRightFollower } from "@/components/poyraz-bottom-right-follower";
 import { listAnimationSources } from "@/data/animation-sources";
 import { getHomeBlogNews, getLatestAgendaArticle } from "@/data/blog";
+import { SITE_URL } from "@/lib/seo";
 
 export async function generateMetadata({
   params,
@@ -24,7 +25,7 @@ export async function generateMetadata({
   const description = t("description");
 
   return {
-    metadataBase: new URL("https://poyrazavsever.com"),
+    metadataBase: new URL(SITE_URL),
     title: {
       default: title,
       template: titleTemplate,
@@ -34,7 +35,7 @@ export async function generateMetadata({
     icons: {
       icon: [
         { url: "/favicon.ico", sizes: "any" },
-        { url: "/logo/logo.webp", type: "image/webp" },
+        { url: "/logo/logo-96.webp", type: "image/webp", sizes: "96x96" },
       ],
       shortcut: "/favicon.ico",
       apple: "/logo/apple-touch-icon.png",
diff --git a/app/robots.ts b/app/robots.ts
index 6825975..c406a1a 100644
--- a/app/robots.ts
+++ b/app/robots.ts
@@ -1,6 +1,5 @@
 import type { MetadataRoute } from "next";
-
-const SITE_URL = process.env.NEXT_PUBLIC_SITE_URL || "https://poyrazavsever.com";
+import { SITE_URL } from "@/lib/seo";
 
 export default function robots(): MetadataRoute.Robots {
   return {
diff --git a/app/rss.xml/route.ts b/app/rss.xml/route.ts
index 3de436d..5418e4d 100644
--- a/app/rss.xml/route.ts
+++ b/app/rss.xml/route.ts
@@ -1,6 +1,6 @@
 import { getAllBlogArticles } from "@/data/blog";
 
-const SITE_URL = process.env.NEXT_PUBLIC_SITE_URL || "https://poyrazavsever.com";
+import { SITE_URL } from "@/lib/seo";
 const FEED_PATH = "/rss.xml";
 const FEED_TITLE = "Poyraz Avsever Blog";
 const FEED_DESCRIPTION =
diff --git a/components/json-ld.tsx b/components/json-ld.tsx
index a3757f0..fc0667a 100644
--- a/components/json-ld.tsx
+++ b/components/json-ld.tsx
@@ -1,4 +1,4 @@
-const SITE_URL = process.env.NEXT_PUBLIC_SITE_URL || "https://poyrazavsever.com";
+import { SITE_URL } from "@/lib/seo";
 
 function serializeJsonLd(data: object) {
   return JSON.stringify(data).replace(/</g, "\\u003c");
diff --git a/components/layout-promo-rails.tsx b/components/layout-promo-rails.tsx
index 68b1dfe..3d84ad8 100644
--- a/components/layout-promo-rails.tsx
+++ b/components/layout-promo-rails.tsx
@@ -235,7 +235,7 @@ function PromoRail({
     >
       <div className="sticky top-4 py-4">
         <div
-          role="tablist"
+          role="group"
           aria-label={t("slideNavigationLabel")}
           onKeyDown={handleNavigationKeyDown}
           className="mb-3 flex h-5 items-center justify-center gap-2"
@@ -247,9 +247,7 @@ function PromoRail({
               <button
                 key={`${railId}-dot-${index}`}
                 type="button"
-                role="tab"
-                aria-selected={selected}
-                aria-controls={`${railId}-panel-${index}`}
+                aria-pressed={selected}
                 aria-label={t("slideCta", { slide: index + 1 })}
                 onClick={() => setActiveSlide(index)}
                 className="group flex size-5 items-center justify-center rounded-full outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
@@ -266,12 +264,19 @@ function PromoRail({
           })}
         </div>
 
+        <span className="sr-only" aria-live="polite">
+          {t("slideStatus", {
+            current: activeSlide + 1,
+            total: slides.length,
+          })}
+        </span>
+
         <div className="overflow-hidden">
           <AnimatePresence mode="wait" initial={false}>
             <motion.div
               key={`${railId}-slide-${activeSlide}`}
               id={`${railId}-panel-${activeSlide}`}
-              role="tabpanel"
+              role="group"
               aria-label={t("slideStatus", {
                 current: activeSlide + 1,
                 total: slides.length,
diff --git a/components/site-navbar.tsx b/components/site-navbar.tsx
index 69318e9..1cec203 100644
--- a/components/site-navbar.tsx
+++ b/components/site-navbar.tsx
@@ -25,9 +25,6 @@ import {
   SheetContent,
   SheetTitle,
   SheetTrigger,
-  Tabs,
-  TabsList,
-  TabsTrigger,
   Tooltip,
   TooltipContent,
   TooltipProvider,
@@ -74,6 +71,18 @@ function getDesktopDropdownTriggerClass(isActive: boolean) {
   ].join(" ");
 }
 
+function getDesktopNavLinkClass(isActive: boolean) {
+  return [
+    "relative inline-flex h-9 shrink-0 items-center justify-center whitespace-nowrap rounded-sm px-2.5 text-xs font-medium outline-none",
+    "transition-[color,background-color] duration-[var(--poyraz-motion-duration-fast)] ease-[var(--poyraz-motion-ease-out)]",
+    "focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+    "after:absolute after:inset-x-2.5 after:bottom-0 after:h-0.5 after:rounded-full after:transition-colors",
+    isActive
+      ? "text-foreground after:bg-primary"
+      : "text-muted-foreground after:bg-transparent hover:text-foreground",
+  ].join(" ");
+}
+
 type ThemeToggleProps = {
   theme: ThemeMode;
   onThemeChange: (theme: ThemeMode) => void;
@@ -125,7 +134,6 @@ export function SiteNavbar({
     return pathname === href || pathname.startsWith(`${href}/`);
   };
 
-  const activeTab = NAV_LINKS.find((item) => isActiveLink(item.href))?.id;
   const activeMobileMenuGroup = NAV_DROPDOWN_GROUPS.find(
     (group) => group.id === mobileMenuGroupId,
   );
@@ -204,7 +212,7 @@ export function SiteNavbar({
           className="inline-flex shrink-0 items-center"
         >
           <Logo
-            src="/logo/logo.webp"
+            src="/logo/logo-96.webp"
             alt="Poyraz Avsever"
             width={40}
             height={40}
@@ -216,13 +224,10 @@ export function SiteNavbar({
         </Link>
 
         <div className="hidden min-w-0 flex-1 items-center justify-end gap-2 min-[840px]:flex">
-          <Tabs value={activeTab ?? ""} className="w-auto shrink-0">
-            <TabsList
-              variant="line"
-              radius="sm"
-              className="h-9 gap-1 bg-transparent p-0"
-              aria-label="Ana navigasyon"
-            >
+          <nav
+            aria-label={locale === "tr" ? "Ana navigasyon" : "Main navigation"}
+            className="flex h-9 w-auto shrink-0 items-center gap-1"
+          >
               {NAV_LINKS.map((item, index) => (
                 <Fragment key={item.id}>
                   <div className="flex items-center gap-1.5">
@@ -233,15 +238,15 @@ export function SiteNavbar({
                         decorative
                       />
                     )}
-                    <TabsTrigger
-                      value={item.id}
-                      asChild
-                      size="sm"
-                      radius="sm"
-                      className="cursor-pointer px-2.5"
+                    <Link
+                      href={item.href}
+                      aria-current={isActiveLink(item.href) ? "page" : undefined}
+                      className={getDesktopNavLinkClass(
+                        isActiveLink(item.href),
+                      )}
                     >
-                      <Link href={item.href}>{t(item.id)}</Link>
-                    </TabsTrigger>
+                      {t(item.id)}
+                    </Link>
                   </div>
 
                   {NAV_DROPDOWN_GROUPS.filter(
@@ -316,8 +321,7 @@ export function SiteNavbar({
                   ))}
                 </Fragment>
               ))}
-            </TabsList>
-          </Tabs>
+          </nav>
 
           <Separator
             orientation="vertical"
diff --git a/lib/seo.ts b/lib/seo.ts
index bb6dab2..73921a4 100644
--- a/lib/seo.ts
+++ b/lib/seo.ts
@@ -1,9 +1,21 @@
 import type { Metadata } from "next";
 import { getTranslations } from "next-intl/server";
 
-export const SITE_URL = (
-  process.env.NEXT_PUBLIC_SITE_URL || "https://poyrazavsever.com"
-).replace(/\/$/, "");
+function resolveSiteUrl() {
+  const url = new URL(
+    process.env.NEXT_PUBLIC_SITE_URL || "https://www.poyrazavsever.com",
+  );
+
+  // The public site redirects the apex domain to `www`. Canonicals must point
+  // directly to the final URL instead of a redirecting host.
+  if (url.hostname === "poyrazavsever.com") {
+    url.hostname = "www.poyrazavsever.com";
+  }
+
+  return url.origin;
+}
+
+export const SITE_URL = resolveSiteUrl();
 
 export type SiteLocale = "tr" | "en";