From 80016bc39ab5f5345af13866f329db7eb6da0c79 Mon Sep 17 00:00:00 2001
From: parsa aghaei <p.aghaei@hoshmand.local>
Date: Wed, 23 Oct 2024 19:05:31 +0330
Subject: [PATCH] en replaced with defalutLocale cookie

---
 src/app/(routes)/(website)/components/aboutMe/aboutMe.tsx   | 2 +-
 src/app/(routes)/(website)/components/services/services.tsx | 5 +++--
 src/middleware.ts                                           | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/(routes)/(website)/components/aboutMe/aboutMe.tsx b/src/app/(routes)/(website)/components/aboutMe/aboutMe.tsx
index f316575..c213b16 100644
--- a/src/app/(routes)/(website)/components/aboutMe/aboutMe.tsx
+++ b/src/app/(routes)/(website)/components/aboutMe/aboutMe.tsx
@@ -6,7 +6,7 @@ import "react-loading-skeleton/dist/skeleton.css";
 
 export default async function AboutMe() {
   const aboutMeData: AboutMeDataType = await fetch(
-    `${process.env.NEXT_PUBLIC_API_URL}/website/about-me/1/translation/${cookies().get("selectedLocale")?.value}`,
+    `${process.env.NEXT_PUBLIC_API_URL}/website/about-me/1/translation/${cookies().get("selectedLocale")?.value ? cookies().get("selectedLocale")?.value : cookies().get("defaultLocale")?.value}`,
   ).then((res) => res.json());
 
   return (
diff --git a/src/app/(routes)/(website)/components/services/services.tsx b/src/app/(routes)/(website)/components/services/services.tsx
index 0dd60a1..3aea35a 100644
--- a/src/app/(routes)/(website)/components/services/services.tsx
+++ b/src/app/(routes)/(website)/components/services/services.tsx
@@ -24,11 +24,12 @@ export default function Services({ dict }: ServicesProps) {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
 
+
   useEffect(() => {
     const fetchServices = async () => {
-      setLoading(true);
+      setLoading(true);      
       const response = await fetch(
-        `${process.env.NEXT_PUBLIC_API_URL}/website/services/${getCookie("selectedLocale")}`,
+        `${process.env.NEXT_PUBLIC_API_URL}/website/services/${getCookie("selectedLocale") !== undefined ? getCookie("selectedLocale") : getCookie("defaultLocale")}`,
       ).then((res) => res.json());
 
       setServices(response);
diff --git a/src/middleware.ts b/src/middleware.ts
index 0e00247..ae5a549 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -45,12 +45,12 @@ export function middleware(request: NextRequest) {
   if (selectedLocale && selectedLocale.value !== "") {
     response.cookies.set("defaultLocale", selectedLocale.value, {
       path: "/",
-      httpOnly: true,
+      httpOnly: false,
     });
   } else {
     response.cookies.set("defaultLocale", defaultLocale, {
       path: "/",
-      httpOnly: true,
+      httpOnly: false,
     });
   }