diff --git a/app/_layout.tsx b/app/_layout.tsx index 409ffa9..b4e3938 100644 --- a/app/_layout.tsx +++ b/app/_layout.tsx @@ -21,11 +21,20 @@ import { Toast, TextProps, } from "react-native-ui-lib"; +import functions from "@react-native-firebase/functions"; +import auth from "@react-native-firebase/auth"; +import firestore from "@react-native-firebase/firestore"; SplashScreen.preventAutoHideAsync(); const queryClient = new QueryClient(); +if (__DEV__) { + functions().useEmulator('localhost', 5001); + firestore().useEmulator("localhost", 5471); + auth().useEmulator("http://localhost:9099"); +} + type TextStyleBase = | "text10" | "text20" diff --git a/assets/images/child-picture.png b/assets/images/child-picture.png new file mode 100644 index 0000000..5669ec4 Binary files /dev/null and b/assets/images/child-picture.png differ diff --git a/assets/images/child1-picture.png b/assets/images/child1-picture.png new file mode 100644 index 0000000..09a5ba1 Binary files /dev/null and b/assets/images/child1-picture.png differ diff --git a/assets/svgs/FireworksOrangeIcon.tsx b/assets/svgs/FireworksOrangeIcon.tsx new file mode 100644 index 0000000..6600231 --- /dev/null +++ b/assets/svgs/FireworksOrangeIcon.tsx @@ -0,0 +1,21 @@ +import * as React from "react" +import Svg, { G, Path, Defs, ClipPath, SvgProps } from "react-native-svg" + +const FireworksOrangeIcon: React.FC = (props) => ( + + + + + + + + + + +) +export default FireworksOrangeIcon diff --git a/assets/svgs/GiftIcon.tsx b/assets/svgs/GiftIcon.tsx new file mode 100644 index 0000000..ee4be5d --- /dev/null +++ b/assets/svgs/GiftIcon.tsx @@ -0,0 +1,23 @@ +import * as React from "react"; +import Svg, { Path, SvgProps } from "react-native-svg"; +const GiftIcon: React.FC = (props) => ( + + + + + + +); +export default GiftIcon; diff --git a/components/pages/brain_dump/DumpItem.tsx b/components/pages/brain_dump/DumpItem.tsx index 5efd909..a1bdda2 100644 --- a/components/pages/brain_dump/DumpItem.tsx +++ b/components/pages/brain_dump/DumpItem.tsx @@ -16,10 +16,10 @@ const BrainDumpItem = (props: { item: IBrainDump }) => { padding-15 style={{ borderRadius: 20, elevation: 2 }} > - + {props.item.title} - {props.item.description} + {props.item.description} diff --git a/components/pages/brain_dump/DumpList.tsx b/components/pages/brain_dump/DumpList.tsx index 86453ae..8cd8efb 100644 --- a/components/pages/brain_dump/DumpList.tsx +++ b/components/pages/brain_dump/DumpList.tsx @@ -19,7 +19,7 @@ const DumpList = (props: { searchText: string }) => { ); return ( - + item.title} diff --git a/components/pages/grocery/AddGroceryItem.tsx b/components/pages/grocery/AddGroceryItem.tsx index 898598a..e391a4d 100644 --- a/components/pages/grocery/AddGroceryItem.tsx +++ b/components/pages/grocery/AddGroceryItem.tsx @@ -45,8 +45,11 @@ const AddGroceryItem = () => { text70L iconSource={() => } style={styles.finishShopBtn} + labelStyle={styles.addBtnLbl} enableShadow - onPress={() => {setIsAddingGrocery(true)}} + onPress={() => { + setIsAddingGrocery(true); + }} /> @@ -89,4 +92,5 @@ const styles = StyleSheet.create({ flex: 1, marginHorizontal: 3, }, + addBtnLbl: { fontFamily: "Manrope_500Medium", fontSize: 17, marginLeft: 5 }, }); diff --git a/components/pages/grocery/GroceryList.tsx b/components/pages/grocery/GroceryList.tsx index fe87ee9..1743c4d 100644 --- a/components/pages/grocery/GroceryList.tsx +++ b/components/pages/grocery/GroceryList.tsx @@ -1,13 +1,17 @@ -import {FlatList, StyleSheet} from "react-native"; -import React, {useEffect, useState} from "react"; -import {Button, Text, View} from "react-native-ui-lib"; +import { FlatList, StyleSheet } from "react-native"; +import React, { useEffect, useState } from "react"; +import { Button, Text, TouchableOpacity, View } from "react-native-ui-lib"; import GroceryItem from "./GroceryItem"; -import {GroceryCategory, GroceryFrequency, useGroceryContext,} from "@/contexts/GroceryContext"; +import { + GroceryCategory, + GroceryFrequency, + useGroceryContext, +} from "@/contexts/GroceryContext"; import HeaderTemplate from "@/components/shared/HeaderTemplate"; -import {AntDesign, MaterialIcons} from "@expo/vector-icons"; +import { AntDesign, MaterialIcons } from "@expo/vector-icons"; import EditGroceryItem from "./EditGroceryItem"; -import {ProfileType, useAuthContext} from "@/contexts/AuthContext"; -import {IGrocery} from "@/hooks/firebase/types/groceryData"; +import { ProfileType, useAuthContext } from "@/contexts/AuthContext"; +import { IGrocery } from "@/hooks/firebase/types/groceryData"; const GroceryList = () => { const { @@ -81,20 +85,35 @@ const GroceryList = () => { message={"Welcome to your grocery list"} isWelcome={false} > - + - + {approvedGroceries?.length} list{" "} {approvedGroceries?.length === 1 ? ( - + item ) : ( - + items )} @@ -103,19 +122,21 @@ const GroceryList = () => { - + {pendingGroceries?.length} pending -