Merge pull request #1318 from andrew-bierman/feat/items-redesign

Feat/items redesign
andrew-bierman · Oct 21, 2024 · c585f5c · c585f5c
2 parents 828e7c8 + ba228ae
commit c585f5c
Show file tree

Hide file tree

Showing 106 changed files with 5,633 additions and 829 deletions.
diff --git a/apps/expo/app/(app)/(drawer)/(tabs)/(stack)/item/[itemId].tsx b/apps/expo/app/(app)/(drawer)/(tabs)/(stack)/item/[itemId].tsx
@@ -16,13 +16,12 @@ export default function Item() {
       <Stack.Screen
         options={{
           // https://reactnavigation.org/docs/headers#setting-the-header-title
-          title: 'Pack',
+          title: 'Item',
           // https://reactnavigation.org/docs/headers#adjusting-header-styles
 
           // https://reactnavigation.org/docs/headers#replacing-the-title-with-a-custom-component
         }}
       />
-      {/* <DetailsComponent type='pack'/> */}
       <ItemDetailsScreen />
     </>
   );

diff --git a/apps/expo/app/(app)/(drawer)/(tabs)/(stack)/products/index.tsx b/apps/expo/app/(app)/(drawer)/(tabs)/(stack)/products/index.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { ProductsScreen } from 'app/modules/item';
+import { Platform } from 'react-native';
+import { Stack } from 'expo-router';
+import Head from 'expo-router/head';
+import useTheme from 'app/hooks/useTheme';
+import { DrawerToggleButton } from '@react-navigation/drawer';
+
+export default function ProductsPage() {
+  const { currentTheme } = useTheme();
+
+  return (
+    <>
+      {Platform.OS === 'web' && (
+        <Head>
+          <title>Products</title>
+        </Head>
+      )}
+      <Stack.Screen
+        options={{
+          // https://reactnavigation.org/docs/headers#setting-the-header-title
+          title: 'Products',
+          headerRight: () => (
+            <DrawerToggleButton tintColor={currentTheme.colors.tertiaryBlue} />
+          ),
+
+          headerStyle: {
+            backgroundColor: currentTheme.colors.background,
+          },
+          headerTitleStyle: {
+            fontSize: 24,
+          },
+          headerTintColor: currentTheme.colors.tertiaryBlue,
+          // https://reactnavigation.org/docs/headers#adjusting-header-styles
+
+          // https://reactnavigation.org/docs/headers#replacing-the-title-with-a-custom-component
+        }}
+      />
+      <ProductsScreen />
+    </>
+  );
+}
diff --git a/apps/expo/package.json b/apps/expo/package.json
@@ -126,6 +126,7 @@
     "react-native": "0.73.6",
     "react-native-dotenv": "^3.4.8",
     "react-native-elements": "^3.4.3",
+    "react-native-fast-image": "^8.6.3",
     "react-native-flash-message": "^0.4.2",
     "react-native-gesture-handler": "~2.14.0",
     "react-native-google-places-autocomplete": "^2.5.1",

diff --git a/apps/next/pages/products/index.tsx b/apps/next/pages/products/index.tsx
@@ -0,0 +1,15 @@
+import { ProductsScreen } from 'app/modules/item';
+import { AuthWrapper } from 'app/modules/auth';
+// export const runtime = 'experimental-edge';
+
+export default function ProductsPage() {
+  return (
+    <>
+      <ProductsScreen />
+    </>
+  );
+}
+
+ProductsPage.getLayout = function getLayout(page: any) {
+  return <AuthWrapper>{page}</AuthWrapper>;
+};