fix all imports for new structure

This commit is contained in:
jeffvli 2025-05-20 19:23:36 -07:00
parent 249eaf89f8
commit 930165d006
291 changed files with 2056 additions and 1894 deletions

View file

@ -19,12 +19,11 @@ import {
} from 'react-icons/ri';
import styled from 'styled-components';
import { useCenterControls } from '../hooks/use-center-controls';
import { PlayerButton } from './player-button';
import { openShuffleAllModal } from './shuffle-all-modal';
import { Text } from '/@/renderer/components';
import { PlayerButton } from '/@/renderer/features/player/components/player-button';
import { PlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider';
import { openShuffleAllModal } from '/@/renderer/features/player/components/shuffle-all-modal';
import { useCenterControls } from '/@/renderer/features/player/hooks/use-center-controls';
import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add';
import {
useCurrentPlayer,
@ -40,7 +39,7 @@ import {
usePlaybackType,
useSettingsStore,
} from '/@/renderer/store/settings.store';
import { PlaybackType, PlayerRepeat, PlayerShuffle, PlayerStatus } from '/@/renderer/types';
import { PlaybackType, PlayerRepeat, PlayerShuffle, PlayerStatus } from '/@/shared/types/types';
interface CenterControlsProps {
playersRef: any;

View file

@ -7,26 +7,21 @@ import { generatePath } from 'react-router';
import { Link } from 'react-router-dom';
import styled from 'styled-components';
import { QueueSong } from '/@/renderer/api/types';
import { Badge, Text, TextTitle } from '/@/renderer/components';
import { useFastAverageColor } from '/@/renderer/hooks';
import { AppRoute } from '/@/renderer/router/routes';
import {
PlayerData,
useFullScreenPlayerStore,
usePlayerData,
usePlayerStore,
} from '/@/renderer/store';
import { useFullScreenPlayerStore, usePlayerData, usePlayerStore } from '/@/renderer/store';
import { useSettingsStore } from '/@/renderer/store/settings.store';
import { PlayerData, QueueSong } from '/@/shared/types/domain-types';
const Image = styled(motion.img)<{ $useAspectRatio: boolean }>`
position: absolute;
max-width: 100%;
height: 100%;
filter: drop-shadow(0 0 5px rgb(0 0 0 / 40%)) drop-shadow(0 0 5px rgb(0 0 0 / 40%));
border-radius: 5px;
object-fit: ${({ $useAspectRatio }) => ($useAspectRatio ? 'contain' : 'cover')};
object-position: 50% 100%;
filter: drop-shadow(0 0 5px rgb(0 0 0 / 40%)) drop-shadow(0 0 5px rgb(0 0 0 / 40%));
border-radius: 5px;
`;
const ImageContainer = styled(motion.div)`
@ -41,7 +36,7 @@ const ImageContainer = styled(motion.div)`
`;
interface TransparentMetadataContainer {
opacity: number;
opacity?: number;
}
const MetadataContainer = styled(Stack)<TransparentMetadataContainer>`
@ -101,7 +96,7 @@ const scaleImageUrl = (imageSize: number, url?: null | string) => {
const ImageWithPlaceholder = ({
useAspectRatio,
...props
}: HTMLMotionProps<'img'> & { useAspectRatio: boolean }) => {
}: HTMLMotionProps<'img'> & { placeholder?: string; useAspectRatio: boolean }) => {
if (!props.src) {
return (
<Center

View file

@ -15,7 +15,7 @@ import {
useFullScreenPlayerStore,
useFullScreenPlayerStoreActions,
} from '/@/renderer/store/full-screen-player.store';
import { PlaybackType } from '/@/renderer/types';
import { PlaybackType } from '/@/shared/types/types';
const Visualizer = lazy(() =>
import('/@/renderer/features/player/components/visualizer').then((module) => ({

View file

@ -7,8 +7,6 @@ import { RiArrowDownSLine, RiSettings3Line } from 'react-icons/ri';
import { useLocation } from 'react-router';
import styled from 'styled-components';
import { useFastAverageColor } from '../../../hooks/use-fast-average-color';
import {
Button,
NumberInput,
@ -21,6 +19,7 @@ import {
import { TableConfigDropdown } from '/@/renderer/components/virtual-table';
import { FullScreenPlayerImage } from '/@/renderer/features/player/components/full-screen-player-image';
import { FullScreenPlayerQueue } from '/@/renderer/features/player/components/full-screen-player-queue';
import { useFastAverageColor } from '/@/renderer/hooks';
import {
useCurrentSong,
useFullScreenPlayerStore,
@ -30,7 +29,7 @@ import {
useSettingsStoreActions,
useWindowSettings,
} from '/@/renderer/store';
import { Platform } from '/@/renderer/types';
import { Platform } from '/@/shared/types/types';
const Container = styled(motion.div)`
position: absolute;

View file

@ -7,7 +7,6 @@ import { RiArrowUpSLine, RiDiscLine, RiMore2Fill } from 'react-icons/ri';
import { generatePath, Link } from 'react-router-dom';
import styled from 'styled-components';
import { LibraryItem } from '/@/renderer/api/types';
import { Button, Text, Tooltip } from '/@/renderer/components';
import { Separator } from '/@/renderer/components/separator';
import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
@ -22,6 +21,7 @@ import {
useSidebarStore,
} from '/@/renderer/store';
import { fadeIn } from '/@/renderer/styles';
import { LibraryItem } from '/@/shared/types/domain-types';
const ImageWrapper = styled.div`
position: relative;

View file

@ -165,8 +165,3 @@ export const PlayerButton = forwardRef<HTMLDivElement, PlayerButtonProps>(
);
},
);
PlayerButton.defaultProps = {
$isActive: false,
tooltip: undefined,
};

View file

@ -1,11 +1,10 @@
import { MouseEvent, useCallback } from 'react';
import styled from 'styled-components';
import { CenterControls } from './center-controls';
import { LeftControls } from './left-controls';
import { RightControls } from './right-controls';
import { AudioPlayer } from '/@/renderer/components';
import { CenterControls } from '/@/renderer/features/player/components/center-controls';
import { LeftControls } from '/@/renderer/features/player/components/left-controls';
import { RightControls } from '/@/renderer/features/player/components/right-controls';
import { PlayersRef } from '/@/renderer/features/player/ref/players-ref';
import { updateSong } from '/@/renderer/features/player/update-remote-song';
import {
@ -24,7 +23,7 @@ import {
usePlaybackType,
useSettingsStore,
} from '/@/renderer/store/settings.store';
import { PlaybackType } from '/@/renderer/types';
import { PlaybackType } from '/@/shared/types/types';
const PlayerbarContainer = styled.div`
width: 100vw;
@ -119,7 +118,7 @@ export const Playerbar = () => {
player2={player2}
ref={playersRef}
status={status}
style={settings.style}
style={settings.style as any}
volume={(volume / 100) ** 2}
/>
)}

View file

@ -12,13 +12,11 @@ import {
RiVolumeUpFill,
} from 'react-icons/ri';
import { useRightControls } from '../hooks/use-right-controls';
import { PlayerButton } from './player-button';
import { LibraryItem, QueueSong, ServerType, Song } from '/@/renderer/api/types';
import { DropdownMenu, Rating } from '/@/renderer/components';
import { Slider } from '/@/renderer/components/slider';
import { PlayerButton } from '/@/renderer/features/player/components/player-button';
import { PlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider';
import { useRightControls } from '/@/renderer/features/player/hooks/use-right-controls';
import { useCreateFavorite, useDeleteFavorite, useSetRating } from '/@/renderer/features/shared';
import {
useAppStoreActions,
@ -32,6 +30,7 @@ import {
useSpeed,
useVolume,
} from '/@/renderer/store';
import { LibraryItem, QueueSong, ServerType, Song } from '/@/shared/types/domain-types';
const ipc = isElectron() ? window.api.ipc : null;
const remote = isElectron() ? window.api.remote : null;

View file

@ -11,6 +11,8 @@ import { immer } from 'zustand/middleware/immer';
import i18n from '/@/i18n/i18n';
import { api } from '/@/renderer/api';
import { queryKeys } from '/@/renderer/api/query-keys';
import { Button, Checkbox, NumberInput, Select } from '/@/renderer/components';
import { useAuthStore } from '/@/renderer/store';
import {
GenreListResponse,
GenreListSort,
@ -20,10 +22,8 @@ import {
ServerListItem,
ServerType,
SortOrder,
} from '/@/renderer/api/types';
import { Button, Checkbox, NumberInput, Select } from '/@/renderer/components';
import { useAuthStore } from '/@/renderer/store';
import { Play, PlayQueueAddOptions } from '/@/renderer/types';
} from '/@/shared/types/domain-types';
import { Play, PlayQueueAddOptions } from '/@/shared/types/types';
interface ShuffleAllSlice extends RandomSongListQuery {
actions: {

View file

@ -1,6 +1,6 @@
import { createContext } from 'react';
import { PlayQueueAddOptions } from '/@/renderer/types';
import { PlayQueueAddOptions } from '/@/shared/types/types';
export const PlayQueueHandlerContext = createContext<{
handlePlayQueueAdd: ((options: PlayQueueAddOptions) => void) | undefined;

View file

@ -1,6 +1,6 @@
import { createContext } from 'react';
import { WebAudio } from '/@/renderer/types';
import { WebAudio } from '/@/shared/types/types';
export const WebAudioContext = createContext<{
setWebAudio?: (audio: WebAudio) => void;

View file

@ -17,8 +17,8 @@ import {
useShuffleStatus,
} from '/@/renderer/store';
import { usePlaybackType } from '/@/renderer/store/settings.store';
import { PlaybackType, PlayerRepeat, PlayerShuffle, PlayerStatus } from '/@/renderer/types';
import { setAutoNext, setQueue, setQueueNext } from '/@/renderer/utils/set-transcoded-queue-data';
import { PlaybackType, PlayerRepeat, PlayerShuffle, PlayerStatus } from '/@/shared/types/types';
const mpvPlayer = isElectron() ? window.api.mpvPlayer : null;
const mpvPlayerListener = isElectron() ? window.api.mpvPlayerListener : null;
@ -565,7 +565,6 @@ export const useCenterControls = (args: { playersRef: any }) => {
});
mpvPlayerListener.rendererCurrentTime((_event: any, time: number) => {
console.log('time :>> ', time);
setCurrentTime(time);
});

View file

@ -5,13 +5,6 @@ import { useCallback, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { queryKeys } from '/@/renderer/api/query-keys';
import {
instanceOfCancellationError,
LibraryItem,
QueueSong,
Song,
SongListResponse,
} from '/@/renderer/api/types';
import { toast } from '/@/renderer/components/toast/index';
import { PlayersRef } from '/@/renderer/features/player/ref/players-ref';
import { updateSong } from '/@/renderer/features/player/update-remote-song';
@ -26,8 +19,15 @@ import {
} from '/@/renderer/features/player/utils';
import { useCurrentServer, usePlayerControls, usePlayerStore } from '/@/renderer/store';
import { useGeneralSettings, usePlaybackType } from '/@/renderer/store/settings.store';
import { Play, PlaybackType, PlayQueueAddOptions } from '/@/renderer/types';
import { setQueue, setQueueNext } from '/@/renderer/utils/set-transcoded-queue-data';
import {
instanceOfCancellationError,
LibraryItem,
QueueSong,
Song,
SongListResponse,
} from '/@/shared/types/domain-types';
import { Play, PlaybackType, PlayQueueAddOptions } from '/@/shared/types/types';
const getRootQueryKey = (itemType: LibraryItem, serverId: string) => {
let queryKey;

View file

@ -1,10 +1,10 @@
import { useCallback, useEffect, useRef, useState } from 'react';
import { QueueSong, ServerType } from '/@/renderer/api/types';
import { useSendScrobble } from '/@/renderer/features/player/mutations/scrobble-mutation';
import { usePlayerStore } from '/@/renderer/store';
import { usePlaybackSettings } from '/@/renderer/store/settings.store';
import { PlayerStatus } from '/@/renderer/types';
import { QueueSong, ServerType } from '/@/shared/types/domain-types';
import { PlayerStatus } from '/@/shared/types/types';
/*
Scrobble Conditions (match any):

View file

@ -2,10 +2,10 @@ import { useMutation } from '@tanstack/react-query';
import { AxiosError } from 'axios';
import { api } from '/@/renderer/api';
import { ScrobbleArgs, ScrobbleResponse } from '/@/renderer/api/types';
import { MutationOptions } from '/@/renderer/lib/react-query';
import { getServerById, useIncrementQueuePlayCount } from '/@/renderer/store';
import { usePlayEvent } from '/@/renderer/store/event.store';
import { ScrobbleArgs, ScrobbleResponse } from '/@/shared/types/domain-types';
export const useSendScrobble = (options?: MutationOptions) => {
const incrementPlayCount = useIncrementQueuePlayCount();

View file

@ -1,6 +1,6 @@
import isElectron from 'is-electron';
import { QueueSong } from '/@/renderer/api/types';
import { QueueSong } from '/@/shared/types/domain-types';
const remote = isElectron() ? window.api.remote : null;
const mediaSession = navigator.mediaSession;

View file

@ -10,7 +10,7 @@ import {
SongListResponse,
SongListSort,
SortOrder,
} from '/@/renderer/api/types';
} from '/@/shared/types/domain-types';
export const getPlaylistSongsById = async (args: {
id: string;