diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 9b747bd..f927c65 100755 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 20.x - cache: npm + cache: yarn - name: Setup Expo and EAS uses: expo/expo-github-action@v8 @@ -34,7 +34,7 @@ jobs: token: ${{ secrets.EXPO_TOKEN }} - name: Install dependencies - run: npm ci --legacy-peer-deps + run: yarn install --immutable - name: Prebuild, Build and Submit - run: npm run prebuild-build-submit-ios-cicd + run: yarn prebuild-build-submit-ios-cicd \ No newline at end of file diff --git a/app.json b/app.json index 7413002..98db76d 100644 --- a/app.json +++ b/app.json @@ -13,10 +13,10 @@ "backgroundColor": "#ffffff" }, "ios": { - "supportsTablet": true, + "supportsTablet": false, "bundleIdentifier": "com.cally.app", "googleServicesFile": "./ios/GoogleService-Info.plist", - "buildNumber": "60", + "buildNumber": "74", "usesAppleSignIn": true }, "android": { diff --git a/app/(auth)/_layout.tsx b/app/(auth)/_layout.tsx index dceffc1..824e01d 100644 --- a/app/(auth)/_layout.tsx +++ b/app/(auth)/_layout.tsx @@ -1,120 +1,108 @@ import React from "react"; -import { Drawer } from "expo-router/drawer"; -import { useSignOut } from "@/hooks/firebase/useSignOut"; -import { - DrawerContentScrollView, - DrawerItem, - DrawerItemList, -} from "@react-navigation/drawer"; -import { Button, View, Text, ButtonSize } from "react-native-ui-lib"; -import { Dimensions, ImageBackground, StyleSheet } from "react-native"; -import Feather from "@expo/vector-icons/Feather"; +import {Drawer} from "expo-router/drawer"; +import {useSignOut} from "@/hooks/firebase/useSignOut"; +import {DrawerContentScrollView,} from "@react-navigation/drawer"; +import {Button, ButtonSize, Text, View} from "react-native-ui-lib"; +import {ImageBackground, StyleSheet} from "react-native"; import DrawerButton from "@/components/shared/DrawerButton"; -import { - AntDesign, - FontAwesome6, - MaterialCommunityIcons, - Octicons, -} from "@expo/vector-icons"; -import MenuIcon from "@/assets/svgs/MenuIcon"; -import { router } from "expo-router"; import NavGroceryIcon from "@/assets/svgs/NavGroceryIcon"; import NavToDosIcon from "@/assets/svgs/NavToDosIcon"; import NavBrainDumpIcon from "@/assets/svgs/NavBrainDumpIcon"; import NavCalendarIcon from "@/assets/svgs/NavCalendarIcon"; import NavSettingsIcon from "@/assets/svgs/NavSettingsIcon"; -import { useAtom, useSetAtom } from "jotai"; -import { - isFamilyViewAtom, - settingsPageIndex, - toDosPageIndex, - userSettingsView, -} from "@/components/pages/calendar/atoms"; import FeedbackNavIcon from "@/assets/svgs/FeedbackNavIcon"; +import {MaterialIcons} from "@expo/vector-icons"; +import {useSetAtom} from "jotai"; +import { + isFamilyViewAtom, + settingsPageIndex, + toDosPageIndex, + userSettingsView, +} from "@/components/pages/calendar/atoms"; +import Ionicons from "@expo/vector-icons/Ionicons"; export default function TabLayout() { - const { mutateAsync: signOut } = useSignOut(); - const setIsFamilyView = useSetAtom(isFamilyViewAtom); - const setPageIndex = useSetAtom(settingsPageIndex); - const setUserView = useSetAtom(userSettingsView); - const setToDosIndex = useSetAtom(toDosPageIndex); + const {mutateAsync: signOut} = useSignOut(); + const setIsFamilyView = useSetAtom(isFamilyViewAtom); + const setPageIndex = useSetAtom(settingsPageIndex); + const setUserView = useSetAtom(userSettingsView); + const setToDosIndex = useSetAtom(toDosPageIndex); - return ( - { - return ( - - - - Welcome to Cally - - - - { - props.navigation.navigate("calendar"); - setPageIndex(0); - setToDosIndex(0); - setUserView(true); - setIsFamilyView(false); - }} - icon={} - /> - { - props.navigation.navigate("grocery"); - setPageIndex(0); - setToDosIndex(0); - setUserView(true); - setIsFamilyView(false); - }} - icon={} - /> - { - props.navigation.navigate("feedback"); - setPageIndex(0); - setToDosIndex(0); - setUserView(true); - setIsFamilyView(false); - }} - icon={} - /> - - - {/* { + return ( + + + + Welcome to Cally + + + + { + props.navigation.navigate("calendar"); + setPageIndex(0); + setToDosIndex(0); + setUserView(true); + setIsFamilyView(false); + }} + icon={} + /> + { + props.navigation.navigate("grocery"); + setPageIndex(0); + setToDosIndex(0); + setUserView(true); + setIsFamilyView(false); + }} + icon={}/> + { + props.navigation.navigate("feedback"); + setPageIndex(0); + setToDosIndex(0); + setUserView(true); + setIsFamilyView(false); + }} + icon={} + /> + + + {/* } />*/} - { - props.navigation.navigate("todos"); - setPageIndex(0); - setToDosIndex(0); - setUserView(true); - setIsFamilyView(false); - }} - icon={} - /> - { - props.navigation.navigate("brain_dump"); - setPageIndex(0); - setToDosIndex(0); - setUserView(true); - setIsFamilyView(false); - }} - icon={} - /> - {/* signOut()} />*/} - - -