Feed Cards and Global Checklist fixes

andrew-bierman · Apr 27, 2024 · 5b281d4 · 5b281d4
1 parent 1bdef1f
commit 5b281d4
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git 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}
                   </RText>
                 )}
+                {type === 'pack' && (
+                  <RText fontSize="$1" color="mediumpurple" ml={-0.5} mt={-1}>
+                    Total Quantity: {quantity}
+                  </RText>
+                )}
 
                 {type === 'trip' && (
                   <RText fontSize="$1" color="mediumpurple" ml={-0.5} mt={-1}>

diff --git 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}
             />
           </RStack>
           {(feedType === 'userPacks' || feedType === 'userTrips') && (

diff --git a/packages/app/components/itemtable/itemTable.tsx b/packages/app/components/itemtable/itemTable.tsx
@@ -210,7 +210,7 @@ export const ItemsTable = ({
           <RButton
             style={{
               width: 50,
-              backgroundColor: '#0284c7',
+              backgroundColor: page < 2 ? 'gray' : '#0284c7',
               borderRadius: 5,
               borderColor: page < 2 ? 'gray' : '#0284c7',
               borderWidth: 1,
@@ -222,16 +222,16 @@ export const ItemsTable = ({
             <AntDesign
               name="left"
               size={16}
-              color={page < 2 ? 'gray' : 'white'}
+              color='white'
             />
           </RButton>
           <RButton
             style={{
               marginLeft: 10,
               width: 50,
-              backgroundColor: '#0284c7',
+              backgroundColor: page === totalPages ? 'gray' : '#0284c7',
               borderRadius: 5,
-              borderColor: page === totalPages ? 'gray' : 'white',
+              borderColor: page === totalPages ? 'gray' : '#0284c7',
               borderWidth: 1,
               borderStyle: 'solid',
             }}
@@ -241,7 +241,7 @@ export const ItemsTable = ({
             <AntDesign
               name="right"
               size={16}
-              color={page === totalPages ? 'gray' : 'white'}
+              color='white'
             />
           </RButton>
         </View>

diff --git 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
@@ -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
@@ -32,7 +32,7 @@ const options = {
 
   servers: [
     {
-      url: 'http://localhost:8787',
+      url: 'http://localhost:8080',
       description: 'Development server',
     },
     {