aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+signup
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/+signup
parent0c4bacbff53bc732f5a2677d62a6ead7752e2405 (diff)
downloadPeerTube-67ed6552b831df66713bac9e672738796128d33f.tar.gz
PeerTube-67ed6552b831df66713bac9e672738796128d33f.tar.zst
PeerTube-67ed6552b831df66713bac9e672738796128d33f.zip
Reorganize client shared modules
Diffstat (limited to 'client/src/app/+signup')
-rw-r--r--client/src/app/+signup/+register/register-routing.module.ts3
-rw-r--r--client/src/app/+signup/+register/register-step-channel.component.ts10
-rw-r--r--client/src/app/+signup/+register/register-step-user.component.ts10
-rw-r--r--client/src/app/+signup/+register/register.component.ts16
-rw-r--r--client/src/app/+signup/+register/register.module.ts19
-rw-r--r--client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts7
-rw-r--r--client/src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts6
-rw-r--r--client/src/app/+signup/+verify-account/verify-account.module.ts9
-rw-r--r--client/src/app/+signup/shared/signup-shared.module.ts14
9 files changed, 45 insertions, 49 deletions
diff --git a/client/src/app/+signup/+register/register-routing.module.ts b/client/src/app/+signup/+register/register-routing.module.ts
index f47e80755..0deed8a9b 100644
--- a/client/src/app/+signup/+register/register-routing.module.ts
+++ b/client/src/app/+signup/+register/register-routing.module.ts
@@ -1,9 +1,8 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { RouterModule, Routes } from '@angular/router' 2import { RouterModule, Routes } from '@angular/router'
3import { ServerConfigResolver, UnloggedGuard } from '@app/core'
3import { MetaGuard } from '@ngx-meta/core' 4import { MetaGuard } from '@ngx-meta/core'
4import { RegisterComponent } from './register.component' 5import { RegisterComponent } from './register.component'
5import { ServerConfigResolver } from '@app/core/routing/server-config-resolver.service'
6import { UnloggedGuard } from '@app/core/routing/unlogged-guard.service'
7 6
8const registerRoutes: Routes = [ 7const registerRoutes: Routes = [
9 { 8 {
diff --git a/client/src/app/+signup/+register/register-step-channel.component.ts b/client/src/app/+signup/+register/register-step-channel.component.ts
index e434b91a7..8a0120840 100644
--- a/client/src/app/+signup/+register/register-step-channel.component.ts
+++ b/client/src/app/+signup/+register/register-step-channel.component.ts
@@ -1,10 +1,9 @@
1import { concat, of } from 'rxjs'
2import { pairwise } from 'rxjs/operators'
1import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' 3import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
2import { AuthService } from '@app/core'
3import { FormReactive, UserService, VideoChannelValidatorsService } from '@app/shared'
4import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
5import { FormGroup } from '@angular/forms' 4import { FormGroup } from '@angular/forms'
6import { pairwise } from 'rxjs/operators' 5import { UserService } from '@app/core'
7import { concat, of } from 'rxjs' 6import { FormReactive, FormValidatorService, VideoChannelValidatorsService } from '@app/shared/shared-forms'
8 7
9@Component({ 8@Component({
10 selector: 'my-register-step-channel', 9 selector: 'my-register-step-channel',
@@ -17,7 +16,6 @@ export class RegisterStepChannelComponent extends FormReactive implements OnInit
17 16
18 constructor ( 17 constructor (
19 protected formValidatorService: FormValidatorService, 18 protected formValidatorService: FormValidatorService,
20 private authService: AuthService,
21 private userService: UserService, 19 private userService: UserService,
22 private videoChannelValidatorsService: VideoChannelValidatorsService 20 private videoChannelValidatorsService: VideoChannelValidatorsService
23 ) { 21 ) {
diff --git a/client/src/app/+signup/+register/register-step-user.component.ts b/client/src/app/+signup/+register/register-step-user.component.ts
index 6c96f20b4..3d9ab8b6b 100644
--- a/client/src/app/+signup/+register/register-step-user.component.ts
+++ b/client/src/app/+signup/+register/register-step-user.component.ts
@@ -1,10 +1,9 @@
1import { concat, of } from 'rxjs'
2import { pairwise } from 'rxjs/operators'
1import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' 3import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
2import { AuthService } from '@app/core'
3import { FormReactive, UserService, UserValidatorsService } from '@app/shared'
4import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
5import { FormGroup } from '@angular/forms' 4import { FormGroup } from '@angular/forms'
6import { pairwise } from 'rxjs/operators' 5import { UserService } from '@app/core'
7import { concat, of } from 'rxjs' 6import { FormReactive, FormValidatorService, UserValidatorsService } from '@app/shared/shared-forms'
8 7
9@Component({ 8@Component({
10 selector: 'my-register-step-user', 9 selector: 'my-register-step-user',
@@ -20,7 +19,6 @@ export class RegisterStepUserComponent extends FormReactive implements OnInit {
20 19
21 constructor ( 20 constructor (
22 protected formValidatorService: FormValidatorService, 21 protected formValidatorService: FormValidatorService,
23 private authService: AuthService,
24 private userService: UserService, 22 private userService: UserService,
25 private userValidatorsService: UserValidatorsService 23 private userValidatorsService: UserValidatorsService
26 ) { 24 ) {
diff --git a/client/src/app/+signup/+register/register.component.ts b/client/src/app/+signup/+register/register.component.ts
index ae944ec15..3e8171b27 100644
--- a/client/src/app/+signup/+register/register.component.ts
+++ b/client/src/app/+signup/+register/register.component.ts
@@ -1,14 +1,13 @@
1import { Component, OnInit, ViewChild } from '@angular/core' 1import { Component, OnInit, ViewChild } from '@angular/core'
2import { AuthService, Notifier, RedirectService, ServerService } from '@app/core'
3import { UserService, UserValidatorsService } from '@app/shared'
4import { I18n } from '@ngx-translate/i18n-polyfill'
5import { UserRegister } from '@shared/models/users/user-register.model'
6import { FormGroup } from '@angular/forms' 2import { FormGroup } from '@angular/forms'
7import { About, ServerConfig } from '@shared/models/server' 3import { ActivatedRoute } from '@angular/router'
8import { InstanceService } from '@app/shared/instance/instance.service' 4import { AuthService, Notifier, UserService } from '@app/core'
9import { HooksService } from '@app/core/plugins/hooks.service' 5import { HooksService } from '@app/core/plugins/hooks.service'
6import { InstanceService } from '@app/shared/shared-instance'
10import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap' 7import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap'
11import { ActivatedRoute } from '@angular/router' 8import { I18n } from '@ngx-translate/i18n-polyfill'
9import { UserRegister } from '@shared/models'
10import { About, ServerConfig } from '@shared/models/server'
12 11
13@Component({ 12@Component({
14 selector: 'my-register', 13 selector: 'my-register',
@@ -40,11 +39,8 @@ export class RegisterComponent implements OnInit {
40 constructor ( 39 constructor (
41 private route: ActivatedRoute, 40 private route: ActivatedRoute,
42 private authService: AuthService, 41 private authService: AuthService,
43 private userValidatorsService: UserValidatorsService,
44 private notifier: Notifier, 42 private notifier: Notifier,
45 private userService: UserService, 43 private userService: UserService,
46 private serverService: ServerService,
47 private redirectService: RedirectService,
48 private instanceService: InstanceService, 44 private instanceService: InstanceService,
49 private hooks: HooksService, 45 private hooks: HooksService,
50 private i18n: I18n 46 private i18n: I18n
diff --git a/client/src/app/+signup/+register/register.module.ts b/client/src/app/+signup/+register/register.module.ts
index e55f83990..608045f58 100644
--- a/client/src/app/+signup/+register/register.module.ts
+++ b/client/src/app/+signup/+register/register.module.ts
@@ -1,21 +1,24 @@
1import { CdkStepperModule } from '@angular/cdk/stepper'
1import { NgModule } from '@angular/core' 2import { NgModule } from '@angular/core'
3import { SignupSharedModule } from '@app/+signup/shared/signup-shared.module'
4import { SharedInstanceModule } from '@app/shared/shared-instance'
5import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'
6import { CustomStepperComponent } from './custom-stepper.component'
2import { RegisterRoutingModule } from './register-routing.module' 7import { RegisterRoutingModule } from './register-routing.module'
3import { RegisterComponent } from './register.component'
4import { SharedModule } from '@app/shared'
5import { CdkStepperModule } from '@angular/cdk/stepper'
6import { RegisterStepChannelComponent } from './register-step-channel.component' 8import { RegisterStepChannelComponent } from './register-step-channel.component'
7import { RegisterStepUserComponent } from './register-step-user.component' 9import { RegisterStepUserComponent } from './register-step-user.component'
8import { CustomStepperComponent } from './custom-stepper.component' 10import { RegisterComponent } from './register.component'
9import { SignupSharedModule } from '@app/+signup/shared/signup-shared.module'
10import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'
11 11
12@NgModule({ 12@NgModule({
13 imports: [ 13 imports: [
14 RegisterRoutingModule, 14 RegisterRoutingModule,
15 SharedModule, 15
16 CdkStepperModule, 16 CdkStepperModule,
17 NgbAccordionModule,
18
17 SignupSharedModule, 19 SignupSharedModule,
18 NgbAccordionModule 20
21 SharedInstanceModule
19 ], 22 ],
20 23
21 declarations: [ 24 declarations: [
diff --git a/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts b/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
index 3bd604b66..51910471b 100644
--- a/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
+++ b/client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
@@ -1,10 +1,7 @@
1import { Component, OnInit } from '@angular/core' 1import { Component, OnInit } from '@angular/core'
2import { Notifier, RedirectService, ServerService, UserService } from '@app/core'
3import { FormReactive, FormValidatorService, UserValidatorsService } from '@app/shared/shared-forms'
2import { I18n } from '@ngx-translate/i18n-polyfill' 4import { I18n } from '@ngx-translate/i18n-polyfill'
3import { Notifier, RedirectService } from '@app/core'
4import { ServerService } from '@app/core/server'
5import { FormReactive, UserService } from '@app/shared'
6import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
7import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service'
8import { ServerConfig } from '@shared/models' 5import { ServerConfig } from '@shared/models'
9 6
10@Component({ 7@Component({
diff --git a/client/src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts b/client/src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts
index 48ddd7130..586f4e231 100644
--- a/client/src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts
+++ b/client/src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts
@@ -1,8 +1,7 @@
1import { Component, OnInit } from '@angular/core' 1import { Component, OnInit } from '@angular/core'
2import { ActivatedRoute, Router } from '@angular/router' 2import { ActivatedRoute } from '@angular/router'
3import { AuthService, Notifier, UserService } from '@app/core'
3import { I18n } from '@ngx-translate/i18n-polyfill' 4import { I18n } from '@ngx-translate/i18n-polyfill'
4import { AuthService, Notifier } from '@app/core'
5import { UserService } from '@app/shared'
6 5
7@Component({ 6@Component({
8 selector: 'my-verify-account-email', 7 selector: 'my-verify-account-email',
@@ -21,7 +20,6 @@ export class VerifyAccountEmailComponent implements OnInit {
21 private userService: UserService, 20 private userService: UserService,
22 private authService: AuthService, 21 private authService: AuthService,
23 private notifier: Notifier, 22 private notifier: Notifier,
24 private router: Router,
25 private route: ActivatedRoute, 23 private route: ActivatedRoute,
26 private i18n: I18n 24 private i18n: I18n
27 ) { 25 ) {
diff --git a/client/src/app/+signup/+verify-account/verify-account.module.ts b/client/src/app/+signup/+verify-account/verify-account.module.ts
index 9fe14e81e..7255605d4 100644
--- a/client/src/app/+signup/+verify-account/verify-account.module.ts
+++ b/client/src/app/+signup/+verify-account/verify-account.module.ts
@@ -1,14 +1,13 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { VerifyAccountRoutingModule } from './verify-account-routing.module' 2import { SignupSharedModule } from '../shared/signup-shared.module'
3import { VerifyAccountEmailComponent } from './verify-account-email/verify-account-email.component'
4import { VerifyAccountAskSendEmailComponent } from './verify-account-ask-send-email/verify-account-ask-send-email.component' 3import { VerifyAccountAskSendEmailComponent } from './verify-account-ask-send-email/verify-account-ask-send-email.component'
5import { SharedModule } from '@app/shared' 4import { VerifyAccountEmailComponent } from './verify-account-email/verify-account-email.component'
6import { SignupSharedModule } from '@app/+signup/shared/signup-shared.module' 5import { VerifyAccountRoutingModule } from './verify-account-routing.module'
7 6
8@NgModule({ 7@NgModule({
9 imports: [ 8 imports: [
10 VerifyAccountRoutingModule, 9 VerifyAccountRoutingModule,
11 SharedModule, 10
12 SignupSharedModule 11 SignupSharedModule
13 ], 12 ],
14 13
diff --git a/client/src/app/+signup/shared/signup-shared.module.ts b/client/src/app/+signup/shared/signup-shared.module.ts
index cd21fdef3..56b0b3bae 100644
--- a/client/src/app/+signup/shared/signup-shared.module.ts
+++ b/client/src/app/+signup/shared/signup-shared.module.ts
@@ -1,10 +1,14 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { SignupSuccessComponent } from '../shared/signup-success.component' 2import { SharedMainModule } from '@app/shared/shared-main'
3import { SharedModule } from '@app/shared' 3import { SignupSuccessComponent } from './signup-success.component'
4import { SharedFormModule } from '@app/shared/shared-forms'
5import { SharedGlobalIconModule } from '@app/shared/shared-icons'
4 6
5@NgModule({ 7@NgModule({
6 imports: [ 8 imports: [
7 SharedModule 9 SharedMainModule,
10 SharedFormModule,
11 SharedGlobalIconModule
8 ], 12 ],
9 13
10 declarations: [ 14 declarations: [
@@ -12,6 +16,10 @@ import { SharedModule } from '@app/shared'
12 ], 16 ],
13 17
14 exports: [ 18 exports: [
19 SharedMainModule,
20 SharedFormModule,
21 SharedGlobalIconModule,
22
15 SignupSuccessComponent 23 SignupSuccessComponent
16 ], 24 ],
17 25