From 7f67962dd78907e033eb094e494bafff231a77eb Mon Sep 17 00:00:00 2001 From: 4gray Date: Sun, 8 Mar 2026 20:09:50 +0100 Subject: [PATCH] refactor(nx): update repository structure for portals --- .../category-content-view.component.ts | 2 +- .../{xtream-electron => portal-shared}/detail-view.scss | 0 .../portal-main-container.scss} | 0 .../season-container/season-container.component.html | 0 .../season-container/season-container.component.scss | 0 .../season-container/season-container.component.ts | 6 ++++-- .../vod-details/vod-details.component.html | 0 .../vod-details/vod-details.component.ts | 0 .../shared/components/grid-list/grid-list.component.ts | 8 +++++--- .../stalker-inline-detail.component.ts | 2 +- .../src/app/stalker/stalker-main-container.component.ts | 2 +- .../stalker-series-view/stalker-series-view.component.ts | 4 ++-- .../serial-details/serial-details.component.ts | 4 ++-- .../vod-details/vod-details-route.component.ts | 2 +- .../xtream-electron/xtream-main-container.component.ts | 2 +- libs/portal/shared/ui/src/index.ts | 2 ++ .../progress-capsule/progress-capsule.component.ts | 0 .../components}/watched-badge/watched-badge.component.ts | 0 18 files changed, 20 insertions(+), 14 deletions(-) rename apps/web/src/app/{xtream-electron => portal-shared}/detail-view.scss (100%) rename apps/web/src/app/{xtream-electron/xtream-main-container.component.scss => portal-shared/portal-main-container.scss} (100%) rename apps/web/src/app/{xtream-electron => portal-shared}/season-container/season-container.component.html (100%) rename apps/web/src/app/{xtream-electron => portal-shared}/season-container/season-container.component.scss (100%) rename apps/web/src/app/{xtream-electron => portal-shared}/season-container/season-container.component.ts (98%) rename apps/web/src/app/{xtream-electron => portal-shared}/vod-details/vod-details.component.html (100%) rename apps/web/src/app/{xtream-electron => portal-shared}/vod-details/vod-details.component.ts (100%) rename {apps/web/src/app/xtream-electron/shared => libs/portal/shared/ui/src/lib/components}/progress-capsule/progress-capsule.component.ts (100%) rename {apps/web/src/app/xtream-electron/shared => libs/portal/shared/ui/src/lib/components}/watched-badge/watched-badge.component.ts (100%) diff --git a/apps/web/src/app/portal-shared/category-content-view/category-content-view.component.ts b/apps/web/src/app/portal-shared/category-content-view/category-content-view.component.ts index b4c2777e3..6d86141c2 100644 --- a/apps/web/src/app/portal-shared/category-content-view/category-content-view.component.ts +++ b/apps/web/src/app/portal-shared/category-content-view/category-content-view.component.ts @@ -45,7 +45,7 @@ import { StalkerStore } from '@iptvnator/portal/stalker/data-access'; import { XTREAM_DATA_SOURCE } from '@iptvnator/portal/xtream/data-access'; import { XtreamCategorySortMode } from '@iptvnator/portal/xtream/data-access'; import { XtreamStore } from '@iptvnator/portal/xtream/data-access'; -import { VodDetailsComponent } from '../../xtream-electron/vod-details/vod-details.component'; +import { VodDetailsComponent } from '../vod-details/vod-details.component'; const SORT_STORAGE_KEY = 'xtream-category-sort-mode'; diff --git a/apps/web/src/app/xtream-electron/detail-view.scss b/apps/web/src/app/portal-shared/detail-view.scss similarity index 100% rename from apps/web/src/app/xtream-electron/detail-view.scss rename to apps/web/src/app/portal-shared/detail-view.scss diff --git a/apps/web/src/app/xtream-electron/xtream-main-container.component.scss b/apps/web/src/app/portal-shared/portal-main-container.scss similarity index 100% rename from apps/web/src/app/xtream-electron/xtream-main-container.component.scss rename to apps/web/src/app/portal-shared/portal-main-container.scss diff --git a/apps/web/src/app/xtream-electron/season-container/season-container.component.html b/apps/web/src/app/portal-shared/season-container/season-container.component.html similarity index 100% rename from apps/web/src/app/xtream-electron/season-container/season-container.component.html rename to apps/web/src/app/portal-shared/season-container/season-container.component.html diff --git a/apps/web/src/app/xtream-electron/season-container/season-container.component.scss b/apps/web/src/app/portal-shared/season-container/season-container.component.scss similarity index 100% rename from apps/web/src/app/xtream-electron/season-container/season-container.component.scss rename to apps/web/src/app/portal-shared/season-container/season-container.component.scss diff --git a/apps/web/src/app/xtream-electron/season-container/season-container.component.ts b/apps/web/src/app/portal-shared/season-container/season-container.component.ts similarity index 98% rename from apps/web/src/app/xtream-electron/season-container/season-container.component.ts rename to apps/web/src/app/portal-shared/season-container/season-container.component.ts index 0b5db08f2..ac599e118 100644 --- a/apps/web/src/app/xtream-electron/season-container/season-container.component.ts +++ b/apps/web/src/app/portal-shared/season-container/season-container.component.ts @@ -6,11 +6,13 @@ import { MatIcon } from '@angular/material/icon'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatTooltipModule } from '@angular/material/tooltip'; import { TranslateModule } from '@ngx-translate/core'; +import { + ProgressCapsuleComponent, + WatchedBadgeComponent, +} from '@iptvnator/portal/shared/ui'; import { XtreamSerieEpisode, XtreamSerieEpisodeInfo } from 'shared-interfaces'; import { XtreamStore } from '@iptvnator/portal/xtream/data-access'; import { StalkerStore } from '@iptvnator/portal/stalker/data-access'; -import { ProgressCapsuleComponent } from '../shared/progress-capsule/progress-capsule.component'; -import { WatchedBadgeComponent } from '../shared/watched-badge/watched-badge.component'; import { DownloadsService } from '../../services/downloads.service'; import { createLogger } from '@iptvnator/portal/shared/util'; diff --git a/apps/web/src/app/xtream-electron/vod-details/vod-details.component.html b/apps/web/src/app/portal-shared/vod-details/vod-details.component.html similarity index 100% rename from apps/web/src/app/xtream-electron/vod-details/vod-details.component.html rename to apps/web/src/app/portal-shared/vod-details/vod-details.component.html diff --git a/apps/web/src/app/xtream-electron/vod-details/vod-details.component.ts b/apps/web/src/app/portal-shared/vod-details/vod-details.component.ts similarity index 100% rename from apps/web/src/app/xtream-electron/vod-details/vod-details.component.ts rename to apps/web/src/app/portal-shared/vod-details/vod-details.component.ts diff --git a/apps/web/src/app/shared/components/grid-list/grid-list.component.ts b/apps/web/src/app/shared/components/grid-list/grid-list.component.ts index 98631974f..4682e783d 100644 --- a/apps/web/src/app/shared/components/grid-list/grid-list.component.ts +++ b/apps/web/src/app/shared/components/grid-list/grid-list.component.ts @@ -4,9 +4,11 @@ import { MatIcon } from '@angular/material/icon'; import { MatPaginatorModule, PageEvent } from '@angular/material/paginator'; import { MatTooltip } from '@angular/material/tooltip'; import { TranslatePipe } from '@ngx-translate/core'; -import { PlaylistErrorViewComponent } from '@iptvnator/portal/shared/ui'; -import { ProgressCapsuleComponent } from '../../../xtream-electron/shared/progress-capsule/progress-capsule.component'; -import { WatchedBadgeComponent } from '../../../xtream-electron/shared/watched-badge/watched-badge.component'; +import { + PlaylistErrorViewComponent, + ProgressCapsuleComponent, + WatchedBadgeComponent, +} from '@iptvnator/portal/shared/ui'; interface GridListItem { id?: number | string; diff --git a/apps/web/src/app/stalker/stalker-inline-detail/stalker-inline-detail.component.ts b/apps/web/src/app/stalker/stalker-inline-detail/stalker-inline-detail.component.ts index 49430b645..b678c2923 100644 --- a/apps/web/src/app/stalker/stalker-inline-detail/stalker-inline-detail.component.ts +++ b/apps/web/src/app/stalker/stalker-inline-detail/stalker-inline-detail.component.ts @@ -7,7 +7,7 @@ import { } from '@angular/core'; import { ExternalPlaybackService } from '../../services/external-playback.service'; import { VodDetailsItem } from 'shared-interfaces'; -import { VodDetailsComponent } from '../../xtream-electron/vod-details/vod-details.component'; +import { VodDetailsComponent } from '../../portal-shared/vod-details/vod-details.component'; import { StalkerSelectedVodItem } from '@iptvnator/portal/stalker/data-access'; import { StalkerSeriesViewComponent } from '../stalker-series-view/stalker-series-view.component'; diff --git a/apps/web/src/app/stalker/stalker-main-container.component.ts b/apps/web/src/app/stalker/stalker-main-container.component.ts index 68b46c931..ae5156b47 100644 --- a/apps/web/src/app/stalker/stalker-main-container.component.ts +++ b/apps/web/src/app/stalker/stalker-main-container.component.ts @@ -15,7 +15,7 @@ import { StalkerStore } from '@iptvnator/portal/stalker/data-access'; templateUrl: './stalker-main-container.component.html', styleUrls: [ './stalker-main-container.component.scss', - '../xtream-electron/xtream-main-container.component.scss', + '../portal-shared/portal-main-container.scss', '../shared/styles/portal-sidebar.scss', ], imports: [ diff --git a/apps/web/src/app/stalker/stalker-series-view/stalker-series-view.component.ts b/apps/web/src/app/stalker/stalker-series-view/stalker-series-view.component.ts index f7ef847ac..3dc80f366 100644 --- a/apps/web/src/app/stalker/stalker-series-view/stalker-series-view.component.ts +++ b/apps/web/src/app/stalker/stalker-series-view/stalker-series-view.component.ts @@ -12,7 +12,7 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core'; import { FavoritesButtonComponent } from '../favorites-button/favorites-button.component'; import { ContentHeroComponent } from 'components'; import { StalkerStore } from '@iptvnator/portal/stalker/data-access'; -import { SeasonContainerComponent } from '../../xtream-electron/season-container/season-container.component'; +import { SeasonContainerComponent } from '../../portal-shared/season-container/season-container.component'; import { ResolvedPortalPlayback, XtreamSerieEpisode, @@ -46,7 +46,7 @@ import { PortalInlinePlayerComponent } from '../../shared/components/portal-inli @Component({ selector: 'app-stalker-series-view', templateUrl: './stalker-series-view.component.html', - styleUrls: ['../../xtream-electron/detail-view.scss'], + styleUrls: ['../../portal-shared/detail-view.scss'], imports: [ FavoritesButtonComponent, ContentHeroComponent, diff --git a/apps/web/src/app/xtream-electron/serial-details/serial-details.component.ts b/apps/web/src/app/xtream-electron/serial-details/serial-details.component.ts index c075b8cfe..822d31971 100644 --- a/apps/web/src/app/xtream-electron/serial-details/serial-details.component.ts +++ b/apps/web/src/app/xtream-electron/serial-details/serial-details.component.ts @@ -13,13 +13,13 @@ import { import { PlayerService } from '../../services/player.service'; import { ExternalPlaybackService } from '../../services/external-playback.service'; import { PortalInlinePlayerComponent } from '../../shared/components/portal-inline-player/portal-inline-player.component'; -import { SeasonContainerComponent } from '../season-container/season-container.component'; +import { SeasonContainerComponent } from '../../portal-shared/season-container/season-container.component'; import { XtreamStore } from '@iptvnator/portal/xtream/data-access'; @Component({ selector: 'app-serial-details', templateUrl: './serial-details.component.html', - styleUrls: ['../detail-view.scss'], + styleUrls: ['../../portal-shared/detail-view.scss'], imports: [ ContentHeroComponent, MatIcon, diff --git a/apps/web/src/app/xtream-electron/vod-details/vod-details-route.component.ts b/apps/web/src/app/xtream-electron/vod-details/vod-details-route.component.ts index 8689bee6e..d21c3ac33 100644 --- a/apps/web/src/app/xtream-electron/vod-details/vod-details-route.component.ts +++ b/apps/web/src/app/xtream-electron/vod-details/vod-details-route.component.ts @@ -39,7 +39,7 @@ import { createLogger } from '@iptvnator/portal/shared/util'; */ @Component({ templateUrl: './vod-details-route.component.html', - styleUrls: ['../detail-view.scss'], + styleUrls: ['../../portal-shared/detail-view.scss'], imports: [ ContentHeroComponent, MatIcon, diff --git a/apps/web/src/app/xtream-electron/xtream-main-container.component.ts b/apps/web/src/app/xtream-electron/xtream-main-container.component.ts index d1df7f8d2..34bdea1c8 100644 --- a/apps/web/src/app/xtream-electron/xtream-main-container.component.ts +++ b/apps/web/src/app/xtream-electron/xtream-main-container.component.ts @@ -26,7 +26,7 @@ const XTREAM_CATEGORY_SORT_STORAGE_KEY = 'xtream-category-sort-mode'; selector: 'app-xtream-main-container', templateUrl: './xtream-main-container.component.html', styleUrls: [ - './xtream-main-container.component.scss', + '../portal-shared/portal-main-container.scss', '../shared/styles/portal-sidebar.scss', ], imports: [ diff --git a/libs/portal/shared/ui/src/index.ts b/libs/portal/shared/ui/src/index.ts index e802a0003..a35316de2 100644 --- a/libs/portal/shared/ui/src/index.ts +++ b/libs/portal/shared/ui/src/index.ts @@ -2,9 +2,11 @@ export * from './lib/components/category-view/category-view.component'; export * from './lib/components/content-card/content-card.component'; export * from './lib/components/favorites-layout/favorites-layout.component'; export * from './lib/components/playlist-error-view/playlist-error-view.component'; +export * from './lib/components/progress-capsule/progress-capsule.component'; export * from './lib/components/portal-collection-live-shell/portal-collection-live-shell.component'; export * from './lib/components/portal-collection-shell/portal-collection-shell.component'; export * from './lib/components/portal-empty-state/portal-empty-state.component'; export * from './lib/components/search-form/search-form.component'; export * from './lib/components/search-layout/search-layout.component'; +export * from './lib/components/watched-badge/watched-badge.component'; export * from './lib/navigation/portal-rail-links.component'; diff --git a/apps/web/src/app/xtream-electron/shared/progress-capsule/progress-capsule.component.ts b/libs/portal/shared/ui/src/lib/components/progress-capsule/progress-capsule.component.ts similarity index 100% rename from apps/web/src/app/xtream-electron/shared/progress-capsule/progress-capsule.component.ts rename to libs/portal/shared/ui/src/lib/components/progress-capsule/progress-capsule.component.ts diff --git a/apps/web/src/app/xtream-electron/shared/watched-badge/watched-badge.component.ts b/libs/portal/shared/ui/src/lib/components/watched-badge/watched-badge.component.ts similarity index 100% rename from apps/web/src/app/xtream-electron/shared/watched-badge/watched-badge.component.ts rename to libs/portal/shared/ui/src/lib/components/watched-badge/watched-badge.component.ts