diff --git a/src/components/Lib/Modal.vue b/src/components/Lib/Modal.vue
index 390c4cd..d419f4a 100644
--- a/src/components/Lib/Modal.vue
+++ b/src/components/Lib/Modal.vue
@@ -2,26 +2,19 @@
@@ -56,32 +49,38 @@ export default {
box-shadow: 2px 2px 20px 1px rgb(85, 57, 5);
border: 1px solid rgb(85, 57, 5);
overflow-x: auto;
+ overflow-y: hidden;
display: flex;
flex-direction: column;
- }
-
- .modal-header,
- .modal-footer {
- padding: 15px;
- display: flex;
+ height: 90%;
+ font-size: 1.1em;
}
.modal-header {
+ padding: 10px 10px 5px 10px;
+ line-height: normal;
+ color: rgb(141, 102, 31);
position: relative;
border-bottom: 1px #446683 solid;
- color: #ffffff;
justify-content: space-between;
font-size: 120%;
- }
-
- .modal-footer {
- border-top: 1px #446683 solid;
- flex-direction: column;
- justify-content: flex-end;
+ display: grid;
+ grid-template-columns: auto 50px;
}
.modal-body {
position: relative;
padding: 20px 10px;
+ height: auto;
+ }
+
+ div.modal-close {
+ text-align: right;
+ }
+ .modal-close-button {
+ cursor: pointer;
+ }
+ .modal-close-button:hover {
+ color: rgb(192, 140, 44);
}
\ No newline at end of file
diff --git a/src/components/Navigation/Search.vue b/src/components/Navigation/Search.vue
index 5bbf333..8c04bf5 100644
--- a/src/components/Navigation/Search.vue
+++ b/src/components/Navigation/Search.vue
@@ -2,18 +2,20 @@
-
+
- {{ $t("header.search") }}:
+
+
+
@@ -48,8 +50,18 @@
-
-
{{ item.getName() }}
+
+
+
+
+
+
+ {{ song.getName() }}
+
+
+ {{ song.getArtistName() }}
+
+
@@ -72,10 +84,11 @@ import Artist from "../../model/Artist";
import SongListItem from "../../model/SongListItem";
import AlbumCover from "../Album/Lib/AlbumCover.vue";
import ArtistCover from "../Artist/Lib/ArtistCover.vue";
+import SongCover from "../Lib/SongCover.vue";
export default defineComponent({
name: 'Search',
- components: {ArtistCover, AlbumCover, LoadingIcon, Modal},
+ components: {SongCover, ArtistCover, AlbumCover, LoadingIcon, Modal},
methods: {
async search(): Promise
{
if (this.searchState) {
@@ -130,7 +143,7 @@ export default defineComponent({
diff --git a/src/components/Playlist/Lib/AddToPlaylist.vue b/src/components/Playlist/Lib/AddToPlaylist.vue
index 590ec16..cacb544 100644
--- a/src/components/Playlist/Lib/AddToPlaylist.vue
+++ b/src/components/Playlist/Lib/AddToPlaylist.vue
@@ -99,7 +99,7 @@ export default defineComponent({
methods: {
async getPlaylists(): Promise {
HttpRequest.get(`playlists/user`).then(res => {
- this.playlists = res.data.items.map((album_data: any): PlaylistInterface => {
+ this.playlists = res.data.items.map((album_data: object): PlaylistInterface => {
let playlist = plainToInstance(Playlist, album_data);
this.states.set(playlist.getId(), LoadingState.NONE);
return playlist;
@@ -127,10 +127,10 @@ export default defineComponent({
'mediaId': this.itemId
}
)
- .then(res => {
+ .then(() => {
this.states.set(playlistId, LoadingState.SUCCESS);
})
- .catch(res => {
+ .catch(() => {
this.states.set(playlistId, LoadingState.ERROR);
});
});
diff --git a/src/locales/de.json b/src/locales/de.json
index d5bba15..0be8394 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -61,7 +61,7 @@
"title": "Playlist"
},
"add_to_playlists": {
- "title": "Zu Playlist hinzufügen...",
+ "title": "Zu Playlist hinzufügen",
"add_media": "Füge die Medien den folgenden Playlists hinzu",
"table": {
"columns": {
diff --git a/src/locales/en.json b/src/locales/en.json
index 8c19316..1a5d1e2 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -61,7 +61,7 @@
"title": "Playlist"
},
"add_to_playlists": {
- "title": "Add to playlist...",
+ "title": "Add to playlist",
"add_media": "Add the media(s) to the following playlists.",
"table": {
"columns": {
diff --git a/src/main.ts b/src/main.ts
index 7edb0ce..8f8eff6 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,7 +5,7 @@ import Store from './components/Store/Store'
import mitt from 'mitt';
import { library } from '@fortawesome/fontawesome-svg-core'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { faFileCirclePlus, faPlay } from '@fortawesome/free-solid-svg-icons'
+import {faFileCirclePlus, faPlay, faRectangleXmark} from '@fortawesome/free-solid-svg-icons'
import { faStar as faStarSol } from '@fortawesome/free-solid-svg-icons'
import { faStar as faStarReg } from '@fortawesome/free-regular-svg-icons'
import { faPause } from '@fortawesome/free-solid-svg-icons'
@@ -57,6 +57,7 @@ library.add(
faArrowRightFromBracket,
faUser,
faMagnifyingGlass,
+ faRectangleXmark,
);
const emitter = mitt();