diff --git a/apps/expo/metro.config.js b/apps/expo/metro.config.js index 3a7bc95..6a85d2a 100644 --- a/apps/expo/metro.config.js +++ b/apps/expo/metro.config.js @@ -12,7 +12,7 @@ module.exports = withTurborepoManagedCache( isCSSEnabled: true, }), { - input: "./src/app/styles/global.css", + input: "./src/styles/global.css", configPath: "./tailwind.config.ts", }, ), diff --git a/apps/expo/src/app/_layout.tsx b/apps/expo/src/app/_layout.tsx index 623f4b3..5759d39 100644 --- a/apps/expo/src/app/_layout.tsx +++ b/apps/expo/src/app/_layout.tsx @@ -12,7 +12,7 @@ import { import Colors from "@movie-web/tailwind-config/colors"; -import "./styles/global.css"; +import "../styles/global.css"; export { // Catch any errors thrown by the Layout component. diff --git a/apps/expo/src/app/video-player.tsx b/apps/expo/src/app/video-player.tsx index 80373e6..f55d466 100644 --- a/apps/expo/src/app/video-player.tsx +++ b/apps/expo/src/app/video-player.tsx @@ -13,8 +13,8 @@ import { } from "@movie-web/provider-utils"; import { fetchMediaDetails } from "@movie-web/tmdb"; -import type { ItemData } from "./components/item/item"; -import { usePlayer } from "./hooks/usePlayer"; +import type { ItemData } from "~/components/item/item"; +import { usePlayer } from "../hooks/usePlayer"; export default function VideoPlayerWrapper() { const params = useLocalSearchParams(); diff --git a/apps/expo/src/app/components/TabBarIcon.tsx b/apps/expo/src/components/TabBarIcon.tsx similarity index 100% rename from apps/expo/src/app/components/TabBarIcon.tsx rename to apps/expo/src/components/TabBarIcon.tsx diff --git a/apps/expo/src/app/components/item/item.tsx b/apps/expo/src/components/item/item.tsx similarity index 100% rename from apps/expo/src/app/components/item/item.tsx rename to apps/expo/src/components/item/item.tsx diff --git a/apps/expo/src/app/components/layout/ScreenLayout.tsx b/apps/expo/src/components/layout/ScreenLayout.tsx similarity index 100% rename from apps/expo/src/app/components/layout/ScreenLayout.tsx rename to apps/expo/src/components/layout/ScreenLayout.tsx diff --git a/apps/expo/src/app/components/ui/Text.tsx b/apps/expo/src/components/ui/Text.tsx similarity index 91% rename from apps/expo/src/app/components/ui/Text.tsx rename to apps/expo/src/components/ui/Text.tsx index 5375b8f..bd35a5c 100644 --- a/apps/expo/src/app/components/ui/Text.tsx +++ b/apps/expo/src/components/ui/Text.tsx @@ -2,7 +2,7 @@ import type { TextProps } from "react-native"; import { Text as RNText } from "react-native"; import { cva } from "class-variance-authority"; -import { cn } from "~/app/lib/utils"; +import { cn } from "~/lib/utils"; const textVariants = cva("text-white"); diff --git a/apps/expo/src/app/constants/.gitkeep b/apps/expo/src/constants/.gitkeep similarity index 100% rename from apps/expo/src/app/constants/.gitkeep rename to apps/expo/src/constants/.gitkeep diff --git a/apps/expo/src/app/hooks/usePlayer.ts b/apps/expo/src/hooks/usePlayer.ts similarity index 100% rename from apps/expo/src/app/hooks/usePlayer.ts rename to apps/expo/src/hooks/usePlayer.ts diff --git a/apps/expo/src/app/lib/utils.ts b/apps/expo/src/lib/utils.ts similarity index 100% rename from apps/expo/src/app/lib/utils.ts rename to apps/expo/src/lib/utils.ts diff --git a/apps/expo/src/app/styles/global.css b/apps/expo/src/styles/global.css similarity index 100% rename from apps/expo/src/app/styles/global.css rename to apps/expo/src/styles/global.css diff --git a/apps/expo/tsconfig.json b/apps/expo/tsconfig.json index 7bdd73b..f9ed19d 100644 --- a/apps/expo/tsconfig.json +++ b/apps/expo/tsconfig.json @@ -5,7 +5,7 @@ "baseUrl": ".", "paths": { "~/*": ["./src/*"], - "~/components/*": ["./src/app/components/*"], + "~/components/*": ["./src/components/*"], }, "jsx": "react-native", "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json",