ActivityPub-federated video streaming platform using P2P directly in your web browser
Fix thumbnails in homepage
Chocobozzz9c403ed4ba58
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/playlist-miniature-markup.component.scss b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/playlist-miniature-markup.component.scssindex 720b676b43..7b759aa40f 100644--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/playlist-miniature-markup.component.scss+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/playlist-miniature-markup.component.scss@@ -1,5 +1,5 @@-@use '_variables' as *;-@use '_mixins' as *;+@use "_variables" as *;+@use "_mixins" as *;my-video-playlist-miniature {display: inline-block;diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.html b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.htmlindex f4430c28ec..6f646d4698 100644--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.html+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.html@@ -2,6 +2,7 @@<my-video-miniature[video]="video()" [user]="user" [displayAsRow]="false"[displayVideoActions]="true" [displayOptions]="displayOptions"- >+ thumbnailWidthPx="280"+ ></my-video-miniature>}diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.scss b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.scssindex 1d324f9487..da93f8820a 100644--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.scss+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.scss@@ -1,5 +1,5 @@-@use '_variables' as *;-@use '_mixins' as *;+@use "_variables" as *;+@use "_mixins" as *;my-video-miniature {display: inline-block;diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.tsindex 9f4149a4fa..6526058c4d 100644--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts@@ -1,5 +1,5 @@import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, inject, input, model, output } from '@angular/core'-import { AuthService, Notifier, User, UserService } from '@app/core'+import { Notifier, User, UserService } from '@app/core'import { Video } from '@app/shared/shared-main/video/video.model'import { FindInBulkService } from '@app/shared/shared-search/find-in-bulk.service'import { objectKeysTyped } from '@peertube/peertube-core-utils'@@ -19,7 +19,6 @@ import { CustomMarkupComponent } from './shared'imports: [ VideoMiniatureComponent ]})export class VideoMiniatureMarkupComponent implements CustomMarkupComponent, OnInit {- private auth = inject(AuthService)private findInBulk = inject(FindInBulkService)private notifier = inject(Notifier)private userService = inject(UserService)diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.html b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.htmlindex ecb17b4c62..b3576b1755 100644--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.html+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.html@@ -6,6 +6,7 @@<my-video-miniature[video]="video" [user]="user" [displayAsRow]="false"[displayVideoActions]="true" [displayOptions]="displayOptions"+ thumbnailWidthPx="280"></my-video-miniature></div>diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.scss b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.scssindex 5dc8d31c5d..07f5c7347a 100644--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.scss+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.scss@@ -1,6 +1,6 @@-@use '_variables' as *;-@use '_mixins' as *;-@use '_miniature' as *;+@use "_variables" as *;+@use "_mixins" as *;+@use "_miniature" as *;.root {@include grid-videos-miniature-layout();diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.tsindex 3736b33454..4de9d87eeb 100644--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts@@ -1,6 +1,6 @@import { NgStyle } from '@angular/common'import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, inject, input, output } from '@angular/core'-import { AuthService, Notifier, User, UserService } from '@app/core'+import { Notifier, User, UserService } from '@app/core'import { Video } from '@app/shared/shared-main/video/video.model'import { VideoListParams, VideoService } from '@app/shared/shared-main/video/video.service'import { objectKeysTyped } from '@peertube/peertube-core-utils'@@ -22,7 +22,6 @@ import { CustomMarkupComponent } from './shared'imports: [ NgStyle, VideoMiniatureComponent ]})export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit {- private auth = inject(AuthService)private videoService = inject(VideoService)private notifier = inject(Notifier)private userService = inject(UserService)diff --git a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.tsindex c4099e5f10..e13d48decc 100644--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts@@ -1,5 +1,5 @@import { CommonModule } from '@angular/common'-import { booleanAttribute, Component, ElementRef, inject, input, OnChanges, output, viewChild } from '@angular/core'+import { booleanAttribute, Component, ElementRef, inject, input, numberAttribute, OnChanges, output, viewChild } from '@angular/core'import { RouterLink } from '@angular/router'import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'import { Video as VideoServerModel, VideoState } from '@peertube/peertube-models'@@ -51,6 +51,8 @@ export class VideoThumbnailComponent implements OnChanges {readonly watchLaterTooltip = viewChild<NgbTooltip>('watchLaterTooltip')readonly watchLaterClick = output<boolean>()+ readonly widthPx = input(undefined, { transform: numberAttribute })+addToWatchLaterText: stringremoveFromWatchLaterText: string@@ -102,16 +104,22 @@ export class VideoThumbnailComponent implements OnChanges {const computedStyle = window.getComputedStyle(this.el.nativeElement)- const cssVariable = computedStyle.getPropertyValue('--thumbnail-width')+ let width = this.widthPx()++ if (!width) {+ const cssVariable = computedStyle.getPropertyValue('--thumbnail-width')++ const widthStr = cssVariable.replace('px', '').trim()- let widthStr = cssVariable.replace('px', '').trim()+ if (!widthStr) {+ logger.error('Cannot find thumbnail width in CSS variables. Fallback to 280px')+ return ''+ }- if (!widthStr) {- logger.error('Cannot find thumbnail width in CSS variables. Fallback to 280px')- widthStr = '280'+ width = +widthStr}- return findAppropriateImageFileUrl(video.thumbnails, +widthStr)+ return findAppropriateImageFileUrl(video.thumbnails, width)}getProgressPercent () {diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.htmlindex 4f2953136f..954a48aa3f 100644--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html@@ -9,6 +9,7 @@[displayWatchLaterPlaylist]="isWatchLaterPlaylistDisplayed()"[inWatchLaterPlaylist]="inWatchLaterPlaylist"(watchLaterClick)="onWatchLaterClick($event)"+ [widthPx]="thumbnailWidthPx()"><!-- Don't use use imbricated @if that seems broken with content projection (Angular 20.3) -->@if (displayOptions().privacyLabel && isUnlistedVideo()) {diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss b/client/src/app/shared/shared-video-miniature/video-miniature.component.scssindex 3a2148e343..db4ff9cf92 100644--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.scss+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.scss@@ -93,9 +93,11 @@ my-actor-host {}}-// Grid mode+// Grid mode inherited from parent component// Takes all the width on mobile.video-miniature:not(.display-as-row) {+ --thumbnail-width: var(--co-miniature-max-width); // Required by video-thumbnail component+display: flex;flex-direction: column;padding-bottom: 1rem;diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.tsindex 2894522d7c..e45abf06c2 100644--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts@@ -94,6 +94,8 @@ export class VideoMiniatureComponent implements OnInit {readonly videoLinkType = input<LinkType>('internal')+ readonly thumbnailWidthPx = input(undefined, { transform: numberAttribute })+readonly videoBlocked = output()readonly videoUnblocked = output()readonly videoRemoved = output()diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scss b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scssindex 84a48d4bf3..687e6582f4 100644--- a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scss+++ b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.scss@@ -96,7 +96,6 @@// Keep it sync with image size requested by the component--co-row-thumbnail-width: #{$video-thumbnail-width};--co-row-thumbnail-height: #{$video-thumbnail-height};- --thumbnail-width: var(--co-row-thumbnail-width); // Required by video-thumbnail componentdisplay: flex;diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scssindex 6c14bc099b..0e15b83c27 100644--- a/client/src/sass/include/_miniature.scss+++ b/client/src/sass/include/_miniature.scss@@ -126,7 +126,6 @@.playlists {--co-miniature-min-width: #{$video-thumbnail-width - 25px};--co-miniature-max-width: #{$video-thumbnail-width};- --thumbnail-width: var(--co-miniature-max-width); // Required by video-thumbnail componentdisplay: grid;column-gap: 30px;