Merge pull request #20 from binshops/fix/apiCall

Fix/api call

Author: shaghayegh77amd

src/component/languageSelector/languageSelector.tsx

@@ -11,7 +11,7 @@ const LanguageSelector: FC = () => {
   const divRef = useRef<HTMLDivElement | null>(null);
 
   const router = useRouter();
-
+  const locale = router.locale;
   const handleClickOutside = (event: MouseEvent) => {
     if (divRef.current && !divRef.current.contains(event.target as Node)) {
       setOpenLanguage(false);
@@ -22,12 +22,13 @@ const LanguageSelector: FC = () => {
     i18n.changeLanguage(lng);
     const { pathname, query } = router;
     router.push({ pathname, query }, undefined, { locale: lng });
-    setOpenLanguage(!openLanguage);
+    setOpenLanguage(false);
     queryClient.invalidateQueries();
   };
 
   useEffect(() => {
     document.addEventListener("mousedown", handleClickOutside);
+    locale && changeLanguage(locale);
     return () => {
       document.removeEventListener("mousedown", handleClickOutside);
     };

src/component/productDetails/index.tsx

@@ -3,7 +3,6 @@ import { useQuery } from "react-query";
 
 import { FeaturedProductAPI } from "@/const/endPoint";
 import { FeaturedProductTransformer } from "@/utils/api/transformer/featuredProduct";
-import { Product } from "@/utils/type";
 import { getData } from "@/utils/api/fetchData/apiCall";
 
 import ProductCarousel from "../productCarousel";
@@ -12,13 +11,12 @@ import ProductGallery from "../productGallery";
 
 import { productDetailsProps } from "./productDetails.types";
 import styles from "./productDetails.module.scss";
-import { useRouter } from "next/router";
 
 const ProductDetails: FC<productDetailsProps> = ({ product }) => {
   const { data: featuredProduct = [] } = useQuery({
     queryKey: ["featuredProduct"],
     queryFn: async () => {
-      const productData = await getData(FeaturedProductAPI, {}, "", "");
+      const productData = await getData(FeaturedProductAPI);
       return FeaturedProductTransformer(productData);
     },
     enabled: !!product.id,

src/pages/category/[slug].tsx

@@ -23,18 +23,12 @@ const fetchCategoryData = async (
   filterQuery?: string,
   orderQuery?: string
 ) => {
-  const categoryData = await getData(
-    CategoryAPI,
-    {
-      id_category: categoryId,
-      page,
-      q: filterQuery,
-      order: orderQuery,
-    },
-    "",
-    "",
-    locale
-  );
+  const categoryData = await getData(CategoryAPI, {
+    id_category: categoryId,
+    page,
+    q: filterQuery,
+    order: orderQuery,
+  });
   return CategoryTransformer(categoryData);
 };
 
@@ -109,16 +103,13 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
   const categoryId = context.query.slug;
   const page = context.query.page;
   const referer = context.req.headers.referer || null;
-  const menuData = await getData(MegaMenuAPI, {}, "", "", locale);
+  const menuData = await getData(MegaMenuAPI);
   const menu = MegaMenuTransformer(menuData).menuItems;
   if (!referer) {
-    const categoryData = await getData(
-      CategoryAPI,
-      { id_category: categoryId, page },
-      "",
-      "",
-      locale
-    );
+    const categoryData = await getData(CategoryAPI, {
+      id_category: categoryId,
+      page,
+    });
     const data = CategoryTransformer(categoryData);
 
     return {

src/pages/index.tsx

@@ -55,10 +55,10 @@ export default function Home({
 export async function getServerSideProps(context: GetServerSidePropsContext) {
   const referer = context.req.headers.referer || null;
   const locale = context.locale;
-  const menuData = await getData(MegaMenuAPI, {}, "", "", locale);
+  const menuData = await getData(MegaMenuAPI);
   const menu = MegaMenuTransformer(menuData).menuItems;
   if (!referer) {
-    const data = await getData(HomePageAPI, {}, "", "", locale);
+    const data = await getData(HomePageAPI);
     const { homeProductCarousel } = HomeTransformer(data);
 
     return { props: { homeProductCarousel, menu } };

src/pages/product/[slug].tsx

@@ -37,18 +37,11 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
   const locale = context.locale;
   const productId = context.query.slug;
   const referer = context.req.headers.referer || null;
-  const menuData = await getData(MegaMenuAPI, {}, "", "", locale);
+  const menuData = await getData(MegaMenuAPI);
   const menu = MegaMenuTransformer(menuData).menuItems;
   if (!referer) {
     const productData =
-      productId &&
-      (await getData(
-        ProductDetailAPI,
-        { product_id: productId },
-        "",
-        "",
-        locale
-      ));
+      productId && (await getData(ProductDetailAPI, { product_id: productId }));
     const data = ProductTransformer(productData);
     return { props: { initialProduct: data, productId, menu } };
   }

src/utils/api/fetchData/apiCall.ts

@@ -5,10 +5,9 @@ export async function getData(
   endPoint: string,
   queryParams?: any,
   extraParam?: string,
-  body?: any,
-  locale?: string
+  body?: any
 ): Promise<any> {
-  const currentLanguage = locale || i18n.language;
+  const currentLanguage = i18n.language;
   let url = `/${currentLanguage}/rest${endPoint}`;
 
   if (queryParams && Object.keys(queryParams).length > 0) {

src/utils/hooks/api/useFetchProductData.ts

@@ -26,9 +26,7 @@ const fetchProductData = async ({
   const productData = await getData(
     ProductDetailAPI,
     { product_id: productId, refresh },
-    queryString,
-    "",
-    locale
+    queryString
   );
 
   return ProductTransformer(productData);