mirror of
https://github.com/4gray/iptvnator.git
synced 2026-10-16 06:06:18 -08:00
Merge remote-tracking branch 'origin/master' into claude/iptvnator-vod-hero-redesign-2c8950
# Conflicts: # apps/electron-backend-e2e/src/detail-back-lane.e2e.ts # apps/web-e2e/src/m3u-movie-details.e2e.ts # docs/architecture/iptvnator-ui-guidelines.md # libs/ui/components/src/lib/content-hero/content-hero.component.scss # libs/ui/components/src/lib/portal-detail-shell/portal-detail-shell.component.scss
This commit is contained in:
commit
87d7e1d46c
122 files changed
+2080
-1040
No files matched your search
@@ -49,7 +49,11 @@
|
||||
<button mat-button mat-dialog-close cdkFocusInitial>
|
||||
{{ 'CANCEL' | translate }}
|
||||
</button>
|
||||
<button mat-flat-button [mat-dialog-close]="true" color="warn">
|
||||
<button
|
||||
mat-flat-button
|
||||
class="app-destructive-button"
|
||||
[mat-dialog-close]="true"
|
||||
>
|
||||
{{ 'SETTINGS.REMOVE_DIALOG.CONFIRM' | translate }}
|
||||
</button>
|
||||
</mat-dialog-actions>
|
||||
@@ -9,6 +9,7 @@ import { MatButtonModule } from '@angular/material/button';
|
||||
import { MatDialogModule, MAT_DIALOG_DATA } from '@angular/material/dialog';
|
||||
import { MatIconModule } from '@angular/material/icon';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { SOURCE_TYPE_ICONS } from '@iptvnator/shared/interfaces';
|
||||
|
||||
export interface SettingsDeleteAllPlaylistsDialogData {
|
||||
summary: {
|
||||
@@ -48,19 +49,19 @@ export class SettingsDeleteAllPlaylistsDialogComponent {
|
||||
{
|
||||
id: 'm3u',
|
||||
count: this.dialogData.summary.m3u,
|
||||
icon: 'playlist_play',
|
||||
icon: SOURCE_TYPE_ICONS.m3u,
|
||||
labelKey: 'HOME.PLAYLIST_TYPES.M3U',
|
||||
},
|
||||
{
|
||||
id: 'xtream',
|
||||
count: this.dialogData.summary.xtream,
|
||||
icon: 'cloud',
|
||||
icon: SOURCE_TYPE_ICONS.xtream,
|
||||
labelKey: 'HOME.PLAYLIST_TYPES.XTREAM',
|
||||
},
|
||||
{
|
||||
id: 'stalker',
|
||||
count: this.dialogData.summary.stalker,
|
||||
icon: 'router',
|
||||
icon: SOURCE_TYPE_ICONS.stalker,
|
||||
labelKey: 'HOME.PLAYLIST_TYPES.STALKER',
|
||||
},
|
||||
]);
|
||||
|
||||
@@ -217,7 +217,7 @@
|
||||
</button>
|
||||
<button
|
||||
mat-button
|
||||
color="warn"
|
||||
class="app-destructive-button"
|
||||
type="button"
|
||||
[disabled]="isClearingEpgData()"
|
||||
(click)="clearEpgData.emit()"
|
||||
|
||||
@@ -89,6 +89,8 @@ export class SettingsEpgFacade {
|
||||
message: this.translate.instant(
|
||||
'SETTINGS.CLEAR_EPG_DIALOG.MESSAGE'
|
||||
),
|
||||
confirmLabel: this.translate.instant('SETTINGS.CLEAR_EPG_DATA'),
|
||||
tone: 'destructive',
|
||||
onConfirm: async (): Promise<void> => {
|
||||
if (
|
||||
!this.epgBridge.supportsDataManagement ||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
</div>
|
||||
<button
|
||||
mat-button
|
||||
class="danger-zone__button"
|
||||
class="danger-zone__button app-destructive-button"
|
||||
[class.danger-zone__button--busy]="isRemovingAllPlaylists()"
|
||||
[disabled]="!canRemoveAllPlaylists()"
|
||||
[attr.aria-busy]="isRemovingAllPlaylists()"
|
||||
@@ -29,7 +29,6 @@
|
||||
$event.stopPropagation();
|
||||
removeAll.emit()
|
||||
"
|
||||
color="warn"
|
||||
>
|
||||
@if (isRemovingAllPlaylists()) {
|
||||
<mat-progress-spinner
|
||||
@@ -49,9 +48,9 @@
|
||||
</div>
|
||||
<div class="danger-zone__summary" aria-live="polite">
|
||||
<span class="danger-zone__summary-pill">
|
||||
<mat-icon class="danger-zone__summary-icon"
|
||||
>folder_open</mat-icon
|
||||
>
|
||||
<mat-icon class="danger-zone__summary-icon">{{
|
||||
sourceIcons.m3u
|
||||
}}</mat-icon>
|
||||
<span class="danger-zone__summary-label">{{
|
||||
'HOME.PLAYLIST_TYPES.M3U' | translate
|
||||
}}</span>
|
||||
@@ -60,7 +59,9 @@
|
||||
}}</span>
|
||||
</span>
|
||||
<span class="danger-zone__summary-pill">
|
||||
<mat-icon class="danger-zone__summary-icon">cloud</mat-icon>
|
||||
<mat-icon class="danger-zone__summary-icon">{{
|
||||
sourceIcons.xtream
|
||||
}}</mat-icon>
|
||||
<span class="danger-zone__summary-label">{{
|
||||
'HOME.PLAYLIST_TYPES.XTREAM' | translate
|
||||
}}</span>
|
||||
@@ -69,7 +70,9 @@
|
||||
}}</span>
|
||||
</span>
|
||||
<span class="danger-zone__summary-pill">
|
||||
<mat-icon class="danger-zone__summary-icon">cast</mat-icon>
|
||||
<mat-icon class="danger-zone__summary-icon">{{
|
||||
sourceIcons.stalker
|
||||
}}</mat-icon>
|
||||
<span class="danger-zone__summary-label">{{
|
||||
'HOME.PLAYLIST_TYPES.STALKER' | translate
|
||||
}}</span>
|
||||
|
||||
@@ -9,6 +9,7 @@ import { MatButtonModule } from '@angular/material/button';
|
||||
import { MatIconModule } from '@angular/material/icon';
|
||||
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { SOURCE_TYPE_ICONS } from '@iptvnator/shared/interfaces';
|
||||
import { SettingsPlaylistDeleteSummary } from './settings.models';
|
||||
|
||||
@Component({
|
||||
@@ -26,6 +27,7 @@ import { SettingsPlaylistDeleteSummary } from './settings.models';
|
||||
styles: [':host { display: contents; }'],
|
||||
})
|
||||
export class SettingsResetSectionComponent {
|
||||
readonly sourceIcons = SOURCE_TYPE_ICONS;
|
||||
readonly isRemovingAllPlaylists = input(false);
|
||||
readonly canRemoveAllPlaylists = input(false);
|
||||
readonly playlistDeleteSummary =
|
||||
|
||||
@@ -68,6 +68,16 @@ describe('SettingsUnsavedChangesDialogComponent', () => {
|
||||
expect(save.hasAttribute('cdkFocusInitial')).toBe(false);
|
||||
});
|
||||
|
||||
it('marks only Discard as destructive: it throws away the edits', async () => {
|
||||
await render({ canSave: true });
|
||||
|
||||
expect(
|
||||
actionButtons().map((button) =>
|
||||
button.classList.contains('app-destructive-button')
|
||||
)
|
||||
).toEqual([false, true, false]);
|
||||
});
|
||||
|
||||
it('disables save while the form cannot be saved', async () => {
|
||||
await render({ canSave: false });
|
||||
|
||||
|
||||
@@ -82,6 +82,7 @@ export interface SettingsUnsavedChangesDialogData {
|
||||
</button>
|
||||
<button
|
||||
mat-button
|
||||
class="app-destructive-button"
|
||||
[mat-dialog-close]="'discard'"
|
||||
data-test-id="unsaved-dialog-discard"
|
||||
>
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "تشغيل العرض"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "لوحة التحكم",
|
||||
"OPEN_DASHBOARD": "فتح لوحة التحكم",
|
||||
"RAIL_SOURCES": "المصادر",
|
||||
"OPEN_SOURCES": "فتح المصادر",
|
||||
"RAIL_GLOBAL_FAVORITES": "المفضلة",
|
||||
"RAIL_GLOBAL_RECENT": "تمت مشاهدتها مؤخرًا",
|
||||
"RAIL_GLOBAL_SEARCH": "بحث عام",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "شغّل العرض"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "لوحة التحكم",
|
||||
"OPEN_DASHBOARD": "حل لوحة التحكم",
|
||||
"RAIL_SOURCES": "المصادر",
|
||||
"OPEN_SOURCES": "حل المصادر",
|
||||
"RAIL_GLOBAL_FAVORITES": "المفضلة",
|
||||
"RAIL_GLOBAL_RECENT": "متشافين مؤخراً",
|
||||
"RAIL_GLOBAL_SEARCH": "بحث عام",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Аднавіць паказ"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Панэль",
|
||||
"OPEN_DASHBOARD": "Адкрыць панэль",
|
||||
"RAIL_SOURCES": "Крыніцы",
|
||||
"OPEN_SOURCES": "Адкрыць крыніцы",
|
||||
"RAIL_GLOBAL_FAVORITES": "Выбранае",
|
||||
"RAIL_GLOBAL_RECENT": "Нядаўна праглянутае",
|
||||
"RAIL_GLOBAL_SEARCH": "Глабальны пошук",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Diashow abspielen"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Dashboard",
|
||||
"OPEN_DASHBOARD": "Dashboard öffnen",
|
||||
"RAIL_SOURCES": "Quellen",
|
||||
"OPEN_SOURCES": "Quellen öffnen",
|
||||
"RAIL_GLOBAL_FAVORITES": "Favoriten",
|
||||
"RAIL_GLOBAL_RECENT": "Zuletzt angesehen",
|
||||
"RAIL_GLOBAL_SEARCH": "Globale Suche",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Αναπαραγωγή προβολής"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Πίνακας ελέγχου",
|
||||
"OPEN_DASHBOARD": "Άνοιγμα πίνακα ελέγχου",
|
||||
"RAIL_SOURCES": "Πηγές",
|
||||
"OPEN_SOURCES": "Άνοιγμα πηγών",
|
||||
"RAIL_GLOBAL_FAVORITES": "Αγαπημένα",
|
||||
"RAIL_GLOBAL_RECENT": "Πρόσφατα προβληθέντα",
|
||||
"RAIL_GLOBAL_SEARCH": "Καθολική αναζήτηση",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Play slideshow"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Dashboard",
|
||||
"OPEN_DASHBOARD": "Open dashboard",
|
||||
"RAIL_SOURCES": "Sources",
|
||||
"OPEN_SOURCES": "Open sources",
|
||||
"RAIL_GLOBAL_FAVORITES": "Favorites",
|
||||
"RAIL_GLOBAL_RECENT": "Recently viewed",
|
||||
"RAIL_GLOBAL_SEARCH": "Global search",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Reproducir presentación"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Panel",
|
||||
"OPEN_DASHBOARD": "Abrir panel",
|
||||
"RAIL_SOURCES": "Fuentes",
|
||||
"OPEN_SOURCES": "Abrir fuentes",
|
||||
"RAIL_GLOBAL_FAVORITES": "Favoritos",
|
||||
"RAIL_GLOBAL_RECENT": "Vistos recientemente",
|
||||
"RAIL_GLOBAL_SEARCH": "Búsqueda global",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Lancer le diaporama"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Tableau de bord",
|
||||
"OPEN_DASHBOARD": "Ouvrir le tableau de bord",
|
||||
"RAIL_SOURCES": "Sources",
|
||||
"OPEN_SOURCES": "Ouvrir les sources",
|
||||
"RAIL_GLOBAL_FAVORITES": "Favoris",
|
||||
"RAIL_GLOBAL_RECENT": "Récemment consultés",
|
||||
"RAIL_GLOBAL_SEARCH": "Recherche globale",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Diavetítés lejátszása"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Vezérlőpult",
|
||||
"OPEN_DASHBOARD": "Vezérlőpult megnyitása",
|
||||
"RAIL_SOURCES": "Források",
|
||||
"OPEN_SOURCES": "Források megnyitása",
|
||||
"RAIL_GLOBAL_FAVORITES": "Kedvencek",
|
||||
"RAIL_GLOBAL_RECENT": "Megtekintési előzmények",
|
||||
"RAIL_GLOBAL_SEARCH": "Globális keresés",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Avvia la presentazione"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Dashboard",
|
||||
"OPEN_DASHBOARD": "Apri dashboard",
|
||||
"RAIL_SOURCES": "Sorgenti",
|
||||
"OPEN_SOURCES": "Apri sorgenti",
|
||||
"RAIL_GLOBAL_FAVORITES": "Preferiti",
|
||||
"RAIL_GLOBAL_RECENT": "Visti di recente",
|
||||
"RAIL_GLOBAL_SEARCH": "Ricerca globale",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "スライドショーを再生"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "ダッシュボード",
|
||||
"OPEN_DASHBOARD": "ダッシュボードを開く",
|
||||
"RAIL_SOURCES": "ソース",
|
||||
"OPEN_SOURCES": "ソースを開く",
|
||||
"RAIL_GLOBAL_FAVORITES": "お気に入り",
|
||||
"RAIL_GLOBAL_RECENT": "最近表示した項目",
|
||||
"RAIL_GLOBAL_SEARCH": "グローバル検索",
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
"CHANNELS": "채널",
|
||||
"ADDED": "추가되었습니다",
|
||||
"SHOW_DETAILS": "재생 목록 세부 정보 표시",
|
||||
"REMOVE": "재생 목록이 제거되었습니다",
|
||||
"REMOVE": "재생 목록 제거",
|
||||
"SEARCH_PLAYLISTS": "제목으로 재생목록 검색",
|
||||
"INFO_DIALOG": {
|
||||
"PLAYLIST_DETAILS": "재생 목록 세부 사항",
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "슬라이드쇼 재생"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "대시보드",
|
||||
"OPEN_DASHBOARD": "대시보드 열기",
|
||||
"RAIL_SOURCES": "소스",
|
||||
"OPEN_SOURCES": "소스 열기",
|
||||
"RAIL_GLOBAL_FAVORITES": "즐겨찾기",
|
||||
"RAIL_GLOBAL_RECENT": "최근 본 항목",
|
||||
"RAIL_GLOBAL_SEARCH": "전역 검색",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Diavoorstelling afspelen"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Dashboard",
|
||||
"OPEN_DASHBOARD": "Open dashboard",
|
||||
"RAIL_SOURCES": "Bronnen",
|
||||
"OPEN_SOURCES": "Open bronnen",
|
||||
"RAIL_GLOBAL_FAVORITES": "Favorieten",
|
||||
"RAIL_GLOBAL_RECENT": "Recent bekeken",
|
||||
"RAIL_GLOBAL_SEARCH": "Globaal zoeken",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Odtwórz pokaz"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Pulpit",
|
||||
"OPEN_DASHBOARD": "Otwórz pulpit",
|
||||
"RAIL_SOURCES": "Źródła",
|
||||
"OPEN_SOURCES": "Otwórz źródła",
|
||||
"RAIL_GLOBAL_FAVORITES": "Ulubione",
|
||||
"RAIL_GLOBAL_RECENT": "Ostatnio oglądane",
|
||||
"RAIL_GLOBAL_SEARCH": "Wyszukiwanie globalne",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Reproduzir apresentação"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Dashboard",
|
||||
"OPEN_DASHBOARD": "Abrir dashboard",
|
||||
"RAIL_SOURCES": "Fontes",
|
||||
"OPEN_SOURCES": "Abrir fontes",
|
||||
"RAIL_GLOBAL_FAVORITES": "Favoritos",
|
||||
"RAIL_GLOBAL_RECENT": "Visualizados recentemente",
|
||||
"RAIL_GLOBAL_SEARCH": "Pesquisa global",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Возобновить показ"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Панель",
|
||||
"OPEN_DASHBOARD": "Открыть панель",
|
||||
"RAIL_SOURCES": "Источники",
|
||||
"OPEN_SOURCES": "Открыть источники",
|
||||
"RAIL_GLOBAL_FAVORITES": "Избранное",
|
||||
"RAIL_GLOBAL_RECENT": "Недавно просмотренные",
|
||||
"RAIL_GLOBAL_SEARCH": "Глобальный поиск",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "Slayt gösterisini oynat"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "Pano",
|
||||
"OPEN_DASHBOARD": "Panoyu aç",
|
||||
"RAIL_SOURCES": "Kaynaklar",
|
||||
"OPEN_SOURCES": "Kaynakları aç",
|
||||
"RAIL_GLOBAL_FAVORITES": "Favoriler",
|
||||
"RAIL_GLOBAL_RECENT": "Son izlenenler",
|
||||
"RAIL_GLOBAL_SEARCH": "Genel arama",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "播放轮播"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "仪表盘",
|
||||
"OPEN_DASHBOARD": "打开仪表盘",
|
||||
"RAIL_SOURCES": "源",
|
||||
"OPEN_SOURCES": "打开源",
|
||||
"RAIL_GLOBAL_FAVORITES": "收藏",
|
||||
"RAIL_GLOBAL_RECENT": "最近观看",
|
||||
"RAIL_GLOBAL_SEARCH": "全局搜索",
|
||||
|
||||
@@ -1614,11 +1614,8 @@
|
||||
"HERO_PLAY": "播放輪播"
|
||||
},
|
||||
"SHELL": {
|
||||
"BRAND_ALT": "IPTVnator",
|
||||
"RAIL_DASHBOARD": "儀表板",
|
||||
"OPEN_DASHBOARD": "開啟儀表板",
|
||||
"RAIL_SOURCES": "來源",
|
||||
"OPEN_SOURCES": "開啟來源",
|
||||
"RAIL_GLOBAL_FAVORITES": "我的最愛",
|
||||
"RAIL_GLOBAL_RECENT": "最近觀看",
|
||||
"RAIL_GLOBAL_SEARCH": "全域搜尋",
|
||||
|
||||
@@ -304,8 +304,8 @@ html {
|
||||
}
|
||||
|
||||
// ─── Destructive actions ───────────────────────────────────────────────
|
||||
// Material only emits `.mat-warn` button colors for M2 themes, so
|
||||
// `color="warn"` is a no-op with this M3 theme. Buttons that remove or
|
||||
// Material only emits `.mat-warn` button colors for M2 themes, so the
|
||||
// `warn` color input is a no-op with this M3 theme. Buttons that remove or
|
||||
// discard user data opt in with this class instead; the error tokens are
|
||||
// declared per theme context above, so light and dark each get their own
|
||||
// error/on-error pair.
|
||||
|
||||
Reference in new issue
Block a user