Merge pull request 'fix type "scan"' (#38 ) from dev into main

Reviewed-on: #38
2024-02-22 23:37:10 +01:00
4 changed files with 22 additions and 114 deletions
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="64"
   height="64"
   version="1.1"
   id="svg2"
-   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
   sodipodi:docname="icon_64.svg"
   inkscape:export-filename="/home/djoma/Projekte/artemanufrij/app/webplay-client/public/static/icon_192.png"
   inkscape:export-xdpi="288"
-   inkscape:export-ydpi="288"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   inkscape:export-ydpi="288">
  <metadata
     id="metadata96">
    <rdf:RDF>
@@ -37,20 +37,17 @@
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="976"
+     inkscape:window-width="1611"
+     inkscape:window-height="952"
     id="namedview94"
     showgrid="false"
     inkscape:zoom="8"
-     inkscape:cx="31.875"
-     inkscape:cy="31.5625"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" />
+     inkscape:cx="31.924368"
+     inkscape:cy="31.567637"
+     inkscape:window-x="172"
+     inkscape:window-y="92"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
  <defs
     id="defs4">
    <linearGradient
@@ -210,89 +207,7 @@
       r="28"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(0,1.9571706,-2.0851744,0,39.965698,-57.895519)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4189"
-       id="linearGradient4196"
-       x1="32"
-       y1="58"
-       x2="32"
-       y2="62"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95652174,0,0,1.25,1.3913043,-15.5)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4189">
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="0"
-         id="stop4192" />
-      <stop
-         id="stop4198"
-         offset="0.5"
-         style="stop-color:#000000;stop-opacity:0.6" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4194" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4202"
-       id="radialGradient4208"
-       cx="9"
-       cy="60"
-       fx="9"
-       fy="60"
-       r="4"
-       gradientTransform="matrix(-2,0,0,-0.625,28,97)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4202">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.6"
-         offset="0"
-         id="stop4204" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4206" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4202"
-       id="radialGradient4230"
-       cx="56"
-       cy="60"
-       fx="56"
-       fy="60"
-       r="3"
-       gradientTransform="matrix(2.6666666,0,0,0.83333334,-95.333334,9.5)"
-       gradientUnits="userSpaceOnUse" />
  </defs>
-  <rect
-     style="fill:url(#linearGradient4196);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.25098"
-     id="rect4187"
-     width="44"
-     height="5"
-     x="10"
-     y="57"
-     ry="0" />
-  <rect
-     style="fill:url(#radialGradient4208);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.25098"
-     id="rect4200"
-     width="8"
-     height="5"
-     x="2"
-     y="57" />
-  <rect
-     style="fill:url(#radialGradient4230);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.25098"
-     id="rect4222"
-     width="8"
-     height="5"
-     x="54"
-     y="57" />
  <rect
     style="fill:url(#radialGradient879);fill-opacity:1;stroke:none;stroke-width:2.85814881;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     id="rect853"
@@ -15,17 +15,16 @@
              from year <b>{{ album_year }}</b> </span><br />
            <b>{{ album_tracks.length }}</b> Tracks with a duration of
            <b>{{ album_duration }}</b>
+
          </span>
          <div class="grow"> </div>
          <div class="flex-row grow ma-top">
+
            <button class="flat ma-right" title="Favourite" @click="toggleFavourite">
              <awesome-icon :icon="['fas', 'star']" size="2x" class="white-text favourite active" v-if="isFavourite" />
              <awesome-icon :icon="['far', 'star']" size="2x" class="white-text favourite" v-else />
            </button>
-            <button class="flat ma-right" title="Keep playing" v-if="selectedAlbum._id == selectedTrackContainer._id && isPlaying">
-              <awesome-icon icon="compact-disc" size="2x" class="primary-text" />
-            </button>
-            <button class="flat ma-right" title="Keep playing" @click="playProgress" v-else-if="selectedAlbum.progress">
+            <button class="flat ma-right" title="Keep playing" @click="playProgress" v-if="selectedAlbum.progress">
              <awesome-icon icon="play" size="2x" class="primary-text" />
            </button>
            <button class="flat ma-right" title="Play" @click="playAlbum" v-else>
@@ -246,9 +245,7 @@ export default {
      nextAlbum: ["albums/nextAlbum"],
      selectedAlbum: ["albums/selectedAlbum"],
      selectedTrack: ["tracks/selectedTrack"],
-      selectedTrackContainer: ["tracks/selectedTrackContainer"],
      favourites: ["user/favourites"],
-      isPlaying: ["player/isPlaying"],
    }),
    album_title() {
      return this.selectedAlbum.title;
@@ -17,10 +17,7 @@
              <awesome-icon :icon="['fas', 'star']" size="2x" class="white-text favourite active" v-if="isFavourite" />
              <awesome-icon :icon="['far', 'star']" size="2x" class="white-text favourite" v-else />
            </button>
-            <button class="flat ma-right" title="Keep playing" v-if="selectedArtist._id == selectedTrackContainer._id && isPlaying">
-              <awesome-icon icon="compact-disc" size="2x" class="primary-text" />
-            </button>
-            <button class="flat ma-right" @click="playProgress" title="Keep playing" v-else-if="selectedArtist.progress">
+            <button class="flat ma-right" @click="playProgress" title="Keep playing" v-if="selectedArtist.progress">
              <awesome-icon icon="play" size="2x" class="primary-text" />
            </button>
            <button class="flat ma-right" @click="playArtist" title="Play" v-else>
@@ -179,7 +176,6 @@ export default {
      nextArtist: ["artists/nextArtist"],
      selectedArtist: ["artists/selectedArtist"],
      selectedTrack: ["tracks/selectedTrack"],
-      selectedTrackContainer: ["tracks/selectedTrackContainer"],
      favourites: ["user/favourites"],
      isPlaying: ["player/isPlaying"]
    }),