diff --git a/packages/app/components/feed/FeedCard.tsx b/packages/app/components/feed/FeedCard.tsx
index d7f02b17b7..0830e7c85a 100644
--- a/packages/app/components/feed/FeedCard.tsx
+++ b/packages/app/components/feed/FeedCard.tsx
@@ -51,6 +51,7 @@ export default function Card({
createdAt,
owners,
duration,
+ itemPacks,
}: CardProps) {
const user = useAuthUser();
const { enableDarkMode, enableLightMode, isDark, isLight, currentTheme } =
@@ -98,7 +99,11 @@ export default function Card({
const truncatedName = truncateString(name, 25);
const truncatedDestination = truncateString(destination, 25);
// const formattedWeight = formatNumber(total_weight); // TODO convert to user preference once implemented
- const formattedWeight = total_weight;
+ const formattedWeight = total_weight ?? 0;
+ const quantity = itemPacks?.reduce(
+ (accumulator, currentValue) => accumulator + currentValue?.item?.quantity ?? 0,
+ 0,
+ ) ?? 0;
let numberOfNights;
if (duration) numberOfNights = JSON.parse(duration).numberOfNights;
@@ -187,6 +192,11 @@ export default function Card({
Total Weight: {formattedWeight}
)}
+ {type === 'pack' && (
+
+ Total Quantity: {quantity}
+
+ )}
{type === 'trip' && (
diff --git a/packages/app/components/feed/FeedSearchFilter.tsx b/packages/app/components/feed/FeedSearchFilter.tsx
index eb5ee85896..0218262cde 100644
--- a/packages/app/components/feed/FeedSearchFilter.tsx
+++ b/packages/app/components/feed/FeedSearchFilter.tsx
@@ -146,7 +146,7 @@ const FeedSearchFilter = ({
onValueChange={handleSortChange}
placeholder="Sort By"
style={styles.dropdown}
- width={150}
+ width={160}
/>
{(feedType === 'userPacks' || feedType === 'userTrips') && (
diff --git a/packages/app/components/itemtable/itemTable.tsx b/packages/app/components/itemtable/itemTable.tsx
index 12bba9b3e4..375abce80d 100644
--- a/packages/app/components/itemtable/itemTable.tsx
+++ b/packages/app/components/itemtable/itemTable.tsx
@@ -210,7 +210,7 @@ export const ItemsTable = ({
diff --git a/packages/app/constants/api.ts b/packages/app/constants/api.ts
index ec6f8eda95..63d353eefe 100644
--- a/packages/app/constants/api.ts
+++ b/packages/app/constants/api.ts
@@ -2,13 +2,13 @@
import { NODE_ENV, API_URL, NEXT_PUBLIC_API_URL } from '@env';
-let api = 'http://localhost:8787/api';
+let api = 'http://localhost:8080/api';
if (NODE_ENV === 'production') {
// api = API_URL;
api = NEXT_PUBLIC_API_URL;
} else {
- api = 'http://localhost:8787/api';
+ api = 'http://localhost:8080/api';
// api = "https://packrat.onrender.com";
}
diff --git a/server/package.json b/server/package.json
index 585dffc898..01d8cf262f 100644
--- a/server/package.json
+++ b/server/package.json
@@ -21,7 +21,7 @@
"prisma:generate": "npx prisma generate --schema=src/prisma/schema.prisma --data-proxy",
"prisma:validate": "npx prisma validate --schema=src/prisma/schema.prisma",
"prisma:pull": "npx prisma db pull --schema=src/prisma/schema.prisma",
- "wrangler:dev": "npx wrangler dev --port 8787 --local",
+ "wrangler:dev": "npx wrangler dev --port 8080 --local",
"wrangler:dev2": "npx wrangler pages dev --proxy 3001 --local --persist-to=./db.sqlite --d1=DB -- npm run dev",
"generate": "drizzle-kit generate:sqlite --schema=./src/db/schema.ts --out=./migrations",
"migrate": "wrangler d1 migrations apply production",
diff --git a/server/src/swaggerOptions.ts b/server/src/swaggerOptions.ts
index 9f32346eea..2920e48e51 100644
--- a/server/src/swaggerOptions.ts
+++ b/server/src/swaggerOptions.ts
@@ -32,7 +32,7 @@ const options = {
servers: [
{
- url: 'http://localhost:8787',
+ url: 'http://localhost:8080',
description: 'Development server',
},
{