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

enh

Browse source
This commit is contained in:
shafi54 2026-01-31 17:22:11 +05:30
parent df114be912
commit 764806db74
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/admin-ui/app/(drawer)/dashboard/index.tsx
View file

@ -58,7 +58,6 @@ export default function Dashboard() {
const { data: essentialsData } = trpc.admin.user.getEssentials.useQuery(); const { data: essentialsData } = trpc.admin.user.getEssentials.useQuery();
console.log({essentialsData})
const menuItems: MenuItem[] = [ const menuItems: MenuItem[] = [
{ {

7
apps/admin-ui/app/(drawer)/orders/index.tsx
View file

@ -168,7 +168,7 @@ const OrderItem = ({ order, refetch }: { order: OrderType; refetch: () => void }
<View style={tw`flex-row justify-between items-start`}> <View style={tw`flex-row justify-between items-start`}>
<View style={tw`flex-1`}> <View style={tw`flex-1`}>
<View style={tw`flex-row items-center mb-1`}> <View style={tw`flex-row items-center mb-1`}>
<MyText style={tw`font-bold text-lg text-gray-900 mr-2`}> <MyText style={tw`font-bold text-lg mr-2 ${order.status === 'cancelled' ? 'text-red-600' : 'text-gray-900'}`}>
{order.customerName || 'Unknown Customer'} {order.customerName || 'Unknown Customer'}
</MyText> </MyText>
<View style={tw`bg-gray-200 px-2 py-0.5 rounded mr-2`}> <View style={tw`bg-gray-200 px-2 py-0.5 rounded mr-2`}>
@ -231,6 +231,11 @@ const OrderItem = ({ order, refetch }: { order: OrderType; refetch: () => void }
checkColor="#FFFFFF" checkColor="#FFFFFF"
/> />
</View> </View>
{order.status === 'cancelled' && (
<View style={tw`border border-red-500 px-2 py-0.5 rounded-full`}>
<MyText style={tw`text-xs font-bold text-red-600`}>CANCELLED</MyText>
</View>
)}
</View> </View>
{/* Delivery Info */} {/* Delivery Info */}

4
apps/backend/src/trpc/admin-apis/complaint.ts
View file

@ -2,7 +2,7 @@ import { router, protectedProcedure } from '../trpc-index';
import { z } from 'zod'; import { z } from 'zod';
import { db } from '../../db/db_index'; import { db } from '../../db/db_index';
import { complaints, users } from '../../db/schema'; import { complaints, users } from '../../db/schema';
import { eq } from 'drizzle-orm'; import { eq, desc } from 'drizzle-orm';
import { generateSignedUrlsFromS3Urls } from '../../lib/s3-client'; import { generateSignedUrlsFromS3Urls } from '../../lib/s3-client';
export const complaintRouter = router({ export const complaintRouter = router({
@ -30,7 +30,7 @@ export const complaintRouter = router({
}) })
.from(complaints) .from(complaints)
.leftJoin(users, eq(complaints.userId, users.id)) .leftJoin(users, eq(complaints.userId, users.id))
.orderBy(complaints.createdAt) .orderBy(desc(complaints.createdAt))
.limit(limit) .limit(limit)
.offset(offset), .offset(offset),
db db

9
apps/backend/src/trpc/admin-apis/user.ts
View file

@ -54,13 +54,10 @@ export const userRouter = {
getEssentials: protectedProcedure getEssentials: protectedProcedure
.query(async () => { .query(async () => {
const [result] = await db const count = await db.$count(complaints, eq(complaints.isResolved, false));
.select({ count: db.$count(complaints) })
.from(complaints)
.where(eq(complaints.isResolved, false));
return { return {
unresolvedComplaints: result.count || 0, unresolvedComplaints: count || 0,
}; };
}), }),
}; };