mirror/App
1
0
Fork 0
mirror of https://github.com/Jellify-Music/App.git synced 2026-01-04 18:10:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

module import fixes

Browse Source
This commit is contained in:
Violet Caulfield
2025-01-20 10:08:57 -06:00
parent cd58ff7a79
commit 44cd8859be
36 changed files with 75 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/client.ts
View File

@@ -1,11 +1,11 @@
import { Api } from "@jellyfin/sdk/lib/api";
import { JellyfinInfo } from "./info";
import { JellifyServer } from "@/types/JellifyServer";
import { JellifyUser } from "@/types/JellifyUser";
import { JellifyServer } from "../types/JellifyServer";
import { JellifyUser } from "../types/JellifyUser";
import { storage } from '../constants/storage';
import { MMKVStorageKeys } from "../enums/mmkv-storage-keys";
import uuid from 'react-native-uuid';
import { JellifyLibrary } from "@/types/JellifyLibrary";
import { JellifyLibrary } from "../types/JellifyLibrary";
export default class Client {
static #instance: Client;

2
api/queries/favorites.ts
View File

@@ -1,4 +1,4 @@
import { QueryKeys } from "@/enums/query-keys";
import { QueryKeys } from "../../enums/query-keys";
import { useQuery } from "@tanstack/react-query";
import { fetchFavoriteAlbums, fetchFavoriteArtists, fetchFavoriteTracks, fetchUserData } from "./functions/favorites";

2
api/queries/tracks.ts
View File

@@ -1,4 +1,4 @@
import { QueryKeys } from "@/enums/query-keys";
import { QueryKeys } from "../../enums/query-keys";
import { ItemSortBy } from "@jellyfin/sdk/lib/generated-client/models/item-sort-by";
import { getItemsApi } from "@jellyfin/sdk/lib/utils/api/items-api";
import { useQuery } from "@tanstack/react-query";

2
components/Album/component.tsx
View File

@@ -10,7 +10,7 @@ import { FlatList } from "react-native";
import { usePlayerContext } from "../../player/provider";
import { RunTimeTicks } from "../Global/helpers/time-codes";
import Track from "../Global/components/track";
import { useItemTracks } from "@/api/queries/tracks";
import { useItemTracks } from "../../api/queries/tracks";
import { SafeAreaView, useSafeAreaFrame } from "react-native-safe-area-context";
import FavoriteHeaderButton from "../Global/components/favorite-header-button";
import { useEffect } from "react";

2
components/Albums/component.tsx
View File

@@ -1,4 +1,4 @@
import { useFavoriteAlbums } from "@/api/queries/favorites";
import { useFavoriteAlbums } from "../../api/queries/favorites";
import { AlbumsProps } from "../types";
import { SafeAreaView, useSafeAreaFrame } from "react-native-safe-area-context";
import { ItemCard } from "../Global/helpers/item-card";

2
components/Artist/component.tsx
View File

@@ -8,7 +8,7 @@ import { H2 } from "../Global/helpers/text";
import { useState } from "react";
import { CachedImage } from "@georstat/react-native-image-cache";
import { BaseItemDto, ImageType } from "@jellyfin/sdk/lib/generated-client/models";
import { queryConfig } from "@/api/queries/query.config";
import { queryConfig } from "../../api/queries/query.config";
import { getImageApi } from "@jellyfin/sdk/lib/utils/api";
import { SafeAreaView, useSafeAreaFrame } from "react-native-safe-area-context";
import FavoriteHeaderButton from "../Global/components/favorite-header-button";

2
components/Artists/component.tsx
View File

@@ -1,4 +1,4 @@
import { useFavoriteArtists } from "@/api/queries/favorites";
import { useFavoriteArtists } from "../../api/queries/favorites";
import { SafeAreaView, useSafeAreaFrame } from "react-native-safe-area-context";
import React from "react";
import { FlatList, RefreshControl } from "react-native";

4
components/Favorites/screens/index.tsx
View File

@@ -1,8 +1,8 @@
import { FlatList } from "react-native";
import { SafeAreaView, useSafeAreaFrame } from "react-native-safe-area-context";
import Categories from "./categories";
import IconCard from "@/components/Global/helpers/icon-card";
import { StackParamList } from "@/components/types";
import IconCard from "../../../components/Global/helpers/icon-card";
import { StackParamList } from "../../../components/types";
import { RouteProp } from "@react-navigation/native";
import { NativeStackNavigationProp } from "@react-navigation/native-stack";

4
components/Global/components/favorite-header-button.tsx
View File

@@ -1,11 +1,11 @@
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import React, { useEffect, useState } from "react";
import Icon from "../helpers/icon";
import { Colors } from "@/enums/colors";
import { Colors } from "../../../enums/colors";
import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
import { useMutation } from "@tanstack/react-query";
import { isUndefined } from "lodash";
import { useUserData } from "@/api/queries/favorites";
import { useUserData } from "../../../api/queries/favorites";
import { Spinner } from "tamagui";
import Client from "../../../api/client";

8
components/Global/components/track.tsx
View File

@@ -1,17 +1,17 @@
import { usePlayerContext } from "@/player/provider";
import { usePlayerContext } from "../../../player/provider";
import React from "react";
import { Separator, Spacer, View, XStack, YStack } from "tamagui";
import { Text } from "../helpers/text";
import { RunTimeTicks } from "../helpers/time-codes";
import { BaseItemDto, ImageType } from "@jellyfin/sdk/lib/generated-client/models";
import { Colors } from "@/enums/colors";
import { Colors } from "../../../enums/colors";
import { CachedImage } from "@georstat/react-native-image-cache";
import { getImageApi } from "@jellyfin/sdk/lib/utils/api/image-api";
import { queryConfig } from "@/api/queries/query.config";
import { queryConfig } from "../../../api/queries/query.config";
import { useSafeAreaFrame } from "react-native-safe-area-context";
import Icon from "../helpers/icon";
import { NativeStackNavigationProp } from "@react-navigation/native-stack";
import { StackParamList } from "@/components/types";
import { StackParamList } from "../../../components/types";
import Client from "../../../api/client";
interface TrackProps {

2
components/Global/helpers/blurhash-loading.tsx
View File

@@ -1,5 +1,5 @@
import Client from "../../../api/client";
import { useItemImage } from "@/api/queries/image";
import { useItemImage } from "../../../api/queries/image";
import { Blurhash } from "react-native-blurhash";
import { Image, View } from "tamagui";

4
components/Global/helpers/icon-card.tsx
View File

@@ -1,6 +1,6 @@
import { Card, View } from "tamagui";
import { H2, H5, Text } from "./text";
import { Colors } from "@/enums/colors";
import { H2 } from "./text";
import { Colors } from "../../../enums/colors";
import Icon from "./icon";
export default function IconCard({

5
components/Global/helpers/input.tsx
View File

@@ -1,7 +1,6 @@
import { Colors } from '@/enums/colors';
import { Colors } from '../../../enums/colors';
import React, { SetStateAction } from 'react';
import { StyleProp } from 'react-native';
import { Input as TamaguiInput, TextStyle} from 'tamagui';
import { Input as TamaguiInput} from 'tamagui';
interface InputProps {
onChangeText: React.Dispatch<SetStateAction<string | undefined>>,

2
components/Global/helpers/slider.tsx
View File

@@ -1,4 +1,4 @@
import { Colors } from "@/enums/colors";
import { Colors } from "../../../enums/colors";
import React from "react";
import { SliderProps as TamaguiSliderProps, SliderVerticalProps, Slider as TamaguiSlider, styled, Slider } from "tamagui";

2
components/Global/helpers/time-codes.tsx
View File

@@ -1,5 +1,5 @@
import { convertRunTimeTicksToSeconds } from "../../../helpers/runtimeticks";
import { Text } from "./text";
import { convertRunTimeTicksToSeconds } from "@/helpers/runtimeticks";
import React from "react";
export function RunTimeSeconds({ children }: { children: number }) : React.JSX.Element {

8
components/Home/helpers/playlists.tsx
View File

@@ -1,7 +1,7 @@
import { useUserPlaylists } from "@/api/queries/playlist";
import { ItemCard } from "@/components/Global/helpers/item-card";
import { H2 } from "@/components/Global/helpers/text";
import { ProvidedHomeProps } from "@/components/types";
import { useUserPlaylists } from "../../../api/queries/playlist";
import { ItemCard } from "../../../components/Global/helpers/item-card";
import { H2 } from "../../../components/Global/helpers/text";
import { ProvidedHomeProps } from "../../../components/types";
import React from "react";
import { FlatList } from "react-native";
import { View } from "tamagui";

6
components/Home/screens/index.tsx
View File

@@ -1,4 +1,4 @@
import { ProvidedHomeProps } from "@/components/types";
import { ProvidedHomeProps } from "../../../components/types";
import { ScrollView, RefreshControl } from "react-native";
import { SafeAreaView } from "react-native-safe-area-context";
import { YStack, XStack, Separator } from "tamagui";
@@ -6,8 +6,8 @@ import Playlists from "../helpers/playlists";
import RecentArtists from "../helpers/recent-artists";
import RecentlyPlayed from "../helpers/recently-played";
import { useHomeContext } from "../provider";
import { H3 } from "@/components/Global/helpers/text";
import Avatar from "@/components/Global/helpers/avatar";
import { H3 } from "../../../components/Global/helpers/text";
import Avatar from "../../../components/Global/helpers/avatar";
import Client from "../../../api/client";
export function ProvidedHome({ route, navigation }: ProvidedHomeProps): React.JSX.Element {

2
components/ItemDetail/helpers/TrackOptions.tsx
View File

@@ -1,4 +1,4 @@
import { StackParamList } from "@/components/types";
import { StackParamList } from "../../components/types";
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { NativeStackNavigationProp } from "@react-navigation/native-stack";
import { View } from "tamagui";

4
components/ItemDetail/screen.tsx
View File

@@ -1,5 +1,5 @@
import ItemDetail from "@/components/ItemDetail/component";
import { StackParamList } from "@/components/types";
import ItemDetail from "../../components/ItemDetail/component";
import { StackParamList } from "../../components/types";
import { RouteProp } from "@react-navigation/native";
import { NativeStackNavigationProp } from "@react-navigation/native-stack";
import React from "react";

2
components/Login/helpers/server-authentication.tsx
View File

@@ -9,7 +9,7 @@ import Button from "../../Global/helpers/button";
import Input from "../../Global/helpers/input";
import { SafeAreaView } from "react-native-safe-area-context";
import Client from "../../../api/client";
import { JellifyUser } from "@/types/JellifyUser";
import { JellifyUser } from "../../../types/JellifyUser";
export default function ServerAuthentication(): React.JSX.Element {

8
components/Login/helpers/server-library.tsx
View File

@@ -1,13 +1,13 @@
import React, { useEffect, useState } from "react";
import { Spinner, Text, ToggleGroup, View } from "tamagui";
import React, { useState } from "react";
import { Spinner, Text, ToggleGroup } from "tamagui";
import { useAuthenticationContext } from "../provider";
import { H1, Label } from "../../Global/helpers/text";
import Button from "../../Global/helpers/button";
import _ from "lodash";
import { useMusicLibraries, usePlaylistLibrary } from "@/api/queries/libraries";
import { useMusicLibraries, usePlaylistLibrary } from "../../../api/queries/libraries";
import { SafeAreaView } from "react-native-safe-area-context";
import Client from "../../../api/client";
import { useJellifyContext } from "@/components/provider";
import { useJellifyContext } from "../../../components/provider";
export default function ServerLibrary(): React.JSX.Element {

6
components/Login/provider.tsx
View File

@@ -1,9 +1,9 @@
import React, { createContext, ReactNode, SetStateAction, useContext, useState } from "react";
import _ from "lodash";
import { JellifyServer } from "@/types/JellifyServer";
import { JellifyServer } from "../../types/JellifyServer";
import Client from "../../api/client";
import { JellifyUser } from "@/types/JellifyUser";
import { JellifyLibrary } from "@/types/JellifyLibrary";
import { JellifyUser } from "../../types/JellifyUser";
import { JellifyLibrary } from "../../types/JellifyLibrary";
interface JellyfinAuthenticationContext {
server: JellifyServer | undefined;

2
components/Player/helpers/buttons.tsx
View File

@@ -2,7 +2,7 @@ import { State } from "react-native-track-player";
import { Colors } from "react-native/Libraries/NewAppScreen";
import { Spinner, View } from "tamagui";
import Icon from "../../Global/helpers/icon";
import { usePlayerContext } from "@/player/provider";
import { usePlayerContext } from "../../../player/provider";
export default function PlayPauseButton() : React.JSX.Element {

18
components/Player/screens/index.tsx
View File

@@ -1,8 +1,8 @@
import { queryConfig } from "@/api/queries/query.config";
import { HorizontalSlider } from "@/components/Global/helpers/slider";
import { RunTimeSeconds } from "@/components/Global/helpers/time-codes";
import { StackParamList } from "@/components/types";
import { usePlayerContext } from "@/player/provider";
import { queryConfig } from "../../../api/queries/query.config";
import { HorizontalSlider } from "../../../components/Global/helpers/slider";
import { RunTimeSeconds } from "../../../components/Global/helpers/time-codes";
import { StackParamList } from "../../../components/types";
import { usePlayerContext } from "../../../player/provider";
import { CachedImage } from "@georstat/react-native-image-cache";
import { ImageType } from "@jellyfin/sdk/lib/generated-client/models";
import { getImageApi } from "@jellyfin/sdk/lib/utils/api";
@@ -11,11 +11,11 @@ import React, { useState, useEffect } from "react";
import { SafeAreaView, useSafeAreaFrame } from "react-native-safe-area-context";
import { YStack, XStack, Spacer } from "tamagui";
import PlayPauseButton from "../helpers/buttons";
import { H5, Text } from "@/components/Global/helpers/text";
import Icon from "@/components/Global/helpers/icon";
import { Colors } from "@/enums/colors";
import { H5, Text } from "../../../components/Global/helpers/text";
import Icon from "../../../components/Global/helpers/icon";
import { Colors } from "../../../enums/colors";
import { State } from "react-native-track-player";
import FavoriteHeaderButton from "@/components/Global/components/favorite-header-button";
import FavoriteHeaderButton from "../../../components/Global/components/favorite-header-button";
import Client from "../../../api/client";
export default function PlayerScreen({ navigation }: { navigation: NativeStackNavigationProp<StackParamList>}): React.JSX.Element {

6
components/Player/screens/queue.tsx
View File

@@ -1,6 +1,6 @@
import Track from "@/components/Global/components/track";
import { StackParamList } from "@/components/types";
import { usePlayerContext } from "@/player/provider";
import Track from "../../../components/Global/components/track";
import { StackParamList } from "../../../components/types";
import { usePlayerContext } from "../../../player/provider";
import { NativeStackNavigationProp } from "@react-navigation/native-stack";
import { FlatList } from "react-native";
import { SafeAreaView, useSafeAreaFrame } from "react-native-safe-area-context";

6
components/Playlist/component.tsx
View File

@@ -2,13 +2,13 @@ import { BaseItemDto, ImageType } from "@jellyfin/sdk/lib/generated-client/model
import { NativeStackNavigationProp } from "@react-navigation/native-stack";
import { StackParamList } from "../types";
import { ScrollView, XStack, YStack } from "tamagui";
import { usePlayerContext } from "@/player/provider";
import { useItemTracks } from "@/api/queries/tracks";
import { usePlayerContext } from "../../player/provider";
import { useItemTracks } from "../../api/queries/tracks";
import { RunTimeTicks } from "../Global/helpers/time-codes";
import { H4, H5, Text } from "../Global/helpers/text";
import Track from "../Global/components/track";
import { FlatList } from "react-native";
import { queryConfig } from "@/api/queries/query.config";
import { queryConfig } from "../../api/queries/query.config";
import { getImageApi } from "@jellyfin/sdk/lib/utils/api/image-api";
import { CachedImage } from "@georstat/react-native-image-cache";
import { SafeAreaView } from "react-native-safe-area-context";

4
components/Playlist/screens/index.tsx
View File

@@ -1,5 +1,5 @@
import Playlist from "@/components/Playlist/component";
import { StackParamList } from "@/components/types";
import Playlist from "../../components/Playlist/component";
import { StackParamList } from "../../components/types";
import { RouteProp } from "@react-navigation/native";
import { NativeStackNavigationProp } from "@react-navigation/native-stack";
import React from "react";

6
components/Settings/helpers/account-details.tsx
View File

@@ -1,8 +1,8 @@
import { XStack } from "@tamagui/stacks";
import React from "react";
import Avatar from "@/components/Global/helpers/avatar";
import { Text } from "@/components/Global/helpers/text";
import Icon from "@/components/Global/helpers/icon";
import Avatar from "../../../components/Global/helpers/avatar";
import { Text } from "../../../components/Global/helpers/text";
import Icon from "../../../components/Global/helpers/icon";
import Client from "../../../api/client";
export default function AccountDetails(): React.JSX.Element {

2
components/Settings/helpers/library-details.tsx
View File

@@ -1,5 +1,5 @@
import Client from "../../../api/client";
import { Text } from "@/components/Global/helpers/text";
import { Text } from "../../../components/Global/helpers/text";
import React from "react";
import { View } from "tamagui";

2
components/Settings/helpers/server-details.tsx
View File

@@ -1,7 +1,7 @@
import React from "react";
import { XStack, YStack } from "tamagui";
import Icon from "../../Global/helpers/icon";
import { H5, Text } from "@/components/Global/helpers/text";
import { H5, Text } from "../../../components/Global/helpers/text";
import Client from "../../../api/client";
export default function ServerDetails() : React.JSX.Element {

2
components/Settings/helpers/sign-out.tsx
View File

@@ -2,7 +2,7 @@ import React from "react";
import Button from "../../Global/helpers/button";
import { stop } from "react-native-track-player/lib/src/trackPlayer";
import Client from "../../../api/client";
import { useJellifyContext } from "@/components/provider";
import { useJellifyContext } from "../../../components/provider";
export default function SignOut(): React.JSX.Element {

2
components/Tracks/component.tsx
View File

@@ -1,4 +1,4 @@
import { useFavoriteTracks } from "@/api/queries/favorites";
import { useFavoriteTracks } from "../../api/queries/favorites";
import { StackParamList } from "../types";
import { SafeAreaView, useSafeAreaFrame } from "react-native-safe-area-context";
import { FlatList, RefreshControl } from "react-native";

2
player/handlers.ts
View File

@@ -1,7 +1,7 @@
import { Progress, State } from "react-native-track-player";
import { JellifyTrack } from "../types/JellifyTrack";
import { PlaystateApi } from "@jellyfin/sdk/lib/generated-client/api/playstate-api";
import { convertSecondsToRunTimeTicks } from "@/helpers/runtimeticks";
import { convertSecondsToRunTimeTicks } from "../helpers/runtimeticks";
export async function handlePlaybackState(sessionId: string, playstateApi: PlaystateApi, track: JellifyTrack, state: State, progress: Progress) {
switch (state) {

5
player/hooks/index.ts
View File

@@ -1,6 +1,5 @@
import { QueryKeys } from "@/enums/query-keys"
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { useMutation, useQuery } from "@tanstack/react-query"
import { QueryKeys } from "../../enums/query-keys"
import { useQuery } from "@tanstack/react-query"
import TrackPlayer, { Capability, IOSCategory, IOSCategoryOptions, RatingType } from "react-native-track-player"
const CAPABILITIES: Capability[] = [

8
player/provider.tsx
View File

@@ -7,15 +7,15 @@ import TrackPlayer, { Event, Progress, State, usePlaybackState, useProgress, use
import _, { isEqual, isUndefined } from "lodash";
import { getPlaystateApi } from "@jellyfin/sdk/lib/utils/api";
import { handlePlaybackProgressUpdated, handlePlaybackState } from "./handlers";
import { useSetupPlayer } from "@/player/hooks";
import { useSetupPlayer } from "../player/hooks";
import { UPDATE_INTERVAL } from "./config";
import { useMutation, UseMutationResult } from "@tanstack/react-query";
import { QueueMutation } from "./interfaces";
import { mapDtoToTrack } from "@/helpers/mappings";
import { QueuingType } from "@/enums/queuing-type";
import { mapDtoToTrack } from "../helpers/mappings";
import { QueuingType } from "../enums/queuing-type";
import { trigger } from "react-native-haptic-feedback";
import { getQueue, pause, seekTo, skip, skipToNext, skipToPrevious } from "react-native-track-player/lib/src/trackPlayer";
import { convertRunTimeTicksToSeconds } from "@/helpers/runtimeticks";
import { convertRunTimeTicksToSeconds } from "..//helpers/runtimeticks";
import Client from "../api/client";
interface PlayerContext {

2
player/service.ts
View File

@@ -1,5 +1,5 @@
import Client from "../api/client";
import { JellifyTrack } from "@/types/JellifyTrack";
import { JellifyTrack } from "../types/JellifyTrack";
import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
import TrackPlayer, { Event, RatingType } from "react-native-track-player";
import { getActiveTrack, getActiveTrackIndex } from "react-native-track-player/lib/src/trackPlayer";