hey-pharmacist-ecommerce 1.1.28 → 1.1.29

package/src/hooks/useProducts.ts

@@ -1,79 +1,78 @@
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect } from 'react';
 import { AXIOS_CONFIG } from '@/lib/Apis/wrapper';
-import { CategoriesApi, CategoryPopulated, ExtendedProductDTO, ProductsApi } from '@/lib/Apis';
+import { CategoriesApi, CategoryPopulated, ProductsApi, Product } from '@/lib/Apis';
 import { ProductFilters } from '@/lib/types';
+import { useQuery } from '@tanstack/react-query';
+
+export enum SortOrder {
+  Asc = "asc",
+  Desc = "desc",
+}
 
 export function useProducts(filters?: ProductFilters, page: number = 1, limit: number = 20) {
-  const [products, setProducts] = useState<ExtendedProductDTO[]>([]);
-  const [isLoading, setIsLoading] = useState(true);
-  const [error, setError] = useState<Error | null>(null);
-  const [pagination, setPagination] = useState({
-    page: 1,
-    limit: 20,
-    total: 0,
-    totalPages: 0,
-  });
+  const { data, isLoading, error, refetch } = useQuery({
+    queryKey: [
+      "products",
+      filters?.search,
+      filters?.category,
+      filters?.subCategory,
+      filters?.maxPrice,
+      filters?.minPrice,
+      filters?.inStock,
+      page,
+      limit
+    ],
+    queryFn: async () => {
+      const response = await new ProductsApi(AXIOS_CONFIG).getAllProducts(
+        filters?.search ?? "", // searchTerm
+        filters?.maxPrice, // maxPrice
+        filters?.minPrice, // minPrice
+        undefined, // brandFilter
+        filters?.inStock !== undefined ? (filters.inStock ? 'in-stock' : 'out-of-stock') : undefined, // availability
+        "createdAt", // sort
+        filters?.subCategory, // subCategoryId
+        filters?.category, // categoryId
+        true, // isActive
+        limit, // limit
+        page // page
+      );
 
-  const fetchProducts = useCallback(async () => {
-    setIsLoading(true);
-    setError(null);
-    try {
-      let response;
-      if (filters?.subCategory) {
-        response = await new ProductsApi(AXIOS_CONFIG).getAllProducts(
-          filters.subCategory,
-          filters?.search,
-          filters?.maxPrice,
-          filters?.minPrice,
-          undefined, // brandFilter
-          filters?.inStock !== undefined ? (filters.inStock ? 'in-stock' : 'out-of-stock') : undefined,
-          undefined, // sort
-          true, // includeNoVariantProducts
-          true, // isActive
-          limit,
-          page
-        );
-      } else {
-        response = await new ProductsApi(AXIOS_CONFIG).getAllProductsForStore(
-          filters?.search,
-          undefined, // productType
-          filters?.category,
-          filters?.maxPrice,
-          filters?.minPrice,
-          undefined, // brandFilter
-          filters?.inStock !== undefined ? (filters.inStock ? 'in-stock' : 'out-of-stock') : undefined,
-          undefined, // sort
-          true, // includeNoVariantProducts
-          true, // isActive
-          limit,
-          page
-        );
-      }
-      setProducts(response.data.data);
-      setPagination({
-        page: response.data.currentPage || page,
-        limit: response.data.limit || limit,
-        total: products.length, // Use filtered count
-        totalPages: Math.ceil(products.length / limit),
-      });
-    } catch (err) {
-      setError(err as Error);
-    }
-    setIsLoading(false);
-  }, [filters, page, limit]);
+      const res = response.data;
+      console.log("Products API response:", res);
 
-  useEffect(() => {
-    fetchProducts();
-  }, [fetchProducts]);
+      return {
+        products: res.data || [],
+        pagination: {
+          page: res.currentPage || page,
+          limit: res.limit || limit,
+          total: res.totalItems || 0,
+          totalPages: res.totalPages || 0,
+        },
+      };
+    },
+  });
 
-  return { products, isLoading, error, pagination };
+  console.log("useProducts data:", data);
+
+  return {
+    products: data?.products || [],
+    isLoading,
+    error: error as Error | null,
+    pagination: data?.pagination || {
+      page: 1,
+      limit: 20,
+      total: 0,
+      totalPages: 0,
+    },
+    refetch,
+  };
 }
 
 export function useProduct(id: string) {
-  const [product, setProduct] = useState<ExtendedProductDTO | null>(null);
+  const [product, setProduct] = useState<Product | null>(null);
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<Error | null>(null);
-
+  console.log("product", product);
   useEffect(() => {
     const fetchProduct = async () => {
       setIsLoading(true);

package/src/hooks/useWishlistProducts.ts

@@ -1,12 +1,11 @@
 'use client';
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { ProductsApi } from '@/lib/Apis';
+import { ProductsApi, Product } from '@/lib/Apis';
 import { AXIOS_CONFIG } from '@/lib/Apis/wrapper';
-import { ExtendedProductDTO } from '@/lib/Apis/models/extended-product-dto';
 
 interface UseWishlistProductsResult {
-  products: ExtendedProductDTO[];
+  products: Product[];
   isLoading: boolean;
   error: Error | null;
   refetch: () => Promise<void>;
@@ -17,10 +16,10 @@ interface UseWishlistProductsResult {
  * Minimises duplicate requests by caching results during the component lifecycle.
  */
 export function useWishlistProducts(productIds: string[] = []): UseWishlistProductsResult {
-  const [products, setProducts] = useState<ExtendedProductDTO[]>([]);
+  const [products, setProducts] = useState<Product[]>([]);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [error, setError] = useState<Error | null>(null);
-  const [cache] = useState<Map<string, ExtendedProductDTO>>(() => new Map());
+  const [cache] = useState<Map<string, Product>>(() => new Map());
 
   const uniqueIds = useMemo(
     () => Array.from(new Set((productIds || []).filter(Boolean))),

package/src/index.ts

@@ -15,6 +15,8 @@ export { CartScreen } from './screens/CartScreen';
 export { CheckoutScreen } from './screens/CheckoutScreen';
 export { LoginScreen } from './screens/LoginScreen';
 export { RegisterScreen } from './screens/RegisterScreen';
+export { ForgotPasswordScreen } from './screens/ForgotPasswordScreen';
+export { ResetPasswordScreen } from './screens/ResetPasswordScreen';
 export { default as ProfileScreen } from './screens/ProfileScreen';
 export { OrdersScreen } from './screens/OrdersScreen';
 export { CurrentOrdersScreen } from './screens/CurrentOrdersScreen';

package/src/lib/Apis/api.ts

@@ -25,7 +25,6 @@ export * from './apis/marketing-api';
 export * from './apis/notifications-api';
 export * from './apis/orders-api';
 export * from './apis/payments-api';
-export * from './apis/product-variants-api';
 export * from './apis/products-api';
 export * from './apis/review-api';
 export * from './apis/shipping-api';

package/src/lib/Apis/apis/auth-api.ts

@@ -16,6 +16,7 @@ import { Configuration } from '../configuration';
 // Some imports not used depending on template conditions
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
+import { ChangePasswordDto } from '../models';
 import { CreateUserDto } from '../models';
 import { ForgetPassword } from '../models';
 import { LoginDto } from '../models';
@@ -84,19 +85,14 @@ export const AuthApiAxiosParamCreator = function (configuration?: Configuration)
         /**
          * 
          * @summary Change user password
-         * @param {string} oldPassword 
-         * @param {string} newPassword 
+         * @param {ChangePasswordDto} body 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        changePassword: async (oldPassword: string, newPassword: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'oldPassword' is not null or undefined
-            if (oldPassword === null || oldPassword === undefined) {
-                throw new RequiredError('oldPassword','Required parameter oldPassword was null or undefined when calling changePassword.');
-            }
-            // verify required parameter 'newPassword' is not null or undefined
-            if (newPassword === null || newPassword === undefined) {
-                throw new RequiredError('newPassword','Required parameter newPassword was null or undefined when calling changePassword.');
+        changePassword: async (body: ChangePasswordDto, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'body' is not null or undefined
+            if (body === null || body === undefined) {
+                throw new RequiredError('body','Required parameter body was null or undefined when calling changePassword.');
             }
             const localVarPath = `/auth/change-password`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
@@ -117,13 +113,7 @@ export const AuthApiAxiosParamCreator = function (configuration?: Configuration)
                 localVarHeaderParameter["x-store-key"] = localVarApiKeyValue;
             }
 
-            if (oldPassword !== undefined && oldPassword !== null) {
-                localVarHeaderParameter['oldPassword'] = String(oldPassword);
-            }
-
-            if (newPassword !== undefined && newPassword !== null) {
-                localVarHeaderParameter['newPassword'] = String(newPassword);
-            }
+            localVarHeaderParameter['Content-Type'] = 'application/json';
 
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
@@ -135,6 +125,8 @@ export const AuthApiAxiosParamCreator = function (configuration?: Configuration)
             localVarUrlObj.search = (new URLSearchParams(query)).toString();
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || (localVarRequestOptions.headers ||= {})['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
 
             return {
                 url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
@@ -584,13 +576,12 @@ export const AuthApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary Change user password
-         * @param {string} oldPassword 
-         * @param {string} newPassword 
+         * @param {ChangePasswordDto} body 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async changePassword(oldPassword: string, newPassword: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await AuthApiAxiosParamCreator(configuration).changePassword(oldPassword, newPassword, options);
+        async changePassword(body: ChangePasswordDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await AuthApiAxiosParamCreator(configuration).changePassword(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -731,13 +722,12 @@ export const AuthApiFactory = function (configuration?: Configuration, basePath?
         /**
          * 
          * @summary Change user password
-         * @param {string} oldPassword 
-         * @param {string} newPassword 
+         * @param {ChangePasswordDto} body 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async changePassword(oldPassword: string, newPassword: string, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return AuthApiFp(configuration).changePassword(oldPassword, newPassword, options).then((request) => request(axios, basePath));
+        async changePassword(body: ChangePasswordDto, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return AuthApiFp(configuration).changePassword(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -844,14 +834,13 @@ export class AuthApi extends BaseAPI {
     /**
      * 
      * @summary Change user password
-     * @param {string} oldPassword 
-     * @param {string} newPassword 
+     * @param {ChangePasswordDto} body 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof AuthApi
      */
-    public async changePassword(oldPassword: string, newPassword: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return AuthApiFp(this.configuration).changePassword(oldPassword, newPassword, options).then((request) => request(this.axios, this.basePath));
+    public async changePassword(body: ChangePasswordDto, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return AuthApiFp(this.configuration).changePassword(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      *