Merge branch 'andrew_testing' into Add-changesets

andrew-bierman · Aug 23, 2024 · 24f10da · 24f10da
2 parents d5db0ea + b8abfce
commit 24f10da
Show file tree

Hide file tree

Showing 14 changed files with 3,676 additions and 3,272 deletions.
diff --git a/apps/vite/src/routeTree.gen.ts b/apps/vite/src/routeTree.gen.ts
@@ -174,94 +174,163 @@ const ProfileSettingsIndexLazyRoute = ProfileSettingsIndexLazyImport.update({
 declare module '@tanstack/react-router' {
   interface FileRoutesByPath {
     '/': {
+      id: '/'
+      path: '/'
+      fullPath: '/'
       preLoaderRoute: typeof IndexImport
       parentRoute: typeof rootRoute
     }
     '/destination/query': {
+      id: '/destination/query'
+      path: '/destination/query'
+      fullPath: '/destination/query'
       preLoaderRoute: typeof DestinationQueryLazyImport
       parentRoute: typeof rootRoute
     }
     '/item/$itemId': {
+      id: '/item/$itemId'
+      path: '/item/$itemId'
+      fullPath: '/item/$itemId'
       preLoaderRoute: typeof ItemItemIdLazyImport
       parentRoute: typeof rootRoute
     }
     '/pack/$id': {
+      id: '/pack/$id'
+      path: '/pack/$id'
+      fullPath: '/pack/$id'
       preLoaderRoute: typeof PackIdLazyImport
       parentRoute: typeof rootRoute
     }
     '/pack/create': {
+      id: '/pack/create'
+      path: '/pack/create'
+      fullPath: '/pack/create'
       preLoaderRoute: typeof PackCreateLazyImport
       parentRoute: typeof rootRoute
     }
     '/profile/$id': {
+      id: '/profile/$id'
+      path: '/profile/$id'
+      fullPath: '/profile/$id'
       preLoaderRoute: typeof ProfileIdLazyImport
       parentRoute: typeof rootRoute
     }
     '/trip/$tripId': {
+      id: '/trip/$tripId'
+      path: '/trip/$tripId'
+      fullPath: '/trip/$tripId'
       preLoaderRoute: typeof TripTripIdLazyImport
       parentRoute: typeof rootRoute
     }
     '/trip/create': {
+      id: '/trip/create'
+      path: '/trip/create'
+      fullPath: '/trip/create'
       preLoaderRoute: typeof TripCreateLazyImport
       parentRoute: typeof rootRoute
     }
     '/about/': {
+      id: '/about/'
+      path: '/about'
+      fullPath: '/about'
       preLoaderRoute: typeof AboutIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/appearance/': {
+      id: '/appearance/'
+      path: '/appearance'
+      fullPath: '/appearance'
       preLoaderRoute: typeof AppearanceIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/dashboard/': {
+      id: '/dashboard/'
+      path: '/dashboard'
+      fullPath: '/dashboard'
       preLoaderRoute: typeof DashboardIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/feed/': {
+      id: '/feed/'
+      path: '/feed'
+      fullPath: '/feed'
       preLoaderRoute: typeof FeedIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/items/': {
+      id: '/items/'
+      path: '/items'
+      fullPath: '/items'
       preLoaderRoute: typeof ItemsIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/map/': {
+      id: '/map/'
+      path: '/map'
+      fullPath: '/map'
       preLoaderRoute: typeof MapIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/maps/': {
+      id: '/maps/'
+      path: '/maps'
+      fullPath: '/maps'
       preLoaderRoute: typeof MapsIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/packs/': {
+      id: '/packs/'
+      path: '/packs'
+      fullPath: '/packs'
       preLoaderRoute: typeof PacksIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/password-reset/': {
+      id: '/password-reset/'
+      path: '/password-reset'
+      fullPath: '/password-reset'
       preLoaderRoute: typeof PasswordResetIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/privacy/': {
+      id: '/privacy/'
+      path: '/privacy'
+      fullPath: '/privacy'
       preLoaderRoute: typeof PrivacyIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/profile/': {
+      id: '/profile/'
+      path: '/profile'
+      fullPath: '/profile'
       preLoaderRoute: typeof ProfileIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/register/': {
+      id: '/register/'
+      path: '/register'
+      fullPath: '/register'
       preLoaderRoute: typeof RegisterIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/sign-in/': {
+      id: '/sign-in/'
+      path: '/sign-in'
+      fullPath: '/sign-in'
       preLoaderRoute: typeof SignInIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/trips/': {
+      id: '/trips/'
+      path: '/trips'
+      fullPath: '/trips'
       preLoaderRoute: typeof TripsIndexLazyImport
       parentRoute: typeof rootRoute
     }
     '/profile/settings/': {
+      id: '/profile/settings/'
+      path: '/profile/settings'
+      fullPath: '/profile/settings'
       preLoaderRoute: typeof ProfileSettingsIndexLazyImport
       parentRoute: typeof rootRoute
     }
@@ -270,7 +339,7 @@ declare module '@tanstack/react-router' {
 
 // Create and export the route tree
 
-export const routeTree = rootRoute.addChildren([
+export const routeTree = rootRoute.addChildren({
   IndexRoute,
   DestinationQueryLazyRoute,
   ItemItemIdLazyRoute,
@@ -294,6 +363,110 @@ export const routeTree = rootRoute.addChildren([
   SignInIndexLazyRoute,
   TripsIndexLazyRoute,
   ProfileSettingsIndexLazyRoute,
-])
+})
 
 /* prettier-ignore-end */
+
+/* ROUTE_MANIFEST_START
+{
+  "routes": {
+    "__root__": {
+      "filePath": "__root.tsx",
+      "children": [
+        "/",
+        "/destination/query",
+        "/item/$itemId",
+        "/pack/$id",
+        "/pack/create",
+        "/profile/$id",
+        "/trip/$tripId",
+        "/trip/create",
+        "/about/",
+        "/appearance/",
+        "/dashboard/",
+        "/feed/",
+        "/items/",
+        "/map/",
+        "/maps/",
+        "/packs/",
+        "/password-reset/",
+        "/privacy/",
+        "/profile/",
+        "/register/",
+        "/sign-in/",
+        "/trips/",
+        "/profile/settings/"
+      ]
+    },
+    "/": {
+      "filePath": "index.tsx"
+    },
+    "/destination/query": {
+      "filePath": "destination/query.lazy.tsx"
+    },
+    "/item/$itemId": {
+      "filePath": "item/$itemId.lazy.tsx"
+    },
+    "/pack/$id": {
+      "filePath": "pack/$id.lazy.tsx"
+    },
+    "/pack/create": {
+      "filePath": "pack/create.lazy.tsx"
+    },
+    "/profile/$id": {
+      "filePath": "profile/$id.lazy.tsx"
+    },
+    "/trip/$tripId": {
+      "filePath": "trip/$tripId.lazy.tsx"
+    },
+    "/trip/create": {
+      "filePath": "trip/create.lazy.tsx"
+    },
+    "/about/": {
+      "filePath": "about/index.lazy.tsx"
+    },
+    "/appearance/": {
+      "filePath": "appearance/index.lazy.tsx"
+    },
+    "/dashboard/": {
+      "filePath": "dashboard/index.lazy.tsx"
+    },
+    "/feed/": {
+      "filePath": "feed/index.lazy.tsx"
+    },
+    "/items/": {
+      "filePath": "items/index.lazy.tsx"
+    },
+    "/map/": {
+      "filePath": "map/index.lazy.tsx"
+    },
+    "/maps/": {
+      "filePath": "maps/index.lazy.tsx"
+    },
+    "/packs/": {
+      "filePath": "packs/index.lazy.tsx"
+    },
+    "/password-reset/": {
+      "filePath": "password-reset/index.lazy.tsx"
+    },
+    "/privacy/": {
+      "filePath": "privacy/index.lazy.tsx"
+    },
+    "/profile/": {
+      "filePath": "profile/index.lazy.tsx"
+    },
+    "/register/": {
+      "filePath": "register/index.lazy.tsx"
+    },
+    "/sign-in/": {
+      "filePath": "sign-in/index.lazy.tsx"
+    },
+    "/trips/": {
+      "filePath": "trips/index.lazy.tsx"
+    },
+    "/profile/settings/": {
+      "filePath": "profile/settings/index.lazy.tsx"
+    }
+  }
+}
+ROUTE_MANIFEST_END */
diff --git a/packages/app/components/weather/WeatherCard.tsx b/packages/app/components/weather/WeatherCard.tsx
@@ -305,11 +305,8 @@ const loadStyles = (theme) => {
     },
 
     tempColor: {
-      color: currentTheme.colors.background === '#0284c7' ? 'black' : 'white',
-      backgroundColor:
-        currentTheme.colors.background === '#0284c7'
-          ? '#eaeaea'
-          : currentTheme.colors.whiteDarkGrey,
+      color: currentTheme.colors.text,
+      backgroundColor: currentTheme.colors.card,
     },
 
     cardContainer: {

diff --git a/packages/app/modules/dashboard/components/SectionHeader/SectionHeader.tsx b/packages/app/modules/dashboard/components/SectionHeader/SectionHeader.tsx
@@ -23,7 +23,7 @@ export const SectionHeader = ({
     <RStack style={styles.rStack}>
       <RText style={styles.text}>{text}</RText>
       <RButton style={styles.rbutton} onPress={() => navigate('/feed')}>
-        0 View all feeds
+        View all feeds
       </RButton>
     </RStack>
   );

diff --git a/packages/app/screens/privacy/PrivacyContent.tsx b/packages/app/screens/privacy/PrivacyContent.tsx
@@ -19,16 +19,11 @@ const PrivacyContent = () => {
       <ScrollView>
         <View style={styles.textContainer}>
           <View style={styles.headerContainer}>
-            <Text style={[isDark ? styles.headerDark : styles.header]}>
-              Privacy Policy
-            </Text>
+            <Text style={styles.header}>Privacy Policy</Text>
           </View>
 
           {privacySections.map((section, index) => (
-            <Text
-              key={index}
-              style={[isDark ? styles.tertiaryBlue : styles.text]}
-            >
+            <Text key={index} style={styles.text}>
               {section}
             </Text>
           ))}

diff --git a/packages/app/screens/privacy/privacy.style.tsx b/packages/app/screens/privacy/privacy.style.tsx
@@ -22,15 +22,10 @@ const loadStyles = (theme: any) => {
     header: {
       fontSize: 24,
       fontWeight: 'bold',
-      color: currentTheme.colors.white,
-      marginRight: 10,
-    },
-    headerDark: {
-      fontSize: 24,
-      fontWeight: 'bold',
-      color: currentTheme.colors.white,
+      color: currentTheme.colors.text,
       marginRight: 10,
     },
+
     textContainer: {
       marginBottom: 20,
     },
@@ -39,16 +34,7 @@ const loadStyles = (theme: any) => {
       lineHeight: 28,
       letterSpacing: 1,
       // fontFamily: 'sans-serif',
-      color: currentTheme.colors.white,
-      textAlign: 'left',
-      marginBottom: 20,
-    },
-    tertiaryBlue: {
-      fontSize: 18,
-      lineHeight: 28,
-      letterSpacing: 1,
-      // fontFamily: "sans-serif",
-      color: currentTheme.colors.white,
+      color: currentTheme.colors.text,
       textAlign: 'left',
       marginBottom: 20,
     },

diff --git a/packages/playwright/tests/add-item.spec.js b/packages/playwright/tests/add-item.spec.js
@@ -12,7 +12,7 @@ test('test', async ({ page }) => {
   await page.getByRole('button', { name: ' Packs' }).click();
   await page.goto('https://packrat.world/packs');
   await page.getByRole('link', { name: 'Quantity field' }).click();
-  await page.waitForLoadState('networkidle')
+  await page.waitForLoadState('networkidle');
   const itemButton = await page.getByRole('button', { name: 'Add Item' });
   await itemButton.isVisible();
   await itemButton.click();
@@ -24,6 +24,6 @@ test('test', async ({ page }) => {
   await page.getByLabel('Essentials').click();
   const submitButton = await page.getByRole('button', { name: 'Add Item' });
   await submitButton.isVisible();
-  await submitButton.click();
+  await submitButton.hover();
   await page.goto('https://packrat.world/pack/jfxuhkd3zflt4ddavnyhh3so');
-});
+});