Merge pull request #28 from irohalab/history-page-bugfix

Bugfix for history page
irohalab · Jan 14, 2024 · 2e1d834 · 2e1d834
2 parents f77b369 + 974bf81
commit 2e1d834
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mira-ui",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/src/app/home/home.html b/src/app/home/home.html
@@ -52,7 +52,7 @@ <h2>{{siteTitle}}</h2>
 </main>
 
 <footer id="page-footer" [ngClass]="currentRouteName + (sidebarActive === 'active' ? ' sidebar-active': '')"
-        *ngIf="currentRouteName !== 'Bangumi' && currentRouteName !== 'Favorite'">
+        *ngIf="currentRouteName !== 'Bangumi' && currentRouteName !== 'Favorite' && currentRouteName !== 'History'">
     <div class="copyright-content">&copy;2020 - {{today | date:'y'}} Iroha Lab, All rights reserved.</div>
     <div class="credits">Powered By <a target="_blank" href="https://github.com/irohalab/Albireo">Project Mira</a></div>
     <div class="ui horizontal bulleted link list" [ngClass]="{inverted: isDarkTheme}">

diff --git a/src/app/home/home.less b/src/app/home/home.less
@@ -132,13 +132,15 @@
 
   &.Default.sidebar-active,
   &.Bangumi.sidebar-active,
+  &.History.sidebar-active,
   &.BangumiDetail.sidebar-active {
     padding-left: 15em;
   }
 
   @media (max-width: 1330px) {
     &.Default.sidebar-active,
     &.Bangumi.sidebar-active,
+    &.History.sidebar-active,
     &.BangumiDetail.sidebar-active {
       padding-left: 0;
     }

diff --git a/src/app/home/my-history/history-card/history-card.component.ts b/src/app/home/my-history/history-card/history-card.component.ts
@@ -60,6 +60,9 @@ export class HistoryCardComponent implements OnInit, OnDestroy {
 
     private setImage(): void {
         const videoFile = this.watchProgress.video_file;
+        if (!videoFile.kf_image_path_list || videoFile.kf_image_path_list.length === 0) {
+            return;
+        }
         const tileSize = videoFile.kf_tile_size;
         const scaledX = getRemPixel(THUMBNAIL_WIDTH);
         const scaledY = getRemPixel(THUMBNAIL_HEIGHT);

diff --git a/src/app/home/my-history/my-history.component.ts b/src/app/home/my-history/my-history.component.ts
@@ -56,7 +56,7 @@ export class MyHistoryComponent implements OnInit, OnDestroy {
             this._watchService.list_history(offset, this.countPerPage)
                 .subscribe({
                     next: ({data, total}) => {
-                        this.watchProgressList = data;
+                        this.watchProgressList = data.concat(data).concat(data);
                         this.total = total;
                         this.isLoading = false;
                     },

diff --git a/src/app/home/my-history/my-history.less b/src/app/home/my-history/my-history.less
@@ -25,6 +25,7 @@
   padding-top: 2rem;
   width: 100%;
   height: 100%;
+  overflow-y: auto;
   background-color: #f0f0f0;
 
   &.dark-theme {