Merge pull request #1143 from andrew-bierman/dev

dev -> main
andrew-bierman · Jul 26, 2024 · 9eb3355 · 9eb3355
2 parents ee2ec1a + 747c794
commit 9eb3355
Show file tree

Hide file tree

Showing 59 changed files with 1,073 additions and 462 deletions.
diff --git a/.github/workflows/node.js.dev.yml b/.github/workflows/node.js.dev.yml
@@ -29,50 +29,9 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
 
-    - name: Debug Information
-      run: |
-        yarn -v
-        ls .yarn/releases
-        cat .yarnrc.yml
-        cat yarn.lock
-
-    - name: ⚙️ Enable Corepack
-      run: |
-        corepack enable
-        echo "corepack enabled"
-
-    - name: Set Yarn Version to Berry
-      run: yarn set version berry
-
-    #   run: yarn policies set-version
-
     - name: Install dependencies
       uses: ./.github/actions/install-deps
 
-    - name: Debug more
-      run: |
-        yarn -v
-        yarn info packrat-world@workspace:.
-        yarn workspaces list --json
-
-    - name: Run setup
-      run: |
-        yarn -v
-        which yarn
-        yarn set version stable
-        yarn install
-
-# cp client/.env.example client/.env
-# cp client/app.json.example client/app.json
-# cp server/.env.example server/.env
-
-# yarn setup
-
-    # - name: Clean Cache and Reinstall
-    #   run: |
-    #     yarn cache clean
-    #     yarn install --immutable
-
     - name: Start Server in Background
       run: |
         cd server
@@ -83,8 +42,13 @@ jobs:
         cd apps/expo
         yarn web &
 
+    - name: Start Vite in Background
+      run: |
+        cd apps/vite
+        yarn dev &
+
     - name: Wait for a while
-      run: sleep 120  # wait for some time to let the server start
+      run: sleep 520  # wait for some time to let the server start
 
     - name: Kill Background Jobs (Unix)
       if: matrix.os != 'windows-latest'

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -3,7 +3,6 @@ on:
   push:
     branches: [ main, master ]
   pull_request:
-    branches: [ main, master ]
 jobs:
   test:
     timeout-minutes: 60
@@ -16,7 +15,9 @@ jobs:
     - name: Install dependencies
       run: npm install -g yarn && yarn
     - name: Install Playwright Browsers
-      run: yarn playwright install --with-deps
+      run: |
+        cd packages/playwright
+        yarn playwright install --with-deps
     - name: Run Playwright tests
       run: |
         cd packages/playwright

diff --git a/packages/app/components/card/LargeCard.tsx b/packages/app/components/card/LargeCard.tsx
@@ -126,10 +126,14 @@ const loadStyles = (theme: any) => {
       flexDirection: 'column',
       alignItems: 'center',
       textAlign: 'center',
-      padding: currentTheme.size.cardPadding,
+      padding:
+        Platform.OS === 'web'
+          ? currentTheme.size.cardPadding
+          : currentTheme.size.mobilePadding,
       paddingHorizontal: currentTheme.padding.paddingInside,
       marginBottom: 20,
       height: Platform.OS === 'web' ? 650 : '23%',
+      minHeight: 350,
       overflow: 'hidden',
     },
   };

diff --git a/packages/app/components/destination/index.tsx b/packages/app/components/destination/index.tsx
@@ -132,69 +132,80 @@ export const DestinationPage = () => {
   const map = () => <MapContainer shape={shape} />;
 
   return (
-    <ScrollView>
-      {isLoading && (
-        <RText style={{ width: '90%', alignSelf: 'center' }}>Loading...</RText>
-      )}
-      {!isLoading && !isError && (
-        <View style={styles.container}>
-          <View
-            style={{
-              zIndex: 1,
-              width: '100%',
-              ...styles.headerContainer,
-            }}
+    <View style={styles.container}>
+      <ScrollView>
+        {isLoading && (
+          <RText
+            style={{ width: '90%', alignSelf: 'center', textAlign: 'center' }}
           >
-            {Platform.OS === 'web' ? (
-              <PlacesAutocomplete
-                onSelect={handleSearchSelect}
-                placeholder={'Search by park, city, or trail'}
-              />
-            ) : (
-              <RButton
+            Loading...
+          </RText>
+        )}
+        <View style={{ flex: 1, marginBottom: 40 }}>
+          {!isLoading && !isError && (
+            <>
+              <View
                 style={{
-                  backgroundColor: currentTheme.colors.text,
-                  minWidth: '100%',
-                  height: 25,
-                  flexDirection: 'row',
-                }}
-                onPress={() => {
-                  router.push('/search');
+                  zIndex: 1,
+                  width: '100%',
+                  ...styles.headerContainer,
                 }}
               >
-                <MaterialCommunityIcons
-                  name="magnify"
-                  size={24}
-                  color={currentTheme.colors.background}
-                />
-                <RText color={currentTheme.colors.textDarkGrey} opacity={0.6}>
-                  Search by park, city, or trail
-                </RText>
-              </RButton>
-            )}
-          </View>
-
-          <DestinationHeader
-            geoJSON={geoJSON}
-            selectedSearchResult={currentDestination}
-          />
-          <LargeCard
-            title="Map"
-            Icon={() => (
-              <Ionicons
-                name="location"
-                size={24}
-                color={currentTheme.colors.textPrimary}
+                {Platform.OS === 'web' ? (
+                  <PlacesAutocomplete
+                    onSelect={handleSearchSelect}
+                    placeholder={'Search by park, city, or trail'}
+                  />
+                ) : (
+                  <RButton
+                    style={{
+                      backgroundColor: currentTheme.colors.text,
+                      minWidth: '100%',
+                      height: 25,
+                      flexDirection: 'row',
+                    }}
+                    onPress={() => {
+                      router.push('/search');
+                    }}
+                  >
+                    <MaterialCommunityIcons
+                      name="magnify"
+                      size={24}
+                      color={currentTheme.colors.background}
+                    />
+                    <RText
+                      color={currentTheme.colors.textDarkGrey}
+                      opacity={0.6}
+                    >
+                      Search by park, city, or trail
+                    </RText>
+                  </RButton>
+                )}
+              </View>
+
+              <DestinationHeader
+                geoJSON={geoJSON}
+                selectedSearchResult={currentDestination}
+              />
+              <LargeCard
+                title="Map"
+                Icon={() => (
+                  <Ionicons
+                    name="location"
+                    size={24}
+                    color={currentTheme.colors.textPrimary}
+                  />
+                )}
+                ContentComponent={map}
+                contentProps={{ shape }}
+                type="map"
               />
-            )}
-            ContentComponent={map}
-            contentProps={{ shape }}
-            type="map"
-          />
-          <WeatherData latLng={latLng} />
+              <WeatherData latLng={latLng} />
+            </>
+          )}
         </View>
-      )}
-    </ScrollView>
+      </ScrollView>
+    </View>
   );
 };
 
@@ -208,7 +219,6 @@ const loadStyles = (theme) => {
       paddingBottom: 12,
       paddingLeft: 16,
       width: '100%',
-      marginBottom: 40,
       backgroundColor: currentTheme.colors.background,
     },
     headerContainer: {
@@ -246,6 +256,8 @@ const loadStyles = (theme) => {
       justifyContent: 'space-between',
       marginBottom: 20,
       width: '100%',
+      backgroundColor: isDark ? '#2D2D2D' : currentTheme.colors.white,
+      padding: 25,
     },
   };
 };