aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-04-24 15:10:54 +0200
committerChocobozzz <me@florianbigard.com>2018-04-24 15:13:19 +0200
commit0626e7af82e02f8a5bd1e74a7d4d8c916d073ceb (patch)
tree79b5befbc6a04c007e5919805f1514d065b30e11 /client/src
parentb4d1af3dd8cdab2d58927e671d62194ca383cd75 (diff)
downloadPeerTube-0626e7af82e02f8a5bd1e74a7d4d8c916d073ceb.tar.gz
PeerTube-0626e7af82e02f8a5bd1e74a7d4d8c916d073ceb.tar.zst
PeerTube-0626e7af82e02f8a5bd1e74a7d4d8c916d073ceb.zip
Add account view
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+account/account-about/account-about.component.html12
-rw-r--r--client/src/app/+account/account-about/account-about.component.scss8
-rw-r--r--client/src/app/+account/account-about/account-about.component.ts39
-rw-r--r--client/src/app/+account/account-routing.module.ts45
-rw-r--r--client/src/app/+account/account-videos/account-videos.component.scss3
-rw-r--r--client/src/app/+account/account-videos/account-videos.component.ts71
-rw-r--r--client/src/app/+account/account.component.html23
-rw-r--r--client/src/app/+account/account.component.scss46
-rw-r--r--client/src/app/+account/account.component.ts29
-rw-r--r--client/src/app/+account/account.module.ts26
-rw-r--r--client/src/app/+account/index.ts3
-rw-r--r--client/src/app/app-routing.module.ts4
-rw-r--r--client/src/app/my-account/my-account-settings/my-account-settings.component.scss6
-rw-r--r--client/src/app/my-account/my-account.component.ts2
-rw-r--r--client/src/app/shared/account/account.model.ts15
-rw-r--r--client/src/app/shared/account/account.service.ts31
-rw-r--r--client/src/app/shared/shared.module.ts2
-rw-r--r--client/src/app/shared/video/abstract-video-list.html4
-rw-r--r--client/src/app/shared/video/abstract-video-list.ts1
-rw-r--r--client/src/app/shared/video/video.service.ts18
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.html4
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts7
-rw-r--r--client/src/sass/include/_mixins.scss7
23 files changed, 389 insertions, 17 deletions
diff --git a/client/src/app/+account/account-about/account-about.component.html b/client/src/app/+account/account-about/account-about.component.html
new file mode 100644
index 000000000..003a8045e
--- /dev/null
+++ b/client/src/app/+account/account-about/account-about.component.html
@@ -0,0 +1,12 @@
1<div *ngIf="account" class="row">
2 <div class="description col-md-6 col-sm-12">
3 <div class="small-title">Description</div>
4 <div class="content">{{ getAccountDescription() }}</div>
5 </div>
6
7 <div class="stats col-md-6 col-sm-12">
8 <div class="small-title">Stats</div>
9
10 <div class="content">Joined {{ account.createdAt | date }}</div>
11 </div>
12</div> \ No newline at end of file
diff --git a/client/src/app/+account/account-about/account-about.component.scss b/client/src/app/+account/account-about/account-about.component.scss
new file mode 100644
index 000000000..b1be7d4ed
--- /dev/null
+++ b/client/src/app/+account/account-about/account-about.component.scss
@@ -0,0 +1,8 @@
1@import '_variables';
2@import '_mixins';
3
4.small-title {
5 @include in-content-small-title;
6
7 margin-bottom: 20px;
8}
diff --git a/client/src/app/+account/account-about/account-about.component.ts b/client/src/app/+account/account-about/account-about.component.ts
new file mode 100644
index 000000000..0772b844e
--- /dev/null
+++ b/client/src/app/+account/account-about/account-about.component.ts
@@ -0,0 +1,39 @@
1import { Component, OnDestroy, OnInit } from '@angular/core'
2import { ActivatedRoute, Router } from '@angular/router'
3import { Location } from '@angular/common'
4import { getParameterByName, immutableAssign } from '@app/shared/misc/utils'
5import { NotificationsService } from 'angular2-notifications'
6import 'rxjs/add/observable/from'
7import 'rxjs/add/operator/concatAll'
8import { AuthService } from '../../core/auth'
9import { ConfirmService } from '../../core/confirm'
10import { AbstractVideoList } from '../../shared/video/abstract-video-list'
11import { VideoService } from '../../shared/video/video.service'
12import { Account } from '@app/shared/account/account.model'
13import { AccountService } from '@app/shared/account/account.service'
14
15@Component({
16 selector: 'my-account-about',
17 templateUrl: './account-about.component.html',
18 styleUrls: [ './account-about.component.scss' ]
19})
20export class AccountAboutComponent implements OnInit {
21 private account: Account
22
23 constructor (
24 protected route: ActivatedRoute,
25 private accountService: AccountService
26 ) { }
27
28 ngOnInit () {
29 // Parent get the account for us
30 this.accountService.accountLoaded
31 .subscribe(account => this.account = account)
32 }
33
34 getAccountDescription () {
35 if (this.account.description) return this.account.description
36
37 return 'No description'
38 }
39}
diff --git a/client/src/app/+account/account-routing.module.ts b/client/src/app/+account/account-routing.module.ts
new file mode 100644
index 000000000..534102121
--- /dev/null
+++ b/client/src/app/+account/account-routing.module.ts
@@ -0,0 +1,45 @@
1import { NgModule } from '@angular/core'
2import { RouterModule, Routes } from '@angular/router'
3import { MetaGuard } from '@ngx-meta/core'
4import { AccountComponent } from './account.component'
5import { AccountVideosComponent } from './account-videos/account-videos.component'
6import { AccountAboutComponent } from '@app/+account/account-about/account-about.component'
7
8const accountRoutes: Routes = [
9 {
10 path: ':accountId',
11 component: AccountComponent,
12 canActivateChild: [ MetaGuard ],
13 children: [
14 {
15 path: '',
16 redirectTo: 'videos',
17 pathMatch: 'full'
18 },
19 {
20 path: 'videos',
21 component: AccountVideosComponent,
22 data: {
23 meta: {
24 title: 'Account videos'
25 }
26 }
27 },
28 {
29 path: 'about',
30 component: AccountAboutComponent,
31 data: {
32 meta: {
33 title: 'About account'
34 }
35 }
36 }
37 ]
38 }
39]
40
41@NgModule({
42 imports: [ RouterModule.forChild(accountRoutes) ],
43 exports: [ RouterModule ]
44})
45export class AccountRoutingModule {}
diff --git a/client/src/app/+account/account-videos/account-videos.component.scss b/client/src/app/+account/account-videos/account-videos.component.scss
new file mode 100644
index 000000000..2ba85c031
--- /dev/null
+++ b/client/src/app/+account/account-videos/account-videos.component.scss
@@ -0,0 +1,3 @@
1.title-page-single {
2 margin-top: 0;
3} \ No newline at end of file
diff --git a/client/src/app/+account/account-videos/account-videos.component.ts b/client/src/app/+account/account-videos/account-videos.component.ts
new file mode 100644
index 000000000..6c0f0bb52
--- /dev/null
+++ b/client/src/app/+account/account-videos/account-videos.component.ts
@@ -0,0 +1,71 @@
1import { Component, OnDestroy, OnInit } from '@angular/core'
2import { ActivatedRoute, Router } from '@angular/router'
3import { Location } from '@angular/common'
4import { immutableAssign } from '@app/shared/misc/utils'
5import { NotificationsService } from 'angular2-notifications'
6import 'rxjs/add/observable/from'
7import 'rxjs/add/operator/concatAll'
8import { AuthService } from '../../core/auth'
9import { ConfirmService } from '../../core/confirm'
10import { AbstractVideoList } from '../../shared/video/abstract-video-list'
11import { VideoService } from '../../shared/video/video.service'
12import { Account } from '@app/shared/account/account.model'
13import { AccountService } from '@app/shared/account/account.service'
14
15@Component({
16 selector: 'my-account-videos',
17 templateUrl: '../../shared/video/abstract-video-list.html',
18 styleUrls: [
19 '../../shared/video/abstract-video-list.scss',
20 './account-videos.component.scss'
21 ]
22})
23export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
24 titlePage = 'Published videos'
25 marginContent = false // Disable margin
26 currentRoute = '/account/videos'
27 loadOnInit = false
28
29 private account: Account
30
31 constructor (
32 protected router: Router,
33 protected route: ActivatedRoute,
34 protected authService: AuthService,
35 protected notificationsService: NotificationsService,
36 protected confirmService: ConfirmService,
37 protected location: Location,
38 private accountService: AccountService,
39 private videoService: VideoService
40 ) {
41 super()
42 }
43
44 ngOnInit () {
45 super.ngOnInit()
46
47 // Parent get the account for us
48 this.accountService.accountLoaded
49 .subscribe(account => {
50 this.account = account
51 this.currentRoute = '/account/' + this.account.id + '/videos'
52
53 this.loadMoreVideos(this.pagination.currentPage)
54 this.generateSyndicationList()
55 })
56 }
57
58 ngOnDestroy () {
59 super.ngOnDestroy()
60 }
61
62 getVideosObservable (page: number) {
63 const newPagination = immutableAssign(this.pagination, { currentPage: page })
64
65 return this.videoService.getAccountVideos(this.account, newPagination, this.sort)
66 }
67
68 generateSyndicationList () {
69 this.syndicationItems = this.videoService.getAccountFeedUrls(this.account.id)
70 }
71}
diff --git a/client/src/app/+account/account.component.html b/client/src/app/+account/account.component.html
new file mode 100644
index 000000000..f875b37a4
--- /dev/null
+++ b/client/src/app/+account/account.component.html
@@ -0,0 +1,23 @@
1<div *ngIf="account" class="row">
2 <div class="sub-menu">
3
4 <div class="account">
5 <img [src]="getAvatarUrl()" alt="Avatar" />
6
7 <div class="account-info">
8 <div class="account-display-name">{{ account.displayName }}</div>
9 <div class="account-followers">{{ account.followersCount }} subscribers</div>
10 </div>
11 </div>
12
13 <div class="links">
14 <a routerLink="videos" routerLinkActive="active" class="title-page">Videos</a>
15
16 <a routerLink="about" routerLinkActive="active" class="title-page">About</a>
17 </div>
18 </div>
19
20 <div class="margin-content">
21 <router-outlet></router-outlet>
22 </div>
23</div>
diff --git a/client/src/app/+account/account.component.scss b/client/src/app/+account/account.component.scss
new file mode 100644
index 000000000..c7b8f038f
--- /dev/null
+++ b/client/src/app/+account/account.component.scss
@@ -0,0 +1,46 @@
1@import '_variables';
2@import '_mixins';
3
4.sub-menu {
5 height: 160px;
6 display: flex;
7 flex-direction: column;
8 align-items: start;
9
10 .account {
11 display: flex;
12 margin-top: 20px;
13 margin-bottom: 20px;
14
15 img {
16 @include avatar(80px);
17
18 margin-right: 20px;
19 }
20
21 .account-info {
22 display: flex;
23 flex-direction: column;
24 justify-content: center;
25
26 .account-display-name {
27 font-size: 23px;
28 font-weight: $font-bold;
29 }
30
31 .account-followers {
32 font-size: 15px;
33 }
34 }
35 }
36
37 .links {
38 margin-top: 0;
39 margin-bottom: 10px;
40
41 a {
42 margin-top: 0;
43 margin-bottom: 0;
44 }
45 }
46} \ No newline at end of file
diff --git a/client/src/app/+account/account.component.ts b/client/src/app/+account/account.component.ts
new file mode 100644
index 000000000..1c3e528a7
--- /dev/null
+++ b/client/src/app/+account/account.component.ts
@@ -0,0 +1,29 @@
1import { Component, OnInit } from '@angular/core'
2import { ActivatedRoute } from '@angular/router'
3import { AccountService } from '@app/shared/account/account.service'
4import { Account } from '@app/shared/account/account.model'
5
6@Component({
7 selector: 'my-account',
8 templateUrl: './account.component.html',
9 styleUrls: [ './account.component.scss' ]
10})
11export class AccountComponent implements OnInit {
12 private account: Account
13
14 constructor (
15 private route: ActivatedRoute,
16 private accountService: AccountService
17 ) {}
18
19 ngOnInit () {
20 const accountId = parseInt(this.route.snapshot.params['accountId'], 10)
21
22 this.accountService.getAccount(accountId)
23 .subscribe(account => this.account = account)
24 }
25
26 getAvatarUrl () {
27 return Account.GET_ACCOUNT_AVATAR_URL(this.account)
28 }
29}
diff --git a/client/src/app/+account/account.module.ts b/client/src/app/+account/account.module.ts
new file mode 100644
index 000000000..2fe67f3c5
--- /dev/null
+++ b/client/src/app/+account/account.module.ts
@@ -0,0 +1,26 @@
1import { NgModule } from '@angular/core'
2import { SharedModule } from '../shared'
3import { AccountRoutingModule } from './account-routing.module'
4import { AccountComponent } from './account.component'
5import { AccountVideosComponent } from './account-videos/account-videos.component'
6import { AccountAboutComponent } from './account-about/account-about.component'
7
8@NgModule({
9 imports: [
10 AccountRoutingModule,
11 SharedModule
12 ],
13
14 declarations: [
15 AccountComponent,
16 AccountVideosComponent,
17 AccountAboutComponent
18 ],
19
20 exports: [
21 AccountComponent
22 ],
23
24 providers: []
25})
26export class AccountModule { }
diff --git a/client/src/app/+account/index.ts b/client/src/app/+account/index.ts
new file mode 100644
index 000000000..dc56ffdbd
--- /dev/null
+++ b/client/src/app/+account/index.ts
@@ -0,0 +1,3 @@
1export * from './account-routing.module'
2export * from './account.component'
3export * from './account.module'
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 2ee3cf974..1d55b4cea 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -7,6 +7,10 @@ const routes: Routes = [
7 { 7 {
8 path: 'admin', 8 path: 'admin',
9 loadChildren: './+admin/admin.module#AdminModule' 9 loadChildren: './+admin/admin.module#AdminModule'
10 },
11 {
12 path: 'account',
13 loadChildren: './+account/account.module#AccountModule'
10 } 14 }
11] 15]
12 16
diff --git a/client/src/app/my-account/my-account-settings/my-account-settings.component.scss b/client/src/app/my-account/my-account-settings/my-account-settings.component.scss
index 1cc00ca49..85079d620 100644
--- a/client/src/app/my-account/my-account-settings/my-account-settings.component.scss
+++ b/client/src/app/my-account/my-account-settings/my-account-settings.component.scss
@@ -47,10 +47,8 @@
47} 47}
48 48
49.account-title { 49.account-title {
50 text-transform: uppercase; 50 @include in-content-small-title;
51 color: $orange-color; 51
52 font-weight: $font-bold;
53 font-size: 13px;
54 margin-top: 55px; 52 margin-top: 55px;
55 margin-bottom: 30px; 53 margin-bottom: 30px;
56} 54}
diff --git a/client/src/app/my-account/my-account.component.ts b/client/src/app/my-account/my-account.component.ts
index 0955e2b7b..7bb461d3c 100644
--- a/client/src/app/my-account/my-account.component.ts
+++ b/client/src/app/my-account/my-account.component.ts
@@ -1,7 +1,7 @@
1import { Component } from '@angular/core' 1import { Component } from '@angular/core'
2 2
3@Component({ 3@Component({
4 selector: 'my-account', 4 selector: 'my-my-account',
5 templateUrl: './my-account.component.html' 5 templateUrl: './my-account.component.html'
6}) 6})
7export class MyAccountComponent {} 7export class MyAccountComponent {}
diff --git a/client/src/app/shared/account/account.model.ts b/client/src/app/shared/account/account.model.ts
index 0bdc76478..3d5176bdd 100644
--- a/client/src/app/shared/account/account.model.ts
+++ b/client/src/app/shared/account/account.model.ts
@@ -16,6 +16,21 @@ export class Account implements ServerAccount {
16 updatedAt: Date 16 updatedAt: Date
17 avatar: Avatar 17 avatar: Avatar
18 18
19 constructor (hash: ServerAccount) {
20 this.id = hash.id
21 this.uuid = hash.uuid
22 this.url = hash.url
23 this.name = hash.name
24 this.displayName = hash.displayName
25 this.description = hash.description
26 this.host = hash.host
27 this.followingCount = hash.followingCount
28 this.followersCount = hash.followersCount
29 this.createdAt = new Date(hash.createdAt.toString())
30 this.updatedAt = new Date(hash.updatedAt.toString())
31 this.avatar = hash.avatar
32 }
33
19 static GET_ACCOUNT_AVATAR_URL (account: Account) { 34 static GET_ACCOUNT_AVATAR_URL (account: Account) {
20 const absoluteAPIUrl = getAbsoluteAPIUrl() 35 const absoluteAPIUrl = getAbsoluteAPIUrl()
21 36
diff --git a/client/src/app/shared/account/account.service.ts b/client/src/app/shared/account/account.service.ts
new file mode 100644
index 000000000..8c66ae04a
--- /dev/null
+++ b/client/src/app/shared/account/account.service.ts
@@ -0,0 +1,31 @@
1import { Injectable } from '@angular/core'
2import 'rxjs/add/operator/catch'
3import 'rxjs/add/operator/map'
4import { environment } from '../../../environments/environment'
5import { Observable } from 'rxjs/Observable'
6import { Account } from '@app/shared/account/account.model'
7import { RestExtractor } from '@app/shared/rest/rest-extractor.service'
8import { RestService } from '@app/shared/rest/rest.service'
9import { HttpClient } from '@angular/common/http'
10import { Account as ServerAccount } from '../../../../../shared/models/actors/account.model'
11import { ReplaySubject } from 'rxjs/ReplaySubject'
12
13@Injectable()
14export class AccountService {
15 static BASE_ACCOUNT_URL = environment.apiUrl + '/api/v1/accounts/'
16
17 accountLoaded = new ReplaySubject<Account>(1)
18
19 constructor (
20 private authHttp: HttpClient,
21 private restExtractor: RestExtractor,
22 private restService: RestService
23 ) {}
24
25 getAccount (id: number): Observable<Account> {
26 return this.authHttp.get<ServerAccount>(AccountService.BASE_ACCOUNT_URL + id)
27 .map(accountHash => new Account(accountHash))
28 .do(account => this.accountLoaded.next(account))
29 .catch((res) => this.restExtractor.handleError(res))
30 }
31}
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 74730e2aa..2178eebc8 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -31,6 +31,7 @@ import { VideoMiniatureComponent } from './video/video-miniature.component'
31import { VideoFeedComponent } from './video/video-feed.component' 31import { VideoFeedComponent } from './video/video-feed.component'
32import { VideoThumbnailComponent } from './video/video-thumbnail.component' 32import { VideoThumbnailComponent } from './video/video-thumbnail.component'
33import { VideoService } from './video/video.service' 33import { VideoService } from './video/video.service'
34import { AccountService } from '@app/shared/account/account.service'
34 35
35@NgModule({ 36@NgModule({
36 imports: [ 37 imports: [
@@ -104,6 +105,7 @@ import { VideoService } from './video/video.service'
104 VideoBlacklistService, 105 VideoBlacklistService,
105 UserService, 106 UserService,
106 VideoService, 107 VideoService,
108 AccountService,
107 MarkdownService 109 MarkdownService
108 ] 110 ]
109}) 111})
diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html
index cb04e07b4..690529dcf 100644
--- a/client/src/app/shared/video/abstract-video-list.html
+++ b/client/src/app/shared/video/abstract-video-list.html
@@ -1,5 +1,5 @@
1<div class="margin-content"> 1<div [ngClass]="{ 'margin-content': marginContent }">
2 <div class="title-page title-page-single"> 2 <div *ngIf="titlePage" class="title-page title-page-single">
3 {{ titlePage }} 3 {{ titlePage }}
4 </div> 4 </div>
5 <my-video-feed [syndicationItems]="syndicationItems"></my-video-feed> 5 <my-video-feed [syndicationItems]="syndicationItems"></my-video-feed>
diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts
index 728c864e9..642a85f65 100644
--- a/client/src/app/shared/video/abstract-video-list.ts
+++ b/client/src/app/shared/video/abstract-video-list.ts
@@ -29,6 +29,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy {
29 syndicationItems = [] 29 syndicationItems = []
30 30
31 loadOnInit = true 31 loadOnInit = true
32 marginContent = true
32 pageHeight: number 33 pageHeight: number
33 videoWidth: number 34 videoWidth: number
34 videoHeight: number 35 videoHeight: number
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts
index ef8babd55..f82aa7389 100644
--- a/client/src/app/shared/video/video.service.ts
+++ b/client/src/app/shared/video/video.service.ts
@@ -21,6 +21,8 @@ import { VideoDetails } from './video-details.model'
21import { VideoEdit } from './video-edit.model' 21import { VideoEdit } from './video-edit.model'
22import { Video } from './video.model' 22import { Video } from './video.model'
23import { objectToFormData } from '@app/shared/misc/utils' 23import { objectToFormData } from '@app/shared/misc/utils'
24import { Account } from '@app/shared/account/account.model'
25import { AccountService } from '@app/shared/account/account.service'
24 26
25@Injectable() 27@Injectable()
26export class VideoService { 28export class VideoService {
@@ -97,6 +99,22 @@ export class VideoService {
97 .catch((res) => this.restExtractor.handleError(res)) 99 .catch((res) => this.restExtractor.handleError(res))
98 } 100 }
99 101
102 getAccountVideos (
103 account: Account,
104 videoPagination: ComponentPagination,
105 sort: VideoSortField
106 ): Observable<{ videos: Video[], totalVideos: number}> {
107 const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
108
109 let params = new HttpParams()
110 params = this.restService.addRestGetParams(params, pagination, sort)
111
112 return this.authHttp
113 .get(AccountService.BASE_ACCOUNT_URL + account.id + '/videos', { params })
114 .map(this.extractVideos)
115 .catch((res) => this.restExtractor.handleError(res))
116 }
117
100 getVideos ( 118 getVideos (
101 videoPagination: ComponentPagination, 119 videoPagination: ComponentPagination,
102 sort: VideoSortField, 120 sort: VideoSortField,
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 91e590094..abda5043e 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -22,12 +22,10 @@
22 </div> 22 </div>
23 23
24 <div class="video-info-by"> 24 <div class="video-info-by">
25 <a [routerLink]="[ '/videos', 'search' ]" [queryParams]="{ search: video.account.name }" title="Search videos of this account"> 25 <a [routerLink]="[ '/account', video.account.id ]" title="Go the account page">
26 By {{ video.by }} 26 By {{ video.by }}
27 <img [src]="getAvatarPath()" alt="Account avatar" /> 27 <img [src]="getAvatarPath()" alt="Account avatar" />
28 </a> 28 </a>
29
30 <my-video-feed [syndicationItems]="syndicationItems"></my-video-feed>
31 </div> 29 </div>
32 </div> 30 </div>
33 31
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 6f6f02378..4b0c49583 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -39,8 +39,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
39 39
40 otherVideosDisplayed: Video[] = [] 40 otherVideosDisplayed: Video[] = []
41 41
42 syndicationItems = {}
43
44 player: videojs.Player 42 player: videojs.Player
45 playerElement: HTMLVideoElement 43 playerElement: HTMLVideoElement
46 userRating: UserVideoRateType = null 44 userRating: UserVideoRateType = null
@@ -110,7 +108,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
110 const startTime = this.route.snapshot.queryParams.start 108 const startTime = this.route.snapshot.queryParams.start
111 this.onVideoFetched(video, startTime) 109 this.onVideoFetched(video, startTime)
112 .catch(err => this.handleError(err)) 110 .catch(err => this.handleError(err))
113 this.generateSyndicationList()
114 }, 111 },
115 112
116 error => { 113 error => {
@@ -247,10 +244,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
247 return this.video.tags.join(', ') 244 return this.video.tags.join(', ')
248 } 245 }
249 246
250 generateSyndicationList () {
251 this.syndicationItems = this.videoService.getAccountFeedUrls(this.video.account.id)
252 }
253
254 isVideoRemovable () { 247 isVideoRemovable () {
255 return this.video.isRemovableBy(this.authService.getUser()) 248 return this.video.isRemovableBy(this.authService.getUser())
256 } 249 }
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 7e7a38bbd..cbf9b566a 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -314,3 +314,10 @@
314 left: 0.25em; 314 left: 0.25em;
315 transform: rotate(-135deg); 315 transform: rotate(-135deg);
316} 316}
317
318@mixin in-content-small-title {
319 text-transform: uppercase;
320 color: $orange-color;
321 font-weight: $font-bold;
322 font-size: 13px;
323} \ No newline at end of file