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 @@ -@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/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 @@ -export * from './account-routing.module' -export * from './account.component' -export * from './account.module' diff --git a/client/src/app/+account/account-about/account-about.component.html b/client/src/app/+accounts/account-about/account-about.component.html similarity index 100% rename from client/src/app/+account/account-about/account-about.component.html rename to client/src/app/+accounts/account-about/account-about.component.html diff --git a/client/src/app/+account/account-about/account-about.component.scss b/client/src/app/+accounts/account-about/account-about.component.scss similarity index 100% rename from client/src/app/+account/account-about/account-about.component.scss rename to client/src/app/+accounts/account-about/account-about.component.scss diff --git a/client/src/app/+account/account-about/account-about.component.ts b/client/src/app/+accounts/account-about/account-about.component.ts similarity index 100% rename from client/src/app/+account/account-about/account-about.component.ts rename to client/src/app/+accounts/account-about/account-about.component.ts diff --git a/client/src/app/+account/account-video-channels/account-video-channels.component.html b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html similarity index 100% rename from client/src/app/+account/account-video-channels/account-video-channels.component.html rename to client/src/app/+accounts/account-video-channels/account-video-channels.component.html diff --git a/client/src/app/+account/account-video-channels/account-video-channels.component.scss b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss similarity index 100% rename from client/src/app/+account/account-video-channels/account-video-channels.component.scss rename to client/src/app/+accounts/account-video-channels/account-video-channels.component.scss diff --git a/client/src/app/+account/account-video-channels/account-video-channels.component.ts b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts similarity index 92% rename from client/src/app/+account/account-video-channels/account-video-channels.component.ts rename to client/src/app/+accounts/account-video-channels/account-video-channels.component.ts index 8915eb622..4c5782f9d 100644 --- a/client/src/app/+account/account-video-channels/account-video-channels.component.ts +++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts @@ -26,7 +26,7 @@ export class AccountVideoChannelsComponent implements OnInit { // Parent get the account for us this.accountService.accountLoaded .do(account => this.account = account) - .flatMap(account => this.videoChannelService.getVideoChannels(account.id)) + .flatMap(account => this.videoChannelService.listAccountVideoChannels(account.id)) .map(res => res.data) .subscribe(videoChannels => this.videoChannels = videoChannels) } diff --git a/client/src/app/+account/account-videos/account-videos.component.scss b/client/src/app/+accounts/account-videos/account-videos.component.scss similarity index 100% rename from client/src/app/+account/account-videos/account-videos.component.scss rename to client/src/app/+accounts/account-videos/account-videos.component.scss diff --git a/client/src/app/+account/account-videos/account-videos.component.ts b/client/src/app/+accounts/account-videos/account-videos.component.ts similarity index 100% rename from client/src/app/+account/account-videos/account-videos.component.ts rename to client/src/app/+accounts/account-videos/account-videos.component.ts diff --git a/client/src/app/+account/account-routing.module.ts b/client/src/app/+accounts/accounts-routing.module.ts similarity index 84% rename from client/src/app/+account/account-routing.module.ts rename to client/src/app/+accounts/accounts-routing.module.ts index f72d8373f..ffe606b43 100644 --- a/client/src/app/+account/account-routing.module.ts +++ b/client/src/app/+accounts/accounts-routing.module.ts @@ -1,15 +1,15 @@ import { NgModule } from '@angular/core' import { RouterModule, Routes } from '@angular/router' import { MetaGuard } from '@ngx-meta/core' -import { AccountComponent } from './account.component' +import { AccountsComponent } from './accounts.component' import { AccountVideosComponent } from './account-videos/account-videos.component' import { AccountAboutComponent } from './account-about/account-about.component' import { AccountVideoChannelsComponent } from './account-video-channels/account-video-channels.component' -const accountRoutes: Routes = [ +const accountsRoutes: Routes = [ { path: ':accountId', - component: AccountComponent, + component: AccountsComponent, canActivateChild: [ MetaGuard ], children: [ { @@ -49,7 +49,7 @@ const accountRoutes: Routes = [ ] @NgModule({ - imports: [ RouterModule.forChild(accountRoutes) ], + imports: [ RouterModule.forChild(accountsRoutes) ], exports: [ RouterModule ] }) -export class AccountRoutingModule {} +export class AccountsRoutingModule {} diff --git a/client/src/app/+account/account.component.html b/client/src/app/+accounts/accounts.component.html similarity index 71% rename from client/src/app/+account/account.component.html rename to client/src/app/+accounts/accounts.component.html index d0e99edda..549676e5a 100644 --- a/client/src/app/+account/account.component.html +++ b/client/src/app/+accounts/accounts.component.html @@ -1,12 +1,12 @@