hey-pharmacist-ecommerce 1.1.3 → 1.1.5

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/ShopScreen.tsx

@@ -65,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())}`));
     }
   };
 
@@ -79,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())}`));
     }
   };
 

package/src/screens/WishlistScreen.tsx

@@ -183,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>
@@ -287,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>
@@ -381,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>