18 files changed, 258 insertions, 40 deletions

diff --git a/client/src/app/+video-channels/video-channels.component.html b/client/src/app/+video-channels/video-channels.component.html
index 1941a2eab..e5a32dc92 100644
--- a/client/src/app/+video-channels/video-channels.component.html
+++ b/client/src/app/+video-channels/video-channels.component.html
@@ -9,7 +9,7 @@
           <div class="actor-display-name">{{ videoChannel.displayName }}</div>
           <div class="actor-name">{{ videoChannel.nameWithHost }}</div>
 
-          <my-subscribe-button [videoChannel]="videoChannel"></my-subscribe-button>
+          <my-subscribe-button *ngIf="isUserLoggedIn()" [videoChannel]="videoChannel"></my-subscribe-button>
         </div>
         <div i18n class="actor-followers">{{ videoChannel.followersCount }} subscribers</div>
 
diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts
index 57c55d286..ee2c86915 100644
--- a/client/src/app/+video-channels/video-channels.component.ts
+++ b/client/src/app/+video-channels/video-channels.component.ts
@@ -5,6 +5,7 @@ import { VideoChannelService } from '@app/shared/video-channel/video-channel.ser
 import { RestExtractor } from '@app/shared'
 import { catchError, distinctUntilChanged, map, switchMap } from 'rxjs/operators'
 import { Subscription } from 'rxjs'
+import { AuthService } from '@app/core'
 
 @Component({
   templateUrl: './video-channels.component.html',
@@ -17,6 +18,7 @@ export class VideoChannelsComponent implements OnInit, OnDestroy {
 
   constructor (
     private route: ActivatedRoute,
+    private authService: AuthService,
     private videoChannelService: VideoChannelService,
     private restExtractor: RestExtractor
   ) { }
@@ -36,4 +38,8 @@ export class VideoChannelsComponent implements OnInit, OnDestroy {
   ngOnDestroy () {
     if (this.routeSub) this.routeSub.unsubscribe()
   }
+
+  isUserLoggedIn () {
+    return this.authService.isLoggedIn()
+  }
 }
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index bd03af9b3..8fe6797d6 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -47,6 +47,11 @@
           <ng-container i18n>Subscriptions</ng-container>
         </a>
 
+        <a routerLink="/videos/overview" routerLinkActive="active">
+          <span class="icon icon-videos-overview"></span>
+          <ng-container i18n>Overview</ng-container>
+        </a>
+
         <a routerLink="/videos/trending" routerLinkActive="active">
           <span class="icon icon-videos-trending"></span>
           <ng-container i18n>Trending</ng-container>
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 606fea961..8539c0e56 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -141,6 +141,11 @@ menu {
           background-image: url('../../assets/images/menu/subscriptions.svg');
         }
 
+        &.icon-videos-overview {
+          position: relative;
+          background-image: url('../../assets/images/menu/globe.svg');
+        }
+
         &.icon-videos-trending {
           position: relative;
           top: -2px;
diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html
index d2ed1f881..b35a46ec9 100644
--- a/client/src/app/search/search.component.html
+++ b/client/src/app/search/search.component.html
@@ -22,7 +22,7 @@
     </div>
   </div>
 
-  <div i18n *ngIf="pagination.totalItems === 0 && results.length === 0" class="no-result">
+  <div i18n *ngIf="pagination.totalItems === 0 && results.length === 0" class="no-results">
     No results found
   </div>
 
diff --git a/client/src/app/search/search.component.scss b/client/src/app/search/search.component.scss
index e5dfddcc5..f394099e2 100644
--- a/client/src/app/search/search.component.scss
+++ b/client/src/app/search/search.component.scss
@@ -1,15 +1,6 @@
 @import '_variables';
 @import '_mixins';
 
-.no-result {
-  height: 40vh;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 16px;
-  font-weight: $font-semibold;
-}
-
 .search-result {
   padding: 40px;
 
diff --git a/client/src/app/shared/overview/index.ts b/client/src/app/shared/overview/index.ts
new file mode 100644
index 000000000..2f7e41298
--- /dev/null
+++ b/client/src/app/shared/overview/index.ts
@@ -0,0 +1 @@
+export * from './overview.service'
diff --git a/client/src/app/shared/overview/overview.service.ts b/client/src/app/shared/overview/overview.service.ts
new file mode 100644
index 000000000..4a4714af6
--- /dev/null
+++ b/client/src/app/shared/overview/overview.service.ts
@@ -0,0 +1,76 @@
+import { catchError, map, switchMap, tap } from 'rxjs/operators'
+import { HttpClient } from '@angular/common/http'
+import { Injectable } from '@angular/core'
+import { forkJoin, Observable, of } from 'rxjs'
+import { VideosOverview as VideosOverviewServer, peertubeTranslate } from '../../../../../shared/models'
+import { environment } from '../../../environments/environment'
+import { RestExtractor } from '../rest/rest-extractor.service'
+import { RestService } from '../rest/rest.service'
+import { VideosOverview } from '@app/shared/overview/videos-overview.model'
+import { VideoService } from '@app/shared/video/video.service'
+import { ServerService } from '@app/core'
+import { immutableAssign } from '@app/shared/misc/utils'
+
+@Injectable()
+export class OverviewService {
+  static BASE_OVERVIEW_URL = environment.apiUrl + '/api/v1/overviews/'
+
+  constructor (
+    private authHttp: HttpClient,
+    private restExtractor: RestExtractor,
+    private restService: RestService,
+    private videosService: VideoService,
+    private serverService: ServerService
+  ) {}
+
+  getVideosOverview (): Observable<VideosOverview> {
+    return this.authHttp
+               .get<VideosOverviewServer>(OverviewService.BASE_OVERVIEW_URL + 'videos')
+               .pipe(
+                 switchMap(serverVideosOverview => this.updateVideosOverview(serverVideosOverview)),
+                 catchError(err => this.restExtractor.handleError(err))
+               )
+  }
+
+  private updateVideosOverview (serverVideosOverview: VideosOverviewServer): Observable<VideosOverview> {
+    const observables: Observable<any>[] = []
+    const videosOverviewResult: VideosOverview = {
+      tags: [],
+      categories: [],
+      channels: []
+    }
+
+    // Build videos objects
+    for (const key of Object.keys(serverVideosOverview)) {
+      for (const object of serverVideosOverview[ key ]) {
+        observables.push(
+          of(object.videos)
+            .pipe(
+              switchMap(videos => this.videosService.extractVideos({ total: 0, data: videos })),
+              map(result => result.videos),
+              tap(videos => {
+                videosOverviewResult[key].push(immutableAssign(object, { videos }))
+              })
+            )
+        )
+      }
+    }
+
+    return forkJoin(observables)
+      .pipe(
+        // Translate categories
+        switchMap(() => {
+          return this.serverService.localeObservable
+              .pipe(
+                tap(translations => {
+                  for (const c of videosOverviewResult.categories) {
+                    c.category.label = peertubeTranslate(c.category.label, translations)
+                  }
+                })
+              )
+        }),
+        map(() => videosOverviewResult)
+      )
+  }
+
+}
diff --git a/client/src/app/shared/overview/videos-overview.model.ts b/client/src/app/shared/overview/videos-overview.model.ts
new file mode 100644
index 000000000..cf02bdb3d
--- /dev/null
+++ b/client/src/app/shared/overview/videos-overview.model.ts
@@ -0,0 +1,19 @@
+import { VideoChannelAttribute, VideoConstant, VideosOverview as VideosOverviewServer } from '../../../../../shared/models'
+import { Video } from '@app/shared/video/video.model'
+
+export class VideosOverview implements VideosOverviewServer {
+  channels: {
+    channel: VideoChannelAttribute
+    videos: Video[]
+  }[]
+
+  categories: {
+    category: VideoConstant<number>
+    videos: Video[]
+  }[]
+
+  tags: {
+    tag: string
+    videos: Video[]
+  }[]
+}
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 2cbaaf4ae..b96a9aa41 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -52,6 +52,7 @@ import { ActionDropdownComponent } from '@app/shared/buttons/action-dropdown.com
 import { NgbDropdownModule, NgbModalModule, NgbPopoverModule, NgbTabsetModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
 import { SubscribeButtonComponent, UserSubscriptionService } from '@app/shared/user-subscription'
 import { InstanceFeaturesTableComponent } from '@app/shared/instance/instance-features-table.component'
+import { OverviewService } from '@app/shared/overview'
 
 @NgModule({
   imports: [
@@ -154,6 +155,7 @@ import { InstanceFeaturesTableComponent } from '@app/shared/instance/instance-fe
     VideoValidatorsService,
     VideoCaptionsValidatorsService,
     VideoBlacklistValidatorsService,
+    OverviewService,
 
     I18nPrimengCalendarService,
     ScreenService,
diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html
index d4b00c07c..0f48b9a64 100644
--- a/client/src/app/shared/video/abstract-video-list.html
+++ b/client/src/app/shared/video/abstract-video-list.html
@@ -4,7 +4,7 @@
   </div>
   <my-video-feed [syndicationItems]="syndicationItems"></my-video-feed>
 
-  <div i18n *ngIf="pagination.totalItems === 0">No results.</div>
+  <div class="no-results" i18n *ngIf="pagination.totalItems === 0">No results.</div>
   <div
     myInfiniteScroller
     [pageHeight]="pageHeight"
@@ -12,11 +12,7 @@
     class="videos" #videosElement
   >
     <div *ngFor="let videos of videoPages" class="videos-page">
-      <my-video-miniature
-        class="ng-animate"
-        *ngFor="let video of videos" [video]="video" [user]="user" [ownerDisplayType]="ownerDisplayType"
-      >
-      </my-video-miniature>
+      <my-video-miniature *ngFor="let video of videos" [video]="video" [user]="user" [ownerDisplayType]="ownerDisplayType"></my-video-miniature>
     </div>
   </div>
 </div>
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts
index 558db9543..7cc98c77a 100644
--- a/client/src/app/shared/video/video.service.ts
+++ b/client/src/app/shared/video/video.service.ts
@@ -51,14 +51,6 @@ export class VideoService {
                )
   }
 
-  viewVideo (uuid: string): Observable<boolean> {
-    return this.authHttp.post(this.getVideoViewUrl(uuid), {})
-               .pipe(
-                 map(this.restExtractor.extractDataBool),
-                 catchError(err => this.restExtractor.handleError(err))
-               )
-  }
-
   updateVideo (video: VideoEdit) {
     const language = video.language || null
     const licence = video.licence || null
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 333c9d11b..2c8305777 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -38,7 +38,7 @@
                 Published {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
               </div>
             </div>
-            
+
             <div class="d-flex justify-content-between align-items-sm-end">
               <div class="d-none d-sm-block">
                 <div class="video-info-name">{{ video.name }}</div>
@@ -46,7 +46,7 @@
                 <div i18n class="video-info-date-views">
                   Published {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
                 </div>
-              </div>  
+              </div>
 
               <div class="video-actions-rates">
                 <div class="video-actions fullWidth justify-content-end">
@@ -56,57 +56,57 @@
                   >
                     <span class="icon icon-like" i18n-title title="Like this video" ></span>
                   </div>
-      
+
                   <div
                     *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
                     class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'"
                   >
                     <span class="icon icon-dislike" i18n-title title="Dislike this video"></span>
                   </div>
-      
+
                   <div *ngIf="video.support" (click)="showSupportModal()" class="action-button action-button-support">
                     <span class="icon icon-support"></span>
                     <span class="icon-text" i18n>Support</span>
                   </div>
-      
+
                   <div (click)="showShareModal()" class="action-button action-button-share" role="button">
                     <span class="icon icon-share"></span>
                     <span class="icon-text" i18n>Share</span>
                   </div>
-      
+
                   <div class="action-more" ngbDropdown placement="top" role="button">
                     <div class="action-button" ngbDropdownToggle role="button">
                       <span class="icon icon-more"></span>
                     </div>
-      
+
                     <div ngbDropdownMenu>
                       <a class="dropdown-item" i18n-title title="Download the video" href="#" (click)="showDownloadModal($event)">
                         <span class="icon icon-download"></span> <ng-container i18n>Download</ng-container>
                       </a>
-      
+
                       <a *ngIf="isUserLoggedIn()" class="dropdown-item" i18n-title title="Report this video" href="#" (click)="showReportModal($event)">
                         <span class="icon icon-alert"></span> <ng-container i18n>Report</ng-container>
                       </a>
-      
+
                       <a *ngIf="isVideoUpdatable()" class="dropdown-item" i18n-title title="Update this video" href="#" [routerLink]="[ '/videos/update', video.uuid ]">
                         <span class="icon icon-edit"></span> <ng-container i18n>Update</ng-container>
                       </a>
-      
+
                       <a *ngIf="isVideoBlacklistable()" class="dropdown-item" i18n-title title="Blacklist this video" href="#" (click)="showBlacklistModal($event)">
                         <span class="icon icon-blacklist"></span> <ng-container i18n>Blacklist</ng-container>
                       </a>
-      
+
                       <a *ngIf="isVideoUnblacklistable()" class="dropdown-item" i18n-title title="Unblacklist this video" href="#" (click)="unblacklistVideo($event)">
                         <span class="icon icon-unblacklist"></span> <ng-container i18n>Unblacklist</ng-container>
                       </a>
-      
+
                       <a *ngIf="isVideoRemovable()" class="dropdown-item" i18n-title title="Delete this video" href="#" (click)="removeVideo($event)">
                         <span class="icon icon-delete"></span> <ng-container i18n>Delete</ng-container>
                       </a>
                     </div>
                   </div>
                 </div>
-      
+
                 <div
                   class="video-info-likes-dislikes-bar"
                   *ngIf="video.likes !== 0 || video.dislikes !== 0"
@@ -125,7 +125,7 @@
                 <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
               </a>
 
-              <my-subscribe-button [videoChannel]="video.channel" size="small"></my-subscribe-button>
+              <my-subscribe-button *ngIf="isUserLoggedIn()" [videoChannel]="video.channel" size="small"></my-subscribe-button>
             </div>
 
             <div class="video-info-by">
diff --git a/client/src/app/videos/video-list/video-overview.component.html b/client/src/app/videos/video-list/video-overview.component.html
new file mode 100644
index 000000000..9282dd59c
--- /dev/null
+++ b/client/src/app/videos/video-list/video-overview.component.html
@@ -0,0 +1,35 @@
+<div class="margin-content">
+
+  <div class="no-results" i18n *ngIf="notResults">No results.</div>
+
+  <div class="section" *ngFor="let object of overview.categories">
+    <div class="section-title" i18n>
+      <a routerLink="/search" [queryParams]="{ categoryOneOf: [ object.category.id ] }">Category {{ object.category.label }}</a>
+    </div>
+
+    <div>
+      <my-video-miniature *ngFor="let video of object.videos" [video]="video" [user]="user"></my-video-miniature>
+    </div>
+  </div>
+
+  <div class="section" *ngFor="let object of overview.tags">
+    <div class="section-title" i18n>
+      <a routerLink="/search" [queryParams]="{ categoryOneOf: [ object.category.id ] }">Tag {{ object.tag }}</a>
+    </div>
+
+    <div>
+      <my-video-miniature *ngFor="let video of object.videos" [video]="video" [user]="user"></my-video-miniature>
+    </div>
+  </div>
+
+  <div class="section" *ngFor="let object of overview.channels">
+    <div class="section-title" i18n>
+      <a [routerLink]="[ '/video-channels', buildVideoChannelBy(object) ]">Channel {{ object.channel.displayName }}</a>
+    </div>
+
+    <div>
+      <my-video-miniature *ngFor="let video of object.videos" [video]="video" [user]="user"></my-video-miniature>
+    </div>
+  </div>
+
+</div>
diff --git a/client/src/app/videos/video-list/video-overview.component.scss b/client/src/app/videos/video-list/video-overview.component.scss
new file mode 100644
index 000000000..8d66cf80a
--- /dev/null
+++ b/client/src/app/videos/video-list/video-overview.component.scss
@@ -0,0 +1,22 @@
+@import '_variables';
+@import '_mixins';
+
+.section {
+  padding-top: 10px;
+
+  &:first-child {
+    padding-top: 30px;
+  }
+}
+
+.section-title {
+  font-size: 17px;
+  font-weight: $font-semibold;
+  margin-bottom: 20px;
+
+  a {
+    @include disable-default-a-behaviour;
+
+    color: #000;
+  }
+}
\ No newline at end of file
diff --git a/client/src/app/videos/video-list/video-overview.component.ts b/client/src/app/videos/video-list/video-overview.component.ts
new file mode 100644
index 000000000..c758e115c
--- /dev/null
+++ b/client/src/app/videos/video-list/video-overview.component.ts
@@ -0,0 +1,56 @@
+import { Component, OnInit } from '@angular/core'
+import { AuthService } from '@app/core'
+import { NotificationsService } from 'angular2-notifications'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { VideosOverview } from '@app/shared/overview/videos-overview.model'
+import { OverviewService } from '@app/shared/overview'
+import { Video } from '@app/shared/video/video.model'
+
+@Component({
+  selector: 'my-video-overview',
+  templateUrl: './video-overview.component.html',
+  styleUrls: [ './video-overview.component.scss' ]
+})
+export class VideoOverviewComponent implements OnInit {
+  overview: VideosOverview = {
+    categories: [],
+    channels: [],
+    tags: []
+  }
+  notResults = false
+
+  constructor (
+    private i18n: I18n,
+    private notificationsService: NotificationsService,
+    private authService: AuthService,
+    private overviewService: OverviewService
+  ) { }
+
+  get user () {
+    return this.authService.getUser()
+  }
+
+  ngOnInit () {
+    this.overviewService.getVideosOverview()
+        .subscribe(
+          overview => {
+            this.overview = overview
+
+            if (
+              this.overview.categories.length === 0 &&
+              this.overview.channels.length === 0 &&
+              this.overview.tags.length === 0
+            ) this.notResults = true
+          },
+
+          err => {
+            console.log(err)
+            this.notificationsService.error('Error', err.text)
+          }
+        )
+  }
+
+  buildVideoChannelBy (object: { videos: Video[] }) {
+    return object.videos[0].byVideoChannel
+  }
+}
diff --git a/client/src/app/videos/videos-routing.module.ts b/client/src/app/videos/videos-routing.module.ts
index 18ed52570..58988ffd1 100644
--- a/client/src/app/videos/videos-routing.module.ts
+++ b/client/src/app/videos/videos-routing.module.ts
@@ -6,6 +6,7 @@ import { VideoRecentlyAddedComponent } from './video-list/video-recently-added.c
 import { VideoTrendingComponent } from './video-list/video-trending.component'
 import { VideosComponent } from './videos.component'
 import { VideoUserSubscriptionsComponent } from '@app/videos/video-list/video-user-subscriptions.component'
+import { VideoOverviewComponent } from '@app/videos/video-list/video-overview.component'
 
 const videosRoutes: Routes = [
   {
@@ -14,6 +15,15 @@ const videosRoutes: Routes = [
     canActivateChild: [ MetaGuard ],
     children: [
       {
+        path: 'overview',
+        component: VideoOverviewComponent,
+        data: {
+          meta: {
+            title: 'Videos overview'
+          }
+        }
+      },
+      {
         path: 'trending',
         component: VideoTrendingComponent,
         data: {
diff --git a/client/src/app/videos/videos.module.ts b/client/src/app/videos/videos.module.ts
index 3c3877273..5cf1e944f 100644
--- a/client/src/app/videos/videos.module.ts
+++ b/client/src/app/videos/videos.module.ts
@@ -6,6 +6,7 @@ import { VideoTrendingComponent } from './video-list/video-trending.component'
 import { VideosRoutingModule } from './videos-routing.module'
 import { VideosComponent } from './videos.component'
 import { VideoUserSubscriptionsComponent } from '@app/videos/video-list/video-user-subscriptions.component'
+import { VideoOverviewComponent } from '@app/videos/video-list/video-overview.component'
 
 @NgModule({
   imports: [
@@ -19,7 +20,8 @@ import { VideoUserSubscriptionsComponent } from '@app/videos/video-list/video-us
     VideoTrendingComponent,
     VideoRecentlyAddedComponent,
     VideoLocalComponent,
-    VideoUserSubscriptionsComponent
+    VideoUserSubscriptionsComponent,
+    VideoOverviewComponent
   ],
 
   exports: [