+
diff --git a/src/renderer/components/PlayerControls/PlayerControls.module.css b/src/components/PlayerControls/PlayerControls.module.css
similarity index 94%
rename from src/renderer/components/PlayerControls/PlayerControls.module.css
rename to src/components/PlayerControls/PlayerControls.module.css
index f7c76039a..93c0b8144 100644
--- a/src/renderer/components/PlayerControls/PlayerControls.module.css
+++ b/src/components/PlayerControls/PlayerControls.module.css
@@ -1,5 +1,4 @@
.playerControls {
- -webkit-app-region: no-drag;
display: flex;
align-items: center;
position: relative;
diff --git a/src/renderer/components/PlayerControls/PlayerControls.tsx b/src/components/PlayerControls/PlayerControls.tsx
similarity index 94%
rename from src/renderer/components/PlayerControls/PlayerControls.tsx
rename to src/components/PlayerControls/PlayerControls.tsx
index 8b8c0abb0..b0aeefb10 100644
--- a/src/renderer/components/PlayerControls/PlayerControls.tsx
+++ b/src/components/PlayerControls/PlayerControls.tsx
@@ -1,7 +1,7 @@
import Icon from 'react-fontawesome';
import VolumeControl from '../VolumeControl/VolumeControl';
-import { PlayerStatus } from '../../../shared/types/museeks';
+import { PlayerStatus } from '../../types/museeks';
import usePlayerStore, { usePlayerAPI } from '../../stores/usePlayerStore';
import styles from './PlayerControls.module.css';
diff --git a/src/renderer/components/PlayerOptionsButtons/ButtonRepeat.tsx b/src/components/PlayerOptionsButtons/ButtonRepeat.tsx
similarity index 64%
rename from src/renderer/components/PlayerOptionsButtons/ButtonRepeat.tsx
rename to src/components/PlayerOptionsButtons/ButtonRepeat.tsx
index 2ac2fb4c8..b175ee26d 100644
--- a/src/renderer/components/PlayerOptionsButtons/ButtonRepeat.tsx
+++ b/src/components/PlayerOptionsButtons/ButtonRepeat.tsx
@@ -1,26 +1,30 @@
import InlineSVG from 'svg-inline-react';
import cx from 'classnames';
-import { Repeat } from '../../../shared/types/museeks';
import icons from '../../lib/icons';
import usePlayerStore, { usePlayerAPI } from '../../stores/usePlayerStore';
+import { Repeat } from '../../generated/typings';
import styles from './common.module.css';
-const svgMap = {
- [Repeat.ONE]: icons.REPEAT_ONE,
- [Repeat.ALL]: icons.REPEAT,
- [Repeat.NONE]: icons.REPEAT,
- default: icons.REPEAT,
-};
+function getIcon(repeat: Repeat) {
+ switch (repeat) {
+ case 'One':
+ return icons.REPEAT_ONE;
+ case 'None':
+ case 'All':
+ default:
+ return icons.REPEAT;
+ }
+}
export default function ButtonRepeat() {
const repeat = usePlayerStore((state) => state.repeat);
const playerAPI = usePlayerAPI();
- const svg = svgMap[repeat] || svgMap.default;
+ const svg = getIcon(repeat);
const buttonClasses = cx(styles.button, {
- [styles.active]: repeat === Repeat.ONE || repeat === Repeat.ALL,
+ [styles.active]: repeat === 'One' || repeat === 'All',
});
return (
diff --git a/src/renderer/components/PlayerOptionsButtons/ButtonShuffle.tsx b/src/components/PlayerOptionsButtons/ButtonShuffle.tsx
similarity index 100%
rename from src/renderer/components/PlayerOptionsButtons/ButtonShuffle.tsx
rename to src/components/PlayerOptionsButtons/ButtonShuffle.tsx
diff --git a/src/renderer/components/PlayerOptionsButtons/common.module.css b/src/components/PlayerOptionsButtons/common.module.css
similarity index 91%
rename from src/renderer/components/PlayerOptionsButtons/common.module.css
rename to src/components/PlayerOptionsButtons/common.module.css
index 95a3a5949..a2e3257d7 100644
--- a/src/renderer/components/PlayerOptionsButtons/common.module.css
+++ b/src/components/PlayerOptionsButtons/common.module.css
@@ -7,11 +7,11 @@
}
.button {
- -webkit-app-region: no-drag;
border: 0;
color: inherit;
background: transparent;
font-size: 20px;
+ padding: 0 8px;
&.active {
.icon > svg {
diff --git a/src/renderer/components/PlayingBar/PlayingBar.module.css b/src/components/PlayingBar/PlayingBar.module.css
similarity index 93%
rename from src/renderer/components/PlayingBar/PlayingBar.module.css
rename to src/components/PlayingBar/PlayingBar.module.css
index 84a8c9920..394505257 100644
--- a/src/renderer/components/PlayingBar/PlayingBar.module.css
+++ b/src/components/PlayingBar/PlayingBar.module.css
@@ -17,7 +17,6 @@
}
.playerOptions {
- -webkit-app-region: no-drag;
flex-shrink: 0;
display: flex;
align-items: center;
diff --git a/src/renderer/components/PlayingBar/PlayingBar.tsx b/src/components/PlayingBar/PlayingBar.tsx
similarity index 100%
rename from src/renderer/components/PlayingBar/PlayingBar.tsx
rename to src/components/PlayingBar/PlayingBar.tsx
diff --git a/src/renderer/components/PlayingBarInfo/PlayingBarInfo.module.css b/src/components/PlayingBarInfo/PlayingBarInfo.module.css
similarity index 91%
rename from src/renderer/components/PlayingBarInfo/PlayingBarInfo.module.css
rename to src/components/PlayingBarInfo/PlayingBarInfo.module.css
index 034f57a0a..49844521c 100644
--- a/src/renderer/components/PlayingBarInfo/PlayingBarInfo.module.css
+++ b/src/components/PlayingBarInfo/PlayingBarInfo.module.css
@@ -5,6 +5,7 @@
flex-direction: column;
justify-content: flex-end;
padding: 0 4px;
+ padding-left: 8px;
}
.playingBar__info__metas {
@@ -12,6 +13,7 @@
display: flex;
align-items: flex-end;
justify-content: center;
+ pointer-events: none;
}
.metas {
@@ -38,4 +40,5 @@
padding: 0 2px;
font-variant-numeric: tabular-nums;
white-space: nowrap;
+ opacity: 0.7;
}
diff --git a/src/renderer/components/PlayingBarInfo/PlayingBarInfo.tsx b/src/components/PlayingBarInfo/PlayingBarInfo.tsx
similarity index 72%
rename from src/renderer/components/PlayingBarInfo/PlayingBarInfo.tsx
rename to src/components/PlayingBarInfo/PlayingBarInfo.tsx
index c8bbd3c25..f965f2cb4 100644
--- a/src/renderer/components/PlayingBarInfo/PlayingBarInfo.tsx
+++ b/src/components/PlayingBarInfo/PlayingBarInfo.tsx
@@ -1,12 +1,12 @@
import * as utils from '../../lib/utils';
-import { TrackModel, Repeat } from '../../../shared/types/museeks';
import TrackProgress from '../TrackProgress/TrackProgress';
import usePlayingTrackCurrentTime from '../../hooks/usePlayingTrackCurrentTime';
+import { TrackDoc, Repeat } from '../../generated/typings';
import styles from './PlayingBarInfo.module.css';
type Props = {
- trackPlaying: TrackModel;
+ trackPlaying: TrackDoc;
shuffle: boolean;
repeat: Repeat;
};
@@ -16,22 +16,23 @@ export default function PlayingBarInfo(props: Props) {
const elapsed = usePlayingTrackCurrentTime();
return (
-
+
{utils.parseDuration(elapsed)}
+
- {trackPlaying.title}
+ {trackPlaying.doc.title}
- {trackPlaying.artist.join(', ')}
+ {trackPlaying.doc.artists.join(', ')}
—
- {trackPlaying.album}
+ {trackPlaying.doc.album}
- {utils.parseDuration(trackPlaying.duration)}
+ {utils.parseDuration(trackPlaying.doc.duration)}
diff --git a/src/renderer/components/PlayingIndicator/PlayingIndicator.module.css b/src/components/PlayingIndicator/PlayingIndicator.module.css
similarity index 100%
rename from src/renderer/components/PlayingIndicator/PlayingIndicator.module.css
rename to src/components/PlayingIndicator/PlayingIndicator.module.css
diff --git a/src/renderer/components/PlayingIndicator/PlayingIndicator.tsx b/src/components/PlayingIndicator/PlayingIndicator.tsx
similarity index 95%
rename from src/renderer/components/PlayingIndicator/PlayingIndicator.tsx
rename to src/components/PlayingIndicator/PlayingIndicator.tsx
index b0d594d9c..671b17586 100644
--- a/src/renderer/components/PlayingIndicator/PlayingIndicator.tsx
+++ b/src/components/PlayingIndicator/PlayingIndicator.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
import Icon from 'react-fontawesome';
-import { PlayerStatus } from '../../../shared/types/museeks';
+import { PlayerStatus } from '../../types/museeks';
import usePlayerStore, { usePlayerAPI } from '../../stores/usePlayerStore';
import styles from './PlayingIndicator.module.css';
diff --git a/src/renderer/components/PlaylistsNav/PlaylistsNav.module.css b/src/components/PlaylistsNav/PlaylistsNav.module.css
similarity index 100%
rename from src/renderer/components/PlaylistsNav/PlaylistsNav.module.css
rename to src/components/PlaylistsNav/PlaylistsNav.module.css
diff --git a/src/renderer/components/PlaylistsNav/PlaylistsNav.tsx b/src/components/PlaylistsNav/PlaylistsNav.tsx
similarity index 70%
rename from src/renderer/components/PlaylistsNav/PlaylistsNav.tsx
rename to src/components/PlaylistsNav/PlaylistsNav.tsx
index 79f2d3363..657d606bf 100644
--- a/src/renderer/components/PlaylistsNav/PlaylistsNav.tsx
+++ b/src/components/PlaylistsNav/PlaylistsNav.tsx
@@ -1,59 +1,56 @@
/* eslint-disable jsx-a11y/no-autofocus */
-import type { MenuItemConstructorOptions } from 'electron';
import React, { useCallback, useState } from 'react';
import Icon from 'react-fontawesome';
import PlaylistsAPI from '../../stores/PlaylistsAPI';
import PlaylistsNavLink from '../PlaylistsNavLink/PlaylistsNavLink';
-import { PlaylistModel } from '../../../shared/types/museeks';
+import { PlaylistDoc } from '../../generated/typings';
import styles from './PlaylistsNav.module.css';
-const { menu } = window.ElectronAPI;
-
type Props = {
- playlists: PlaylistModel[];
+ playlists: PlaylistDoc[];
};
export default function PlaylistsNav(props: Props) {
const [renamed, setRenamed] = useState
(null);
const showContextMenu = useCallback((playlistID: string) => {
- const template: MenuItemConstructorOptions[] = [
- {
- label: 'Rename',
- click: () => {
- setRenamed(playlistID);
- },
- },
- {
- label: 'Delete',
- click: async () => {
- await PlaylistsAPI.remove(playlistID);
- },
- },
- {
- type: 'separator',
- },
- {
- label: 'Duplicate',
- click: async () => {
- await PlaylistsAPI.duplicate(playlistID);
- },
- },
- {
- type: 'separator',
- },
- {
- label: 'Export',
- click: async () => {
- await PlaylistsAPI.exportToM3u(playlistID);
- },
- },
- ];
-
- menu.showContextMenu(template);
+ // TODO: implement menu
+ // const template: MenuItemConstructorOptions[] = [
+ // {
+ // label: 'Rename',
+ // click: () => {
+ // setRenamed(playlistID);
+ // },
+ // },
+ // {
+ // label: 'Delete',
+ // click: async () => {
+ // await PlaylistsAPI.remove(playlistID);
+ // },
+ // },
+ // {
+ // type: 'separator',
+ // },
+ // {
+ // label: 'Duplicate',
+ // click: async () => {
+ // await PlaylistsAPI.duplicate(playlistID);
+ // },
+ // },
+ // {
+ // type: 'separator',
+ // },
+ // {
+ // label: 'Export',
+ // click: async () => {
+ // await PlaylistsAPI.exportToM3u(playlistID);
+ // },
+ // },
+ // ];
+ // menu.showContextMenu(template);
}, []);
const createPlaylist = useCallback(async () => {
@@ -108,16 +105,15 @@ export default function PlaylistsNav(props: Props) {
const { playlists } = props;
- // TODO (y.solovyov): extract into separate method that returns items
const nav = playlists.map((elem) => {
let navItemContent;
- if (elem._id === renamed) {
+ if (elem.id === renamed) {
navItemContent = (
- {elem.name}
+ {elem.doc.name}
);
}
- return {navItemContent}
;
+ return {navItemContent}
;
});
return (
diff --git a/src/renderer/components/PlaylistsNavLink/PlaylistsNavLink.module.css b/src/components/PlaylistsNavLink/PlaylistsNavLink.module.css
similarity index 100%
rename from src/renderer/components/PlaylistsNavLink/PlaylistsNavLink.module.css
rename to src/components/PlaylistsNavLink/PlaylistsNavLink.module.css
diff --git a/src/renderer/components/PlaylistsNavLink/PlaylistsNavLink.tsx b/src/components/PlaylistsNavLink/PlaylistsNavLink.tsx
similarity index 100%
rename from src/renderer/components/PlaylistsNavLink/PlaylistsNavLink.tsx
rename to src/components/PlaylistsNavLink/PlaylistsNavLink.tsx
diff --git a/src/renderer/components/ProgressBar/ProgressBar.module.css b/src/components/ProgressBar/ProgressBar.module.css
similarity index 100%
rename from src/renderer/components/ProgressBar/ProgressBar.module.css
rename to src/components/ProgressBar/ProgressBar.module.css
diff --git a/src/renderer/components/ProgressBar/ProgressBar.tsx b/src/components/ProgressBar/ProgressBar.tsx
similarity index 100%
rename from src/renderer/components/ProgressBar/ProgressBar.tsx
rename to src/components/ProgressBar/ProgressBar.tsx
diff --git a/src/renderer/components/Queue/Queue.module.css b/src/components/Queue/Queue.module.css
similarity index 84%
rename from src/renderer/components/Queue/Queue.module.css
rename to src/components/Queue/Queue.module.css
index 6b31f98d8..f7431944b 100644
--- a/src/renderer/components/Queue/Queue.module.css
+++ b/src/components/Queue/Queue.module.css
@@ -2,6 +2,7 @@
width: 300px;
background: var(--queue-bg);
border: solid 1px var(--border-color);
+ border-radius: var(--border-radius);
text-overflow: ellipsis;
overflow-x: hidden;
font-size: 12px;
diff --git a/src/renderer/components/Queue/Queue.tsx b/src/components/Queue/Queue.tsx
similarity index 90%
rename from src/renderer/components/Queue/Queue.tsx
rename to src/components/Queue/Queue.tsx
index 380cf9a6f..9da69eef4 100644
--- a/src/renderer/components/Queue/Queue.tsx
+++ b/src/components/Queue/Queue.tsx
@@ -2,12 +2,12 @@ import React, { useMemo } from 'react';
import QueueEmpty from '../QueueEmpty/QueueEmpty';
import QueueList from '../QueueList/QueueList';
-import { TrackModel } from '../../../shared/types/museeks';
+import { TrackDoc } from '../../generated/typings';
import styles from './Queue.module.css';
type Props = {
- queue: TrackModel[];
+ queue: TrackDoc[];
queueCursor: number | null;
};
diff --git a/src/renderer/components/QueueEmpty/QueueEmpty.module.css b/src/components/QueueEmpty/QueueEmpty.module.css
similarity index 100%
rename from src/renderer/components/QueueEmpty/QueueEmpty.module.css
rename to src/components/QueueEmpty/QueueEmpty.module.css
diff --git a/src/renderer/components/QueueEmpty/QueueEmpty.tsx b/src/components/QueueEmpty/QueueEmpty.tsx
similarity index 100%
rename from src/renderer/components/QueueEmpty/QueueEmpty.tsx
rename to src/components/QueueEmpty/QueueEmpty.tsx
diff --git a/src/renderer/components/QueueList/QueueList.module.css b/src/components/QueueList/QueueList.module.css
similarity index 100%
rename from src/renderer/components/QueueList/QueueList.module.css
rename to src/components/QueueList/QueueList.module.css
diff --git a/src/renderer/components/QueueList/QueueList.tsx b/src/components/QueueList/QueueList.tsx
similarity index 95%
rename from src/renderer/components/QueueList/QueueList.tsx
rename to src/components/QueueList/QueueList.tsx
index eb5af15e8..a6811fa30 100644
--- a/src/renderer/components/QueueList/QueueList.tsx
+++ b/src/components/QueueList/QueueList.tsx
@@ -2,16 +2,16 @@ import React, { useCallback, useState } from 'react';
import QueueListItem from '../QueueListItem/QueueListItem';
import { getStatus } from '../../lib/utils-library';
-import { TrackModel } from '../../../shared/types/museeks';
import Button from '../../elements/Button/Button';
import { usePlayerAPI } from '../../stores/usePlayerStore';
+import { TrackDoc } from '../../generated/typings';
import styles from './QueueList.module.css';
const INITIAL_QUEUE_SIZE = 20;
type Props = {
- queue: TrackModel[];
+ queue: TrackDoc[];
queueCursor: number;
};
@@ -30,7 +30,7 @@ export default function QueueList(props: Props) {
const dragStart = useCallback(
(e: React.DragEvent, index: number) => {
- e.dataTransfer.setData('text/html', props.queue[index]._id);
+ e.dataTransfer.setData('text/html', props.queue[index].id);
e.dataTransfer.dropEffect = 'move';
e.dataTransfer.effectAllowed = 'move';
@@ -117,7 +117,7 @@ export default function QueueList(props: Props) {
{shownQueue.map((track, index) => (
, index: number) => void;
onDragOver: (e: React.DragEvent, index: number) => void;
onDragEnd: React.DragEventHandler;
@@ -61,9 +61,9 @@ export default function QueueListItem(props: Props) {
onDragEnd={props.onDragEnd}
>
-
{track.title}
+
{track.doc.title}
- {track.artist} - {track.album}
+ {track.doc.artists[0]} - {track.doc.album}
@@ -34,32 +39,32 @@ export default function TracksListHeader(props: Props) {
);
diff --git a/src/renderer/components/TracksListHeaderCell/TracksListHeaderCell.module.css b/src/components/TracksListHeaderCell/TracksListHeaderCell.module.css
similarity index 100%
rename from src/renderer/components/TracksListHeaderCell/TracksListHeaderCell.module.css
rename to src/components/TracksListHeaderCell/TracksListHeaderCell.module.css
diff --git a/src/renderer/components/TracksListHeaderCell/TracksListHeaderCell.tsx b/src/components/TracksListHeaderCell/TracksListHeaderCell.tsx
similarity index 95%
rename from src/renderer/components/TracksListHeaderCell/TracksListHeaderCell.tsx
rename to src/components/TracksListHeaderCell/TracksListHeaderCell.tsx
index 3b15f3ed7..ddb79a956 100644
--- a/src/renderer/components/TracksListHeaderCell/TracksListHeaderCell.tsx
+++ b/src/components/TracksListHeaderCell/TracksListHeaderCell.tsx
@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
import cx from 'classnames';
import Icon from 'react-fontawesome';
-import { SortBy } from '../../../shared/types/museeks';
+import { SortBy } from '../../generated/typings';
import { useLibraryAPI } from '../../stores/useLibraryStore';
import styles from './TracksListHeaderCell.module.css';
diff --git a/src/renderer/components/VolumeControl/VolumeControl.module.css b/src/components/VolumeControl/VolumeControl.module.css
similarity index 97%
rename from src/renderer/components/VolumeControl/VolumeControl.module.css
rename to src/components/VolumeControl/VolumeControl.module.css
index 8725192b1..bb3ea9b5f 100644
--- a/src/renderer/components/VolumeControl/VolumeControl.module.css
+++ b/src/components/VolumeControl/VolumeControl.module.css
@@ -4,7 +4,6 @@
}
.volumeControl {
- -webkit-app-region: no-drag;
background-color: var(--header-bg);
position: absolute;
z-index: 10;
diff --git a/src/renderer/components/VolumeControl/VolumeControl.tsx b/src/components/VolumeControl/VolumeControl.tsx
similarity index 100%
rename from src/renderer/components/VolumeControl/VolumeControl.tsx
rename to src/components/VolumeControl/VolumeControl.tsx
diff --git a/src/constants/sort-orders.ts b/src/constants/sort-orders.ts
new file mode 100644
index 000000000..511810d01
--- /dev/null
+++ b/src/constants/sort-orders.ts
@@ -0,0 +1,115 @@
+import { SortOrder, SortBy, TrackDoc } from '../generated/typings';
+import { Path } from '../types/museeks';
+
+// For perforances reasons, otherwise _.orderBy will perform weird check
+// the is far more resource/time impactful
+const parseArtist = (t: TrackDoc): string => {
+ return t.doc.artists[0].toString();
+};
+const parseGenre = (t: TrackDoc): string => t.doc.genres[0].toString();
+
+type TrackKeys = Path;
+type IterateeFunction = (track: TrackDoc) => string;
+export type SortTuple = [
+ Array,
+ Array<'asc' | 'desc'>,
+];
+
+// Declarations
+const sortOrders: Record> = {
+ Artist: {
+ Asc: [
+ // Default
+ [parseArtist, 'doc.year', 'doc.album', 'doc.disk.no', 'doc.track.no'],
+ ['asc'],
+ ],
+ Dsc: [
+ [parseArtist, 'doc.year', 'doc.album', 'doc.disk.no', 'doc.track.no'],
+ ['desc'],
+ ],
+ },
+ Title: {
+ Asc: [
+ [
+ 'doc.title',
+ parseArtist,
+ 'doc.year',
+ 'doc.album',
+ 'doc.disk.no',
+ 'doc.track.no',
+ ],
+ ['asc'],
+ ],
+ Dsc: [
+ [
+ 'doc.title',
+ parseArtist,
+ 'doc.year',
+ 'doc.album',
+ 'doc.disk.no',
+ 'doc.track.no',
+ ],
+ ['desc'],
+ ],
+ },
+ Duration: {
+ Asc: [
+ [
+ 'doc.duration',
+ parseArtist,
+ 'doc.year',
+ 'doc.album',
+ 'doc.disk.no',
+ 'doc.track.no',
+ ],
+ ['asc'],
+ ],
+ Dsc: [
+ [
+ 'doc.duration',
+ parseArtist,
+ 'doc.year',
+ 'doc.album',
+ 'doc.disk.no',
+ 'doc.track.no',
+ ],
+ ['desc'],
+ ],
+ },
+ Album: {
+ Asc: [
+ ['doc.album', parseArtist, 'doc.year', 'doc.disk.no', 'doc.track.no'],
+ ['asc'],
+ ],
+ Dsc: [
+ ['doc.album', parseArtist, 'doc.year', 'doc.disk.no', 'doc.track.no'],
+ ['desc'],
+ ],
+ },
+ Genre: {
+ Asc: [
+ [
+ parseGenre,
+ parseArtist,
+ 'doc.year',
+ 'doc.album',
+ 'doc.disk.no',
+ 'doc.track.no',
+ ],
+ ['asc'],
+ ],
+ Dsc: [
+ [
+ parseGenre,
+ parseArtist,
+ 'doc.year',
+ 'doc.album',
+ 'doc.disk.no',
+ 'doc.track.no',
+ ],
+ ['desc'],
+ ],
+ },
+};
+
+export default sortOrders;
diff --git a/src/renderer/elements/Button/Button.module.css b/src/elements/Button/Button.module.css
similarity index 90%
rename from src/renderer/elements/Button/Button.module.css
rename to src/elements/Button/Button.module.css
index 9d98ca285..b93fe9175 100644
--- a/src/renderer/elements/Button/Button.module.css
+++ b/src/elements/Button/Button.module.css
@@ -7,6 +7,10 @@
cursor: pointer;
&:active {
+ opacity: 0.7;
+ }
+
+ &[disabled] {
opacity: 0.5;
}
}
diff --git a/src/renderer/elements/Button/Button.tsx b/src/elements/Button/Button.tsx
similarity index 100%
rename from src/renderer/elements/Button/Button.tsx
rename to src/elements/Button/Button.tsx
diff --git a/src/renderer/elements/ExternalLink/ExternalLink.module.css b/src/elements/ExternalLink/ExternalLink.module.css
similarity index 100%
rename from src/renderer/elements/ExternalLink/ExternalLink.module.css
rename to src/elements/ExternalLink/ExternalLink.module.css
diff --git a/src/renderer/elements/ExternalLink/ExternalLink.tsx b/src/elements/ExternalLink/ExternalLink.tsx
similarity index 85%
rename from src/renderer/elements/ExternalLink/ExternalLink.tsx
rename to src/elements/ExternalLink/ExternalLink.tsx
index 635819c5a..d97cdac59 100644
--- a/src/renderer/elements/ExternalLink/ExternalLink.tsx
+++ b/src/elements/ExternalLink/ExternalLink.tsx
@@ -1,9 +1,8 @@
import React, { useCallback } from 'react';
+import { open } from '@tauri-apps/plugin-shell';
import styles from './ExternalLink.module.css';
-const { shell } = window.MuseeksAPI;
-
type Props = {
children: string;
href: string;
@@ -13,7 +12,7 @@ export default function ExternalLink(props: Props) {
const openLink = useCallback(
(e: React.SyntheticEvent) => {
e.preventDefault();
- shell.openExternal(props.href);
+ open(props.href);
},
[props.href],
);
diff --git a/src/renderer/elements/Heart/Heart.module.css b/src/elements/Heart/Heart.module.css
similarity index 100%
rename from src/renderer/elements/Heart/Heart.module.css
rename to src/elements/Heart/Heart.module.css
diff --git a/src/renderer/elements/Heart/Heart.tsx b/src/elements/Heart/Heart.tsx
similarity index 100%
rename from src/renderer/elements/Heart/Heart.tsx
rename to src/elements/Heart/Heart.tsx
diff --git a/src/renderer/elements/Nav/Nav.module.css b/src/elements/Nav/Nav.module.css
similarity index 100%
rename from src/renderer/elements/Nav/Nav.module.css
rename to src/elements/Nav/Nav.module.css
diff --git a/src/renderer/elements/Nav/Nav.tsx b/src/elements/Nav/Nav.tsx
similarity index 100%
rename from src/renderer/elements/Nav/Nav.tsx
rename to src/elements/Nav/Nav.tsx
diff --git a/src/renderer/elements/Toast/Toast.module.css b/src/elements/Toast/Toast.module.css
similarity index 93%
rename from src/renderer/elements/Toast/Toast.module.css
rename to src/elements/Toast/Toast.module.css
index 896491f39..1707a6bdb 100644
--- a/src/renderer/elements/Toast/Toast.module.css
+++ b/src/elements/Toast/Toast.module.css
@@ -5,6 +5,7 @@
border-top-color: var(--border-color);
border-right-color: var(--border-color);
border-bottom-color: var(--border-color);
+ border-radius: var(--border-radius);
color: var(--text);
box-shadow: 0 5px 3px -5px rgba(0 0 0 0.5);
padding: 15px;
diff --git a/src/renderer/elements/Toast/Toast.tsx b/src/elements/Toast/Toast.tsx
similarity index 100%
rename from src/renderer/elements/Toast/Toast.tsx
rename to src/elements/Toast/Toast.tsx
diff --git a/src/renderer/elements/ViewMessage/ViewMessage.module.css b/src/elements/ViewMessage/ViewMessage.module.css
similarity index 100%
rename from src/renderer/elements/ViewMessage/ViewMessage.module.css
rename to src/elements/ViewMessage/ViewMessage.module.css
diff --git a/src/renderer/elements/ViewMessage/ViewMessage.tsx b/src/elements/ViewMessage/ViewMessage.tsx
similarity index 100%
rename from src/renderer/elements/ViewMessage/ViewMessage.tsx
rename to src/elements/ViewMessage/ViewMessage.tsx
diff --git a/src/generated/typings/index.ts b/src/generated/typings/index.ts
new file mode 100644
index 000000000..a48a09e8f
--- /dev/null
+++ b/src/generated/typings/index.ts
@@ -0,0 +1,22 @@
+/**
+ * Re-export of types generates by ts-rs
+ */
+export type { Config } from './Config';
+export type { DefaultView } from './DefaultView';
+export type { Doc } from './Doc';
+export type { NumberOf } from './NumberOf';
+export type { Playlist } from './Playlist';
+export type { Repeat } from './Repeat';
+export type { SortBy } from './SortBy';
+export type { SortOrder } from './SortOrder';
+export type { Track } from './Track';
+
+/**
+ * Custom-aggregated types
+ */
+import type { Doc } from './Doc';
+import type { Track } from './Track';
+import type { Playlist } from './Playlist';
+
+export type TrackDoc = Doc