Add account view

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 @@
+<div *ngIf="account" class="row">
+  <div class="description col-md-6 col-sm-12">
+    <div class="small-title">Description</div>
+    <div class="content">{{ getAccountDescription() }}</div>
+  </div>
+
+  <div class="stats col-md-6 col-sm-12">
+    <div class="small-title">Stats</div>
+
+    <div class="content">Joined {{ account.createdAt | date }}</div>
+  </div>
+</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 @@
+@import '_variables';
+@import '_mixins';
+
+.small-title {
+  @include in-content-small-title;
+
+  margin-bottom: 20px;
+}
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 @@
+import { Component, OnDestroy, OnInit } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
+import { Location } from '@angular/common'
+import { getParameterByName, immutableAssign } from '@app/shared/misc/utils'
+import { NotificationsService } from 'angular2-notifications'
+import 'rxjs/add/observable/from'
+import 'rxjs/add/operator/concatAll'
+import { AuthService } from '../../core/auth'
+import { ConfirmService } from '../../core/confirm'
+import { AbstractVideoList } from '../../shared/video/abstract-video-list'
+import { VideoService } from '../../shared/video/video.service'
+import { Account } from '@app/shared/account/account.model'
+import { AccountService } from '@app/shared/account/account.service'
+
+@Component({
+  selector: 'my-account-about',
+  templateUrl: './account-about.component.html',
+  styleUrls: [ './account-about.component.scss' ]
+})
+export class AccountAboutComponent implements OnInit {
+  private account: Account
+
+  constructor (
+    protected route: ActivatedRoute,
+    private accountService: AccountService
+  ) { }
+
+  ngOnInit () {
+    // Parent get the account for us
+    this.accountService.accountLoaded
+      .subscribe(account => this.account = account)
+  }
+
+  getAccountDescription () {
+    if (this.account.description) return this.account.description
+
+    return 'No description'
+  }
+}
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 @@
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
+import { MetaGuard } from '@ngx-meta/core'
+import { AccountComponent } from './account.component'
+import { AccountVideosComponent } from './account-videos/account-videos.component'
+import { AccountAboutComponent } from '@app/+account/account-about/account-about.component'
+
+const accountRoutes: Routes = [
+  {
+    path: ':accountId',
+    component: AccountComponent,
+    canActivateChild: [ MetaGuard ],
+    children: [
+      {
+        path: '',
+        redirectTo: 'videos',
+        pathMatch: 'full'
+      },
+      {
+        path: 'videos',
+        component: AccountVideosComponent,
+        data: {
+          meta: {
+            title: 'Account videos'
+          }
+        }
+      },
+      {
+        path: 'about',
+        component: AccountAboutComponent,
+        data: {
+          meta: {
+            title: 'About account'
+          }
+        }
+      }
+    ]
+  }
+]
+
+@NgModule({
+  imports: [ RouterModule.forChild(accountRoutes) ],
+  exports: [ RouterModule ]
+})
+export 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 @@
+.title-page-single {
+  margin-top: 0;
+}
\ 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 @@
+import { Component, OnDestroy, OnInit } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
+import { Location } from '@angular/common'
+import { immutableAssign } from '@app/shared/misc/utils'
+import { NotificationsService } from 'angular2-notifications'
+import 'rxjs/add/observable/from'
+import 'rxjs/add/operator/concatAll'
+import { AuthService } from '../../core/auth'
+import { ConfirmService } from '../../core/confirm'
+import { AbstractVideoList } from '../../shared/video/abstract-video-list'
+import { VideoService } from '../../shared/video/video.service'
+import { Account } from '@app/shared/account/account.model'
+import { AccountService } from '@app/shared/account/account.service'
+
+@Component({
+  selector: 'my-account-videos',
+  templateUrl: '../../shared/video/abstract-video-list.html',
+  styleUrls: [
+    '../../shared/video/abstract-video-list.scss',
+    './account-videos.component.scss'
+  ]
+})
+export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
+  titlePage = 'Published videos'
+  marginContent = false // Disable margin
+  currentRoute = '/account/videos'
+  loadOnInit = false
+
+  private account: Account
+
+  constructor (
+    protected router: Router,
+    protected route: ActivatedRoute,
+    protected authService: AuthService,
+    protected notificationsService: NotificationsService,
+    protected confirmService: ConfirmService,
+    protected location: Location,
+    private accountService: AccountService,
+    private videoService: VideoService
+  ) {
+    super()
+  }
+
+  ngOnInit () {
+    super.ngOnInit()
+
+    // Parent get the account for us
+    this.accountService.accountLoaded
+      .subscribe(account => {
+        this.account = account
+        this.currentRoute = '/account/' + this.account.id + '/videos'
+
+        this.loadMoreVideos(this.pagination.currentPage)
+        this.generateSyndicationList()
+      })
+  }
+
+  ngOnDestroy () {
+    super.ngOnDestroy()
+  }
+
+  getVideosObservable (page: number) {
+    const newPagination = immutableAssign(this.pagination, { currentPage: page })
+
+    return this.videoService.getAccountVideos(this.account, newPagination, this.sort)
+  }
+
+  generateSyndicationList () {
+    this.syndicationItems = this.videoService.getAccountFeedUrls(this.account.id)
+  }
+}
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 @@
+<div *ngIf="account" class="row">
+  <div class="sub-menu">
+
+    <div class="account">
+      <img [src]="getAvatarUrl()" alt="Avatar" />
+
+      <div class="account-info">
+        <div class="account-display-name">{{ account.displayName }}</div>
+        <div class="account-followers">{{ account.followersCount }} subscribers</div>
+      </div>
+    </div>
+
+    <div class="links">
+      <a routerLink="videos" routerLinkActive="active" class="title-page">Videos</a>
+
+      <a routerLink="about" routerLinkActive="active" class="title-page">About</a>
+    </div>
+  </div>
+
+  <div class="margin-content">
+    <router-outlet></router-outlet>
+  </div>
+</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 @@
+@import '_variables';
+@import '_mixins';
+
+.sub-menu {
+  height: 160px;
+  display: flex;
+  flex-direction: column;
+  align-items: start;
+
+  .account {
+    display: flex;
+    margin-top: 20px;
+    margin-bottom: 20px;
+
+    img {
+      @include avatar(80px);
+
+      margin-right: 20px;
+    }
+
+    .account-info {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+
+      .account-display-name {
+        font-size: 23px;
+        font-weight: $font-bold;
+      }
+
+      .account-followers {
+        font-size: 15px;
+      }
+    }
+  }
+
+  .links {
+    margin-top: 0;
+    margin-bottom: 10px;
+
+    a {
+      margin-top: 0;
+      margin-bottom: 0;
+    }
+  }
+}
\ 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 @@
+import { Component, OnInit } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import { AccountService } from '@app/shared/account/account.service'
+import { Account } from '@app/shared/account/account.model'
+
+@Component({
+  selector: 'my-account',
+  templateUrl: './account.component.html',
+  styleUrls: [ './account.component.scss' ]
+})
+export class AccountComponent implements OnInit {
+  private account: Account
+
+  constructor (
+    private route: ActivatedRoute,
+    private accountService: AccountService
+  ) {}
+
+  ngOnInit () {
+    const accountId = parseInt(this.route.snapshot.params['accountId'], 10)
+
+    this.accountService.getAccount(accountId)
+        .subscribe(account => this.account = account)
+  }
+
+  getAvatarUrl () {
+    return Account.GET_ACCOUNT_AVATAR_URL(this.account)
+  }
+}
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 @@
+import { NgModule } from '@angular/core'
+import { SharedModule } from '../shared'
+import { AccountRoutingModule } from './account-routing.module'
+import { AccountComponent } from './account.component'
+import { AccountVideosComponent } from './account-videos/account-videos.component'
+import { AccountAboutComponent } from './account-about/account-about.component'
+
+@NgModule({
+  imports: [
+    AccountRoutingModule,
+    SharedModule
+  ],
+
+  declarations: [
+    AccountComponent,
+    AccountVideosComponent,
+    AccountAboutComponent
+  ],
+
+  exports: [
+    AccountComponent
+  ],
+
+  providers: []
+})
+export 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 @@
+export * from './account-routing.module'
+export * from './account.component'
+export * 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 = [
   {
     path: 'admin',
     loadChildren: './+admin/admin.module#AdminModule'
+  },
+  {
+    path: 'account',
+    loadChildren: './+account/account.module#AccountModule'
   }
 ]
 
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 @@
 }
 
 .account-title {
-  text-transform: uppercase;
-  color: $orange-color;
-  font-weight: $font-bold;
-  font-size: 13px;
+  @include in-content-small-title;
+
   margin-top: 55px;
   margin-bottom: 30px;
 }
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 @@
 import { Component } from '@angular/core'
 
 @Component({
-  selector: 'my-account',
+  selector: 'my-my-account',
   templateUrl: './my-account.component.html'
 })
 export 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 {
   updatedAt: Date
   avatar: Avatar
 
+  constructor (hash: ServerAccount) {
+    this.id = hash.id
+    this.uuid = hash.uuid
+    this.url = hash.url
+    this.name = hash.name
+    this.displayName = hash.displayName
+    this.description = hash.description
+    this.host = hash.host
+    this.followingCount = hash.followingCount
+    this.followersCount = hash.followersCount
+    this.createdAt = new Date(hash.createdAt.toString())
+    this.updatedAt = new Date(hash.updatedAt.toString())
+    this.avatar = hash.avatar
+  }
+
   static GET_ACCOUNT_AVATAR_URL (account: Account) {
     const absoluteAPIUrl = getAbsoluteAPIUrl()
 
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 @@
+import { Injectable } from '@angular/core'
+import 'rxjs/add/operator/catch'
+import 'rxjs/add/operator/map'
+import { environment } from '../../../environments/environment'
+import { Observable } from 'rxjs/Observable'
+import { Account } from '@app/shared/account/account.model'
+import { RestExtractor } from '@app/shared/rest/rest-extractor.service'
+import { RestService } from '@app/shared/rest/rest.service'
+import { HttpClient } from '@angular/common/http'
+import { Account as ServerAccount } from '../../../../../shared/models/actors/account.model'
+import { ReplaySubject } from 'rxjs/ReplaySubject'
+
+@Injectable()
+export class AccountService {
+  static BASE_ACCOUNT_URL = environment.apiUrl + '/api/v1/accounts/'
+
+  accountLoaded = new ReplaySubject<Account>(1)
+
+  constructor (
+    private authHttp: HttpClient,
+    private restExtractor: RestExtractor,
+    private restService: RestService
+  ) {}
+
+  getAccount (id: number): Observable<Account> {
+    return this.authHttp.get<ServerAccount>(AccountService.BASE_ACCOUNT_URL + id)
+               .map(accountHash => new Account(accountHash))
+               .do(account => this.accountLoaded.next(account))
+               .catch((res) => this.restExtractor.handleError(res))
+  }
+}
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'
 import { VideoFeedComponent } from './video/video-feed.component'
 import { VideoThumbnailComponent } from './video/video-thumbnail.component'
 import { VideoService } from './video/video.service'
+import { AccountService } from '@app/shared/account/account.service'
 
 @NgModule({
   imports: [
@@ -104,6 +105,7 @@ import { VideoService } from './video/video.service'
     VideoBlacklistService,
     UserService,
     VideoService,
+    AccountService,
     MarkdownService
   ]
 })
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 @@
-<div class="margin-content">
-  <div class="title-page title-page-single">
+<div [ngClass]="{ 'margin-content': marginContent }">
+  <div *ngIf="titlePage" class="title-page title-page-single">
     {{ titlePage }}
   </div>
   <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 {
   syndicationItems = []
 
   loadOnInit = true
+  marginContent = true
   pageHeight: number
   videoWidth: number
   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'
 import { VideoEdit } from './video-edit.model'
 import { Video } from './video.model'
 import { objectToFormData } from '@app/shared/misc/utils'
+import { Account } from '@app/shared/account/account.model'
+import { AccountService } from '@app/shared/account/account.service'
 
 @Injectable()
 export class VideoService {
@@ -97,6 +99,22 @@ export class VideoService {
       .catch((res) => this.restExtractor.handleError(res))
   }
 
+  getAccountVideos (
+    account: Account,
+    videoPagination: ComponentPagination,
+    sort: VideoSortField
+  ): Observable<{ videos: Video[], totalVideos: number}> {
+    const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
+
+    let params = new HttpParams()
+    params = this.restService.addRestGetParams(params, pagination, sort)
+
+    return this.authHttp
+               .get(AccountService.BASE_ACCOUNT_URL + account.id + '/videos', { params })
+               .map(this.extractVideos)
+               .catch((res) => this.restExtractor.handleError(res))
+  }
+
   getVideos (
     videoPagination: ComponentPagination,
     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 @@
           </div>
 
           <div class="video-info-by">
-            <a [routerLink]="[ '/videos', 'search' ]" [queryParams]="{ search: video.account.name }" title="Search videos of this account">
+            <a [routerLink]="[ '/account', video.account.id ]" title="Go the account page">
               By {{ video.by }}
               <img [src]="getAvatarPath()" alt="Account avatar" />
             </a>
-
-            <my-video-feed [syndicationItems]="syndicationItems"></my-video-feed>
           </div>
         </div>
 
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 {
 
   otherVideosDisplayed: Video[] = []
 
-  syndicationItems = {}
-
   player: videojs.Player
   playerElement: HTMLVideoElement
   userRating: UserVideoRateType = null
@@ -110,7 +108,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
           const startTime = this.route.snapshot.queryParams.start
           this.onVideoFetched(video, startTime)
             .catch(err => this.handleError(err))
-          this.generateSyndicationList()
         },
 
         error => {
@@ -247,10 +244,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     return this.video.tags.join(', ')
   }
 
-  generateSyndicationList () {
-    this.syndicationItems = this.videoService.getAccountFeedUrls(this.video.account.id)
-  }
-
   isVideoRemovable () {
     return this.video.isRemovableBy(this.authService.getUser())
   }
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 @@
   left: 0.25em;
   transform: rotate(-135deg);
 }
+
+@mixin in-content-small-title {
+  text-transform: uppercase;
+  color: $orange-color;
+  font-weight: $font-bold;
+  font-size: 13px;
+}
\ No newline at end of file