Merge branch 'development' of https://github.com/andrew-bierman/PackRat…

… into server_types
andrew-bierman · Dec 28, 2024 · 51e6226 · 51e6226
2 parents 877f9dd + 3444ffd
commit 51e6226
Show file tree

Hide file tree

Showing 33 changed files with 295 additions and 239 deletions.
diff --git a/packages/app/components/Avatar/Avatar.tsx b/packages/app/components/Avatar/Avatar.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
 import { RImage } from '@packrat/ui';
 import { MaterialCommunityIcons } from '@expo/vector-icons';
 export interface AvatarProps {

diff --git a/packages/app/components/DialogDemo/DialogDemo.tsx b/packages/app/components/DialogDemo/DialogDemo.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
 import { MaterialCommunityIcons } from '@expo/vector-icons';
 import {
   Button as OriginalButton,

diff --git a/packages/app/components/MultistepForm/ProgressBar.tsx b/packages/app/components/MultistepForm/ProgressBar.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
 import useCustomStyles from 'app/hooks/useCustomStyles';
 import { Svg, Line, Circle } from 'react-native-svg';
 import { View } from 'react-native';

diff --git a/packages/app/components/MultistepForm/Sidebar.tsx b/packages/app/components/MultistepForm/Sidebar.tsx
@@ -1,8 +1,9 @@
+import React from 'react';
 import useCustomStyles from 'app/hooks/useCustomStyles';
 import { View, Text } from 'react-native';
 
 interface SidebarProps {
-  data: { title?: string; subtext?: string }[];
+  data: Array<{ title?: string; subtext?: string }>;
   currentStep: number;
 }
 
@@ -15,7 +16,6 @@ export const Sidebar: React.FC<SidebarProps> = ({ data, currentStep }) => {
 
   return (
     <View style={styles.sidebar}>
-      {/* Display your data here */}
       {displayData.map((currentData, index) => {
         if (!currentData) return null;
         const { title, subtext } = currentData;

diff --git a/packages/app/components/RPrimaryButton/index.tsx b/packages/app/components/RPrimaryButton/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { styled, Button, ButtonProps } from 'tamagui';
+import { styled, Button, type ButtonProps } from 'tamagui';
 
 interface RPrimaryButtonProps extends ButtonProps {
   label: string;

diff --git a/packages/app/components/RSecondaryButton/index.tsx b/packages/app/components/RSecondaryButton/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { styled, Button, ButtonProps } from 'tamagui';
+import { styled, Button, type ButtonProps } from 'tamagui';
 import useTheme from 'app/hooks/useTheme';
 
 interface RSecondaryButtonProps extends ButtonProps {

diff --git a/packages/app/components/Redirect/Redirect.tsx b/packages/app/components/Redirect/Redirect.tsx
@@ -1,9 +1,9 @@
 import { useEffect } from 'react';
 import { useRouter } from 'app/hooks/router';
 
-type RedirectProps = {
+interface RedirectProps {
   to: string;
-};
+}
 
 export const Redirect = ({ to }: RedirectProps) => {
   const router = useRouter();

diff --git a/packages/app/components/Suggestion/SuggestionDescription.tsx b/packages/app/components/Suggestion/SuggestionDescription.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { FlatList } from 'react-native';
 import { AnimatePresence, Text, Theme, View, styled } from 'tamagui';
 
@@ -11,10 +11,10 @@ const List = styled(FlatList<Message>, {
 
 const getMessages = (data: Message[]) => data;
 
-type Message = {
+interface Message {
   role: 'user' | 'ai';
   content: string;
-};
+}
 
 const renderItem = ({
   item: message,

diff --git a/packages/app/components/Suggestion/SuggestionList.tsx b/packages/app/components/Suggestion/SuggestionList.tsx
@@ -10,7 +10,7 @@ interface Category {
   name: string;
 }
 
-interface Item {
+interface SuggestionItem {
   id: string;
   name: string;
   ownerId: string;
@@ -21,12 +21,12 @@ interface Item {
 }
 
 interface SuggestionListProps {
-  suggestion: { Items: Item[] } | null;
+  suggestion: { Items: SuggestionItem[] } | null;
   onAddItem: (itemId: string) => void;
 }
 
 export function SuggestionList({ suggestion, onAddItem }: SuggestionListProps) {
-  const [itemsList, setItemsList] = useState<Item[]>([]);
+  const [itemsList, setItemsList] = useState<SuggestionItem[]>([]);
   const { isDark } = useTheme();
 
   useEffect(() => {
@@ -51,7 +51,7 @@ export function SuggestionList({ suggestion, onAddItem }: SuggestionListProps) {
         style={{
           minWidth: 300,
           height: '100%',
-          overflow: 'auto',
+          overflow: 'scroll',
         }}
       >
         {itemsList.map((item, i) => (
@@ -67,7 +67,12 @@ export function SuggestionList({ suggestion, onAddItem }: SuggestionListProps) {
 
 SuggestionList.fileName = 'List';
 
-function Item({ item, onAddItem }) {
+interface ItemProps {
+  item: SuggestionItem;
+  onAddItem: (itemId: string) => void;
+}
+
+function Item({ item, onAddItem }: ItemProps) {
   const { addPackItem, isLoading } = useAddPackItem();
 
   const handleAddItem = (item) => {
@@ -89,7 +94,7 @@ function Item({ item, onAddItem }) {
         style={{
           borderRadius: 5,
           flexDirection: 'row',
-          aligItems: 'center',
+          alignItems: 'center',
         }}
       >
         <View style={{ flexDirection: 'column', justifyContent: 'center' }}>

diff --git a/packages/app/components/carousel/ScrollButton.tsx b/packages/app/components/carousel/ScrollButton.tsx
@@ -5,9 +5,9 @@ import {
   TouchableOpacity,
   View,
   StyleProp,
-  TextStyle,
+  type TextStyle,
+  type ViewStyle,
   TouchableOpacityProps,
-  ViewStyle,
 } from 'react-native';
 import useCustomStyles from 'app/hooks/useCustomStyles';
 import useTheme from 'app/hooks/useTheme';

diff --git a/packages/app/components/carousel/index.tsx b/packages/app/components/carousel/index.tsx
@@ -1,9 +1,9 @@
-import React, { useRef, useState, ReactNode } from 'react';
+import React, { useRef, useState, type ReactNode } from 'react';
 import {
   ScrollView,
   Platform,
   Dimensions,
-  NativeScrollEvent,
+  type NativeScrollEvent,
 } from 'react-native';
 import { RStack } from '@packrat/ui';
 import ScrollButton from './ScrollButton';

diff --git a/packages/app/components/chat/ActionItem.tsx b/packages/app/components/chat/ActionItem.tsx
@@ -6,7 +6,7 @@ import Animated, {
   withTiming,
   FadeIn,
 } from 'react-native-reanimated';
-import { LucideIcon } from 'lucide-react-native';
+import type { LucideIcon } from 'lucide-react-native';
 
 const AnimatedPressable = Animated.createAnimatedComponent(Pressable);
 

diff --git a/packages/app/components/hero/index.tsx b/packages/app/components/hero/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { RStack, RImage } from '@packrat/ui';
-import { ImageSourcePropType, Platform, View } from 'react-native';
+import { type ImageSourcePropType, Platform, View } from 'react-native';
 import { theme } from '../../theme';
 import { isObjectEmpty } from '../../utils/isObjectEmpty';
 import useCustomStyles from 'app/hooks/useCustomStyles';

diff --git a/packages/app/components/inventory/Inventory.tsx b/packages/app/components/inventory/Inventory.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
 import { View, Text, TouchableOpacity } from 'react-native';
 // import { TableContainer } from '../Table';
 

diff --git a/packages/app/components/landing_page/FAQS.tsx b/packages/app/components/landing_page/FAQS.tsx
@@ -6,7 +6,7 @@ import useTheme from 'app/hooks/useTheme';
 import useResponsive from 'app/hooks/useResponsive';
 import { FaqList } from 'app/constants/FAQS';
 import { MaterialCommunityIcons } from '@expo/vector-icons';
-import { useState } from 'react';
+import React, { useState } from 'react';
 
 export const FAQS = () => {
   const { currentTheme } = useTheme();
@@ -26,10 +26,10 @@ export const FAQS = () => {
     <View style={styles.faqMainContainer}>
       <View style={styles.faqFirstContainer}>
         <RText style={styles.faqMainTitle}>Frequently Asked Questions</RText>
-        <View style={{width: '100%'}}>
+        <View style={{ width: '100%' }}>
           {FaqList.map((faq, index) => {
             return (
-              <View style={styles.faqBox}>
+              <View key={index} style={styles.faqBox}>
                 <View
                   onPress={() => toggleAnswer(index)}
                   style={styles.faqQuestion}
@@ -59,8 +59,8 @@ export const FAQS = () => {
           src={PakRat_FAQS}
           style={{
             backgroundColor: 'transparent',
-            width: xs || sm || md ?  359 : 650,
-            height: xs || sm || md ?  250 : 541,
+            width: xs || sm || md ? 359 : 650,
+            height: xs || sm || md ? 250 : 541,
           }}
           alt="PackRat Frequently Asked Questions"
         />
@@ -69,47 +69,47 @@ export const FAQS = () => {
   );
 };
 
-const loadStyles = (currentTheme, xs, sm, md) => StyleSheet.create({
-  faqMainContainer: {
-    flexDirection: xs || sm || md ? 'column' : 'row',
-    alignItems: 'center',
-    justifyContent: 'space-evenly',
-    gap: 10,
-    width: '100vw',
-    maxWidth: '100vw',
-    paddingTop: 20,
-    paddingBottom: 20,
-  },
-  faqFirstContainer: {
-    alignItems: 'center',
-  },
-  faqBox: {
-    width: xs || sm || md  ? '100%' : '24vw',
-  },
-  faqMainTitle: {
-    fontSize: xs || sm || md ?  20 : 26,
-    textAlign : xs || sm || md ? 'center' : 'auto',
-    fontWeight: 'bold',
-    color: currentTheme.colors.textPrimary,
-    marginBottom: 30,
-  },
-  faqQuestion: {
-    borderBottomWidth: 1,
-    borderBottomColor: currentTheme.colors.textPrimary,
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-    marginTop: 4,
-    marginBottom: 4,
-    marginLeft: xs || sm || md ? 10 : 0,
-    marginRight: xs || sm || md ? 10 : 0,
-    gap: xs || sm || md ? 2 : 10,
-  },
-  faqAnswer: {
-    marginLeft: 0,
-    width: xs || sm || md ? '100%' : '24vw',
-    marginLeft: xs || sm || md ? 10 : 0,
-    marginRight: xs || sm || md ? 10 : 0,
-  },
-  faqSecondContainer: {},
-});
+const loadStyles = (currentTheme, xs, sm, md) =>
+  StyleSheet.create({
+    faqMainContainer: {
+      flexDirection: xs || sm || md ? 'column' : 'row',
+      alignItems: 'center',
+      justifyContent: 'space-evenly',
+      gap: 10,
+      width: '100vw',
+      maxWidth: '100vw',
+      paddingTop: 20,
+      paddingBottom: 20,
+    },
+    faqFirstContainer: {
+      alignItems: 'center',
+    },
+    faqBox: {
+      width: xs || sm || md ? '100%' : '24vw',
+    },
+    faqMainTitle: {
+      fontSize: xs || sm || md ? 20 : 26,
+      textAlign: xs || sm || md ? 'center' : 'auto',
+      fontWeight: 'bold',
+      color: currentTheme.colors.textPrimary,
+      marginBottom: 30,
+    },
+    faqQuestion: {
+      borderBottomWidth: 1,
+      borderBottomColor: currentTheme.colors.textPrimary,
+      flexDirection: 'row',
+      alignItems: 'center',
+      justifyContent: 'space-between',
+      marginTop: 4,
+      marginBottom: 4,
+      marginLeft: xs || sm || md ? 10 : 0,
+      marginRight: xs || sm || md ? 10 : 0,
+      gap: xs || sm || md ? 2 : 10,
+    },
+    faqAnswer: {
+      width: xs || sm || md ? '100%' : '24vw',
+      marginLeft: xs || sm || md ? 10 : 0,
+      marginRight: xs || sm || md ? 10 : 0,
+    },
+    faqSecondContainer: {},
+  });