hey-pharmacist-ecommerce 1.1.29 → 1.1.31

package/src/screens/ProductDetailScreen.tsx

@@ -36,6 +36,8 @@ import { useWishlist } from '@/providers/WishlistProvider';
 import { ProductsApi, ProductVariant, ProductVariantInventoryStatusEnum } from '@/lib/Apis';
 import { useBasePath } from '@/providers/BasePathProvider';
 import { Category } from '@/lib/types';
+import { useProductReviews } from '@/hooks/useReviews';
+import { ProductReviewsSection } from '@/components/ProductReviewsSection';
 
 const safeFormatDate = (date?: Date | string, format: 'long' | 'short' = 'long'): string => {
   if (!date) return 'N/A';
@@ -60,6 +62,7 @@ export function ProductDetailScreen({ productId }: ProductDetailScreenProps) {
   const { addToCart } = useCart();
   const { isAuthenticated } = useAuth();
   const notification = useNotification();
+  const { reviews, isLoading: reviewsLoading } = useProductReviews(productId);
 
   // State declarations
   const [selectedVariant, setSelectedVariant] = useState<ProductVariant | null>(null);
@@ -97,6 +100,24 @@ export function ProductDetailScreen({ productId }: ProductDetailScreenProps) {
     return productData;
   }, [productData, selectedVariant, initialProductData]);
 
+  // Calculate average rating and review count from actual reviews
+  const reviewStats = useMemo(() => {
+    if (!reviews || reviews.length === 0) {
+      return {
+        averageRating: product?.rating || 0,
+        reviewCount: 0,
+      };
+    }
+
+    const totalRating = reviews.reduce((sum, review) => sum + (review.rating || 0), 0);
+    const averageRating = totalRating / reviews.length;
+
+    return {
+      averageRating: Math.round(averageRating * 10) / 10, // Round to 1 decimal place
+      reviewCount: reviews.length,
+    };
+  }, [reviews, product?.rating]);
+
   const getVariantImages = () => {
     if (selectedVariant?.media?.length) {
       return selectedVariant.media.map((media: any) => ({
@@ -450,7 +471,7 @@ export function ProductDetailScreen({ productId }: ProductDetailScreenProps) {
                       {[...Array(5)].map((_, i) => (
                         <Star
                           key={i}
-                          className={`size-4 ${i < Math.floor(product.rating)
+                          className={`size-4 ${i < Math.floor(reviewStats.averageRating)
                             ? 'text-[#E67E50] fill-[#E67E50]'
                             : 'text-gray-300'
                             }`}
@@ -458,7 +479,7 @@ export function ProductDetailScreen({ productId }: ProductDetailScreenProps) {
                       ))}
                     </div>
                     <span className="font-['Poppins',sans-serif] text-[14px] text-muted">
-                      {product.rating} ({product.reviewCount ? product.reviewCount : 0} reviews)
+                      {reviewStats.averageRating} ({reviewStats.reviewCount} {reviewStats.reviewCount === 1 ? 'review' : 'reviews'})
                     </span>
                   </div>
                   {selectedVariant && (
@@ -754,15 +775,7 @@ export function ProductDetailScreen({ productId }: ProductDetailScreenProps) {
                 )}
 
                 {activeTab === 'reviews' && (
-                  <div className="text-center py-8">
-                    <Star className="size-12 text-[#E67E50] mx-auto mb-4" />
-                    <h3 className="font-['Poppins',sans-serif] font-semibold text-secondary mb-2">
-                      {product.rating} out of 5 stars
-                    </h3>
-                    <p className="font-['Poppins',sans-serif] text-[14px] text-muted">
-                      Based on {product.reviewCount} customer reviews
-                    </p>
-                  </div>
+                  <ProductReviewsSection productId={productId} />
                 )}
               </div>
             </div>

package/src/screens/ProfileScreen.tsx

@@ -11,6 +11,7 @@ import {
   Settings,
   LogOut,
   ChevronDown,
+  Star,
 } from 'lucide-react';
 import { useAuth } from '@/providers/AuthProvider';
 import { useBasePath } from '@/providers/BasePathProvider';
@@ -22,10 +23,12 @@ import { AccountSavedItemsTab } from '@/components/AccountSavedItemsTab';
 import { AccountPaymentTab } from '@/components/AccountPaymentTab';
 import { AccountAddressesTab } from '@/components/AccountAddressesTab';
 import { AccountSettingsTab } from '@/components/AccountSettingsTab';
+import { AccountReviewsTab } from '@/components/AccountReviewsTab';
 
 const tabs = [
   { id: 'overview', label: 'Overview', icon: User },
   { id: 'orders', label: 'Orders', icon: Package },
+  { id: 'reviews', label: 'My Reviews', icon: Star },
   { id: 'saved-items', label: 'Saved Items', icon: Heart },
   // { id: 'payment', label: 'Payment', icon: CreditCard },
   { id: 'addresses', label: 'Addresses', icon: MapPin },
@@ -75,6 +78,8 @@ export default function AccountPage() {
         return <AccountOverviewTab />;
       case 'orders':
         return <AccountOrdersTab />;
+      case 'reviews':
+        return <AccountReviewsTab />;
       case 'saved-items':
         return <AccountSavedItemsTab />;
       // case 'payment':

package/src/screens/ResetPasswordScreen.tsx

@@ -69,7 +69,14 @@ export function ResetPasswordScreen() {
     setStatus(null);
     try {
       const authApi = new AuthApi(AXIOS_CONFIG);
-      await authApi.resetPassword(data.newPassword, token);
+      if (!storeId) {
+        setStatus({
+          type: 'error',
+          message: 'Store ID is missing. Please use the link from your email.',
+        });
+        return;
+      }
+      await authApi.resetPassword(data.newPassword, token, storeId);
       setStatus({
         type: 'success',
         message: 'Password reset successfully! Redirecting to login...',
@@ -117,11 +124,10 @@ export function ResetPasswordScreen() {
             >
               {status && (
                 <div
-                  className={`flex items-start gap-2 rounded-2xl border px-4 py-3 text-sm ${
-                    status.type === 'success'
+                  className={`flex items-start gap-2 rounded-2xl border px-4 py-3 text-sm ${status.type === 'success'
                       ? 'border-green-200 bg-green-50 text-green-800'
                       : 'border-red-200 bg-red-50 text-red-700'
-                  }`}
+                    }`}
                 >
                   <span className="mt-[2px] text-base">{status.type === 'success' ? '✔' : '!'}</span>
                   <span>{status.message}</span>

package/src/lib/Apis/models/create-notification-dto.ts

@@ -1,75 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Hey Pharamcist API
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: 1.0
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-/**
- * 
- * @export
- * @interface CreateNotificationDto
- */
-export interface CreateNotificationDto {
-  _id?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof CreateNotificationDto
-     */
-    title: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof CreateNotificationDto
-     */
-    content: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof CreateNotificationDto
-     */
-    notificationType: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof CreateNotificationDto
-     */
-    notificationLink: string;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof CreateNotificationDto
-     */
-    sentTo: Array<string>;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof CreateNotificationDto
-     */
-    readBy: Array<string>;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof CreateNotificationDto
-     */
-    clearedBy: Array<string>;
-    /**
-     * 
-     * @type {boolean}
-     * @memberof CreateNotificationDto
-     */
-    isAdminNotification: boolean;
-    /**
-     * 
-     * @type {string}
-     * @memberof CreateNotificationDto
-     */
-    storeId: string;
-}

package/src/lib/Apis/models/notification.ts

@@ -1,93 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Hey Pharamcist API
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: 1.0
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-/**
- * 
- * @export
- * @interface Notification
- */
-export interface Notification {
-  _id?: string;
-    /**
-     * 
-     * @type {Date}
-     * @memberof Notification
-     */
-    createdAt: Date;
-    /**
-     * 
-     * @type {Date}
-     * @memberof Notification
-     */
-    updatedAt: Date;
-    /**
-     * 
-     * @type {string}
-     * @memberof Notification
-     */
-    id: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof Notification
-     */
-    title: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof Notification
-     */
-    content: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof Notification
-     */
-    notificationType: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof Notification
-     */
-    notificationLink: string;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof Notification
-     */
-    sentTo: Array<string>;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof Notification
-     */
-    readBy: Array<string>;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof Notification
-     */
-    clearedBy: Array<string>;
-    /**
-     * 
-     * @type {boolean}
-     * @memberof Notification
-     */
-    isAdminNotification: boolean;
-    /**
-     * 
-     * @type {string}
-     * @memberof Notification
-     */
-    storeId: string;
-}

package/src/lib/Apis/models/single-notification-dto.ts

@@ -1,99 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Hey Pharamcist API
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: 1.0
- * 
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-/**
- * 
- * @export
- * @interface SingleNotificationDto
- */
-export interface SingleNotificationDto {
-  _id?: string;
-    /**
-     * 
-     * @type {Date}
-     * @memberof SingleNotificationDto
-     */
-    createdAt: Date;
-    /**
-     * 
-     * @type {Date}
-     * @memberof SingleNotificationDto
-     */
-    updatedAt: Date;
-    /**
-     * 
-     * @type {string}
-     * @memberof SingleNotificationDto
-     */
-    id: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof SingleNotificationDto
-     */
-    title: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof SingleNotificationDto
-     */
-    content: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof SingleNotificationDto
-     */
-    notificationType: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof SingleNotificationDto
-     */
-    notificationLink: string;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof SingleNotificationDto
-     */
-    sentTo: Array<string>;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof SingleNotificationDto
-     */
-    readBy: Array<string>;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof SingleNotificationDto
-     */
-    clearedBy: Array<string>;
-    /**
-     * 
-     * @type {boolean}
-     * @memberof SingleNotificationDto
-     */
-    isAdminNotification: boolean;
-    /**
-     * 
-     * @type {string}
-     * @memberof SingleNotificationDto
-     */
-    storeId: string;
-    /**
-     * 
-     * @type {boolean}
-     * @memberof SingleNotificationDto
-     */
-    isRead: boolean;
-}