ActivityPub-federated video streaming platform using P2P directly in your web browser
Move manage menu in its own component
Chocobozzz5722674e990c
diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.html b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.htmlindex d116a1abe3..d418aa216d 100644--- a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.html+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.html@@ -1,118 +1,6 @@<div class="root"><div>- <div class="menu">- <h1 i18n>MANAGE MY VIDEO</h1>-- <ul class="ul-unstyle">- <li>- <a routerLink="." queryParamsHandling="merge" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">- <div class="global-icon-wrapper">- <my-global-icon iconName="film"></my-global-icon>- </div>-- <span i18n>Main information</span>- </a>- </li>-- <li *ngIf="getVideo().isLive">- <a routerLink="live-settings" queryParamsHandling="merge" routerLinkActive="active">- <div class="global-icon-wrapper">- <my-global-icon iconName="live"></my-global-icon>- </div>-- <span i18n>Live settings</span>- </a>- </li>-- <div class="separator">- <div></div>- </div>-- <li>- <a routerLink="customization" queryParamsHandling="merge" routerLinkActive="active">- <div class="global-icon-wrapper">- <my-global-icon iconName="cog"></my-global-icon>- </div>-- <span i18n>Customization</span>- </a>- </li>-- <li>- <a routerLink="moderation" queryParamsHandling="merge" routerLinkActive="active">- <div class="global-icon-wrapper">- <my-global-icon iconName="moderation"></my-global-icon>- </div>-- <span i18n>Moderation</span>- </a>- </li>-- @if (!getVideo().isLive) {- <li>- <a routerLink="captions" queryParamsHandling="merge" routerLinkActive="active">- <div class="global-icon-wrapper">- <my-global-icon iconName="captions"></my-global-icon>- </div>-- <span i18n>Captions</span>- </a>- </li>-- <li>- <a routerLink="chapters" queryParamsHandling="merge" routerLinkActive="active">- <div class="global-icon-wrapper">- <my-global-icon iconName="chapters"></my-global-icon>- </div>-- <span i18n>Chapters</span>- </a>- </li>-- <div class="separator">- <div></div>- </div>-- <li>- <a routerLink="studio" queryParamsHandling="merge" routerLinkActive="active">- <div class="global-icon-wrapper">- <my-global-icon iconName="studio"></my-global-icon>- </div>-- <span i18n>Studio</span>- </a>- </li>-- <li>- <a routerLink="replace-file" queryParamsHandling="merge" routerLinkActive="active">- <div class="global-icon-wrapper">- <my-global-icon iconName="upload"></my-global-icon>- </div>-- <span i18n>Replace file</span>- </a>- </li>- }-- @if (canWatch()) {- <div class="separator">- <div></div>- </div>-- <li>- <a routerLink="stats" queryParamsHandling="merge" routerLinkActive="active">- <div class="global-icon-wrapper">- <my-global-icon iconName="stats"></my-global-icon>- </div>-- <span i18n>Statistics</span>- </a>- </li>- }- </ul>- </div>-- <div class="menu-placeholder"></div>+ <my-video-manage-menu [canWatch]="canWatch()"></my-video-manage-menu></div><div class="w-100 min-width-0">diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.scss b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.scssindex fc2f45718c..ec0a0ed418 100644--- a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.scss+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.scss@@ -3,172 +3,14 @@@use '_form-mixins' as *;@import 'bootstrap/scss/mixins';-h1 {- color: pvar(--fg-200);- font-weight: $font-bold;- margin-bottom: 1rem;- text-align: center;-- @include font-size(14px);-}-.root {display: flex;}-.menu,-.menu-placeholder {- position: sticky;- top: pvar(--header-height);- width: calc(#{$menu-width} - 2rem);- max-height: calc(100vh - #{pvar(--header-height)});- z-index: z(menu);-- @include margin-right(pvar(--x-margin-content));-}--.menu {- padding-top: 1.5rem;- padding-bottom: 1.5rem;- background-color: pvar(--bg-secondary-400);- border-radius: 14px;- overflow: auto;-- .global-icon-wrapper {- display: inline-block;- border-radius: 100%;- padding: 5px;- background-color: pvar(--bg);- line-height: 1;- width: fit-content;-- @include margin-right(0.75rem);-- my-global-icon {- color: pvar(--primary);-- @include global-icon-size(22px);- }- }-- li {- list-style: none;- }-- a,- .separator {- @include padding-left(1.5rem);- }-- a {- display: block;- padding-top: 0.5rem;- padding-bottom: 0.5rem;- color: pvar(--fg-350);-- @include disable-default-a-behaviour;-- &:hover {- opacity: 1;- color: pvar(--fg-400);- }-- &.active {- color: pvar(--fg-400);- font-weight: $font-bold;- background-color: pvar(--bg-secondary-350);-- .global-icon-wrapper {- background-color: pvar(--primary);-- my-global-icon {- color: pvar(--bg);- }- }- }- }-- .separator {- padding-top: 1rem;- padding-bottom: 1rem;-- @include padding-right(1.5rem);-- > div {- height: 2px;- width: 100%;- background-color: pvar(--bg-secondary-500);- border-radius: 14px;- }- }-}-@media screen and (max-width: 1000px) {.root {margin-bottom: 150px;}-- h1 {- @include visually-hidden;- }-- ul {- display: flex;- margin: 0 auto;- width: fit-content;- }-- .menu-placeholder {- display: none;- }-- .menu {- position: fixed;- bottom: 0;- top: unset;- width: calc(100vw - #{pvar(--menu-width)} - (#{pvar(--x-margin-content)} * 2));- padding: 0.75rem 0.5rem;- border: 1px solid pvar(--bg-secondary-450);- border-bottom: 0;- border-end-end-radius: 0;- border-end-start-radius: 0;-- a {- display: flex;- flex-direction: column;- text-align: center;- align-items: center;-- &.active {- background-color: inherit;- }- }-- a,- .separator {- font-size: 12px;- line-height: 1.2;- padding: 0 0.5rem;- }-- .separator > div {- width: 2px;- height: 100%;- }-- .global-icon-wrapper {- margin: 0 0 0.25rem;- }- }-}--@media screen and (max-width: $mobile-view) {- .menu {- border-radius: 0;- border-width: 1px 0 0;- width: 100vw;- left: 0;- }}.video-header-block {diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.tsindex 811107dee1..d6987aed1f 100644--- a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts@@ -6,14 +6,14 @@ import { RouterModule } from '@angular/router'import { Notifier, ScreenService } from '@app/core'import { HeaderService } from '@app/header/header.service'import { Video } from '@app/shared/shared-main/video/video.model'+import { VideoStateMessageService } from '@app/shared/shared-video/video-state-message.service'import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'-import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'import { ButtonComponent } from '../../shared/shared-main/buttons/button.component'import { UploadProgressComponent } from '../../shared/standalone-upload/upload-progress.component'import { ManageErrorsComponent } from './common/manage-errors.component'import { VideoEdit } from './common/video-edit.model'import { VideoManageController } from './video-manage-controller.service'-import { VideoStateMessageService } from '@app/shared/shared-video/video-state-message.service'+import { VideoManageMenuComponent } from './video-manage-menu.component'@Component({selector: 'my-video-manage-container',@@ -28,7 +28,7 @@ import { VideoStateMessageService } from '@app/shared/shared-video/video-state-mManageErrorsComponent,NgbTooltipModule,UploadProgressComponent,- GlobalIconComponent+ VideoManageMenuComponent]})export class VideoManageContainerComponent implements OnInit, OnDestroy {diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.html b/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.htmlnew file mode 100644index 0000000000..1f44e9af8e--- /dev/null+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.html@@ -0,0 +1,113 @@+<div class="menu">+ <h1 i18n>MANAGE MY VIDEO</h1>++ <ul class="ul-unstyle">+ <li>+ <a routerLink="." queryParamsHandling="merge" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">+ <div class="global-icon-wrapper">+ <my-global-icon iconName="film"></my-global-icon>+ </div>++ <span i18n>Main information</span>+ </a>+ </li>++ <li *ngIf="getVideo().isLive">+ <a routerLink="live-settings" queryParamsHandling="merge" routerLinkActive="active">+ <div class="global-icon-wrapper">+ <my-global-icon iconName="live"></my-global-icon>+ </div>++ <span i18n>Live settings</span>+ </a>+ </li>++ <div class="separator">+ <div></div>+ </div>++ <li>+ <a routerLink="customization" queryParamsHandling="merge" routerLinkActive="active">+ <div class="global-icon-wrapper">+ <my-global-icon iconName="cog"></my-global-icon>+ </div>++ <span i18n>Customization</span>+ </a>+ </li>++ <li>+ <a routerLink="moderation" queryParamsHandling="merge" routerLinkActive="active">+ <div class="global-icon-wrapper">+ <my-global-icon iconName="moderation"></my-global-icon>+ </div>++ <span i18n>Moderation</span>+ </a>+ </li>++ @if (!getVideo().isLive) {+ <li>+ <a routerLink="captions" queryParamsHandling="merge" routerLinkActive="active">+ <div class="global-icon-wrapper">+ <my-global-icon iconName="captions"></my-global-icon>+ </div>++ <span i18n>Captions</span>+ </a>+ </li>++ <li>+ <a routerLink="chapters" queryParamsHandling="merge" routerLinkActive="active">+ <div class="global-icon-wrapper">+ <my-global-icon iconName="chapters"></my-global-icon>+ </div>++ <span i18n>Chapters</span>+ </a>+ </li>++ <div class="separator">+ <div></div>+ </div>++ <li>+ <a routerLink="studio" queryParamsHandling="merge" routerLinkActive="active">+ <div class="global-icon-wrapper">+ <my-global-icon iconName="studio"></my-global-icon>+ </div>++ <span i18n>Studio</span>+ </a>+ </li>++ <li>+ <a routerLink="replace-file" queryParamsHandling="merge" routerLinkActive="active">+ <div class="global-icon-wrapper">+ <my-global-icon iconName="upload"></my-global-icon>+ </div>++ <span i18n>Replace file</span>+ </a>+ </li>+ }++ @if (canWatch()) {+ <div class="separator">+ <div></div>+ </div>++ <li>+ <a routerLink="stats" queryParamsHandling="merge" routerLinkActive="active">+ <div class="global-icon-wrapper">+ <my-global-icon iconName="stats"></my-global-icon>+ </div>++ <span i18n>Statistics</span>+ </a>+ </li>+ }+ </ul>+</div>++<div class="menu-placeholder"></div>diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.scss b/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.scssnew file mode 100644index 0000000000..0969395903--- /dev/null+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.scss@@ -0,0 +1,164 @@+@use '_variables' as *;+@use '_mixins' as *;+@use '_form-mixins' as *;+@import 'bootstrap/scss/mixins';++h1 {+ color: pvar(--fg-200);+ font-weight: $font-bold;+ margin-bottom: 1rem;+ text-align: center;++ @include font-size(14px);+}++.menu,+.menu-placeholder {+ position: sticky;+ top: pvar(--header-height);+ width: calc(#{$menu-width} - 2rem);+ max-height: calc(100vh - #{pvar(--header-height)});+ z-index: z(menu);++ @include margin-right(pvar(--x-margin-content));+}++.menu {+ padding-top: 1.5rem;+ padding-bottom: 1.5rem;+ background-color: pvar(--bg-secondary-400);+ border-radius: 14px;+ overflow: auto;++ .global-icon-wrapper {+ display: inline-block;+ border-radius: 100%;+ padding: 5px;+ background-color: pvar(--bg);+ line-height: 1;+ width: fit-content;++ @include margin-right(0.75rem);++ my-global-icon {+ color: pvar(--primary);++ @include global-icon-size(22px);+ }+ }++ li {+ list-style: none;+ }++ a,+ .separator {+ @include padding-left(1.5rem);+ }++ a {+ display: block;+ padding-top: 0.5rem;+ padding-bottom: 0.5rem;+ color: pvar(--fg-350);++ @include disable-default-a-behaviour;++ &:hover {+ opacity: 1;+ color: pvar(--fg-400);+ }++ &.active {+ color: pvar(--fg-400);+ font-weight: $font-bold;+ background-color: pvar(--bg-secondary-350);++ .global-icon-wrapper {+ background-color: pvar(--primary);++ my-global-icon {+ color: pvar(--bg);+ }+ }+ }+ }++ .separator {+ padding-top: 1rem;+ padding-bottom: 1rem;++ @include padding-right(1.5rem);++ > div {+ height: 2px;+ width: 100%;+ background-color: pvar(--bg-secondary-500);+ border-radius: 14px;+ }+ }+}++@media screen and (max-width: 1000px) {+ h1 {+ @include visually-hidden;+ }++ ul {+ display: flex;+ margin: 0 auto;+ width: fit-content;+ }++ .menu-placeholder {+ display: none;+ }++ .menu {+ position: fixed;+ bottom: 0;+ top: unset;+ width: calc(100vw - #{pvar(--menu-width)} - (#{pvar(--x-margin-content)} * 2));+ padding: 0.75rem 0.5rem;+ border: 1px solid pvar(--bg-secondary-450);+ border-bottom: 0;+ border-end-end-radius: 0;+ border-end-start-radius: 0;++ a {+ display: flex;+ flex-direction: column;+ text-align: center;+ align-items: center;++ &.active {+ background-color: inherit;+ }+ }++ a,+ .separator {+ font-size: 12px;+ line-height: 1.2;+ padding: 0 0.5rem;+ }++ .separator > div {+ width: 2px;+ height: 100%;+ }++ .global-icon-wrapper {+ margin: 0 0 0.25rem;+ }+ }+}++@media screen and (max-width: $mobile-view) {+ .menu {+ border-radius: 0;+ border-width: 1px 0 0;+ width: 100vw;+ left: 0;+ }+}diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.ts b/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.tsnew file mode 100644index 0000000000..6ecf26f943--- /dev/null+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.ts@@ -0,0 +1,39 @@+import { CommonModule } from '@angular/common'+import { booleanAttribute, Component, inject, input, OnInit } from '@angular/core'+import { FormsModule, ReactiveFormsModule } from '@angular/forms'+import { RouterModule } from '@angular/router'+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'+import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'+import { VideoEdit } from './common/video-edit.model'+import { VideoManageController } from './video-manage-controller.service'++@Component({+ selector: 'my-video-manage-menu',+ styleUrls: [ './video-manage-menu.component.scss' ],+ templateUrl: './video-manage-menu.component.html',+ imports: [+ CommonModule,+ RouterModule,+ FormsModule,+ ReactiveFormsModule,+ NgbTooltipModule,+ GlobalIconComponent+ ]+})+export class VideoManageMenuComponent implements OnInit {+ private manageController = inject(VideoManageController)++ readonly canWatch = input.required<boolean, string | boolean>({ transform: booleanAttribute })++ private videoEdit: VideoEdit++ ngOnInit (): void {+ const { videoEdit } = this.manageController.getStore()++ this.videoEdit = videoEdit+ }++ getVideo () {+ return this.videoEdit.getVideoAttributes()+ }+}