Es: transaltions for Terms Condition

hooks/AuthHooks/useLoginHook.ts

@@ -61,7 +61,7 @@ const useLoginHook = () => {
         localStorage.setItem('selected_currency', tokenData?.data?.currency);
         // Redirect to the home page or any other page after successful login
         if (tokenData?.data?.isPwdChg === 0) {
-          router.push('/forgot_password');
+          router.push('/forgot-password');
         } else {
           if (AFTER_LOGIN_REDIRECT_URL) {
             router.push(AFTER_LOGIN_REDIRECT_URL);
@@ -72,12 +72,14 @@ const useLoginHook = () => {
         // toast.success('Login Successfully');
       }
     } catch (error: any) {
-      if (error?.status === 400 && error?.response?.data?.error === "Invalid username or password") {
-        toast.error(t('invalid_credentials'));
-        return;
-      } else {
-        toast.error(t('error_while_login'));
-      }
+      // if (error?.response?.data?.error === "Invalid username or password") {
+      //   toast.error(t('invalid_credentials'));
+      //   return;
+      // } else {
+      //   toast.error(t('error_while_login'));
+      // }
+      toast.error(error?.response?.data?.error || t('error_while_login'));
+      console.error('Error:', error);
     } finally {
       setLoginBtnLoader(false);
     }

hooks/GeneralHooks/LanguageHandler.ts

@@ -19,8 +19,9 @@ const useCurrencyLanguageHandler = () => {
   const selectedLanguage = languageDisplayOptions.find((opt) => opt?.value === languageState)!;
 
   const updateUserPreference = async (language: Option, currency: Option) => {
-    const languageCode = language.toString();
-    const currencyCode = currency.toString()
+    console
+    const languageCode = language?.value?.toString();
+    const currencyCode = currency?.value?.toString()
     const apiBody = {
       userPreferences:{
         language: languageDisplayOptions.find((opt: Option) => opt?.value === languageCode)?.label,
@@ -39,22 +40,22 @@ const useCurrencyLanguageHandler = () => {
     }
   };
 
- const handleLanguageChange = (value: Option) => {
+ const handleLanguageChange = (value: Option | null) => {
     dispatch(setLanguage(value?.value));
-    updateUserPreference(value, selectedCurrency);
+    updateUserPreference(value!, selectedCurrency);
   };
 
-  const handleLanguageShallowUpdate = (value: Option) => {
+  const handleLanguageShallowUpdate = (value: Option | null) => {
     dispatch(setLanguage(value?.value));
     i18n.changeLanguage(value?.value as string).catch((err) => {});
   };
 
-  const handleCurrencyChange = (value: Option) => {
+  const handleCurrencyChange = (value: Option | null) => {
     dispatch(setCurrencyValue(value?.value));
-    updateUserPreference(selectedLanguage, value);
+    updateUserPreference(selectedLanguage, value!);
   };
 
-  const handleCurrencyShallowUpdate = (value: Option) => {
+  const handleCurrencyShallowUpdate = (value: Option | null) => {
     dispatch(setCurrencyValue(value?.value));
   }
 

hooks/ProductDetailPageHooks/useProductDetail.ts

@@ -10,7 +10,7 @@ import fetchStockAvailabilityOfProduct from '../../services/api/product-detail-p
 import fetchPinCodesListAPI from '../../services/api/general-apis/get-pin-code-list-api';
 import debounce from 'debounce';
 import useAuthErrorHandler from '../AuthHooks/handleAuthError';
-import useCurrencyLanguageHandler from '../GeneralHooks/KCLanguageHandler';
+import useCurrencyLanguageHandler from '../GeneralHooks/LanguageHandler';
 type PinCodeTypes = {
   name: string;
 };
@@ -40,6 +40,8 @@ const useProductDetail = () => {
       quantity: productDetailData?.min_order_qty || 1,
     },
   ]);
+  const router = useRouter();
+
   const handleMultipleQtyChange = (index: number, itemCode: string, value: string) => {
     setItemList((prevItemList: any) => {
       if (!Array.isArray(prevItemList)) {
@@ -70,7 +72,7 @@ const useProductDetail = () => {
       if (
         productDetailAPI?.status === 200 &&
         productDetailAPI?.data?.msg === 'success' &&
-        Object?.keys(productDetailAPI?.data?.data).length > 0
+        Object?.keys(productDetailAPI?.data?.data[0]).length > 0
       ) {
         setProductDetailData(productDetailAPI?.data?.data[0]);
         if (productDetailAPI?.data?.message?.data?.min_order_qty > 0) {
@@ -174,10 +176,12 @@ const useProductDetail = () => {
     debouncedSetValue(pinCode); // Debounce state update
   };
 
+
   useEffect(() => {
+    if (!router.isReady) return;
     fetchProductDetailDataAPI();
-  // }, [query?.productId]);
-  }, [query?.productId, selectedCurrency]);
+  }, [router.isReady, query?.productId, selectedCurrency]);
+
 
   return {
     isLoading,

interfaces/login-params-interface.ts

@@ -13,4 +13,7 @@ export interface TypeRegistrationForm {
   eml: string;
   usr: string;
   pwd: string;
+  mob?: string;
+  defLang?: string;
+  defCurr?: string;
 }

interfaces/product-slideshow-images.ts

@@ -2,4 +2,4 @@ export interface ProductSlideshowImages {
   slideShowImages: string[];
   selectedImageBasedOnSelectedTone: number;
   setSelectedImageBasedOnSelectedTone: (i: number) => void;
-}
+}

next.config.js

@@ -6,10 +6,12 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
 });
 const nextConfig = {
   images: {
-    domains: ['summit.8848digitalerp.com', 'staging-twinkle.8848digitalerp.com', 'emr-euro-shine.8848digitalerp.com', 'backend.atelier-reya.com', 'kc-backend.8848digitalcloud.com'],
+    domains: ['summit.8848digitalerp.com', 'staging-twinkle.8848digitalerp.com', 'emr-euro-shine.8848digitalerp.com', 'backend.atelier-reya.com', 'localhost'],
+    formats: ['image/avif', 'image/webp'],
   },    
-    reactStrictMode: false,
+  reactStrictMode: false,
   swcMinify: true,
+  compress: true,
 };
 
 module.exports = withBundleAnalyzer(nextConfig);

pages/admin/customer-activation.tsx

@@ -0,0 +1,32 @@
+import { CONSTANTS } from '../../services/config/app-config';
+import { ServerDataTypes } from '../../interfaces/meta-data-interface';
+import getPageMetaData from '../../utils/fetch-page-meta-deta';
+import PageMetaData from '../../components/PageMetaData';
+import CustomerActivationComponent from '../../components/Admin/CustomerListingComponent';
+
+const CustomerListingPage = ({ serverDataForPages }: ServerDataTypes) => {
+  return (
+    <>
+      {CONSTANTS.ENABLE_META_TAGS && <PageMetaData meta_data={serverDataForPages.metaData} />}
+      <CustomerActivationComponent />
+      {/* <div>Customer Activation Page</div> */}
+    </>
+  );
+};
+
+export async function getServerSideProps(context: any) {
+  const { SUMMIT_APP_CONFIG } = CONSTANTS;
+  const method = 'get-meta-tags-api';
+  const version = SUMMIT_APP_CONFIG.version;
+  const entity = 'seo';
+  const params = `?version=${version}&method=${method}&entity=${entity}`;
+  const url = `${context.resolvedUrl.split('?')[0]}`;
+  if (CONSTANTS.ENABLE_META_TAGS) {
+    return await getPageMetaData(method, params, url);
+  } else {
+    return {
+      props: {},
+    };
+  }
+}
+export default CustomerListingPage;

pages/forgot_password.tsx → pages/forgot-password.tsx

@@ -2,14 +2,14 @@ import { CONSTANTS } from '../services/config/app-config';
 import { ServerDataTypes } from '../interfaces/meta-data-interface';
 import getPageMetaData from '../utils/fetch-page-meta-deta';
 import PageMetaData from '../components/PageMetaData';
-// import ForgotPasswordComponent from '../components/Auth/FallbackForgotPassword/ForgotPasswordComponent';
+import ForgotPasswordComponent from '../components/Auth/FallbackForgotPassword/ForgotPasswordComponent';
 
-const ResetPassowrd = ({ serverDataForPages }: ServerDataTypes) => {
+const ResetPassword = ({ serverDataForPages }: ServerDataTypes) => {
   return (
     <>
       {CONSTANTS.ENABLE_META_TAGS && <PageMetaData meta_data={serverDataForPages.metaData} />}
-      {/* <ForgotPasswordComponent /> */}
-      <div>Forgot Password Page</div>
+      <ForgotPasswordComponent />
+      {/* <div>Forgot Password Page</div> */}
     </>
   );
 };
@@ -29,4 +29,4 @@ export async function getServerSideProps(context: any) {
     };
   }
 }
-export default ResetPassowrd;
+export default ResetPassword;

pages/privacy-policy.tsx

@@ -0,0 +1,32 @@
+import { CONSTANTS } from '../services/config/app-config';
+import { ServerDataTypes } from '../interfaces/meta-data-interface';
+import getPageMetaData from '../utils/fetch-page-meta-deta';
+import PageMetaData from '../components/PageMetaData';
+import TermsPrivacyContent from '../components/Auth/TermsPrivacyContent';
+
+const PrivacyPolicyPage = ({ serverDataForPages }: ServerDataTypes) => {
+  return (
+    <>
+      {CONSTANTS.ENABLE_META_TAGS && <PageMetaData meta_data={serverDataForPages.metaData} />}
+      {/* <div>Privacy Policy page</div> */}
+      <TermsPrivacyContent type="privacy" />
+    </>
+  );
+};
+
+export async function getServerSideProps(context: any) {
+  const { SUMMIT_APP_CONFIG } = CONSTANTS;
+  const method = 'get-meta-tags-api';
+  const version = SUMMIT_APP_CONFIG.version;
+  const entity = 'seo';
+  const params = `?version=${version}&method=${method}&entity=${entity}`;
+  const url = `${context.resolvedUrl.split('?')[0]}`;
+  if (CONSTANTS.ENABLE_META_TAGS) {
+    return await getPageMetaData(method, params, url);
+  } else {
+    return {
+      props: {},
+    };
+  }
+}
+export default PrivacyPolicyPage;

pages/profile.tsx

@@ -0,0 +1,32 @@
+import { CONSTANTS } from '../services/config/app-config';
+import { ServerDataTypes } from '../interfaces/meta-data-interface';
+import getPageMetaData from '../utils/fetch-page-meta-deta';
+import PageMetaData from '../components/PageMetaData';
+import FallbackProfileComponent from '../components/profile/FallbackProfile/FallbackProfileComponent';
+
+const MyAccountPage = ({ serverDataForPages }: ServerDataTypes) => {
+  return (
+    <>
+      {CONSTANTS.ENABLE_META_TAGS && <PageMetaData meta_data={serverDataForPages.metaData} />}
+      {/* <div>Profile page</div> */}
+      <FallbackProfileComponent />
+    </>
+  );
+};
+
+export async function getServerSideProps(context: any) {
+  const { SUMMIT_APP_CONFIG } = CONSTANTS;
+  const method = 'get-meta-tags-api';
+  const version = SUMMIT_APP_CONFIG.version;
+  const entity = 'seo';
+  const params = `?version=${version}&method=${method}&entity=${entity}`;
+  const url = `${context.resolvedUrl.split('?')[0]}`;
+  if (CONSTANTS.ENABLE_META_TAGS) {
+    return await getPageMetaData(method, params, url);
+  } else {
+    return {
+      props: {},
+    };
+  }
+}
+export default MyAccountPage;

pages/register.tsx

@@ -3,14 +3,14 @@ import { ServerDataTypes } from '../interfaces/meta-data-interface';
 import getPageMetaData from '../utils/fetch-page-meta-deta';
 import PageMetaData from '../components/PageMetaData';
 import RegisterComponent from '../components/Auth/RegisterComponent';
-// import FallbackRegisterComponent from '../components/Auth/FallbackRegister/FallbackRegisterComponent';
+import FallbackRegisterComponent from '../components/Auth/FallbackRegister/FallbackRegisterComponent';
 
 const Register = ({ serverDataForPages }: ServerDataTypes) => {
   return (
     <>
       {CONSTANTS.ENABLE_META_TAGS && <PageMetaData meta_data={serverDataForPages.metaData} />}
-      <RegisterComponent />
-      {/* <FallbackRegisterComponent /> */}
+      {/* <RegisterComponent /> */}
+      <FallbackRegisterComponent />
     </>
   );
 };

pages/saved-addresses.tsx

@@ -0,0 +1,32 @@
+import { CONSTANTS } from '../services/config/app-config';
+import { ServerDataTypes } from '../interfaces/meta-data-interface';
+import getPageMetaData from '../utils/fetch-page-meta-deta';
+import PageMetaData from '../components/PageMetaData';
+import SavedAddresses from '../components/profile/FallbackProfile/SavedAddressesComponent';
+
+const SavedAddressesPage = ({ serverDataForPages }: ServerDataTypes) => {
+  return (
+    <>
+      {CONSTANTS.ENABLE_META_TAGS && <PageMetaData meta_data={serverDataForPages.metaData} />}
+      <SavedAddresses />
+      {/* <div>Saved Addresses Page</div> */}
+    </>
+  );
+};
+
+export async function getServerSideProps(context: any) {
+  const { SUMMIT_APP_CONFIG } = CONSTANTS;
+  const method = 'get-meta-tags-api';
+  const version = SUMMIT_APP_CONFIG.version;
+  const entity = 'seo';
+  const params = `?version=${version}&method=${method}&entity=${entity}`;
+  const url = `${context.resolvedUrl.split('?')[0]}`;
+  if (CONSTANTS.ENABLE_META_TAGS) {
+    return await getPageMetaData(method, params, url);
+  } else {
+    return {
+      props: {},
+    };
+  }
+}
+export default SavedAddressesPage;

pages/terms-and-conditions.tsx

@@ -0,0 +1,32 @@
+import { CONSTANTS } from '../services/config/app-config';
+import { ServerDataTypes } from '../interfaces/meta-data-interface';
+import getPageMetaData from '../utils/fetch-page-meta-deta';
+import PageMetaData from '../components/PageMetaData';
+import TermsPrivacyContent from '../components/Auth/TermsPrivacyContent';
+
+const TermsConditionPage = ({ serverDataForPages }: ServerDataTypes) => {
+  return (
+    <>
+      {CONSTANTS.ENABLE_META_TAGS && <PageMetaData meta_data={serverDataForPages.metaData} />}
+      {/* <div>Terms & Conditions page</div> */}
+      <TermsPrivacyContent type="terms" />
+    </>
+  );
+};
+
+export async function getServerSideProps(context: any) {
+  const { SUMMIT_APP_CONFIG } = CONSTANTS;
+  const method = 'get-meta-tags-api';
+  const version = SUMMIT_APP_CONFIG.version;
+  const entity = 'seo';
+  const params = `?version=${version}&method=${method}&entity=${entity}`;
+  const url = `${context.resolvedUrl.split('?')[0]}`;
+  if (CONSTANTS.ENABLE_META_TAGS) {
+    return await getPageMetaData(method, params, url);
+  } else {
+    return {
+      props: {},
+    };
+  }
+}
+export default TermsConditionPage;

pages/update-password.tsx

@@ -0,0 +1,32 @@
+import { CONSTANTS } from '../services/config/app-config';
+import { ServerDataTypes } from '../interfaces/meta-data-interface';
+import getPageMetaData from '../utils/fetch-page-meta-deta';
+import PageMetaData from '../components/PageMetaData';
+import UpdatePasswordComponent from '../components/Auth/FallbackUpdatePassword/UpdatePasswordComponent';
+
+const UpdatePassword = ({ serverDataForPages }: ServerDataTypes) => {
+  return (
+    <>
+      {CONSTANTS.ENABLE_META_TAGS && <PageMetaData meta_data={serverDataForPages.metaData} />}
+      <UpdatePasswordComponent />
+      {/* <div>Update Password Page</div> */}
+    </>
+  );
+};
+
+export async function getServerSideProps(context: any) {
+  const { SUMMIT_APP_CONFIG } = CONSTANTS;
+  const method = 'get-meta-tags-api';
+  const version = SUMMIT_APP_CONFIG.version;
+  const entity = 'seo';
+  const params = `?version=${version}&method=${method}&entity=${entity}`;
+  const url = `${context.resolvedUrl.split('?')[0]}`;
+  if (CONSTANTS.ENABLE_META_TAGS) {
+    return await getPageMetaData(method, params, url);
+  } else {
+    return {
+      props: {},
+    };
+  }
+}
+export default UpdatePassword;