aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+account
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-04-25 16:56:13 +0200
committerChocobozzz <me@florianbigard.com>2018-04-25 16:56:13 +0200
commit170726f523ff48f89da45473fc53ca54784f43dd (patch)
treef9f783ebdfc934c6831396c2bf33f658d6640583 /client/src/app/+account
parentcc918ac3f45e32f031cce7b6e0473e5c2c34b8ae (diff)
downloadPeerTube-170726f523ff48f89da45473fc53ca54784f43dd.tar.gz
PeerTube-170726f523ff48f89da45473fc53ca54784f43dd.tar.zst
PeerTube-170726f523ff48f89da45473fc53ca54784f43dd.zip
Implement video channel views
Diffstat (limited to 'client/src/app/+account')
-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.ts55
-rw-r--r--client/src/app/+account/account-video-channels/account-video-channels.component.html11
-rw-r--r--client/src/app/+account/account-video-channels/account-video-channels.component.scss30
-rw-r--r--client/src/app/+account/account-video-channels/account-video-channels.component.ts33
-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.html25
-rw-r--r--client/src/app/+account/account.component.scss46
-rw-r--r--client/src/app/+account/account.component.ts25
-rw-r--r--client/src/app/+account/account.module.ts28
-rw-r--r--client/src/app/+account/index.ts3
14 files changed, 0 insertions, 389 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
deleted file mode 100644
index 003a8045e..000000000
--- a/client/src/app/+account/account-about/account-about.component.html
+++ /dev/null
@@ -1,12 +0,0 @@
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
deleted file mode 100644
index b1be7d4ed..000000000
--- a/client/src/app/+account/account-about/account-about.component.scss
+++ /dev/null
@@ -1,8 +0,0 @@
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
deleted file mode 100644
index 8746875cb..000000000
--- a/client/src/app/+account/account-about/account-about.component.ts
+++ /dev/null
@@ -1,39 +0,0 @@
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 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
deleted file mode 100644
index f72d8373f..000000000
--- a/client/src/app/+account/account-routing.module.ts
+++ /dev/null
@@ -1,55 +0,0 @@
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 './account-about/account-about.component'
7import { AccountVideoChannelsComponent } from './account-video-channels/account-video-channels.component'
8
9const accountRoutes: Routes = [
10 {
11 path: ':accountId',
12 component: AccountComponent,
13 canActivateChild: [ MetaGuard ],
14 children: [
15 {
16 path: '',
17 redirectTo: 'videos',
18 pathMatch: 'full'
19 },
20 {
21 path: 'videos',
22 component: AccountVideosComponent,
23 data: {
24 meta: {
25 title: 'Account videos'
26 }
27 }
28 },
29 {
30 path: 'video-channels',
31 component: AccountVideoChannelsComponent,
32 data: {
33 meta: {
34 title: 'Account video channels'
35 }
36 }
37 },
38 {
39 path: 'about',
40 component: AccountAboutComponent,
41 data: {
42 meta: {
43 title: 'About account'
44 }
45 }
46 }
47 ]
48 }
49]
50
51@NgModule({
52 imports: [ RouterModule.forChild(accountRoutes) ],
53 exports: [ RouterModule ]
54})
55export class AccountRoutingModule {}
diff --git a/client/src/app/+account/account-video-channels/account-video-channels.component.html b/client/src/app/+account/account-video-channels/account-video-channels.component.html
deleted file mode 100644
index d20b40c60..000000000
--- a/client/src/app/+account/account-video-channels/account-video-channels.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
1<div *ngIf="account" class="row">
2 <a
3 *ngFor="let videoChannel of videoChannels" [routerLink]="[ '/video-channels', videoChannel.uuid ]"
4 class="video-channel" title="See this video channel"
5 >
6 <img [src]="videoChannel.avatarUrl" alt="Avatar" />
7
8 <div class="video-channel-display-name">{{ videoChannel.displayName }}</div>
9 <div class="video-channel-followers">{{ videoChannel.followersCount }} subscribers</div>
10 </a>
11</div> \ No newline at end of file
diff --git a/client/src/app/+account/account-video-channels/account-video-channels.component.scss b/client/src/app/+account/account-video-channels/account-video-channels.component.scss
deleted file mode 100644
index c9c7fa8eb..000000000
--- a/client/src/app/+account/account-video-channels/account-video-channels.component.scss
+++ /dev/null
@@ -1,30 +0,0 @@
1@import '_variables';
2@import '_mixins';
3
4.row {
5 text-align: center;
6}
7
8a.video-channel {
9 @include disable-default-a-behaviour;
10
11 display: inline-block;
12 text-align: center;
13 color: #000;
14 margin: 10px 30px;
15
16 img {
17 @include avatar(80px);
18
19 margin-bottom: 10px;
20 }
21
22 .video-channel-display-name {
23 font-size: 20px;
24 font-weight: $font-bold;
25 }
26
27 .video-channel-followers {
28 font-size: 15px;
29 }
30} \ No newline at end of file
diff --git a/client/src/app/+account/account-video-channels/account-video-channels.component.ts b/client/src/app/+account/account-video-channels/account-video-channels.component.ts
deleted file mode 100644
index 8915eb622..000000000
--- a/client/src/app/+account/account-video-channels/account-video-channels.component.ts
+++ /dev/null
@@ -1,33 +0,0 @@
1import { Component, OnInit } from '@angular/core'
2import { ActivatedRoute } from '@angular/router'
3import 'rxjs/add/observable/from'
4import 'rxjs/add/operator/concatAll'
5import { Account } from '@app/shared/account/account.model'
6import { AccountService } from '@app/shared/account/account.service'
7import { VideoChannel } from '../../../../../shared/models/videos'
8import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
9
10@Component({
11 selector: 'my-account-video-channels',
12 templateUrl: './account-video-channels.component.html',
13 styleUrls: [ './account-video-channels.component.scss' ]
14})
15export class AccountVideoChannelsComponent implements OnInit {
16 account: Account
17 videoChannels: VideoChannel[] = []
18
19 constructor (
20 protected route: ActivatedRoute,
21 private accountService: AccountService,
22 private videoChannelService: VideoChannelService
23 ) { }
24
25 ngOnInit () {
26 // Parent get the account for us
27 this.accountService.accountLoaded
28 .do(account => this.account = account)
29 .flatMap(account => this.videoChannelService.getVideoChannels(account.id))
30 .map(res => res.data)
31 .subscribe(videoChannels => this.videoChannels = videoChannels)
32 }
33}
diff --git a/client/src/app/+account/account-videos/account-videos.component.scss b/client/src/app/+account/account-videos/account-videos.component.scss
deleted file mode 100644
index 2ba85c031..000000000
--- a/client/src/app/+account/account-videos/account-videos.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
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
deleted file mode 100644
index 6c0f0bb52..000000000
--- a/client/src/app/+account/account-videos/account-videos.component.ts
+++ /dev/null
@@ -1,71 +0,0 @@
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
deleted file mode 100644
index d0e99edda..000000000
--- a/client/src/app/+account/account.component.html
+++ /dev/null
@@ -1,25 +0,0 @@
1<div *ngIf="account" class="row">
2 <div class="sub-menu">
3
4 <div class="account">
5 <img [src]="account.avatarUrl" 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="video-channels" routerLinkActive="active" class="title-page">Video channels</a>
17
18 <a routerLink="about" routerLinkActive="active" class="title-page">About</a>
19 </div>
20 </div>
21
22 <div class="margin-content">
23 <router-outlet></router-outlet>
24 </div>
25</div>
diff --git a/client/src/app/+account/account.component.scss b/client/src/app/+account/account.component.scss
deleted file mode 100644
index c7b8f038f..000000000
--- a/client/src/app/+account/account.component.scss
+++ /dev/null
@@ -1,46 +0,0 @@
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
deleted file mode 100644
index d936ce2fe..000000000
--- a/client/src/app/+account/account.component.ts
+++ /dev/null
@@ -1,25 +0,0 @@
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 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}
diff --git a/client/src/app/+account/account.module.ts b/client/src/app/+account/account.module.ts
deleted file mode 100644
index 82ef06e76..000000000
--- a/client/src/app/+account/account.module.ts
+++ /dev/null
@@ -1,28 +0,0 @@
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'
7import { AccountVideoChannelsComponent } from './account-video-channels/account-video-channels.component'
8
9@NgModule({
10 imports: [
11 AccountRoutingModule,
12 SharedModule
13 ],
14
15 declarations: [
16 AccountComponent,
17 AccountVideosComponent,
18 AccountVideoChannelsComponent,
19 AccountAboutComponent
20 ],
21
22 exports: [
23 AccountComponent
24 ],
25
26 providers: []
27})
28export class AccountModule { }
diff --git a/client/src/app/+account/index.ts b/client/src/app/+account/index.ts
deleted file mode 100644
index dc56ffdbd..000000000
--- a/client/src/app/+account/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
1export * from './account-routing.module'
2export * from './account.component'
3export * from './account.module'