Merge branch 'advplyr:master' into playerUpdates

components/app/Appbar.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="w-full h-16 bg-primary relative">
-    <div id="appbar" class="absolute top-0 left-0 w-full h-full z-10 flex items-center px-2">
+  <div class="w-full h-16 bg-primary relative z-20">
+    <div id="appbar" class="absolute top-0 left-0 w-full h-full flex items-center px-2">
       <nuxt-link v-show="!showBack" to="/" class="mr-3">
         <img src="/Logo.png" class="h-10 w-10" />
       </nuxt-link>

components/bookshelf/LazyBookshelf.vue

@@ -309,7 +309,7 @@ export default {
       var { clientHeight, clientWidth } = bookshelf
       this.bookshelfHeight = clientHeight
       this.bookshelfWidth = clientWidth
-      this.entitiesPerShelf = this.showBookshelfListView ? 1 : Math.floor((this.bookshelfWidth - 16) / this.totalEntityCardWidth)
+      this.entitiesPerShelf = Math.max(1, this.showBookshelfListView ? 1 : Math.floor((this.bookshelfWidth - 16) / this.totalEntityCardWidth))
       this.shelvesPerPage = Math.ceil(this.bookshelfHeight / this.shelfHeight) + 2
       this.bookshelfMarginLeft = (this.bookshelfWidth - this.entitiesPerShelf * this.totalEntityCardWidth) / 2
 

components/cards/LazySeriesCard.vue

@@ -61,10 +61,6 @@ export default {
     },
     seriesId() {
       return this.series ? this.series.id : null
-    },
-    hasValidCovers() {
-      var validCovers = this.books.map((bookItem) => bookItem.book.cover)
-      return !!validCovers.length
     }
   },
   methods: {

ios/App/App.xcodeproj/project.pbxproj

@@ -723,7 +723,7 @@
 				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = 7UFJ7D8V6A;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 0.9.60;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
@@ -747,7 +747,7 @@
 				CURRENT_PROJECT_VERSION = 17;
 				DEVELOPMENT_TEAM = 7UFJ7D8V6A;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 0.9.60;
 				PRODUCT_BUNDLE_IDENTIFIER = com.audiobookshelf.app;

pages/bookshelf/series/index.vue

@@ -5,94 +5,9 @@
 <script>
 export default {
   data() {
-    return {
-      groupsPerRow: 2,
-      booksPerRow: 3,
-      selectedSeriesName: null
-    }
-  },
-  watch: {
-    routeQuery: {
-      handler(newVal) {
-        if (newVal && newVal.series) {
-          console.log('Select series')
-          this.selectedSeriesName = this.$decode(newVal.series)
-        } else {
-          this.selectedSeriesName = null
-        }
-      }
-    }
-  },
-  computed: {
-    routeQuery() {
-      return this.$route.query
-    },
-    series() {
-      return this.$store.getters['audiobooks/getSeriesGroups']()
-    },
-    seriesShelves() {
-      var shelves = []
-      var shelf = {
-        id: 0,
-        groups: []
-      }
-      for (let i = 0; i < this.series.length; i++) {
-        var shelfNum = Math.floor((i + 1) / this.groupsPerRow)
-        shelf.id = shelfNum
-        shelf.groups.push(this.series[i])
-
-        if ((i + 1) % this.groupsPerRow === 0) {
-          shelves.push(shelf)
-          shelf = {
-            id: 0,
-            groups: []
-          }
-        }
-      }
-      if (shelf.groups.length) {
-        shelves.push(shelf)
-      }
-      return shelves
-    },
-    selectedSeries() {
-      if (!this.selectedSeriesName) return null
-      return this.series.find((s) => s.name === this.selectedSeriesName)
-    },
-    seriesBooksShelves() {
-      if (!this.selectedSeries) return []
-      var seriesBooks = this.selectedSeries.books || []
-
-      var shelves = []
-      var shelf = {
-        id: 0,
-        books: []
-      }
-      for (let i = 0; i < seriesBooks.length; i++) {
-        var shelfNum = Math.floor((i + 1) / this.booksPerRow)
-        shelf.id = shelfNum
-        shelf.books.push(seriesBooks[i])
-
-        if ((i + 1) % this.booksPerRow === 0) {
-          shelves.push(shelf)
-          shelf = {
-            id: 0,
-            books: []
-          }
-        }
-      }
-      if (shelf.books.length) {
-        shelves.push(shelf)
-      }
-      return shelves
-    },
-    shelves() {
-      if (this.selectedSeries) {
-        return this.seriesBooksShelves
-      } else {
-        return this.seriesShelves
-      }
-    }
+    return {}
   },
+  computed: {},
   methods: {},
   mounted() {}
 }

pages/item/_id/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="w-full h-full px-3 py-4 overflow-y-auto relative bg-bg">
-    <div class="absolute top-0 left-0 w-full h-full pointer-events-none p-px">
+    <div class="fixed top-0 left-0 w-full h-full pointer-events-none p-px z-10">
       <div class="w-full h-full" :style="{ backgroundColor: coverRgb }" />
       <div class="w-full h-full absolute top-0 left-0" style="background: linear-gradient(169deg, rgba(0, 0, 0, 0.4) 0%, rgba(55, 56, 56, 1) 80%)" />
     </div>