Reorganize left menu and account menu

Add my-settings and my-library in left menu
Move administration below my-library
Split account menu: my-setting and my library

1 files changed, 10 insertions, 74 deletions

diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts
index d3bf8d143..d6e9d1c15 100644
--- a/client/src/app/+my-account/my-account.component.ts
+++ b/client/src/app/+my-account/my-account.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { AuthService, AuthUser, ScreenService, ServerService } from '@app/core'
-import { ServerConfig } from '@shared/models'
+import { AuthUser, ScreenService } from '@app/core'
 import { TopMenuDropdownParam } from '../shared/shared-main/misc/top-menu-dropdown.component'
 
 @Component({
@@ -12,11 +11,7 @@ export class MyAccountComponent implements OnInit {
   menuEntries: TopMenuDropdownParam[] = []
   user: AuthUser
 
-  private serverConfig: ServerConfig
-
   constructor (
-    private serverService: ServerService,
-    private authService: AuthService,
     private screenService: ScreenService
     ) { }
 
@@ -25,67 +20,12 @@ export class MyAccountComponent implements OnInit {
   }
 
   ngOnInit (): void {
-    this.serverConfig = this.serverService.getTmpConfig()
-    this.serverService.getConfig()
-        .subscribe(config => this.serverConfig = config)
-
-    this.user = this.authService.getUser()
-
-    this.authService.userInformationLoaded.subscribe(
-      () => this.buildMenu()
-    )
-  }
-
-  isVideoImportEnabled () {
-    const importConfig = this.serverConfig.import.videos
-
-    return importConfig.http.enabled || importConfig.torrent.enabled
+    this.buildMenu()
   }
 
   private buildMenu () {
-    const libraryEntries: TopMenuDropdownParam = {
-      label: $localize`My library`,
-      children: [
-        {
-          label: $localize`My channels`,
-          routerLink: '/my-account/video-channels',
-          iconName: 'channel'
-        },
-        {
-          label: $localize`My videos`,
-          routerLink: '/my-account/videos',
-          iconName: 'videos',
-          isDisplayed: () => this.user.canSeeVideosLink
-        },
-        {
-          label: $localize`My playlists`,
-          routerLink: '/my-account/video-playlists',
-          iconName: 'playlists'
-        },
-        {
-          label: $localize`My subscriptions`,
-          routerLink: '/my-account/subscriptions',
-          iconName: 'subscriptions'
-        },
-        {
-          label: $localize`My history`,
-          routerLink: '/my-account/history/videos',
-          iconName: 'history'
-        }
-      ]
-    }
-
-    if (this.isVideoImportEnabled()) {
-      libraryEntries.children.push({
-        label: 'My imports',
-        routerLink: '/my-account/video-imports',
-        iconName: 'cloud-download',
-        isDisplayed: () => this.user.canSeeVideosLink
-      })
-    }
-
-    const miscEntries: TopMenuDropdownParam = {
-      label: $localize`Misc`,
+    const moderationEntries: TopMenuDropdownParam = {
+      label: $localize`Moderation`,
       children: [
         {
           label: $localize`Muted accounts`,
@@ -98,29 +38,25 @@ export class MyAccountComponent implements OnInit {
           iconName: 'peertube-x'
         },
         {
-          label: $localize`My abuse reports`,
+          label: $localize`Abuse reports`,
           routerLink: '/my-account/abuses',
           iconName: 'flag'
-        },
-        {
-          label: $localize`Ownership changes`,
-          routerLink: '/my-account/ownership',
-          iconName: 'download'
         }
       ]
     }
 
     this.menuEntries = [
       {
-        label: $localize`My settings`,
+        label: $localize`Settings`,
         routerLink: '/my-account/settings'
       },
+
       {
-        label: $localize`My notifications`,
+        label: $localize`Notifications`,
         routerLink: '/my-account/notifications'
       },
-      libraryEntries,
-      miscEntries
+
+      moderationEntries
     ]
   }
 }