diff options
author | Chocobozzz <me@florianbigard.com> | 2020-06-23 14:10:17 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-06-23 16:00:49 +0200 |
commit | 67ed6552b831df66713bac9e672738796128d33f (patch) | |
tree | 59c97d41e0b49d75a90aa3de987968ab9b1ff447 /client/src/app/+signup/+register | |
parent | 0c4bacbff53bc732f5a2677d62a6ead7752e2405 (diff) | |
download | PeerTube-67ed6552b831df66713bac9e672738796128d33f.tar.gz PeerTube-67ed6552b831df66713bac9e672738796128d33f.tar.zst PeerTube-67ed6552b831df66713bac9e672738796128d33f.zip |
Reorganize client shared modules
Diffstat (limited to 'client/src/app/+signup/+register')
5 files changed, 26 insertions, 32 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 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { RouterModule, Routes } from '@angular/router' | 2 | import { RouterModule, Routes } from '@angular/router' |
3 | import { ServerConfigResolver, UnloggedGuard } from '@app/core' | ||
3 | import { MetaGuard } from '@ngx-meta/core' | 4 | import { MetaGuard } from '@ngx-meta/core' |
4 | import { RegisterComponent } from './register.component' | 5 | import { RegisterComponent } from './register.component' |
5 | import { ServerConfigResolver } from '@app/core/routing/server-config-resolver.service' | ||
6 | import { UnloggedGuard } from '@app/core/routing/unlogged-guard.service' | ||
7 | 6 | ||
8 | const registerRoutes: Routes = [ | 7 | const 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 @@ | |||
1 | import { concat, of } from 'rxjs' | ||
2 | import { pairwise } from 'rxjs/operators' | ||
1 | import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' | 3 | import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' |
2 | import { AuthService } from '@app/core' | ||
3 | import { FormReactive, UserService, VideoChannelValidatorsService } from '@app/shared' | ||
4 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | ||
5 | import { FormGroup } from '@angular/forms' | 4 | import { FormGroup } from '@angular/forms' |
6 | import { pairwise } from 'rxjs/operators' | 5 | import { UserService } from '@app/core' |
7 | import { concat, of } from 'rxjs' | 6 | import { 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 @@ | |||
1 | import { concat, of } from 'rxjs' | ||
2 | import { pairwise } from 'rxjs/operators' | ||
1 | import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' | 3 | import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' |
2 | import { AuthService } from '@app/core' | ||
3 | import { FormReactive, UserService, UserValidatorsService } from '@app/shared' | ||
4 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | ||
5 | import { FormGroup } from '@angular/forms' | 4 | import { FormGroup } from '@angular/forms' |
6 | import { pairwise } from 'rxjs/operators' | 5 | import { UserService } from '@app/core' |
7 | import { concat, of } from 'rxjs' | 6 | import { 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 @@ | |||
1 | import { Component, OnInit, ViewChild } from '@angular/core' | 1 | import { Component, OnInit, ViewChild } from '@angular/core' |
2 | import { AuthService, Notifier, RedirectService, ServerService } from '@app/core' | ||
3 | import { UserService, UserValidatorsService } from '@app/shared' | ||
4 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
5 | import { UserRegister } from '@shared/models/users/user-register.model' | ||
6 | import { FormGroup } from '@angular/forms' | 2 | import { FormGroup } from '@angular/forms' |
7 | import { About, ServerConfig } from '@shared/models/server' | 3 | import { ActivatedRoute } from '@angular/router' |
8 | import { InstanceService } from '@app/shared/instance/instance.service' | 4 | import { AuthService, Notifier, UserService } from '@app/core' |
9 | import { HooksService } from '@app/core/plugins/hooks.service' | 5 | import { HooksService } from '@app/core/plugins/hooks.service' |
6 | import { InstanceService } from '@app/shared/shared-instance' | ||
10 | import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap' | 7 | import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap' |
11 | import { ActivatedRoute } from '@angular/router' | 8 | import { I18n } from '@ngx-translate/i18n-polyfill' |
9 | import { UserRegister } from '@shared/models' | ||
10 | import { 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 @@ | |||
1 | import { CdkStepperModule } from '@angular/cdk/stepper' | ||
1 | import { NgModule } from '@angular/core' | 2 | import { NgModule } from '@angular/core' |
3 | import { SignupSharedModule } from '@app/+signup/shared/signup-shared.module' | ||
4 | import { SharedInstanceModule } from '@app/shared/shared-instance' | ||
5 | import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap' | ||
6 | import { CustomStepperComponent } from './custom-stepper.component' | ||
2 | import { RegisterRoutingModule } from './register-routing.module' | 7 | import { RegisterRoutingModule } from './register-routing.module' |
3 | import { RegisterComponent } from './register.component' | ||
4 | import { SharedModule } from '@app/shared' | ||
5 | import { CdkStepperModule } from '@angular/cdk/stepper' | ||
6 | import { RegisterStepChannelComponent } from './register-step-channel.component' | 8 | import { RegisterStepChannelComponent } from './register-step-channel.component' |
7 | import { RegisterStepUserComponent } from './register-step-user.component' | 9 | import { RegisterStepUserComponent } from './register-step-user.component' |
8 | import { CustomStepperComponent } from './custom-stepper.component' | 10 | import { RegisterComponent } from './register.component' |
9 | import { SignupSharedModule } from '@app/+signup/shared/signup-shared.module' | ||
10 | import { 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: [ |