diff --git a/src/renderer/app.tsx b/src/renderer/app.tsx index 4505a495..49311806 100644 --- a/src/renderer/app.tsx +++ b/src/renderer/app.tsx @@ -17,7 +17,7 @@ import 'overlayscrollbars/overlayscrollbars.css'; import '/styles/overlayscrollbars.css'; import i18n from '/@/i18n/i18n'; import { useDiscordRpc } from '/@/renderer/features/discord-rpc/use-discord-rpc'; -import { PlayQueueHandlerContext } from '/@/renderer/features/player'; +import { PlayQueueHandlerContext } from '/@/renderer/features/player/context/play-queue-handler-context'; import { WebAudioContext } from '/@/renderer/features/player/context/webaudio-context'; import { useHandlePlayQueueAdd } from '/@/renderer/features/player/hooks/use-handle-playqueue-add'; import { updateSong } from '/@/renderer/features/player/update-remote-song'; diff --git a/src/renderer/components/feature-carousel/feature-carousel.tsx b/src/renderer/components/feature-carousel/feature-carousel.tsx index ee6ed5a2..02f33703 100644 --- a/src/renderer/components/feature-carousel/feature-carousel.tsx +++ b/src/renderer/components/feature-carousel/feature-carousel.tsx @@ -9,7 +9,7 @@ import { generatePath, Link } from 'react-router-dom'; import styles from './feature-carousel.module.css'; import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; -import { PlayButton } from '/@/renderer/features/shared'; +import { PlayButton } from '/@/renderer/features/shared/components/play-button'; import { AppRoute } from '/@/renderer/router/routes'; import { usePlayButtonBehavior } from '/@/renderer/store'; import { Badge } from '/@/shared/components/badge/badge'; diff --git a/src/renderer/components/grid-carousel/grid-carousel.tsx b/src/renderer/components/grid-carousel/grid-carousel.tsx index 2075003b..08b54fed 100644 --- a/src/renderer/components/grid-carousel/grid-carousel.tsx +++ b/src/renderer/components/grid-carousel/grid-carousel.tsx @@ -16,8 +16,9 @@ import { Swiper, SwiperSlide } from 'swiper/react'; import { Swiper as SwiperCore } from 'swiper/types'; import { PosterCard } from '/@/renderer/components/card/poster-card'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; -import { useCreateFavorite, useDeleteFavorite } from '/@/renderer/features/shared'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; +import { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation'; +import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-favorite-mutation'; import { usePlayButtonBehavior } from '/@/renderer/store'; import { Button } from '/@/shared/components/button/button'; import { Group } from '/@/shared/components/group/group'; diff --git a/src/renderer/components/index.ts b/src/renderer/components/index.ts deleted file mode 100644 index 4caa73b6..00000000 --- a/src/renderer/components/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './audio-player'; -export * from './motion'; diff --git a/src/renderer/components/virtual-grid/index.ts b/src/renderer/components/virtual-grid/index.ts deleted file mode 100644 index 05ff6379..00000000 --- a/src/renderer/components/virtual-grid/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './virtual-grid-wrapper'; -export * from './virtual-infinite-grid'; diff --git a/src/renderer/components/virtual-table/cells/combined-title-cell-controls.tsx b/src/renderer/components/virtual-table/cells/combined-title-cell-controls.tsx index 573cd8a8..6cf373de 100644 --- a/src/renderer/components/virtual-table/cells/combined-title-cell-controls.tsx +++ b/src/renderer/components/virtual-table/cells/combined-title-cell-controls.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import styles from './combined-title-cell-controls.module.css'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { usePlayButtonBehavior } from '/@/renderer/store/settings.store'; import { ActionIcon } from '/@/shared/components/action-icon/action-icon'; import { LibraryItem } from '/@/shared/types/domain-types'; diff --git a/src/renderer/components/virtual-table/cells/favorite-cell.tsx b/src/renderer/components/virtual-table/cells/favorite-cell.tsx index ff4db1af..71ca889d 100644 --- a/src/renderer/components/virtual-table/cells/favorite-cell.tsx +++ b/src/renderer/components/virtual-table/cells/favorite-cell.tsx @@ -1,7 +1,8 @@ import type { ICellRendererParams } from '@ag-grid-community/core'; import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell'; -import { useCreateFavorite, useDeleteFavorite } from '/@/renderer/features/shared'; +import { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation'; +import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-favorite-mutation'; import { ActionIcon } from '/@/shared/components/action-icon/action-icon'; export const FavoriteCell = ({ data, node, value }: ICellRendererParams) => { diff --git a/src/renderer/components/virtual-table/cells/rating-cell.tsx b/src/renderer/components/virtual-table/cells/rating-cell.tsx index b5669e25..266a4265 100644 --- a/src/renderer/components/virtual-table/cells/rating-cell.tsx +++ b/src/renderer/components/virtual-table/cells/rating-cell.tsx @@ -1,7 +1,7 @@ import type { ICellRendererParams } from '@ag-grid-community/core'; import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell'; -import { useSetRating } from '/@/renderer/features/shared'; +import { useSetRating } from '/@/renderer/features/shared/mutations/set-rating-mutation'; import { Rating } from '/@/shared/components/rating/rating'; export const RatingCell = ({ node, value }: ICellRendererParams) => { diff --git a/src/renderer/components/virtual-table/hooks/use-virtual-table.ts b/src/renderer/components/virtual-table/hooks/use-virtual-table.ts index 6678fd6c..f7e158c3 100644 --- a/src/renderer/components/virtual-table/hooks/use-virtual-table.ts +++ b/src/renderer/components/virtual-table/hooks/use-virtual-table.ts @@ -19,7 +19,8 @@ import { useSearchParams } from 'react-router-dom'; import { api } from '/@/renderer/api'; import { queryKeys, QueryPagination } from '/@/renderer/api/query-keys'; import { getColumnDefs, VirtualTableProps } from '/@/renderer/components/virtual-table'; -import { SetContextMenuItems, useHandleTableContextMenu } from '/@/renderer/features/context-menu'; +import { SetContextMenuItems } from '/@/renderer/features/context-menu/events'; +import { useHandleTableContextMenu } from '/@/renderer/features/context-menu/hooks/use-handle-context-menu'; import { AppRoute } from '/@/renderer/router/routes'; import { PersistedTableColumn, useListStoreActions } from '/@/renderer/store'; import { ListKey, useListStoreByKey } from '/@/renderer/store/list.store'; diff --git a/src/renderer/features/action-required/components/server-required.tsx b/src/renderer/features/action-required/components/server-required.tsx index 45335db1..4d950e79 100644 --- a/src/renderer/features/action-required/components/server-required.tsx +++ b/src/renderer/features/action-required/components/server-required.tsx @@ -3,10 +3,10 @@ import isElectron from 'is-electron'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router'; -import { AddServerForm } from '/@/renderer/features/servers'; import JellyfinLogo from '/@/renderer/features/servers/assets/jellyfin.png'; import NavidromeLogo from '/@/renderer/features/servers/assets/navidrome.png'; import OpenSubsonicLogo from '/@/renderer/features/servers/assets/opensubsonic.png'; +import { AddServerForm } from '/@/renderer/features/servers/components/add-server-form'; import { EditServerForm } from '/@/renderer/features/servers/components/edit-server-form'; import { AppRoute } from '/@/renderer/router/routes'; import { useAuthStoreActions, useCurrentServer, useServerList } from '/@/renderer/store'; diff --git a/src/renderer/features/action-required/index.ts b/src/renderer/features/action-required/index.ts deleted file mode 100644 index 285f182b..00000000 --- a/src/renderer/features/action-required/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './components/error-fallback'; diff --git a/src/renderer/features/action-required/routes/action-required-route.tsx b/src/renderer/features/action-required/routes/action-required-route.tsx index 9a04ace4..2fa1c901 100644 --- a/src/renderer/features/action-required/routes/action-required-route.tsx +++ b/src/renderer/features/action-required/routes/action-required-route.tsx @@ -6,8 +6,8 @@ import { PageHeader } from '/@/renderer/components/page-header/page-header'; import { ActionRequiredContainer } from '/@/renderer/features/action-required/components/action-required-container'; import { ServerCredentialRequired } from '/@/renderer/features/action-required/components/server-credential-required'; import { ServerRequired } from '/@/renderer/features/action-required/components/server-required'; -import { ServerList } from '/@/renderer/features/servers'; -import { AnimatedPage } from '/@/renderer/features/shared'; +import { ServerList } from '/@/renderer/features/servers/components/server-list'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; import { AppRoute } from '/@/renderer/router/routes'; import { useCurrentServer } from '/@/renderer/store'; import { Button } from '/@/shared/components/button/button'; diff --git a/src/renderer/features/action-required/routes/invalid-route.tsx b/src/renderer/features/action-required/routes/invalid-route.tsx index 2bac03d0..4fcb7c2c 100644 --- a/src/renderer/features/action-required/routes/invalid-route.tsx +++ b/src/renderer/features/action-required/routes/invalid-route.tsx @@ -1,7 +1,7 @@ import { useTranslation } from 'react-i18next'; import { useLocation, useNavigate } from 'react-router-dom'; -import { AnimatedPage } from '/@/renderer/features/shared'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; import { ActionIcon } from '/@/shared/components/action-icon/action-icon'; import { Center } from '/@/shared/components/center/center'; import { Group } from '/@/shared/components/group/group'; diff --git a/src/renderer/features/albums/components/album-detail-content.tsx b/src/renderer/features/albums/components/album-detail-content.tsx index 36e1c6ae..b1ed7665 100644 --- a/src/renderer/features/albums/components/album-detail-content.tsx +++ b/src/renderer/features/albums/components/album-detail-content.tsx @@ -20,17 +20,19 @@ import { import { FullWidthDiscCell } from '/@/renderer/components/virtual-table/cells/full-width-disc-cell'; import { useCurrentSongRowStyles } from '/@/renderer/components/virtual-table/hooks/use-current-song-row-styles'; import { albumQueries } from '/@/renderer/features/albums/api/album-api'; -import { - useHandleGeneralContextMenu, - useHandleTableContextMenu, -} from '/@/renderer/features/context-menu'; import { ALBUM_CONTEXT_MENU_ITEMS, SONG_CONTEXT_MENU_ITEMS, } from '/@/renderer/features/context-menu/context-menu-items'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; -import { PlayButton, useCreateFavorite, useDeleteFavorite } from '/@/renderer/features/shared'; +import { + useHandleGeneralContextMenu, + useHandleTableContextMenu, +} from '/@/renderer/features/context-menu/hooks/use-handle-context-menu'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { LibraryBackgroundOverlay } from '/@/renderer/features/shared/components/library-background-overlay'; +import { PlayButton } from '/@/renderer/features/shared/components/play-button'; +import { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation'; +import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-favorite-mutation'; import { useAppFocus, useContainerQuery } from '/@/renderer/hooks'; import { useGenreRoute } from '/@/renderer/hooks/use-genre-route'; import { AppRoute } from '/@/renderer/router/routes'; diff --git a/src/renderer/features/albums/components/album-detail-header.tsx b/src/renderer/features/albums/components/album-detail-header.tsx index c45b1ded..2c47e314 100644 --- a/src/renderer/features/albums/components/album-detail-header.tsx +++ b/src/renderer/features/albums/components/album-detail-header.tsx @@ -6,7 +6,8 @@ import { Link } from 'react-router-dom'; import { queryKeys } from '/@/renderer/api/query-keys'; import { albumQueries } from '/@/renderer/features/albums/api/album-api'; -import { LibraryHeader, useSetRating } from '/@/renderer/features/shared'; +import { LibraryHeader } from '/@/renderer/features/shared/components/library-header'; +import { useSetRating } from '/@/renderer/features/shared/mutations/set-rating-mutation'; import { useContainerQuery } from '/@/renderer/hooks'; import { useSongChange } from '/@/renderer/hooks/use-song-change'; import { queryClient } from '/@/renderer/lib/react-query'; diff --git a/src/renderer/features/albums/components/album-list-content.tsx b/src/renderer/features/albums/components/album-list-content.tsx index d066098a..9526075c 100644 --- a/src/renderer/features/albums/components/album-list-content.tsx +++ b/src/renderer/features/albums/components/album-list-content.tsx @@ -2,7 +2,7 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { lazy, MutableRefObject, Suspense } from 'react'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; import { useListStoreByKey } from '/@/renderer/store'; import { Spinner } from '/@/shared/components/spinner/spinner'; diff --git a/src/renderer/features/albums/components/album-list-grid-view.tsx b/src/renderer/features/albums/components/album-list-grid-view.tsx index 7d2da95b..626d6a0d 100644 --- a/src/renderer/features/albums/components/album-list-grid-view.tsx +++ b/src/renderer/features/albums/components/album-list-grid-view.tsx @@ -7,12 +7,10 @@ import { ListOnScrollProps } from 'react-window'; import { controller } from '/@/renderer/api/controller'; import { queryKeys } from '/@/renderer/api/query-keys'; import { ALBUM_CARD_ROWS } from '/@/renderer/components/card/card-rows'; -import { - VirtualGridAutoSizerContainer, - VirtualInfiniteGrid, -} from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; +import { VirtualInfiniteGrid } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite'; import { AppRoute } from '/@/renderer/router/routes'; import { useCurrentServer, useListStoreActions, useListStoreByKey } from '/@/renderer/store'; diff --git a/src/renderer/features/albums/components/album-list-header-filters.tsx b/src/renderer/features/albums/components/album-list-header-filters.tsx index ce7970f6..c8102cbe 100644 --- a/src/renderer/features/albums/components/album-list-header-filters.tsx +++ b/src/renderer/features/albums/components/album-list-header-filters.tsx @@ -8,18 +8,18 @@ import { useTranslation } from 'react-i18next'; import i18n from '/@/i18n/i18n'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { ALBUM_TABLE_COLUMNS } from '/@/renderer/components/virtual-table'; import { useListContext } from '/@/renderer/context/list-context'; import { JellyfinAlbumFilters } from '/@/renderer/features/albums/components/jellyfin-album-filters'; import { NavidromeAlbumFilters } from '/@/renderer/features/albums/components/navidrome-album-filters'; import { SubsonicAlbumFilters } from '/@/renderer/features/albums/components/subsonic-album-filters'; -import { OrderToggleButton } from '/@/renderer/features/shared'; import { sharedQueries } from '/@/renderer/features/shared/api/shared-api'; import { FilterButton } from '/@/renderer/features/shared/components/filter-button'; import { FolderButton } from '/@/renderer/features/shared/components/folder-button'; import { ListConfigMenu } from '/@/renderer/features/shared/components/list-config-menu'; import { MoreButton } from '/@/renderer/features/shared/components/more-button'; +import { OrderToggleButton } from '/@/renderer/features/shared/components/order-toggle-button'; import { RefreshButton } from '/@/renderer/features/shared/components/refresh-button'; import { useContainerQuery } from '/@/renderer/hooks'; import { useListFilterRefresh } from '/@/renderer/hooks/use-list-filter-refresh'; diff --git a/src/renderer/features/albums/components/album-list-header.tsx b/src/renderer/features/albums/components/album-list-header.tsx index daa67237..8acb43d4 100644 --- a/src/renderer/features/albums/components/album-list-header.tsx +++ b/src/renderer/features/albums/components/album-list-header.tsx @@ -5,9 +5,10 @@ import { type ChangeEvent, type MutableRefObject, useEffect, useRef } from 'reac import { useTranslation } from 'react-i18next'; import { PageHeader } from '/@/renderer/components/page-header/page-header'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { AlbumListHeaderFilters } from '/@/renderer/features/albums/components/album-list-header-filters'; -import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared'; +import { FilterBar } from '/@/renderer/features/shared/components/filter-bar'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { SearchInput } from '/@/renderer/features/shared/components/search-input'; import { useContainerQuery } from '/@/renderer/hooks'; import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh'; diff --git a/src/renderer/features/albums/components/album-list-table-view.tsx b/src/renderer/features/albums/components/album-list-table-view.tsx index 05c06303..593913c7 100644 --- a/src/renderer/features/albums/components/album-list-table-view.tsx +++ b/src/renderer/features/albums/components/album-list-table-view.tsx @@ -1,4 +1,4 @@ -import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { VirtualTable } from '/@/renderer/components/virtual-table'; import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table'; import { useListContext } from '/@/renderer/context/list-context'; diff --git a/src/renderer/features/albums/index.ts b/src/renderer/features/albums/index.ts deleted file mode 100644 index 630d1ddb..00000000 --- a/src/renderer/features/albums/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './queries/album-detail-query'; -export * from './queries/album-list-query'; diff --git a/src/renderer/features/albums/routes/album-detail-route.tsx b/src/renderer/features/albums/routes/album-detail-route.tsx index 7a1e586a..39f0befd 100644 --- a/src/renderer/features/albums/routes/album-detail-route.tsx +++ b/src/renderer/features/albums/routes/album-detail-route.tsx @@ -8,8 +8,9 @@ import { NativeScrollArea } from '/@/renderer/components/native-scroll-area/nati import { albumQueries } from '/@/renderer/features/albums/api/album-api'; import { AlbumDetailContent } from '/@/renderer/features/albums/components/album-detail-content'; import { AlbumDetailHeader } from '/@/renderer/features/albums/components/album-detail-header'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; -import { AnimatedPage, LibraryHeaderBar } from '/@/renderer/features/shared'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { useFastAverageColor } from '/@/renderer/hooks'; import { useCurrentServer, useGeneralSettings } from '/@/renderer/store'; import { usePlayButtonBehavior } from '/@/renderer/store/settings.store'; diff --git a/src/renderer/features/albums/routes/album-list-route.tsx b/src/renderer/features/albums/routes/album-list-route.tsx index af13df33..f39cfe31 100644 --- a/src/renderer/features/albums/routes/album-list-route.tsx +++ b/src/renderer/features/albums/routes/album-list-route.tsx @@ -7,14 +7,14 @@ import { useParams, useSearchParams } from 'react-router-dom'; import { api } from '/@/renderer/api'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { ListContext } from '/@/renderer/context/list-context'; import { albumQueries } from '/@/renderer/features/albums/api/album-api'; import { AlbumListContent } from '/@/renderer/features/albums/components/album-list-content'; import { AlbumListHeader } from '/@/renderer/features/albums/components/album-list-header'; import { genresQueries } from '/@/renderer/features/genres/api/genres-api'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; -import { AnimatedPage } from '/@/renderer/features/shared'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; import { queryClient } from '/@/renderer/lib/react-query'; import { useCurrentServer, useListFilterByKey } from '/@/renderer/store'; import { diff --git a/src/renderer/features/albums/routes/dummy-album-detail-route.tsx b/src/renderer/features/albums/routes/dummy-album-detail-route.tsx index ae68381e..a007ff42 100644 --- a/src/renderer/features/albums/routes/dummy-album-detail-route.tsx +++ b/src/renderer/features/albums/routes/dummy-album-detail-route.tsx @@ -8,16 +8,14 @@ import styles from './dummy-album-detail-route.module.css'; import { api } from '/@/renderer/api'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { useHandleGeneralContextMenu } from '/@/renderer/features/context-menu'; import { SONG_ALBUM_PAGE } from '/@/renderer/features/context-menu/context-menu-items'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; -import { - AnimatedPage, - LibraryHeader, - PlayButton, - useCreateFavorite, - useDeleteFavorite, -} from '/@/renderer/features/shared'; +import { useHandleGeneralContextMenu } from '/@/renderer/features/context-menu/hooks/use-handle-context-menu'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; +import { LibraryHeader } from '/@/renderer/features/shared/components/library-header'; +import { PlayButton } from '/@/renderer/features/shared/components/play-button'; +import { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation'; +import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-favorite-mutation'; import { useContainerQuery, useFastAverageColor } from '/@/renderer/hooks'; import { queryClient } from '/@/renderer/lib/react-query'; import { AppRoute } from '/@/renderer/router/routes'; diff --git a/src/renderer/features/artists/components/album-artist-detail-content.tsx b/src/renderer/features/artists/components/album-artist-detail-content.tsx index 7afb2f2d..fbbf9815 100644 --- a/src/renderer/features/artists/components/album-artist-detail-content.tsx +++ b/src/renderer/features/artists/components/album-artist-detail-content.tsx @@ -11,17 +11,19 @@ import { MemoizedSwiperGridCarousel } from '/@/renderer/components/grid-carousel import { getColumnDefs, VirtualTable } from '/@/renderer/components/virtual-table'; import { albumQueries } from '/@/renderer/features/albums/api/album-api'; import { artistsQueries } from '/@/renderer/features/artists/api/artists-api'; -import { - useHandleGeneralContextMenu, - useHandleTableContextMenu, -} from '/@/renderer/features/context-menu'; import { ARTIST_CONTEXT_MENU_ITEMS, SONG_CONTEXT_MENU_ITEMS, } from '/@/renderer/features/context-menu/context-menu-items'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; -import { PlayButton, useCreateFavorite, useDeleteFavorite } from '/@/renderer/features/shared'; +import { + useHandleGeneralContextMenu, + useHandleTableContextMenu, +} from '/@/renderer/features/context-menu/hooks/use-handle-context-menu'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { LibraryBackgroundOverlay } from '/@/renderer/features/shared/components/library-background-overlay'; +import { PlayButton } from '/@/renderer/features/shared/components/play-button'; +import { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation'; +import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-favorite-mutation'; import { useContainerQuery } from '/@/renderer/hooks'; import { useGenreRoute } from '/@/renderer/hooks/use-genre-route'; import { AppRoute } from '/@/renderer/router/routes'; diff --git a/src/renderer/features/artists/components/album-artist-detail-header.tsx b/src/renderer/features/artists/components/album-artist-detail-header.tsx index dbf4b82f..26d56e29 100644 --- a/src/renderer/features/artists/components/album-artist-detail-header.tsx +++ b/src/renderer/features/artists/components/album-artist-detail-header.tsx @@ -4,7 +4,8 @@ import { useTranslation } from 'react-i18next'; import { useParams } from 'react-router'; import { artistsQueries } from '/@/renderer/features/artists/api/artists-api'; -import { LibraryHeader, useSetRating } from '/@/renderer/features/shared'; +import { LibraryHeader } from '/@/renderer/features/shared/components/library-header'; +import { useSetRating } from '/@/renderer/features/shared/mutations/set-rating-mutation'; import { AppRoute } from '/@/renderer/router/routes'; import { useCurrentServer } from '/@/renderer/store'; import { formatDurationString } from '/@/renderer/utils'; diff --git a/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx b/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx index 5d4eb5dc..04fdcdbb 100644 --- a/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx +++ b/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx @@ -3,13 +3,13 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { MutableRefObject } from 'react'; -import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { VirtualTable } from '/@/renderer/components/virtual-table'; import { useCurrentSongRowStyles } from '/@/renderer/components/virtual-table/hooks/use-current-song-row-styles'; import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table'; import { useListContext } from '/@/renderer/context/list-context'; import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { useCurrentServer } from '/@/renderer/store'; import { usePlayButtonBehavior } from '/@/renderer/store/settings.store'; import { LibraryItem, QueueSong, SongListQuery } from '/@/shared/types/domain-types'; diff --git a/src/renderer/features/artists/components/album-artist-detail-top-songs-list-header.tsx b/src/renderer/features/artists/components/album-artist-detail-top-songs-list-header.tsx index e0287391..00d54902 100644 --- a/src/renderer/features/artists/components/album-artist-detail-top-songs-list-header.tsx +++ b/src/renderer/features/artists/components/album-artist-detail-top-songs-list-header.tsx @@ -1,8 +1,8 @@ import { useTranslation } from 'react-i18next'; import { PageHeader } from '/@/renderer/components/page-header/page-header'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; -import { LibraryHeaderBar } from '/@/renderer/features/shared'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { usePlayButtonBehavior } from '/@/renderer/store/settings.store'; import { Badge } from '/@/shared/components/badge/badge'; import { SpinnerIcon } from '/@/shared/components/spinner/spinner'; diff --git a/src/renderer/features/artists/components/album-artist-list-content.tsx b/src/renderer/features/artists/components/album-artist-list-content.tsx index 028eff97..e7a9c5d3 100644 --- a/src/renderer/features/artists/components/album-artist-list-content.tsx +++ b/src/renderer/features/artists/components/album-artist-list-content.tsx @@ -2,7 +2,7 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { lazy, MutableRefObject, Suspense } from 'react'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; import { useListStoreByKey } from '/@/renderer/store'; import { Spinner } from '/@/shared/components/spinner/spinner'; diff --git a/src/renderer/features/artists/components/album-artist-list-grid-view.tsx b/src/renderer/features/artists/components/album-artist-list-grid-view.tsx index db02bde8..194973d2 100644 --- a/src/renderer/features/artists/components/album-artist-list-grid-view.tsx +++ b/src/renderer/features/artists/components/album-artist-list-grid-view.tsx @@ -6,13 +6,13 @@ import { ListOnScrollProps } from 'react-window'; import { api } from '/@/renderer/api'; import { queryKeys } from '/@/renderer/api/query-keys'; import { ALBUMARTIST_CARD_ROWS } from '/@/renderer/components/card/card-rows'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { - VirtualGridAutoSizerContainer, VirtualInfiniteGrid, VirtualInfiniteGridRef, -} from '/@/renderer/components/virtual-grid'; +} from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite'; import { AppRoute } from '/@/renderer/router/routes'; import { useCurrentServer, useListStoreActions, useListStoreByKey } from '/@/renderer/store'; diff --git a/src/renderer/features/artists/components/album-artist-list-header-filters.tsx b/src/renderer/features/artists/components/album-artist-list-header-filters.tsx index dd0b15c4..3ae74973 100644 --- a/src/renderer/features/artists/components/album-artist-list-header-filters.tsx +++ b/src/renderer/features/artists/components/album-artist-list-header-filters.tsx @@ -9,13 +9,14 @@ import { useTranslation } from 'react-i18next'; import i18n from '/@/i18n/i18n'; import { api } from '/@/renderer/api'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { ALBUMARTIST_TABLE_COLUMNS } from '/@/renderer/components/virtual-table'; import { useListContext } from '/@/renderer/context/list-context'; import { sharedQueries } from '/@/renderer/features/shared/api/shared-api'; import { FolderButton } from '/@/renderer/features/shared/components/folder-button'; import { ListConfigMenu } from '/@/renderer/features/shared/components/list-config-menu'; import { MoreButton } from '/@/renderer/features/shared/components/more-button'; +import { OrderToggleButton } from '/@/renderer/features/shared/components/order-toggle-button'; import { RefreshButton } from '/@/renderer/features/shared/components/refresh-button'; import { useContainerQuery } from '/@/renderer/hooks'; import { diff --git a/src/renderer/features/artists/components/album-artist-list-header.tsx b/src/renderer/features/artists/components/album-artist-list-header.tsx index 0eea5317..8acd3b06 100644 --- a/src/renderer/features/artists/components/album-artist-list-header.tsx +++ b/src/renderer/features/artists/components/album-artist-list-header.tsx @@ -5,9 +5,10 @@ import debounce from 'lodash/debounce'; import { useTranslation } from 'react-i18next'; import { PageHeader } from '/@/renderer/components/page-header/page-header'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { AlbumArtistListHeaderFilters } from '/@/renderer/features/artists/components/album-artist-list-header-filters'; -import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared'; +import { FilterBar } from '/@/renderer/features/shared/components/filter-bar'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { SearchInput } from '/@/renderer/features/shared/components/search-input'; import { useContainerQuery } from '/@/renderer/hooks'; import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh'; diff --git a/src/renderer/features/artists/components/album-artist-list-table-view.tsx b/src/renderer/features/artists/components/album-artist-list-table-view.tsx index ef291f2c..d7f8e81c 100644 --- a/src/renderer/features/artists/components/album-artist-list-table-view.tsx +++ b/src/renderer/features/artists/components/album-artist-list-table-view.tsx @@ -2,7 +2,7 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { MutableRefObject } from 'react'; -import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { VirtualTable } from '/@/renderer/components/virtual-table'; import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table'; import { useListContext } from '/@/renderer/context/list-context'; diff --git a/src/renderer/features/artists/components/artist-list-content.tsx b/src/renderer/features/artists/components/artist-list-content.tsx index 90c22404..9f39760f 100644 --- a/src/renderer/features/artists/components/artist-list-content.tsx +++ b/src/renderer/features/artists/components/artist-list-content.tsx @@ -2,7 +2,7 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { lazy, MutableRefObject, Suspense } from 'react'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; import { useListStoreByKey } from '/@/renderer/store'; import { Spinner } from '/@/shared/components/spinner/spinner'; diff --git a/src/renderer/features/artists/components/artist-list-grid-view.tsx b/src/renderer/features/artists/components/artist-list-grid-view.tsx index 2b85c202..acd0c420 100644 --- a/src/renderer/features/artists/components/artist-list-grid-view.tsx +++ b/src/renderer/features/artists/components/artist-list-grid-view.tsx @@ -6,13 +6,13 @@ import { ListOnScrollProps } from 'react-window'; import { api } from '/@/renderer/api'; import { queryKeys } from '/@/renderer/api/query-keys'; import { ALBUMARTIST_CARD_ROWS } from '/@/renderer/components/card/card-rows'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { - VirtualGridAutoSizerContainer, VirtualInfiniteGrid, VirtualInfiniteGridRef, -} from '/@/renderer/components/virtual-grid'; +} from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite'; import { AppRoute } from '/@/renderer/router/routes'; import { useCurrentServer, useListStoreActions } from '/@/renderer/store'; diff --git a/src/renderer/features/artists/components/artist-list-header-filters.tsx b/src/renderer/features/artists/components/artist-list-header-filters.tsx index 07aa0229..0f572555 100644 --- a/src/renderer/features/artists/components/artist-list-header-filters.tsx +++ b/src/renderer/features/artists/components/artist-list-header-filters.tsx @@ -9,13 +9,13 @@ import { useTranslation } from 'react-i18next'; import i18n from '/@/i18n/i18n'; import { api } from '/@/renderer/api'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { ALBUMARTIST_TABLE_COLUMNS } from '/@/renderer/components/virtual-table'; import { useListContext } from '/@/renderer/context/list-context'; -import { OrderToggleButton } from '/@/renderer/features/shared'; import { sharedQueries } from '/@/renderer/features/shared/api/shared-api'; import { ListConfigMenu } from '/@/renderer/features/shared/components/list-config-menu'; import { MoreButton } from '/@/renderer/features/shared/components/more-button'; +import { OrderToggleButton } from '/@/renderer/features/shared/components/order-toggle-button'; import { RefreshButton } from '/@/renderer/features/shared/components/refresh-button'; import { useContainerQuery } from '/@/renderer/hooks'; import { diff --git a/src/renderer/features/artists/components/artist-list-header.tsx b/src/renderer/features/artists/components/artist-list-header.tsx index 0a0e65e9..81fbaa75 100644 --- a/src/renderer/features/artists/components/artist-list-header.tsx +++ b/src/renderer/features/artists/components/artist-list-header.tsx @@ -5,9 +5,10 @@ import debounce from 'lodash/debounce'; import { useTranslation } from 'react-i18next'; import { PageHeader } from '/@/renderer/components/page-header/page-header'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { ArtistListHeaderFilters } from '/@/renderer/features/artists/components/artist-list-header-filters'; -import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared'; +import { FilterBar } from '/@/renderer/features/shared/components/filter-bar'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { SearchInput } from '/@/renderer/features/shared/components/search-input'; import { useContainerQuery } from '/@/renderer/hooks'; import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh'; diff --git a/src/renderer/features/artists/components/artist-list-table-view.tsx b/src/renderer/features/artists/components/artist-list-table-view.tsx index 88285b0d..d7c247cb 100644 --- a/src/renderer/features/artists/components/artist-list-table-view.tsx +++ b/src/renderer/features/artists/components/artist-list-table-view.tsx @@ -2,7 +2,7 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { MutableRefObject } from 'react'; -import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { VirtualTable } from '/@/renderer/components/virtual-table'; import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table'; import { useListContext } from '/@/renderer/context/list-context'; diff --git a/src/renderer/features/artists/routes/album-artist-detail-route.tsx b/src/renderer/features/artists/routes/album-artist-detail-route.tsx index 2bb13a28..0c6e0a58 100644 --- a/src/renderer/features/artists/routes/album-artist-detail-route.tsx +++ b/src/renderer/features/artists/routes/album-artist-detail-route.tsx @@ -6,8 +6,9 @@ import { NativeScrollArea } from '/@/renderer/components/native-scroll-area/nati import { artistsQueries } from '/@/renderer/features/artists/api/artists-api'; import { AlbumArtistDetailContent } from '/@/renderer/features/artists/components/album-artist-detail-content'; import { AlbumArtistDetailHeader } from '/@/renderer/features/artists/components/album-artist-detail-header'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; -import { AnimatedPage, LibraryHeaderBar } from '/@/renderer/features/shared'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { useFastAverageColor } from '/@/renderer/hooks'; import { useCurrentServer } from '/@/renderer/store'; import { useGeneralSettings, usePlayButtonBehavior } from '/@/renderer/store/settings.store'; diff --git a/src/renderer/features/artists/routes/album-artist-detail-top-songs-list-route.tsx b/src/renderer/features/artists/routes/album-artist-detail-top-songs-list-route.tsx index 38da5a38..dea8693b 100644 --- a/src/renderer/features/artists/routes/album-artist-detail-top-songs-list-route.tsx +++ b/src/renderer/features/artists/routes/album-artist-detail-top-songs-list-route.tsx @@ -8,7 +8,7 @@ import { ListContext } from '/@/renderer/context/list-context'; import { artistsQueries } from '/@/renderer/features/artists/api/artists-api'; import { AlbumArtistDetailTopSongsListContent } from '/@/renderer/features/artists/components/album-artist-detail-top-songs-list-content'; import { AlbumArtistDetailTopSongsListHeader } from '/@/renderer/features/artists/components/album-artist-detail-top-songs-list-header'; -import { AnimatedPage } from '/@/renderer/features/shared'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; import { useCurrentServer } from '/@/renderer/store/auth.store'; import { LibraryItem } from '/@/shared/types/domain-types'; diff --git a/src/renderer/features/artists/routes/album-artist-list-route.tsx b/src/renderer/features/artists/routes/album-artist-list-route.tsx index ff5f06e0..2d1f4852 100644 --- a/src/renderer/features/artists/routes/album-artist-list-route.tsx +++ b/src/renderer/features/artists/routes/album-artist-list-route.tsx @@ -3,12 +3,12 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { useQuery } from '@tanstack/react-query'; import { useMemo, useRef } from 'react'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { ListContext } from '/@/renderer/context/list-context'; import { artistsQueries } from '/@/renderer/features/artists/api/artists-api'; import { AlbumArtistListContent } from '/@/renderer/features/artists/components/album-artist-list-content'; import { AlbumArtistListHeader } from '/@/renderer/features/artists/components/album-artist-list-header'; -import { AnimatedPage } from '/@/renderer/features/shared'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; import { useCurrentServer } from '/@/renderer/store/auth.store'; import { useListFilterByKey } from '/@/renderer/store/list.store'; import { AlbumArtistListQuery, LibraryItem } from '/@/shared/types/domain-types'; diff --git a/src/renderer/features/artists/routes/artist-list-route.tsx b/src/renderer/features/artists/routes/artist-list-route.tsx index 722abbfa..9ee535aa 100644 --- a/src/renderer/features/artists/routes/artist-list-route.tsx +++ b/src/renderer/features/artists/routes/artist-list-route.tsx @@ -3,12 +3,12 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { useQuery } from '@tanstack/react-query'; import { useMemo, useRef } from 'react'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { ListContext } from '/@/renderer/context/list-context'; import { artistsQueries } from '/@/renderer/features/artists/api/artists-api'; import { ArtistListContent } from '/@/renderer/features/artists/components/artist-list-content'; import { ArtistListHeader } from '/@/renderer/features/artists/components/artist-list-header'; -import { AnimatedPage } from '/@/renderer/features/shared'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; import { useCurrentServer } from '/@/renderer/store/auth.store'; import { useListFilterByKey } from '/@/renderer/store/list.store'; import { ArtistListQuery, LibraryItem } from '/@/shared/types/domain-types'; diff --git a/src/renderer/features/context-menu/context-menu-provider.tsx b/src/renderer/features/context-menu/context-menu-provider.tsx index fc056ce3..5df98770 100644 --- a/src/renderer/features/context-menu/context-menu-provider.tsx +++ b/src/renderer/features/context-menu/context-menu-provider.tsx @@ -30,11 +30,13 @@ import { useContextMenuEvents, } from '/@/renderer/features/context-menu/events'; import { ItemDetailsModal } from '/@/renderer/features/item-details/components/item-details-modal'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { updateSong } from '/@/renderer/features/player/update-remote-song'; -import { useDeletePlaylist } from '/@/renderer/features/playlists'; +import { useDeletePlaylist } from '/@/renderer/features/playlists/mutations/delete-playlist-mutation'; import { useRemoveFromPlaylist } from '/@/renderer/features/playlists/mutations/remove-from-playlist-mutation'; -import { useCreateFavorite, useDeleteFavorite, useSetRating } from '/@/renderer/features/shared'; +import { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation'; +import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-favorite-mutation'; +import { useSetRating } from '/@/renderer/features/shared/mutations/set-rating-mutation'; import { AppRoute } from '/@/renderer/router/routes'; import { getServerById, diff --git a/src/renderer/features/context-menu/index.tsx b/src/renderer/features/context-menu/index.tsx deleted file mode 100644 index e5229ef7..00000000 --- a/src/renderer/features/context-menu/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export * from './context-menu-provider'; -export * from './events'; -export * from './hooks/use-handle-context-menu'; diff --git a/src/renderer/features/genres/components/genre-list-content.tsx b/src/renderer/features/genres/components/genre-list-content.tsx index d331479c..9c36f3ad 100644 --- a/src/renderer/features/genres/components/genre-list-content.tsx +++ b/src/renderer/features/genres/components/genre-list-content.tsx @@ -2,7 +2,7 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { lazy, MutableRefObject, Suspense } from 'react'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; import { useListStoreByKey } from '/@/renderer/store'; import { Spinner } from '/@/shared/components/spinner/spinner'; diff --git a/src/renderer/features/genres/components/genre-list-grid-view.tsx b/src/renderer/features/genres/components/genre-list-grid-view.tsx index c95a850f..46acb6b9 100644 --- a/src/renderer/features/genres/components/genre-list-grid-view.tsx +++ b/src/renderer/features/genres/components/genre-list-grid-view.tsx @@ -7,12 +7,10 @@ import { ListOnScrollProps } from 'react-window'; import { api } from '/@/renderer/api'; import { queryKeys } from '/@/renderer/api/query-keys'; import { ALBUM_CARD_ROWS } from '/@/renderer/components/card/card-rows'; -import { - VirtualGridAutoSizerContainer, - VirtualInfiniteGrid, -} from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; +import { VirtualInfiniteGrid } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { useGenreRoute } from '/@/renderer/hooks/use-genre-route'; import { useCurrentServer, useListStoreActions, useListStoreByKey } from '/@/renderer/store'; import { diff --git a/src/renderer/features/genres/components/genre-list-header-filters.tsx b/src/renderer/features/genres/components/genre-list-header-filters.tsx index e14a1b8d..85dc5768 100644 --- a/src/renderer/features/genres/components/genre-list-header-filters.tsx +++ b/src/renderer/features/genres/components/genre-list-header-filters.tsx @@ -7,14 +7,14 @@ import { useTranslation } from 'react-i18next'; import i18n from '/@/i18n/i18n'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { GENRE_TABLE_COLUMNS } from '/@/renderer/components/virtual-table'; import { useListContext } from '/@/renderer/context/list-context'; -import { OrderToggleButton } from '/@/renderer/features/shared'; import { sharedQueries } from '/@/renderer/features/shared/api/shared-api'; import { FolderButton } from '/@/renderer/features/shared/components/folder-button'; import { ListConfigMenu } from '/@/renderer/features/shared/components/list-config-menu'; import { MoreButton } from '/@/renderer/features/shared/components/more-button'; +import { OrderToggleButton } from '/@/renderer/features/shared/components/order-toggle-button'; import { RefreshButton } from '/@/renderer/features/shared/components/refresh-button'; import { useContainerQuery } from '/@/renderer/hooks'; import { useListFilterRefresh } from '/@/renderer/hooks/use-list-filter-refresh'; diff --git a/src/renderer/features/genres/components/genre-list-header.tsx b/src/renderer/features/genres/components/genre-list-header.tsx index e44bbee8..1986e8cf 100644 --- a/src/renderer/features/genres/components/genre-list-header.tsx +++ b/src/renderer/features/genres/components/genre-list-header.tsx @@ -5,9 +5,10 @@ import { ChangeEvent, MutableRefObject } from 'react'; import { useTranslation } from 'react-i18next'; import { PageHeader } from '/@/renderer/components/page-header/page-header'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { GenreListHeaderFilters } from '/@/renderer/features/genres/components/genre-list-header-filters'; -import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared'; +import { FilterBar } from '/@/renderer/features/shared/components/filter-bar'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { SearchInput } from '/@/renderer/features/shared/components/search-input'; import { useContainerQuery } from '/@/renderer/hooks'; import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh'; diff --git a/src/renderer/features/genres/components/genre-list-table-view.tsx b/src/renderer/features/genres/components/genre-list-table-view.tsx index 825e4023..1ab13106 100644 --- a/src/renderer/features/genres/components/genre-list-table-view.tsx +++ b/src/renderer/features/genres/components/genre-list-table-view.tsx @@ -4,7 +4,7 @@ import { RowDoubleClickedEvent } from '@ag-grid-community/core'; import { MutableRefObject, useCallback } from 'react'; import { generatePath, useNavigate } from 'react-router'; -import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { VirtualTable } from '/@/renderer/components/virtual-table'; import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table'; import { useListContext } from '/@/renderer/context/list-context'; diff --git a/src/renderer/features/genres/index.ts b/src/renderer/features/genres/index.ts deleted file mode 100644 index d27b2441..00000000 --- a/src/renderer/features/genres/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './queries/genre-list-query'; diff --git a/src/renderer/features/genres/routes/genre-list-route.tsx b/src/renderer/features/genres/routes/genre-list-route.tsx index cfcbf487..ccc5538f 100644 --- a/src/renderer/features/genres/routes/genre-list-route.tsx +++ b/src/renderer/features/genres/routes/genre-list-route.tsx @@ -3,12 +3,12 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { useQuery } from '@tanstack/react-query'; import { useMemo, useRef } from 'react'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { ListContext } from '/@/renderer/context/list-context'; import { genresQueries } from '/@/renderer/features/genres/api/genres-api'; import { GenreListContent } from '/@/renderer/features/genres/components/genre-list-content'; import { GenreListHeader } from '/@/renderer/features/genres/components/genre-list-header'; -import { AnimatedPage } from '/@/renderer/features/shared'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; import { useCurrentServer } from '/@/renderer/store'; import { useListStoreByKey } from '/@/renderer/store/list.store'; import { GenreListQuery } from '/@/shared/types/domain-types'; diff --git a/src/renderer/features/home/routes/home-route.tsx b/src/renderer/features/home/routes/home-route.tsx index 1644cf1c..45acd256 100644 --- a/src/renderer/features/home/routes/home-route.tsx +++ b/src/renderer/features/home/routes/home-route.tsx @@ -7,7 +7,8 @@ import { MemoizedSwiperGridCarousel } from '/@/renderer/components/grid-carousel import { NativeScrollArea } from '/@/renderer/components/native-scroll-area/native-scroll-area'; import { albumQueries } from '/@/renderer/features/albums/api/album-api'; import { homeQueries } from '/@/renderer/features/home/api/home-api'; -import { AnimatedPage, LibraryHeaderBar } from '/@/renderer/features/shared'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { songsQueries } from '/@/renderer/features/songs/api/songs-api'; import { AppRoute } from '/@/renderer/router/routes'; import { diff --git a/src/renderer/features/lyrics/lyrics.tsx b/src/renderer/features/lyrics/lyrics.tsx index 7a572be4..730f8a37 100644 --- a/src/renderer/features/lyrics/lyrics.tsx +++ b/src/renderer/features/lyrics/lyrics.tsx @@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next'; import styles from './lyrics.module.css'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { ErrorFallback } from '/@/renderer/features/action-required'; +import { ErrorFallback } from '/@/renderer/features/action-required/components/error-fallback'; import { translateLyrics } from '/@/renderer/features/lyrics/api/lyric-translate'; import { lyricsQueries } from '/@/renderer/features/lyrics/api/lyrics-api'; import { LyricsActions } from '/@/renderer/features/lyrics/lyrics-actions'; diff --git a/src/renderer/features/now-playing/components/now-playing-header.tsx b/src/renderer/features/now-playing/components/now-playing-header.tsx index b60ce29e..77727bff 100644 --- a/src/renderer/features/now-playing/components/now-playing-header.tsx +++ b/src/renderer/features/now-playing/components/now-playing-header.tsx @@ -1,5 +1,5 @@ import { PageHeader } from '/@/renderer/components/page-header/page-header'; -import { LibraryHeaderBar } from '/@/renderer/features/shared'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; export const NowPlayingHeader = () => { // const currentSong = useCurrentSong(); diff --git a/src/renderer/features/now-playing/components/play-queue.tsx b/src/renderer/features/now-playing/components/play-queue.tsx index c7ee52ca..31387cf8 100644 --- a/src/renderer/features/now-playing/components/play-queue.tsx +++ b/src/renderer/features/now-playing/components/play-queue.tsx @@ -14,11 +14,11 @@ import debounce from 'lodash/debounce'; import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'; import { ErrorBoundary } from 'react-error-boundary'; -import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { getColumnDefs, VirtualTable } from '/@/renderer/components/virtual-table'; -import { ErrorFallback } from '/@/renderer/features/action-required'; -import { useHandleTableContextMenu } from '/@/renderer/features/context-menu'; +import { ErrorFallback } from '/@/renderer/features/action-required/components/error-fallback'; import { QUEUE_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items'; +import { useHandleTableContextMenu } from '/@/renderer/features/context-menu/hooks/use-handle-context-menu'; import { PlayersRef } from '/@/renderer/features/player/ref/players-ref'; import { updateSong } from '/@/renderer/features/player/update-remote-song'; import { useAppFocus } from '/@/renderer/hooks'; diff --git a/src/renderer/features/now-playing/components/sidebar-play-queue.tsx b/src/renderer/features/now-playing/components/sidebar-play-queue.tsx index 58a74649..8202f1d1 100644 --- a/src/renderer/features/now-playing/components/sidebar-play-queue.tsx +++ b/src/renderer/features/now-playing/components/sidebar-play-queue.tsx @@ -4,7 +4,7 @@ import { useRef, useState } from 'react'; import { PlayQueueListControls } from './play-queue-list-controls'; -import { VirtualGridContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { PlayQueue } from '/@/renderer/features/now-playing/components/play-queue'; import { useWindowSettings } from '/@/renderer/store/settings.store'; import { Box } from '/@/shared/components/box/box'; diff --git a/src/renderer/features/now-playing/index.ts b/src/renderer/features/now-playing/index.ts deleted file mode 100644 index a53963f1..00000000 --- a/src/renderer/features/now-playing/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './components/drawer-play-queue'; -export * from './components/play-queue'; -export * from './components/play-queue-list-controls'; -export * from './components/sidebar-play-queue'; diff --git a/src/renderer/features/now-playing/routes/now-playing-route.tsx b/src/renderer/features/now-playing/routes/now-playing-route.tsx index 2df08b1b..cd6e21eb 100644 --- a/src/renderer/features/now-playing/routes/now-playing-route.tsx +++ b/src/renderer/features/now-playing/routes/now-playing-route.tsx @@ -3,11 +3,11 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { useRef, useState } from 'react'; -import { VirtualGridContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { NowPlayingHeader } from '/@/renderer/features/now-playing/components/now-playing-header'; import { PlayQueue } from '/@/renderer/features/now-playing/components/play-queue'; import { PlayQueueListControls } from '/@/renderer/features/now-playing/components/play-queue-list-controls'; -import { AnimatedPage } from '/@/renderer/features/shared'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; const NowPlayingRoute = () => { const queueRef = useRef }>(null); diff --git a/src/renderer/features/player/components/full-screen-player-queue.tsx b/src/renderer/features/player/components/full-screen-player-queue.tsx index 3b458170..6ace8547 100644 --- a/src/renderer/features/player/components/full-screen-player-queue.tsx +++ b/src/renderer/features/player/components/full-screen-player-queue.tsx @@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next'; import styles from './full-screen-player-queue.module.css'; import { Lyrics } from '/@/renderer/features/lyrics/lyrics'; -import { PlayQueue } from '/@/renderer/features/now-playing'; +import { PlayQueue } from '/@/renderer/features/now-playing/components/play-queue'; import { FullScreenSimilarSongs } from '/@/renderer/features/player/components/full-screen-similar-songs'; import { usePlaybackSettings } from '/@/renderer/store'; import { diff --git a/src/renderer/features/player/components/playerbar.tsx b/src/renderer/features/player/components/playerbar.tsx index 6e2baa9c..1e275fd6 100644 --- a/src/renderer/features/player/components/playerbar.tsx +++ b/src/renderer/features/player/components/playerbar.tsx @@ -3,7 +3,7 @@ import { MouseEvent, useCallback } from 'react'; import styles from './playerbar.module.css'; -import { AudioPlayer } from '/@/renderer/components'; +import { AudioPlayer } from '/@/renderer/components/audio-player'; 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'; diff --git a/src/renderer/features/player/components/right-controls.tsx b/src/renderer/features/player/components/right-controls.tsx index 61d37268..1c2b7694 100644 --- a/src/renderer/features/player/components/right-controls.tsx +++ b/src/renderer/features/player/components/right-controls.tsx @@ -5,7 +5,9 @@ import { useTranslation } from 'react-i18next'; 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 { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation'; +import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-favorite-mutation'; +import { useSetRating } from '/@/renderer/features/shared/mutations/set-rating-mutation'; import { useAppStoreActions, useCurrentServer, diff --git a/src/renderer/features/player/index.ts b/src/renderer/features/player/index.ts deleted file mode 100644 index a191d50b..00000000 --- a/src/renderer/features/player/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -export * from './components/center-controls'; -export * from './components/left-controls'; -export * from './components/playerbar'; -export * from './context/play-queue-handler-context'; -export * from './hooks/use-playqueue-add'; -export * from './utils'; diff --git a/src/renderer/features/playlists/components/add-to-playlist-context-modal.tsx b/src/renderer/features/playlists/components/add-to-playlist-context-modal.tsx index d3744b9e..f99fa59b 100644 --- a/src/renderer/features/playlists/components/add-to-playlist-context-modal.tsx +++ b/src/renderer/features/playlists/components/add-to-playlist-context-modal.tsx @@ -8,7 +8,7 @@ import styles from './add-to-playlist-context-modal.module.css'; import { api } from '/@/renderer/api'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { getGenreSongsById } from '/@/renderer/features/player'; +import { getGenreSongsById } from '/@/renderer/features/player/utils'; import { playlistsQueries } from '/@/renderer/features/playlists/api/playlists-api'; import { useAddToPlaylist } from '/@/renderer/features/playlists/mutations/add-to-playlist-mutation'; import { queryClient } from '/@/renderer/lib/react-query'; diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx index 579efd88..7fca0633 100644 --- a/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx +++ b/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx @@ -16,15 +16,15 @@ import { useParams } from 'react-router'; import { api } from '/@/renderer/api'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { getColumnDefs, TablePagination, VirtualTable } from '/@/renderer/components/virtual-table'; import { useCurrentSongRowStyles } from '/@/renderer/components/virtual-table/hooks/use-current-song-row-styles'; -import { useHandleTableContextMenu } from '/@/renderer/features/context-menu'; import { PLAYLIST_SONG_CONTEXT_MENU_ITEMS, SMART_PLAYLIST_SONG_CONTEXT_MENU_ITEMS, } from '/@/renderer/features/context-menu/context-menu-items'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; +import { useHandleTableContextMenu } from '/@/renderer/features/context-menu/hooks/use-handle-context-menu'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { playlistsQueries } from '/@/renderer/features/playlists/api/playlists-api'; import { useAppFocus } from '/@/renderer/hooks'; import { diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx index 527692b8..9d30839a 100644 --- a/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx +++ b/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx @@ -13,9 +13,9 @@ import { SONG_TABLE_COLUMNS } from '/@/renderer/components/virtual-table'; import { playlistsQueries } from '/@/renderer/features/playlists/api/playlists-api'; import { openUpdatePlaylistModal } from '/@/renderer/features/playlists/components/update-playlist-form'; import { useDeletePlaylist } from '/@/renderer/features/playlists/mutations/delete-playlist-mutation'; -import { OrderToggleButton } from '/@/renderer/features/shared'; import { ListConfigMenu } from '/@/renderer/features/shared/components/list-config-menu'; import { MoreButton } from '/@/renderer/features/shared/components/more-button'; +import { OrderToggleButton } from '/@/renderer/features/shared/components/order-toggle-button'; import { SearchInput } from '/@/renderer/features/shared/components/search-input'; import { useContainerQuery } from '/@/renderer/hooks'; import { AppRoute } from '/@/renderer/router/routes'; diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx index 140cdaed..0de90eda 100644 --- a/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx +++ b/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx @@ -6,10 +6,11 @@ import { useTranslation } from 'react-i18next'; import { useParams } from 'react-router'; import { PageHeader } from '/@/renderer/components/page-header/page-header'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { playlistsQueries } from '/@/renderer/features/playlists/api/playlists-api'; import { PlaylistDetailSongListHeaderFilters } from '/@/renderer/features/playlists/components/playlist-detail-song-list-header-filters'; -import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared'; +import { FilterBar } from '/@/renderer/features/shared/components/filter-bar'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { useCurrentServer, usePlaylistDetailStore } from '/@/renderer/store'; import { usePlayButtonBehavior } from '/@/renderer/store/settings.store'; import { formatDurationString } from '/@/renderer/utils'; diff --git a/src/renderer/features/playlists/components/playlist-list-content.tsx b/src/renderer/features/playlists/components/playlist-list-content.tsx index 75940c26..9fdf2460 100644 --- a/src/renderer/features/playlists/components/playlist-list-content.tsx +++ b/src/renderer/features/playlists/components/playlist-list-content.tsx @@ -2,7 +2,7 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { lazy, MutableRefObject, Suspense } from 'react'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; import { useListStoreByKey } from '/@/renderer/store/list.store'; import { Spinner } from '/@/shared/components/spinner/spinner'; diff --git a/src/renderer/features/playlists/components/playlist-list-grid-view.tsx b/src/renderer/features/playlists/components/playlist-list-grid-view.tsx index a008fa88..4e3094ca 100644 --- a/src/renderer/features/playlists/components/playlist-list-grid-view.tsx +++ b/src/renderer/features/playlists/components/playlist-list-grid-view.tsx @@ -6,13 +6,13 @@ import { ListOnScrollProps } from 'react-window'; import { controller } from '/@/renderer/api/controller'; import { queryKeys } from '/@/renderer/api/query-keys'; import { PLAYLIST_CARD_ROWS } from '/@/renderer/components/card/card-rows'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { - VirtualGridAutoSizerContainer, VirtualInfiniteGrid, VirtualInfiniteGridRef, -} from '/@/renderer/components/virtual-grid'; +} from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite'; import { AppRoute } from '/@/renderer/router/routes'; import { useCurrentServer, useListStoreByKey } from '/@/renderer/store'; diff --git a/src/renderer/features/playlists/components/playlist-list-header-filters.tsx b/src/renderer/features/playlists/components/playlist-list-header-filters.tsx index 0f756ef6..15073eed 100644 --- a/src/renderer/features/playlists/components/playlist-list-header-filters.tsx +++ b/src/renderer/features/playlists/components/playlist-list-header-filters.tsx @@ -10,13 +10,13 @@ import { useTranslation } from 'react-i18next'; import i18n from '/@/i18n/i18n'; import { api } from '/@/renderer/api'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { PLAYLIST_TABLE_COLUMNS } from '/@/renderer/components/virtual-table'; import { useListContext } from '/@/renderer/context/list-context'; import { CreatePlaylistForm } from '/@/renderer/features/playlists/components/create-playlist-form'; -import { OrderToggleButton } from '/@/renderer/features/shared'; import { ListConfigMenu } from '/@/renderer/features/shared/components/list-config-menu'; import { MoreButton } from '/@/renderer/features/shared/components/more-button'; +import { OrderToggleButton } from '/@/renderer/features/shared/components/order-toggle-button'; import { RefreshButton } from '/@/renderer/features/shared/components/refresh-button'; import { useContainerQuery } from '/@/renderer/hooks'; import { diff --git a/src/renderer/features/playlists/components/playlist-list-header.tsx b/src/renderer/features/playlists/components/playlist-list-header.tsx index 73ccf598..ae5fa572 100644 --- a/src/renderer/features/playlists/components/playlist-list-header.tsx +++ b/src/renderer/features/playlists/components/playlist-list-header.tsx @@ -5,9 +5,10 @@ import { ChangeEvent, MutableRefObject } from 'react'; import { useTranslation } from 'react-i18next'; import { PageHeader } from '/@/renderer/components/page-header/page-header'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { PlaylistListHeaderFilters } from '/@/renderer/features/playlists/components/playlist-list-header-filters'; -import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared'; +import { FilterBar } from '/@/renderer/features/shared/components/filter-bar'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { SearchInput } from '/@/renderer/features/shared/components/search-input'; import { useContainerQuery } from '/@/renderer/hooks'; import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh'; diff --git a/src/renderer/features/playlists/components/playlist-list-table-view.tsx b/src/renderer/features/playlists/components/playlist-list-table-view.tsx index 89804b79..82468e49 100644 --- a/src/renderer/features/playlists/components/playlist-list-table-view.tsx +++ b/src/renderer/features/playlists/components/playlist-list-table-view.tsx @@ -4,7 +4,7 @@ import { RowDoubleClickedEvent } from '@ag-grid-community/core'; import { MutableRefObject } from 'react'; import { generatePath, useNavigate } from 'react-router'; -import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { VirtualTable } from '/@/renderer/components/virtual-table'; import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table'; import { PLAYLIST_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items'; diff --git a/src/renderer/features/playlists/index.ts b/src/renderer/features/playlists/index.ts deleted file mode 100644 index 543657b2..00000000 --- a/src/renderer/features/playlists/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from './components/add-to-playlist-context-modal'; -export * from './components/create-playlist-form'; -export * from './mutations/add-to-playlist-mutation'; -export * from './mutations/create-playlist-mutation'; -export * from './mutations/delete-playlist-mutation'; -export * from './mutations/remove-from-playlist-mutation'; -export * from './mutations/update-playlist-mutation'; -export * from './queries/playlist-list-query'; diff --git a/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx b/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx index 18bae2d4..766cd523 100644 --- a/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx +++ b/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx @@ -16,7 +16,7 @@ import { PlaylistQueryBuilder } from '/@/renderer/features/playlists/components/ import { SaveAsPlaylistForm } from '/@/renderer/features/playlists/components/save-as-playlist-form'; import { useCreatePlaylist } from '/@/renderer/features/playlists/mutations/create-playlist-mutation'; import { useDeletePlaylist } from '/@/renderer/features/playlists/mutations/delete-playlist-mutation'; -import { AnimatedPage } from '/@/renderer/features/shared'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; import { AppRoute } from '/@/renderer/router/routes'; import { useCurrentServer, usePlaylistDetailStore } from '/@/renderer/store'; import { searchSongs } from '/@/renderer/utils/search-songs'; @@ -215,7 +215,7 @@ const PlaylistDetailSongListRoute = () => { {isQueryBuilderExpanded && ( { const { state: locationState } = useLocation(); diff --git a/src/renderer/features/servers/index.ts b/src/renderer/features/servers/index.ts deleted file mode 100644 index 006447d9..00000000 --- a/src/renderer/features/servers/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './components/add-server-form'; -export * from './components/server-list'; diff --git a/src/renderer/features/settings/components/general/context-menu-settings.tsx b/src/renderer/features/settings/components/general/context-menu-settings.tsx index 7d3768bb..8205bd0f 100644 --- a/src/renderer/features/settings/components/general/context-menu-settings.tsx +++ b/src/renderer/features/settings/components/general/context-menu-settings.tsx @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'; import { CONFIGURABLE_CONTEXT_MENU_ITEMS, CONTEXT_MENU_ITEM_MAPPING, -} from '/@/renderer/features/context-menu'; +} from '/@/renderer/features/context-menu/events'; import { SettingsOptions } from '/@/renderer/features/settings/components/settings-option'; import { useSettingsStore, useSettingsStoreActions } from '/@/renderer/store'; import { Button } from '/@/shared/components/button/button'; diff --git a/src/renderer/features/settings/components/settings-header.tsx b/src/renderer/features/settings/components/settings-header.tsx index ecf24145..5b581773 100644 --- a/src/renderer/features/settings/components/settings-header.tsx +++ b/src/renderer/features/settings/components/settings-header.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'; import { PageHeader } from '/@/renderer/components/page-header/page-header'; import { useSettingSearchContext } from '/@/renderer/features/settings/context/search-context'; -import { LibraryHeaderBar } from '/@/renderer/features/shared'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { SearchInput } from '/@/renderer/features/shared/components/search-input'; import { useContainerQuery } from '/@/renderer/hooks'; import { useSettingsStoreActions } from '/@/renderer/store/settings.store'; diff --git a/src/renderer/features/settings/routes/settings-route.tsx b/src/renderer/features/settings/routes/settings-route.tsx index 4255b225..bb140a38 100644 --- a/src/renderer/features/settings/routes/settings-route.tsx +++ b/src/renderer/features/settings/routes/settings-route.tsx @@ -3,7 +3,7 @@ import { useState } from 'react'; import { SettingsContent } from '/@/renderer/features/settings/components/settings-content'; import { SettingsHeader } from '/@/renderer/features/settings/components/settings-header'; import { SettingSearchContext } from '/@/renderer/features/settings/context/search-context'; -import { AnimatedPage } from '/@/renderer/features/shared'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; import { Flex } from '/@/shared/components/flex/flex'; const SettingsRoute = () => { diff --git a/src/renderer/features/shared/hooks/use-handle-favorite.ts b/src/renderer/features/shared/hooks/use-handle-favorite.ts index 35c488a6..b4c6d1f3 100644 --- a/src/renderer/features/shared/hooks/use-handle-favorite.ts +++ b/src/renderer/features/shared/hooks/use-handle-favorite.ts @@ -1,6 +1,6 @@ import { MutableRefObject, useCallback } from 'react'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation'; import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-favorite-mutation'; import { LibraryItem } from '/@/shared/types/domain-types'; diff --git a/src/renderer/features/shared/index.ts b/src/renderer/features/shared/index.ts deleted file mode 100644 index 85b712bd..00000000 --- a/src/renderer/features/shared/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -export * from './components/animated-page'; -export * from './components/filter-bar'; -export * from './components/library-header'; -export * from './components/library-header-bar'; -export * from './components/order-toggle-button'; -export * from './components/play-button'; -export * from './components/resize-handle'; -export * from './mutations/create-favorite-mutation'; -export * from './mutations/delete-favorite-mutation'; -export * from './mutations/set-rating-mutation'; -export * from './queries/music-folders-query'; -export * from './utils'; diff --git a/src/renderer/features/sharing/index.ts b/src/renderer/features/sharing/index.ts deleted file mode 100644 index 74f988e2..00000000 --- a/src/renderer/features/sharing/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './components/share-item-context-modal'; -export * from './mutations/share-item-mutation'; diff --git a/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx b/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx index 37b31930..db94c629 100644 --- a/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx +++ b/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx @@ -8,9 +8,9 @@ import { Link } from 'react-router-dom'; import styles from './sidebar-playlist-list.module.css'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; -import { CreatePlaylistForm } from '/@/renderer/features/playlists'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { playlistsQueries } from '/@/renderer/features/playlists/api/playlists-api'; +import { CreatePlaylistForm } from '/@/renderer/features/playlists/components/create-playlist-form'; import { SidebarItem } from '/@/renderer/features/sidebar/components/sidebar-item'; import { AppRoute } from '/@/renderer/router/routes'; import { useCurrentServer } from '/@/renderer/store'; diff --git a/src/renderer/features/similar-songs/components/similar-songs-list.tsx b/src/renderer/features/similar-songs/components/similar-songs-list.tsx index 42ab31d7..905481e8 100644 --- a/src/renderer/features/similar-songs/components/similar-songs-list.tsx +++ b/src/renderer/features/similar-songs/components/similar-songs-list.tsx @@ -4,11 +4,11 @@ import { useQuery } from '@tanstack/react-query'; import { useMemo, useRef } from 'react'; import { ErrorBoundary } from 'react-error-boundary'; -import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { getColumnDefs, VirtualTable } from '/@/renderer/components/virtual-table'; -import { ErrorFallback } from '/@/renderer/features/action-required'; -import { useHandleTableContextMenu } from '/@/renderer/features/context-menu'; +import { ErrorFallback } from '/@/renderer/features/action-required/components/error-fallback'; import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items'; +import { useHandleTableContextMenu } from '/@/renderer/features/context-menu/hooks/use-handle-context-menu'; import { useHandlePlayQueueAdd } from '/@/renderer/features/player/hooks/use-handle-playqueue-add'; import { songsQueries } from '/@/renderer/features/songs/api/songs-api'; import { usePlayButtonBehavior, useTableSettings } from '/@/renderer/store'; diff --git a/src/renderer/features/songs/components/song-list-content.tsx b/src/renderer/features/songs/components/song-list-content.tsx index 3cf18383..61996795 100644 --- a/src/renderer/features/songs/components/song-list-content.tsx +++ b/src/renderer/features/songs/components/song-list-content.tsx @@ -2,7 +2,7 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { lazy, MutableRefObject, Suspense } from 'react'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; import { useListStoreByKey } from '/@/renderer/store'; import { Spinner } from '/@/shared/components/spinner/spinner'; diff --git a/src/renderer/features/songs/components/song-list-grid-view.tsx b/src/renderer/features/songs/components/song-list-grid-view.tsx index ff0a9e3d..886c0e44 100644 --- a/src/renderer/features/songs/components/song-list-grid-view.tsx +++ b/src/renderer/features/songs/components/song-list-grid-view.tsx @@ -7,11 +7,11 @@ import { ListOnScrollProps } from 'react-window'; import { controller } from '/@/renderer/api/controller'; import { queryKeys } from '/@/renderer/api/query-keys'; import { SONG_CARD_ROWS } from '/@/renderer/components/card/card-rows'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { - VirtualGridAutoSizerContainer, VirtualInfiniteGrid, VirtualInfiniteGridRef, -} from '/@/renderer/components/virtual-grid'; +} from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite'; diff --git a/src/renderer/features/songs/components/song-list-header-filters.tsx b/src/renderer/features/songs/components/song-list-header-filters.tsx index 71994377..f9c39c81 100644 --- a/src/renderer/features/songs/components/song-list-header-filters.tsx +++ b/src/renderer/features/songs/components/song-list-header-filters.tsx @@ -8,15 +8,15 @@ import { useTranslation } from 'react-i18next'; import i18n from '/@/i18n/i18n'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { SONG_TABLE_COLUMNS } from '/@/renderer/components/virtual-table'; import { useListContext } from '/@/renderer/context/list-context'; -import { OrderToggleButton } from '/@/renderer/features/shared'; import { sharedQueries } from '/@/renderer/features/shared/api/shared-api'; import { FilterButton } from '/@/renderer/features/shared/components/filter-button'; import { FolderButton } from '/@/renderer/features/shared/components/folder-button'; import { ListConfigMenu } from '/@/renderer/features/shared/components/list-config-menu'; import { MoreButton } from '/@/renderer/features/shared/components/more-button'; +import { OrderToggleButton } from '/@/renderer/features/shared/components/order-toggle-button'; import { RefreshButton } from '/@/renderer/features/shared/components/refresh-button'; import { JellyfinSongFilters } from '/@/renderer/features/songs/components/jellyfin-song-filters'; import { NavidromeSongFilters } from '/@/renderer/features/songs/components/navidrome-song-filters'; diff --git a/src/renderer/features/songs/components/song-list-header.tsx b/src/renderer/features/songs/components/song-list-header.tsx index c05c343b..85b4f338 100644 --- a/src/renderer/features/songs/components/song-list-header.tsx +++ b/src/renderer/features/songs/components/song-list-header.tsx @@ -5,8 +5,9 @@ import { ChangeEvent, MutableRefObject, useEffect, useRef } from 'react'; import { useTranslation } from 'react-i18next'; import { PageHeader } from '/@/renderer/components/page-header/page-header'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; -import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; +import { FilterBar } from '/@/renderer/features/shared/components/filter-bar'; +import { LibraryHeaderBar } from '/@/renderer/features/shared/components/library-header-bar'; import { SearchInput } from '/@/renderer/features/shared/components/search-input'; import { SongListHeaderFilters } from '/@/renderer/features/songs/components/song-list-header-filters'; import { useContainerQuery } from '/@/renderer/hooks'; diff --git a/src/renderer/features/songs/components/song-list-table-view.tsx b/src/renderer/features/songs/components/song-list-table-view.tsx index 26fcffce..2b5a0a77 100644 --- a/src/renderer/features/songs/components/song-list-table-view.tsx +++ b/src/renderer/features/songs/components/song-list-table-view.tsx @@ -3,7 +3,7 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { RowDoubleClickedEvent } from '@ag-grid-community/core'; import { MutableRefObject } from 'react'; -import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid'; +import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper'; import { VirtualTable } from '/@/renderer/components/virtual-table'; import { useCurrentSongRowStyles } from '/@/renderer/components/virtual-table/hooks/use-current-song-row-styles'; import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table'; diff --git a/src/renderer/features/songs/index.ts b/src/renderer/features/songs/index.ts deleted file mode 100644 index 29c6c296..00000000 --- a/src/renderer/features/songs/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './queries/song-list-query'; diff --git a/src/renderer/features/songs/routes/song-list-route.tsx b/src/renderer/features/songs/routes/song-list-route.tsx index 5a367875..0dc86b5e 100644 --- a/src/renderer/features/songs/routes/song-list-route.tsx +++ b/src/renderer/features/songs/routes/song-list-route.tsx @@ -5,11 +5,11 @@ import isEmpty from 'lodash/isEmpty'; import { useCallback, useMemo, useRef } from 'react'; import { useParams, useSearchParams } from 'react-router-dom'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { ListContext } from '/@/renderer/context/list-context'; import { genresQueries } from '/@/renderer/features/genres/api/genres-api'; -import { usePlayQueueAdd } from '/@/renderer/features/player'; -import { AnimatedPage } from '/@/renderer/features/shared'; +import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add'; +import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page'; import { songsQueries } from '/@/renderer/features/songs/api/songs-api'; import { SongListContent } from '/@/renderer/features/songs/components/song-list-content'; import { SongListHeader } from '/@/renderer/features/songs/components/song-list-header'; diff --git a/src/renderer/features/titlebar/components/app-menu.tsx b/src/renderer/features/titlebar/components/app-menu.tsx index 9c56a35e..292e7590 100644 --- a/src/renderer/features/titlebar/components/app-menu.tsx +++ b/src/renderer/features/titlebar/components/app-menu.tsx @@ -6,8 +6,8 @@ import { Link } from 'react-router-dom'; import packageJson from '../../../../../package.json'; -import { ServerList } from '/@/renderer/features/servers'; import { EditServerForm } from '/@/renderer/features/servers/components/edit-server-form'; +import { ServerList } from '/@/renderer/features/servers/components/server-list'; import { AppRoute } from '/@/renderer/router/routes'; import { useAppStore, diff --git a/src/renderer/features/titlebar/components/titlebar.tsx b/src/renderer/features/titlebar/components/titlebar.tsx index 39482d1a..d2cdadb2 100644 --- a/src/renderer/features/titlebar/components/titlebar.tsx +++ b/src/renderer/features/titlebar/components/titlebar.tsx @@ -2,7 +2,7 @@ import type { ReactNode } from 'react'; import styles from './titlebar.module.css'; -import { WindowControls } from '/@/renderer/features/window-controls'; +import { WindowControls } from '/@/renderer/features/window-controls/components/window-controls'; import { Group } from '/@/shared/components/group/group'; interface TitlebarProps { diff --git a/src/renderer/features/users/index.ts b/src/renderer/features/users/index.ts deleted file mode 100644 index bfe94cf5..00000000 --- a/src/renderer/features/users/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './queries/user-list-query'; diff --git a/src/renderer/features/window-controls/index.ts b/src/renderer/features/window-controls/index.ts deleted file mode 100644 index b1b8447a..00000000 --- a/src/renderer/features/window-controls/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './components/window-controls'; diff --git a/src/renderer/hooks/use-display-refresh.ts b/src/renderer/hooks/use-display-refresh.ts index 21304cfb..1358b783 100644 --- a/src/renderer/hooks/use-display-refresh.ts +++ b/src/renderer/hooks/use-display-refresh.ts @@ -2,7 +2,7 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li import { ChangeEvent, MutableRefObject, useCallback } from 'react'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { useListContext } from '/@/renderer/context/list-context'; import { UseHandleListFilterChangeProps, diff --git a/src/renderer/hooks/use-list-filter-refresh.ts b/src/renderer/hooks/use-list-filter-refresh.ts index 8202bec8..83d60bae 100644 --- a/src/renderer/hooks/use-list-filter-refresh.ts +++ b/src/renderer/hooks/use-list-filter-refresh.ts @@ -7,7 +7,7 @@ import { MutableRefObject, useCallback, useMemo } from 'react'; import { api } from '/@/renderer/api'; import { queryKeys } from '/@/renderer/api/query-keys'; -import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid'; +import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid'; import { BasePaginatedResponse, LibraryItem, ServerListItem } from '/@/shared/types/domain-types'; export interface UseHandleListFilterChangeProps { diff --git a/src/renderer/layouts/default-layout.tsx b/src/renderer/layouts/default-layout.tsx index a99ace32..4c0079b1 100644 --- a/src/renderer/layouts/default-layout.tsx +++ b/src/renderer/layouts/default-layout.tsx @@ -6,7 +6,7 @@ import { useNavigate } from 'react-router'; import styles from './default-layout.module.css'; -import { ContextMenuProvider } from '/@/renderer/features/context-menu'; +import { ContextMenuProvider } from '/@/renderer/features/context-menu/context-menu-provider'; import { CommandPalette } from '/@/renderer/features/search/components/command-palette'; import { MainContent } from '/@/renderer/layouts/default-layout/main-content'; import { PlayerBar } from '/@/renderer/layouts/default-layout/player-bar'; diff --git a/src/renderer/layouts/default-layout/left-sidebar.tsx b/src/renderer/layouts/default-layout/left-sidebar.tsx index 6a406a2b..b1d682be 100644 --- a/src/renderer/layouts/default-layout/left-sidebar.tsx +++ b/src/renderer/layouts/default-layout/left-sidebar.tsx @@ -2,7 +2,7 @@ import { useRef } from 'react'; import styles from './left-sidebar.module.css'; -import { ResizeHandle } from '/@/renderer/features/shared'; +import { ResizeHandle } from '/@/renderer/features/shared/components/resize-handle'; import { CollapsedSidebar } from '/@/renderer/features/sidebar/components/collapsed-sidebar'; import { Sidebar } from '/@/renderer/features/sidebar/components/sidebar'; import { useSidebarStore } from '/@/renderer/store'; diff --git a/src/renderer/layouts/default-layout/player-bar.tsx b/src/renderer/layouts/default-layout/player-bar.tsx index 3b5aa9fd..0fdab281 100644 --- a/src/renderer/layouts/default-layout/player-bar.tsx +++ b/src/renderer/layouts/default-layout/player-bar.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import styles from './player-bar.module.css'; -import { Playerbar } from '/@/renderer/features/player'; +import { Playerbar } from '/@/renderer/features/player/components/playerbar'; import { useGeneralSettings } from '/@/renderer/store/settings.store'; export const PlayerBar = () => { diff --git a/src/renderer/layouts/default-layout/right-sidebar.tsx b/src/renderer/layouts/default-layout/right-sidebar.tsx index 43d31a85..275052b9 100644 --- a/src/renderer/layouts/default-layout/right-sidebar.tsx +++ b/src/renderer/layouts/default-layout/right-sidebar.tsx @@ -4,8 +4,9 @@ import { useLocation } from 'react-router'; import styles from './right-sidebar.module.css'; -import { DrawerPlayQueue, SidebarPlayQueue } from '/@/renderer/features/now-playing'; -import { ResizeHandle } from '/@/renderer/features/shared'; +import { DrawerPlayQueue } from '/@/renderer/features/now-playing/components/drawer-play-queue'; +import { SidebarPlayQueue } from '/@/renderer/features/now-playing/components/sidebar-play-queue'; +import { ResizeHandle } from '/@/renderer/features/shared/components/resize-handle'; import { AppRoute } from '/@/renderer/router/routes'; import { useGeneralSettings, useSidebarStore, useWindowSettings } from '/@/renderer/store'; import { Platform } from '/@/shared/types/types'; diff --git a/src/renderer/layouts/default-layout/side-drawer-queue.tsx b/src/renderer/layouts/default-layout/side-drawer-queue.tsx index ef791a10..2b05235a 100644 --- a/src/renderer/layouts/default-layout/side-drawer-queue.tsx +++ b/src/renderer/layouts/default-layout/side-drawer-queue.tsx @@ -5,7 +5,7 @@ import { useLocation } from 'react-router'; import styles from './side-drawer-queue.module.css'; -import { DrawerPlayQueue } from '/@/renderer/features/now-playing'; +import { DrawerPlayQueue } from '/@/renderer/features/now-playing/components/drawer-play-queue'; import { AppRoute } from '/@/renderer/router/routes'; import { useAppStore, useSidebarStore } from '/@/renderer/store'; import { Icon } from '/@/shared/components/icon/icon'; diff --git a/src/renderer/router/app-router.tsx b/src/renderer/router/app-router.tsx index 94d559e6..52379720 100644 --- a/src/renderer/router/app-router.tsx +++ b/src/renderer/router/app-router.tsx @@ -4,8 +4,8 @@ import { HashRouter, Route, Routes } from 'react-router-dom'; import { AppRoute } from './routes'; import ArtistListRoute from '/@/renderer/features/artists/routes/artist-list-route'; -import { AddToPlaylistContextModal } from '/@/renderer/features/playlists'; -import { ShareItemContextModal } from '/@/renderer/features/sharing'; +import { AddToPlaylistContextModal } from '/@/renderer/features/playlists/components/add-to-playlist-context-modal'; +import { ShareItemContextModal } from '/@/renderer/features/sharing/components/share-item-context-modal'; import { DefaultLayout } from '/@/renderer/layouts/default-layout'; import { AppOutlet } from '/@/renderer/router/app-outlet'; import { TitlebarOutlet } from '/@/renderer/router/titlebar-outlet'; diff --git a/src/renderer/store/settings.store.ts b/src/renderer/store/settings.store.ts index 00a814e0..6e0ac18c 100644 --- a/src/renderer/store/settings.store.ts +++ b/src/renderer/store/settings.store.ts @@ -1,5 +1,3 @@ -import type { ContextMenuItemType } from '/@/renderer/features/context-menu'; - import isElectron from 'is-electron'; import { generatePath } from 'react-router'; import { z } from 'zod'; @@ -9,6 +7,7 @@ import { shallow } from 'zustand/shallow'; import { createWithEqualityFn } from 'zustand/traditional'; import i18n from '/@/i18n/i18n'; +import { ContextMenuItemType } from '/@/renderer/features/context-menu/events'; import { AppRoute } from '/@/renderer/router/routes'; import { usePlayerStore } from '/@/renderer/store/player.store'; import { mergeOverridingColumns } from '/@/renderer/store/utils';