shafi/freshyo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

enh

Browse source
This commit is contained in:
shafi54 2026-05-24 15:24:39 +05:30
parent 5642c53462
commit ba14653721
4 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
apps/user-ui/app/(drawer)/(tabs)/home/index.tsx
View file

@ -389,25 +389,28 @@ export default function Dashboard() {
React.useEffect(() => { React.useEffect(() => {
if (products.length > 0 && displayedProducts.length === 0) { if (products.length === 0) {
setDisplayedProducts([])
setHasMore(false)
return
}
const initialBatch = products const initialBatch = products
.filter(p => typeof p.id === "number") .filter(p => typeof p.id === "number")
.sort((a, b) => { .sort((a, b) => {
const slotA = getQuickestSlot(a.id); const slotA = getQuickestSlot(a.id)
const slotB = getQuickestSlot(b.id); const slotB = getQuickestSlot(b.id)
if (slotA && !slotB) return -1;
if (!slotA && slotB) return 1;
const aOutOfStock = productSlotsMap[a.id]?.isOutOfStock;
const bOutOfStock = productSlotsMap[b.id]?.isOutOfStock;
if (aOutOfStock && !bOutOfStock) return 1;
if (!aOutOfStock && bOutOfStock) return -1;
return 0;
});
console.log('setting the displayed products') const aOutOfStock = Boolean(productSlotsMap[a.id]?.isOutOfStock) || !slotA
setDisplayedProducts(initialBatch); const bOutOfStock = Boolean(productSlotsMap[b.id]?.isOutOfStock) || !slotB
setHasMore(products.length > 10);
} if (aOutOfStock && !bOutOfStock) return 1
if (!aOutOfStock && bOutOfStock) return -1
return 0
})
setDisplayedProducts(initialBatch)
setHasMore(products.length > 10)
}, [productsData, productSlotsMap]); }, [productsData, productSlotsMap]);
const popularItemIds = useMemo(() => { const popularItemIds = useMemo(() => {

3
apps/user-ui/app/(drawer)/(tabs)/me/my-orders/index.tsx
View file

@ -6,6 +6,9 @@ import { useRouter } from 'expo-router';
import { tw, useManualRefresh, MyText, MyFlatList, useMarkDataFetchers, REFUND_STATUS, MyTouchableOpacity, theme } from 'common-ui'; import { tw, useManualRefresh, MyText, MyFlatList, useMarkDataFetchers, REFUND_STATUS, MyTouchableOpacity, theme } from 'common-ui';
import { trpc } from '@/src/trpc-client'; import { trpc } from '@/src/trpc-client';
import { orderStatusManipulator } from '@/src/lib/string-manipulators';
import dayjs from 'dayjs';
import OrderMenu from '@/components/OrderMenu';
// Type definitions // Type definitions
interface OrderItem { interface OrderItem {

2
apps/user-ui/src/components/AddToCartDialog.tsx
View file

@ -106,7 +106,7 @@ export default function AddToCartDialog() {
const availableSlots = availableSlotIds const availableSlots = availableSlotIds
.map((slotId) => slotMap[slotId]) .map((slotId) => slotMap[slotId])
.filter(Boolean) .filter(Boolean)
.filter((slot) => dayjs(slot.deliveryTime).isAfter(dayjs())); .filter((slot) => dayjs(slot.freezeTime).isAfter(dayjs()));
// Find cart item for this product // Find cart item for this product
const cartItem = cartData?.items?.find((item: any) => item.productId === product?.id); const cartItem = cartData?.items?.find((item: any) => item.productId === product?.id);

10
apps/web-ui/src/routes/home.index.tsx
View file

@ -124,15 +124,15 @@ function HomePage() {
.sort((a, b) => { .sort((a, b) => {
const slotA = getQuickestSlot(a.id) const slotA = getQuickestSlot(a.id)
const slotB = getQuickestSlot(b.id) const slotB = getQuickestSlot(b.id)
if (slotA && !slotB) return -1
if (!slotA && slotB) return 1 const aOutOfStock = Boolean(productSlotsMap[a.id]?.isOutOfStock) || !slotA
const aOutOfStock = productSlotsMap[a.id]?.isOutOfStock const bOutOfStock = Boolean(productSlotsMap[b.id]?.isOutOfStock) || !slotB
const bOutOfStock = productSlotsMap[b.id]?.isOutOfStock
if (aOutOfStock && !bOutOfStock) return 1 if (aOutOfStock && !bOutOfStock) return 1
if (!aOutOfStock && bOutOfStock) return -1 if (!aOutOfStock && bOutOfStock) return -1
return 0 return 0
}) })
}, [allProducts, productSlotsMap, getQuickestSlot]) }, [productsData, productSlotsMap])
// Get popular products from essential consts // Get popular products from essential consts
const popularItemIds = useMemo(() => { const popularItemIds = useMemo(() => {