hey-pharmacist-ecommerce 1.1.2 → 1.1.4

package/src/screens/OrdersScreen.tsx

@@ -11,6 +11,7 @@ import { useOrders } from '@/hooks/useOrders';
 import { FilterChips } from '@/components/FilterChips';
 import { useRouter } from 'next/navigation';
 import { ManualOrderDTOOrderStatusEnum, PaymentPaymentStatusEnum } from '@/lib/Apis';
+import { useBasePath } from '@/providers/BasePathProvider';
 
 const STATUS_FILTERS = ['All', ...Object.values(ManualOrderDTOOrderStatusEnum)];
 const PAYMENT_FILTERS = ['All', ...Object.values(PaymentPaymentStatusEnum)];
@@ -19,6 +20,7 @@ type PaymentFilterType = (typeof PAYMENT_FILTERS)[number];
 
 export function OrdersScreen() {
   const router = useRouter();
+  const { buildPath } = useBasePath();
   const [page, setPage] = useState(1);
   const [selectedFilter, setSelectedFilter] = useState<StatusFilterType>('All');
   const [selectedPaymentFilter, setSelectedPaymentFilter] = useState<PaymentFilterType>('All');
@@ -160,7 +162,7 @@ export function OrdersScreen() {
                   title="No orders found for these filters"
                   description="Adjust the status or payment filters, or browse the shop for new essentials."
                   actionLabel="Shop products"
-                  onAction={() => router.push('/shop')}
+                  onAction={() => router.push(buildPath('/shop'))}
                 />
               )}
             </div>

package/src/screens/ProductDetailScreen.tsx

@@ -32,6 +32,7 @@ import { ProductVariantsApi } from '@/lib/Apis/apis/product-variants-api';
 import { AXIOS_CONFIG } from '@/lib/Apis/wrapper';
 import { useWishlist } from '@/providers/WishlistProvider';
 import { ProductsApi, ProductVariant, ProductVariantInventoryStatusEnum } from '@/lib/Apis';
+import { useBasePath } from '@/providers/BasePathProvider';
 
 const safeFormatDate = (date?: Date | string, format: 'long' | 'short' = 'long'): string => {
   if (!date) return 'N/A';
@@ -51,6 +52,7 @@ interface ProductDetailScreenProps {
 export function ProductDetailScreen({ productId }: ProductDetailScreenProps) {
   // Hooks and state at the top level
   const router = useRouter();
+  const { buildPath } = useBasePath();
   const { product: productData, isLoading } = useProduct(productId);
   const { addToCart } = useCart();
 
@@ -330,17 +332,17 @@ export function ProductDetailScreen({ productId }: ProductDetailScreenProps) {
               <Button
                 variant="ghost"
                 className="text-white hover:bg-white/10"
-                onClick={() => router.push('/shop')}
+                onClick={() => router.push(buildPath('/shop'))}
               >
                 <ArrowLeft className="h-5 w-5" />
                 Continue shopping
               </Button>
               <div className="hidden items-center gap-3 text-sm text-white/80 md:flex">
-                <Link href="/" className="transition hover:text-white">
+                <Link href={buildPath('/')} className="transition hover:text-white">
                   Home
                 </Link>
                 <ChevronRight className="h-4 w-4" />
-                <Link href="/shop" className="transition hover:text-white">
+                <Link href={buildPath('/shop')} className="transition hover:text-white">
                   Shop
                 </Link>
                 <ChevronRight className="h-4 w-4" />

package/src/screens/ProfileScreen.tsx

@@ -24,6 +24,7 @@ import { Input } from '@/components/ui/Input';
 import { useAuth } from '@/providers/AuthProvider';
 import { toast } from 'sonner';
 import { getInitials } from '@/lib/utils/format';
+import { useBasePath } from '@/providers/BasePathProvider';
 
 const profileSchema = z.object({
   firstName: z.string().min(2, 'First name is required'),
@@ -37,6 +38,7 @@ type ProfileFormData = z.infer<typeof profileSchema>;
 export function ProfileScreen() {
   const router = useRouter();
   const { user, updateUser, logout } = useAuth();
+  const { buildPath } = useBasePath();
   const [isSubmitting, setIsSubmitting] = useState(false);
 
   const {
@@ -68,11 +70,11 @@ export function ProfileScreen() {
   const handleLogout = async () => {
     await logout();
     toast.success('Logged out successfully');
-    router.push('/');
+    router.push(buildPath('/'));
   };
 
   if (!user) {
-    router.push('/login');
+    router.push(buildPath('/login'));
     return null;
   }
 
@@ -81,19 +83,19 @@ export function ProfileScreen() {
       icon: Package,
       label: 'Order history',
       description: 'Track shipments and download invoices',
-      href: '/orders',
+      href: buildPath('/orders'),
     },
     {
       icon: Heart,
       label: 'Wishlist',
       description: 'Curate go-to remedies and favorites',
-      href: '/wishlist',
+      href: buildPath('/wishlist'),
     },
     {
       icon: MapPin,
       label: 'Delivery addresses',
       description: 'Manage saved delivery locations',
-      href: '/account/addresses',
+      href: buildPath('/account/addresses'),
     },
   ];
 
@@ -134,7 +136,7 @@ export function ProfileScreen() {
               <Button
                 variant="ghost"
                 className="text-white hover:bg-white/20"
-                onClick={() => router.push('/account/change-password')}
+                onClick={() => router.push(buildPath('/account/change-password'))}
               >
                 Change password
               </Button>
@@ -211,7 +213,7 @@ export function ProfileScreen() {
                       type="button"
                       variant="outline"
                       size="lg"
-                      onClick={() => router.push('/orders')}
+                      onClick={() => router.push(buildPath('/orders'))}
                     >
                       View recent orders
                     </Button>
@@ -257,7 +259,7 @@ export function ProfileScreen() {
                 <Button
                   variant="outline"
                   className="mt-4 w-full"
-                  onClick={() => router.push('/account/preferences')}
+                  onClick={() => router.push(buildPath('/account/preferences'))}
                 >
                   Manage preferences
                 </Button>

package/src/screens/RegisterScreen.tsx

@@ -21,6 +21,7 @@ import { Button } from '@/components/ui/Button';
 import { useAuth } from '@/providers/AuthProvider';
 import { toast } from 'sonner';
 import { CreateUserDtoCustomerTypeEnum, CreateUserDtoRoleEnum } from '@/lib/Apis/models';
+import { useBasePath } from '@/providers/BasePathProvider';
 
 const registerSchema = z
   .object({
@@ -47,6 +48,7 @@ const BENEFITS = [
 export function RegisterScreen() {
   const router = useRouter();
   const { register: registerUser } = useAuth();
+  const { buildPath } = useBasePath();
   const [showPassword, setShowPassword] = useState(false);
   const [showConfirmPassword, setShowConfirmPassword] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -70,7 +72,7 @@ export function RegisterScreen() {
         role: CreateUserDtoRoleEnum.User,
       });
       toast.success('Account created successfully!');
-      router.push('/');
+      router.push(buildPath('/'));
     } catch (error: any) {
       toast.error(error.response?.data?.message || 'Failed to create account');
     } finally {

package/src/screens/SearchResultsScreen.tsx

@@ -12,9 +12,11 @@ import Link from 'next/link';
 import { AXIOS_CONFIG } from '@/lib/Apis/wrapper';
 import { useWishlist } from '@/providers/WishlistProvider';
 import { useRouter } from 'next/navigation';
+import { useBasePath } from '@/providers/BasePathProvider';
 
 export default function SearchPage() {
-    const router = useRouter();
+  const router = useRouter();
+  const { buildPath } = useBasePath();
     const searchParams = useSearchParams();
     const searchQuery = searchParams.get('q') || '';
     const [products, setProducts] = useState<ExtendedProductDTO[]>([]);
@@ -136,7 +138,7 @@ export default function SearchPage() {
                             <ProductCard
                                 product={product}
                                 isFavorited={isInWishlist(product.id)}
-                                onClickProduct={(p) => router.push(`/products/${p.id}`)}
+                                onClickProduct={(p) => router.push(buildPath(`/products/${p.id}`))}
                             />
                         ))}
                     </div>

package/src/screens/ShopScreen.tsx

@@ -23,6 +23,7 @@ import {
 } from 'lucide-react';
 import Image from 'next/image';
 import { useRouter } from 'next/navigation';
+import { useBasePath } from '@/providers/BasePathProvider';
 import { ProductCard } from '@/components/ProductCard';
 import { ProductCardSkeleton } from '@/components/ui/Skeleton';
 import { EmptyState } from '@/components/EmptyState';
@@ -42,6 +43,7 @@ interface ShopScreenProps {
 
 export function ShopScreen({ initialFilters = {}, categoryName }: ShopScreenProps) {
   const router = useRouter();
+  const { buildPath } = useBasePath();
   const [filters, setFilters] = useState<ProductFilters>(initialFilters);
   const [page, setPage] = useState(1);
   const [showFilters, setShowFilters] = useState(false);
@@ -63,7 +65,7 @@ export function ShopScreen({ initialFilters = {}, categoryName }: ShopScreenProp
     e.preventDefault();
     if (searchQuery.trim()) {
       setIsSearching(true);
-      router.push(`/search?q=${encodeURIComponent(searchQuery.trim())}`);
+      router.push(buildPath(`/search?q=${encodeURIComponent(searchQuery.trim())}`));
     }
   };
 
@@ -77,7 +79,7 @@ export function ShopScreen({ initialFilters = {}, categoryName }: ShopScreenProp
     if (e.key === 'Enter' && searchQuery.trim()) {
       e.preventDefault();
       setIsSearching(true);
-      router.push(`/search?q=${encodeURIComponent(searchQuery.trim())}`);
+      router.push(buildPath(`/search?q=${encodeURIComponent(searchQuery.trim())}`));
     }
   };
 
@@ -1026,7 +1028,7 @@ export function ShopScreen({ initialFilters = {}, categoryName }: ShopScreenProp
                               product={product}
                               onClickProduct={(item) => {
                                 const productData = encodeURIComponent(JSON.stringify(item));
-                                router.push(`/products/${item.id}?product=${productData}`);
+                                router.push(buildPath(`/products/${item.id}?product=${productData}`));
                               }}
                             />
                           </div>
@@ -1049,7 +1051,7 @@ export function ShopScreen({ initialFilters = {}, categoryName }: ShopScreenProp
                               key={product.id}
                               whileHover={{ y: -4 }}
                               className="group flex cursor-pointer flex-col gap-6 rounded-2xl border border-gray-100 bg-white p-5 shadow-sm transition hover:shadow-xl md:flex-row md:items-start"
-                              onClick={() => router.push(`/products/${product.id}`)}
+                              onClick={() => router.push(buildPath(`/products/${product.id}`))}
                             >
                               <div className="relative h-48 w-full overflow-hidden rounded-2xl bg-gray-100 md:h-40 md:w-40">
                                 <Image
@@ -1111,7 +1113,7 @@ export function ShopScreen({ initialFilters = {}, categoryName }: ShopScreenProp
                                   size="sm"
                                   onClick={(event) => {
                                     event.stopPropagation();
-                                    router.push(`/products/${product._id}`);
+                                    router.push(buildPath(`/products/${product._id}`));
                                   }}
                                 >
                                   View product

package/src/screens/WishlistScreen.tsx

@@ -23,6 +23,7 @@ import { useWishlistProducts } from '@/hooks/useWishlistProducts';
 import Image from 'next/image';
 import { formatPrice } from '@/lib/utils/format';
 import { ExtendedProductDTO } from '@/lib/Apis';
+import { useBasePath } from '@/providers/BasePathProvider';
 
 type SortOption = 'featured' | 'price-low' | 'price-high' | 'name' | 'availability';
 
@@ -45,6 +46,7 @@ interface InsightCardProps {
 
 export default function WishlistScreen() {
     const router = useRouter();
+  const { buildPath } = useBasePath();
     const { isAuthenticated } = useAuth() || {};
     const {
         products: wishlistItems,
@@ -181,7 +183,7 @@ export default function WishlistScreen() {
                                         <p className="mt-3 text-slate-500">
                                             Create your curated shelf of products and we&apos;ll keep them ready whenever you return.
                                         </p>
-                                        <Button className="mt-6" onClick={() => router.push('/login')}>
+                                        <Button className="mt-6" onClick={() => router.push(buildPath('/login'))}>
                                             Sign In
                                         </Button>
                                     </div>
@@ -285,8 +287,8 @@ export default function WishlistScreen() {
                                                     Bookmark pharmacy essentials, supplements, or skincare picks and we&apos;ll keep them safe until you&apos;re ready to checkout.
                                                 </p>
                                                 <div className="mt-8 flex flex-wrap justify-center gap-3">
-                                                    <Button onClick={() => router.push('/shop')}>Discover products</Button>
-                                                    <Button variant="outline" onClick={() => router.push('/categories')}>
+                                                    <Button onClick={() => router.push(buildPath('/shop'))}>Discover products</Button>
+                                                    <Button variant="outline" onClick={() => router.push(buildPath('/categories'))}>
                                                         Browse categories
                                                     </Button>
                                                 </div>
@@ -314,7 +316,7 @@ export default function WishlistScreen() {
                                                     >
                                                         <ProductCard
                                                             product={product as ExtendedProductDTO}
-                                                            onClickProduct={(p) => router.push(`/products/${p.id}`)}
+                                                          onClickProduct={(p) => router.push(buildPath(`/products/${p.id}`))}
                                                             onFavorite={() => handleRemoveFromWishlist(product.id)}
                                                             isFavorited
                                                         />
@@ -379,7 +381,7 @@ export default function WishlistScreen() {
                                                             <div className="flex flex-wrap gap-2">
                                                                 <Button
                                                                     size="sm"
-                                                                    onClick={() => router.push(`/products/${product.id}`)}
+                                                                    onClick={() => router.push(buildPath(`/products/${product.id}`))}
                                                                 >
                                                                     View details
                                                                 </Button>