diff --git a/apps/expo/package.json b/apps/expo/package.json index 218c3c9b..b8e24306 100644 --- a/apps/expo/package.json +++ b/apps/expo/package.json @@ -25,10 +25,10 @@ "@react-navigation/drawer": "catalog:", "@rehookify/datepicker": "catalog:", "@shopify/flash-list": "catalog:", - "@tamagui/babel-plugin": "catalog:", - "@tamagui/config": "catalog:", - "@tamagui/lucide-icons": "catalog:", - "@tamagui/toast": "catalog:", + "@tamagui/babel-plugin": "catalog:tamagui1", + "@tamagui/config": "catalog:tamagui1", + "@tamagui/lucide-icons": "catalog:tamagui1", + "@tamagui/toast": "catalog:tamagui1", "@tanstack/react-query": "catalog:", "@trpc/client": "catalog:", "@trpc/react-query": "catalog:", @@ -55,7 +55,7 @@ "react-native-screens": "catalog:", "react-native-svg": "catalog:", "superjson": "catalog:", - "tamagui": "catalog:", + "tamagui": "catalog:tamagui1", "zod": "catalog:", "zustand": "catalog:" }, @@ -90,4 +90,4 @@ ] }, "prettier": "@zotmeal/prettier-config" -} +} \ No newline at end of file diff --git a/apps/expo/src/app/_layout.tsx b/apps/expo/src/app/_layout.tsx index ce220a94..c15eb2c4 100644 --- a/apps/expo/src/app/_layout.tsx +++ b/apps/expo/src/app/_layout.tsx @@ -13,8 +13,8 @@ import { createTamagui, TamaguiProvider, Theme } from "tamagui"; import { HamburgerMenu } from "~/components/navigation"; import { DevInfo, Logo } from "~/components/ui"; import { TRPCProvider, useZotmealColorScheme } from "~/utils"; +import { env } from "~/utils/env"; import { tokenCache } from "~/utils/tokenCache"; -import { env } from "../utils/env"; const tamaguiConfig = createTamagui(config); diff --git a/apps/expo/src/app/events/event/[title].tsx b/apps/expo/src/app/events/event/[title].tsx index 509544fc..51766ef8 100644 --- a/apps/expo/src/app/events/event/[title].tsx +++ b/apps/expo/src/app/events/event/[title].tsx @@ -1,4 +1,3 @@ -import React from "react"; import { Redirect, Stack, useGlobalSearchParams } from "expo-router"; import { CalendarClock, @@ -37,7 +36,7 @@ export default function Event() { const event = events?.find((event) => event.title === title); // TODO: Log error if event is not found - if (!event) return ; + if (!event) return ; return ( <> diff --git a/apps/expo/src/app/index.tsx b/apps/expo/src/app/index.tsx index 64162ebe..e1c74fd2 100644 --- a/apps/expo/src/app/index.tsx +++ b/apps/expo/src/app/index.tsx @@ -14,11 +14,11 @@ import { } from "tamagui"; import { RestaurantTabs } from "~/components/navigation"; +import { EventToast } from "~/components/ui/EventToast"; +import { PeriodPicker } from "~/components/ui/PeriodPicker"; +import { StationTabs } from "~/components/ui/StationTabs"; +import { UniversalDatePicker } from "~/components/ui/UniversalDatePicker"; import { useZotmealQuery, useZotmealStore, ZotmealData } from "~/utils"; -import { EventToast } from "../components/ui/EventToast"; -import { PeriodPicker } from "../components/ui/PeriodPicker"; -import { StationTabs } from "../components/ui/StationTabs"; -import { UniversalDatePicker } from "../components/ui/UniversalDatePicker"; export default function Home() { const theme = useTheme(); diff --git a/apps/expo/src/components/navigation/HamburgerMenu.tsx b/apps/expo/src/components/navigation/HamburgerMenu.tsx index 9ea434a9..e6f16658 100644 --- a/apps/expo/src/components/navigation/HamburgerMenu.tsx +++ b/apps/expo/src/components/navigation/HamburgerMenu.tsx @@ -26,31 +26,31 @@ const screens = [ }, { title: "Events", - href: "/events/", + href: "/events", subTitle: "Upcoming events", icon: CalendarDays, }, { title: "Settings", - href: "/settings/", + href: "/settings", subTitle: "Adjust your settings", icon: Settings, }, { title: "About", - href: "/about/", + href: "/about", subTitle: "Learn about ZotMeal", icon: Info, }, { title: "Privacy Policy", - href: "/privacy-policy/", + href: "/privacy-policy", subTitle: "About your privacy", icon: Siren, }, { title: "Your Account", - href: "/auth/", + href: "/auth", subTitle: "Sign in to your account", icon: LogIn, }, @@ -122,7 +122,7 @@ export function HamburgerMenu() { size="$5" onPress={() => router.push(href)} pressTheme - disabled={href.replaceAll("/", "") === currentSegment} + disabled={href.replace("/", "") === currentSegment} iconAfter={ChevronRight} /> {/* - +