aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+accounts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-06-23 14:10:17 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-06-23 16:00:49 +0200
commit67ed6552b831df66713bac9e672738796128d33f (patch)
tree59c97d41e0b49d75a90aa3de987968ab9b1ff447 /client/src/app/+accounts
parent0c4bacbff53bc732f5a2677d62a6ead7752e2405 (diff)
downloadPeerTube-67ed6552b831df66713bac9e672738796128d33f.tar.gz
PeerTube-67ed6552b831df66713bac9e672738796128d33f.tar.zst
PeerTube-67ed6552b831df66713bac9e672738796128d33f.zip
Reorganize client shared modules
Diffstat (limited to 'client/src/app/+accounts')
-rw-r--r--client/src/app/+accounts/account-about/account-about.component.ts7
-rw-r--r--client/src/app/+accounts/account-video-channels/account-video-channels.component.ts13
-rw-r--r--client/src/app/+accounts/account-videos/account-videos.component.ts23
-rw-r--r--client/src/app/+accounts/accounts.component.ts16
-rw-r--r--client/src/app/+accounts/accounts.module.ts21
5 files changed, 35 insertions, 45 deletions
diff --git a/client/src/app/+accounts/account-about/account-about.component.ts b/client/src/app/+accounts/account-about/account-about.component.ts
index d1616490f..8c01e4007 100644
--- a/client/src/app/+accounts/account-about/account-about.component.ts
+++ b/client/src/app/+accounts/account-about/account-about.component.ts
@@ -1,9 +1,8 @@
1import { Subscription } from 'rxjs'
1import { Component, OnDestroy, OnInit } from '@angular/core' 2import { Component, OnDestroy, OnInit } from '@angular/core'
2import { Account } from '@app/shared/account/account.model' 3import { MarkdownService } from '@app/core'
3import { AccountService } from '@app/shared/account/account.service' 4import { Account, AccountService } from '@app/shared/shared-main'
4import { I18n } from '@ngx-translate/i18n-polyfill' 5import { I18n } from '@ngx-translate/i18n-polyfill'
5import { Subscription } from 'rxjs'
6import { MarkdownService } from '@app/shared/renderer'
7 6
8@Component({ 7@Component({
9 selector: 'my-account-about', 8 selector: 'my-account-about',
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
index eba1acfa1..205245675 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
@@ -1,16 +1,9 @@
1import { from, Subject, Subscription } from 'rxjs' 1import { from, Subject, Subscription } from 'rxjs'
2import { concatMap, map, switchMap, tap } from 'rxjs/operators' 2import { concatMap, map, switchMap, tap } from 'rxjs/operators'
3import { Component, OnDestroy, OnInit } from '@angular/core' 3import { Component, OnDestroy, OnInit } from '@angular/core'
4import { User, UserService } from '@app/shared' 4import { ComponentPagination, hasMoreItems, ScreenService, User, UserService } from '@app/core'
5import { Account } from '@app/shared/account/account.model' 5import { Account, AccountService, Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
6import { AccountService } from '@app/shared/account/account.service' 6import { VideoSortField } from '@shared/models'
7import { ScreenService } from '@app/shared/misc/screen.service'
8import { ComponentPagination, hasMoreItems } from '@app/shared/rest/component-pagination.model'
9import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
10import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
11import { VideoSortField } from '@app/shared/video/sort-field.type'
12import { Video } from '@app/shared/video/video.model'
13import { VideoService } from '@app/shared/video/video.service'
14 7
15@Component({ 8@Component({
16 selector: 'my-account-video-channels', 9 selector: 'my-account-video-channels',
diff --git a/client/src/app/+accounts/account-videos/account-videos.component.ts b/client/src/app/+accounts/account-videos/account-videos.component.ts
index 41b27b541..dd47589c1 100644
--- a/client/src/app/+accounts/account-videos/account-videos.component.ts
+++ b/client/src/app/+accounts/account-videos/account-videos.component.ts
@@ -1,25 +1,18 @@
1import { Subscription } from 'rxjs'
2import { first, tap } from 'rxjs/operators'
1import { Component, OnDestroy, OnInit } from '@angular/core' 3import { Component, OnDestroy, OnInit } from '@angular/core'
2import { ActivatedRoute, Router } from '@angular/router' 4import { ActivatedRoute, Router } from '@angular/router'
3import { immutableAssign } from '@app/shared/misc/utils' 5import { AuthService, ConfirmService, LocalStorageService, Notifier, ScreenService, ServerService, UserService } from '@app/core'
4import { AuthService } from '../../core/auth' 6import { immutableAssign } from '@app/helpers'
5import { ConfirmService } from '../../core/confirm' 7import { Account, AccountService, VideoService } from '@app/shared/shared-main'
6import { AbstractVideoList } from '../../shared/video/abstract-video-list' 8import { AbstractVideoList } from '@app/shared/shared-video-miniature'
7import { VideoService } from '../../shared/video/video.service'
8import { Account } from '@app/shared/account/account.model'
9import { AccountService } from '@app/shared/account/account.service'
10import { first, tap } from 'rxjs/operators'
11import { I18n } from '@ngx-translate/i18n-polyfill' 9import { I18n } from '@ngx-translate/i18n-polyfill'
12import { Subscription } from 'rxjs'
13import { ScreenService } from '@app/shared/misc/screen.service'
14import { Notifier, ServerService } from '@app/core'
15import { UserService } from '@app/shared'
16import { LocalStorageService } from '@app/shared/misc/storage.service'
17 10
18@Component({ 11@Component({
19 selector: 'my-account-videos', 12 selector: 'my-account-videos',
20 templateUrl: '../../shared/video/abstract-video-list.html', 13 templateUrl: '../../shared/shared-video-miniature/abstract-video-list.html',
21 styleUrls: [ 14 styleUrls: [
22 '../../shared/video/abstract-video-list.scss', 15 '../../shared/shared-video-miniature/abstract-video-list.scss',
23 './account-videos.component.scss' 16 './account-videos.component.scss'
24 ] 17 ]
25}) 18})
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index bf71179f3..01911cac2 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -1,17 +1,11 @@
1import { Subscription } from 'rxjs'
2import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'
1import { Component, OnDestroy, OnInit } from '@angular/core' 3import { Component, OnDestroy, OnInit } from '@angular/core'
2import { ActivatedRoute } from '@angular/router' 4import { ActivatedRoute } from '@angular/router'
3import { AccountService } from '@app/shared/account/account.service' 5import { AuthService, Notifier, RedirectService, RestExtractor, ScreenService, UserService } from '@app/core'
4import { Account } from '@app/shared/account/account.model' 6import { Account, AccountService, ListOverflowItem, VideoChannel, VideoChannelService } from '@app/shared/shared-main'
5import { RestExtractor, UserService } from '@app/shared'
6import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'
7import { Subscription } from 'rxjs'
8import { AuthService, Notifier, RedirectService } from '@app/core'
9import { User, UserRight } from '../../../../shared'
10import { I18n } from '@ngx-translate/i18n-polyfill' 7import { I18n } from '@ngx-translate/i18n-polyfill'
11import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' 8import { User, UserRight } from '@shared/models'
12import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
13import { ListOverflowItem } from '@app/shared/misc/list-overflow.component'
14import { ScreenService } from '@app/shared/misc/screen.service'
15 9
16@Component({ 10@Component({
17 templateUrl: './accounts.component.html', 11 templateUrl: './accounts.component.html',
diff --git a/client/src/app/+accounts/accounts.module.ts b/client/src/app/+accounts/accounts.module.ts
index 8e679822a..815360341 100644
--- a/client/src/app/+accounts/accounts.module.ts
+++ b/client/src/app/+accounts/accounts.module.ts
@@ -1,15 +1,26 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { SharedModule } from '../shared' 2import { SharedFormModule } from '@app/shared/shared-forms'
3import { AccountsRoutingModule } from './accounts-routing.module' 3import { SharedGlobalIconModule } from '@app/shared/shared-icons'
4import { AccountsComponent } from './accounts.component' 4import { SharedMainModule } from '@app/shared/shared-main'
5import { AccountVideosComponent } from './account-videos/account-videos.component' 5import { SharedModerationModule } from '@app/shared/shared-moderation'
6import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
7import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
6import { AccountAboutComponent } from './account-about/account-about.component' 8import { AccountAboutComponent } from './account-about/account-about.component'
7import { AccountVideoChannelsComponent } from './account-video-channels/account-video-channels.component' 9import { AccountVideoChannelsComponent } from './account-video-channels/account-video-channels.component'
10import { AccountVideosComponent } from './account-videos/account-videos.component'
11import { AccountsRoutingModule } from './accounts-routing.module'
12import { AccountsComponent } from './accounts.component'
8 13
9@NgModule({ 14@NgModule({
10 imports: [ 15 imports: [
11 AccountsRoutingModule, 16 AccountsRoutingModule,
12 SharedModule 17
18 SharedMainModule,
19 SharedFormModule,
20 SharedUserSubscriptionModule,
21 SharedModerationModule,
22 SharedVideoMiniatureModule,
23 SharedGlobalIconModule
13 ], 24 ],
14 25
15 declarations: [ 26 declarations: [