aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+signup
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+signup')
-rw-r--r--client/src/app/+signup/+register/custom-stepper.component.html2
-rw-r--r--client/src/app/+signup/+register/custom-stepper.component.scss10
-rw-r--r--client/src/app/+signup/+register/custom-stepper.component.ts7
-rw-r--r--client/src/app/+signup/+register/register-step-terms.component.html18
-rw-r--r--client/src/app/+signup/+register/register-step-terms.component.ts47
-rw-r--r--client/src/app/+signup/+register/register-step-user.component.html16
-rw-r--r--client/src/app/+signup/+register/register-step-user.component.ts17
-rw-r--r--client/src/app/+signup/+register/register.component.html77
-rw-r--r--client/src/app/+signup/+register/register.component.scss67
-rw-r--r--client/src/app/+signup/+register/register.component.ts62
-rw-r--r--client/src/app/+signup/+register/register.module.ts4
11 files changed, 153 insertions, 174 deletions
diff --git a/client/src/app/+signup/+register/custom-stepper.component.html b/client/src/app/+signup/+register/custom-stepper.component.html
index 4cfe54152..aad2f31d3 100644
--- a/client/src/app/+signup/+register/custom-stepper.component.html
+++ b/client/src/app/+signup/+register/custom-stepper.component.html
@@ -2,7 +2,7 @@
2 <header *ngIf="steps.length > 2"> 2 <header *ngIf="steps.length > 2">
3 <ng-container *ngFor="let step of steps; let i = index; let isLast = last;"> 3 <ng-container *ngFor="let step of steps; let i = index; let isLast = last;">
4 <div 4 <div
5 class="step-info" [ngClass]="{ active: selectedIndex === i, completed: isCompleted(step) }" [attr.aria-current]="selectedIndex === i" 5 class="step-info" [ngClass]="{ active: selectedIndex === i, completed: isCompleted(step), 'c-hand': isAccessible(i) }" [attr.aria-current]="selectedIndex === i"
6 (click)="onClick(i)" 6 (click)="onClick(i)"
7 > 7 >
8 <div class="step-index"> 8 <div class="step-index">
diff --git a/client/src/app/+signup/+register/custom-stepper.component.scss b/client/src/app/+signup/+register/custom-stepper.component.scss
index cc1591ee8..3b4791d08 100644
--- a/client/src/app/+signup/+register/custom-stepper.component.scss
+++ b/client/src/app/+signup/+register/custom-stepper.component.scss
@@ -4,6 +4,12 @@
4$grey-color: #9CA3AB; 4$grey-color: #9CA3AB;
5$index-block-height: 32px; 5$index-block-height: 32px;
6 6
7.container {
8 padding-left: 0;
9 padding-right: 0;
10 max-width: unset !important;
11}
12
7header { 13header {
8 display: flex; 14 display: flex;
9 justify-content: space-between; 15 justify-content: space-between;
@@ -17,6 +23,10 @@ header {
17 align-items: center; 23 align-items: center;
18 width: $index-block-height; 24 width: $index-block-height;
19 25
26 &:not(.c-hand) {
27 cursor: default;
28 }
29
20 .step-index { 30 .step-index {
21 display: flex; 31 display: flex;
22 justify-content: center; 32 justify-content: center;
diff --git a/client/src/app/+signup/+register/custom-stepper.component.ts b/client/src/app/+signup/+register/custom-stepper.component.ts
index 2ae40f3a9..5a80895f9 100644
--- a/client/src/app/+signup/+register/custom-stepper.component.ts
+++ b/client/src/app/+signup/+register/custom-stepper.component.ts
@@ -16,4 +16,11 @@ export class CustomStepperComponent extends CdkStepper {
16 isCompleted (step: CdkStep) { 16 isCompleted (step: CdkStep) {
17 return step.stepControl && step.stepControl.dirty && step.stepControl.valid 17 return step.stepControl && step.stepControl.dirty && step.stepControl.valid
18 } 18 }
19
20 isAccessible (index: number) {
21 const stepsCompletedMap = this.steps.map(step => this.isCompleted(step))
22 return index === 0
23 ? true
24 : stepsCompletedMap[ index - 1 ]
25 }
19} 26}
diff --git a/client/src/app/+signup/+register/register-step-terms.component.html b/client/src/app/+signup/+register/register-step-terms.component.html
new file mode 100644
index 000000000..1cfdc0a3a
--- /dev/null
+++ b/client/src/app/+signup/+register/register-step-terms.component.html
@@ -0,0 +1,18 @@
1<form role="form" [formGroup]="form">
2 <div class="form-group form-group-terms">
3 <my-peertube-checkbox inputName="terms" formControlName="terms">
4 <ng-template ptTemplate="label">
5 <ng-container i18n>
6 I am at least 16 years old and agree
7 to the <a class="terms-anchor" (click)="onTermsClick($event)" href='#'>Terms</a>
8 <ng-container *ngIf="hasCodeOfConduct"> and to the <a (click)="onCodeOfConductClick($event)" href='#'>Code of Conduct</a></ng-container>
9 of this instance
10 </ng-container>
11 </ng-template>
12 </my-peertube-checkbox>
13
14 <div *ngIf="formErrors.terms" class="form-error">
15 {{ formErrors.terms }}
16 </div>
17 </div>
18</form>
diff --git a/client/src/app/+signup/+register/register-step-terms.component.ts b/client/src/app/+signup/+register/register-step-terms.component.ts
new file mode 100644
index 000000000..db834c68d
--- /dev/null
+++ b/client/src/app/+signup/+register/register-step-terms.component.ts
@@ -0,0 +1,47 @@
1import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
2import { FormGroup } from '@angular/forms'
3import {
4 USER_TERMS_VALIDATOR
5} from '@app/shared/form-validators/user-validators'
6import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
7
8@Component({
9 selector: 'my-register-step-terms',
10 templateUrl: './register-step-terms.component.html',
11 styleUrls: [ './register.component.scss' ]
12})
13export class RegisterStepTermsComponent extends FormReactive implements OnInit {
14 @Input() hasCodeOfConduct = false
15
16 @Output() formBuilt = new EventEmitter<FormGroup>()
17 @Output() termsClick = new EventEmitter<void>()
18 @Output() codeOfConductClick = new EventEmitter<void>()
19
20 constructor (
21 protected formValidatorService: FormValidatorService
22 ) {
23 super()
24 }
25
26 get instanceHost () {
27 return window.location.host
28 }
29
30 ngOnInit () {
31 this.buildForm({
32 terms: USER_TERMS_VALIDATOR
33 })
34
35 setTimeout(() => this.formBuilt.emit(this.form))
36 }
37
38 onTermsClick (event: Event) {
39 event.preventDefault()
40 this.termsClick.emit()
41 }
42
43 onCodeOfConductClick (event: Event) {
44 event.preventDefault()
45 this.codeOfConductClick.emit()
46 }
47}
diff --git a/client/src/app/+signup/+register/register-step-user.component.html b/client/src/app/+signup/+register/register-step-user.component.html
index 6eab4df0c..ac341666b 100644
--- a/client/src/app/+signup/+register/register-step-user.component.html
+++ b/client/src/app/+signup/+register/register-step-user.component.html
@@ -63,20 +63,4 @@
63 </div> 63 </div>
64 </div> 64 </div>
65 65
66 <div class="form-group form-group-terms">
67 <my-peertube-checkbox inputName="terms" formControlName="terms">
68 <ng-template ptTemplate="label">
69 <ng-container i18n>
70 I am at least 16 years old and agree
71 to the <a (click)="onTermsClick($event)" href='#'>Terms</a>
72 <ng-container *ngIf="hasCodeOfConduct"> and to the <a (click)="onCodeOfConductClick($event)" href='#'>Code of Conduct</a></ng-container>
73 of this instance
74 </ng-container>
75 </ng-template>
76 </my-peertube-checkbox>
77
78 <div *ngIf="formErrors.terms" class="form-error">
79 {{ formErrors.terms }}
80 </div>
81 </div>
82</form> 66</form>
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 9193540b4..716cd8c78 100644
--- a/client/src/app/+signup/+register/register-step-user.component.ts
+++ b/client/src/app/+signup/+register/register-step-user.component.ts
@@ -7,7 +7,6 @@ import {
7 USER_DISPLAY_NAME_REQUIRED_VALIDATOR, 7 USER_DISPLAY_NAME_REQUIRED_VALIDATOR,
8 USER_EMAIL_VALIDATOR, 8 USER_EMAIL_VALIDATOR,
9 USER_PASSWORD_VALIDATOR, 9 USER_PASSWORD_VALIDATOR,
10 USER_TERMS_VALIDATOR,
11 USER_USERNAME_VALIDATOR 10 USER_USERNAME_VALIDATOR
12} from '@app/shared/form-validators/user-validators' 11} from '@app/shared/form-validators/user-validators'
13import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' 12import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
@@ -18,12 +17,9 @@ import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
18 styleUrls: [ './register.component.scss' ] 17 styleUrls: [ './register.component.scss' ]
19}) 18})
20export class RegisterStepUserComponent extends FormReactive implements OnInit { 19export class RegisterStepUserComponent extends FormReactive implements OnInit {
21 @Input() hasCodeOfConduct = false
22 @Input() videoUploadDisabled = false 20 @Input() videoUploadDisabled = false
23 21
24 @Output() formBuilt = new EventEmitter<FormGroup>() 22 @Output() formBuilt = new EventEmitter<FormGroup>()
25 @Output() termsClick = new EventEmitter<void>()
26 @Output() codeOfConductClick = new EventEmitter<void>()
27 23
28 constructor ( 24 constructor (
29 protected formValidatorService: FormValidatorService, 25 protected formValidatorService: FormValidatorService,
@@ -41,8 +37,7 @@ export class RegisterStepUserComponent extends FormReactive implements OnInit {
41 displayName: USER_DISPLAY_NAME_REQUIRED_VALIDATOR, 37 displayName: USER_DISPLAY_NAME_REQUIRED_VALIDATOR,
42 username: USER_USERNAME_VALIDATOR, 38 username: USER_USERNAME_VALIDATOR,
43 password: USER_PASSWORD_VALIDATOR, 39 password: USER_PASSWORD_VALIDATOR,
44 email: USER_EMAIL_VALIDATOR, 40 email: USER_EMAIL_VALIDATOR
45 terms: USER_TERMS_VALIDATOR
46 }) 41 })
47 42
48 setTimeout(() => this.formBuilt.emit(this.form)) 43 setTimeout(() => this.formBuilt.emit(this.form))
@@ -54,16 +49,6 @@ export class RegisterStepUserComponent extends FormReactive implements OnInit {
54 .subscribe(([ oldValue, newValue ]) => this.onDisplayNameChange(oldValue, newValue)) 49 .subscribe(([ oldValue, newValue ]) => this.onDisplayNameChange(oldValue, newValue))
55 } 50 }
56 51
57 onTermsClick (event: Event) {
58 event.preventDefault()
59 this.termsClick.emit()
60 }
61
62 onCodeOfConductClick (event: Event) {
63 event.preventDefault()
64 this.codeOfConductClick.emit()
65 }
66
67 private onDisplayNameChange (oldDisplayName: string, newDisplayName: string) { 52 private onDisplayNameChange (oldDisplayName: string, newDisplayName: string) {
68 const username = this.form.value['username'] || '' 53 const username = this.form.value['username'] || ''
69 54
diff --git a/client/src/app/+signup/+register/register.component.html b/client/src/app/+signup/+register/register.component.html
index 7e3704124..bebc5d926 100644
--- a/client/src/app/+signup/+register/register.component.html
+++ b/client/src/app/+signup/+register/register.component.html
@@ -10,19 +10,26 @@
10 <div class="wrapper" [hidden]="signupDone"> 10 <div class="wrapper" [hidden]="signupDone">
11 <div class="register-form"> 11 <div class="register-form">
12 <my-custom-stepper linear *ngIf="!signupDone"> 12 <my-custom-stepper linear *ngIf="!signupDone">
13 <cdk-step [stepControl]="formStepUser" i18n-label label="User"> 13 <cdk-step [stepControl]="formStepTerms" i18n-label="Stepper label for the registration page describing terms of service" label="Terms">
14 <my-register-step-user 14 <div class="instance-information">
15 <my-instance-about-accordion (init)="onInstanceAboutAccordionInit($event)" [panels]="instanceInformationPanels"></my-instance-about-accordion>
16 </div>
17
18 <my-register-step-terms
15 [hasCodeOfConduct]="!!aboutHtml.codeOfConduct" 19 [hasCodeOfConduct]="!!aboutHtml.codeOfConduct"
16 [videoUploadDisabled]="videoUploadDisabled" 20 (formBuilt)="onTermsFormBuilt($event)" (termsClick)="onTermsClick()" (codeOfConductClick)="onCodeOfConductClick()"
17 (formBuilt)="onUserFormBuilt($event)" (termsClick)="onTermsClick()" (codeOfConductClick)="onCodeOfConductClick()" 21 ></my-register-step-terms>
18 > 22
19 </my-register-step-user> 23 <button cdkStepperNext [disabled]="!formStepTerms || !formStepTerms.valid">{{ defaultNextStepButtonLabel }}</button>
24 </cdk-step>
25
26 <cdk-step [stepControl]="formStepUser" i18n-label="Stepper label for the registration page asking user informations" label="User">
27 <my-register-step-user (formBuilt)="onUserFormBuilt($event)" [videoUploadDisabled]="videoUploadDisabled"></my-register-step-user>
20 28
21 <button i18n cdkStepperNext [disabled]="!formStepUser || !formStepUser.valid" 29 <button cdkStepperNext [disabled]="!formStepUser || !formStepUser.valid" (click)="videoUploadDisabled && signup()">{{ stepUserButtonLabel }}</button>
22 (click)="signup()">{{ videoUploadDisabled ? 'Signup' : 'Next' }}</button>
23 </cdk-step> 30 </cdk-step>
24 31
25 <cdk-step [stepControl]="formStepChannel" i18n-label label="Channel" *ngIf="!videoUploadDisabled"> 32 <cdk-step [stepControl]="formStepChannel" i18n-label="Stepper label for the registration page asking information about the default channel" label="Channel" *ngIf="!videoUploadDisabled">
26 <my-register-step-channel (formBuilt)="onChannelFormBuilt($event)" [username]="getUsername()"></my-register-step-channel> 33 <my-register-step-channel (formBuilt)="onChannelFormBuilt($event)" [username]="getUsername()"></my-register-step-channel>
27 34
28 <button i18n cdkStepperNext (click)="signup()" 35 <button i18n cdkStepperNext (click)="signup()"
@@ -43,58 +50,6 @@
43 </cdk-step> 50 </cdk-step>
44 </my-custom-stepper> 51 </my-custom-stepper>
45 </div> 52 </div>
46
47 <div class="instance-information">
48 <ngb-accordion [closeOthers]="true" #accordion="ngbAccordion">
49 <ngb-panel id="instance-features" i18n-title title="Features found on this instance">
50 <ng-template ngbPanelContent>
51 <my-instance-features-table></my-instance-features-table>
52 </ng-template>
53 </ngb-panel>
54
55 <ng-container *ngIf="about">
56 <ngb-panel
57 *ngIf="aboutHtml.administrator || about.instance.maintenanceLifetime || about.instance.businessModel"
58 id="admin-sustainability" i18n-title title="Administrators & Sustainability"
59 >
60 <ng-template ngbPanelContent>
61 <div class="block">
62 <strong i18n>Who are we?</strong>
63 <div [innerHTML]="aboutHtml.administrator"></div>
64 </div>
65
66 <div class="block">
67 <strong i18n>How long do we plan to maintain this instance?</strong>
68 <div [innerHTML]="about.instance.maintenanceLifetime"></div>
69 </div>
70
71 <div class="block">
72 <strong i18n>How will we finance this instance?</strong>
73 <div [innerHTML]="about.instance.businessModel"></div>
74 </div>
75 </ng-template>
76 </ngb-panel>
77
78 <ngb-panel *ngIf="aboutHtml.moderationInformation" id="moderation-information" i18n-title title="Moderation information">
79 <ng-template ngbPanelContent>
80 <div class="block" [innerHTML]="aboutHtml.moderationInformation"></div>
81 </ng-template>
82 </ngb-panel>
83
84 <ngb-panel *ngIf="aboutHtml.codeOfConduct" id="code-of-conduct" i18n-title title="Code of conduct">
85 <ng-template ngbPanelContent>
86 <div class="block" [innerHTML]="aboutHtml.codeOfConduct"></div>
87 </ng-template>
88 </ngb-panel>
89
90 <ngb-panel *ngIf="aboutHtml.terms" id="terms" i18n-title title="Terms">
91 <ng-template ngbPanelContent>
92 <div class="block" [innerHTML]="aboutHtml.terms"></div>
93 </ng-template>
94 </ngb-panel>
95 </ng-container>
96 </ngb-accordion>
97 </div>
98 </div> 53 </div>
99 54
100</div> 55</div>
diff --git a/client/src/app/+signup/+register/register.component.scss b/client/src/app/+signup/+register/register.component.scss
index 4221354ee..d22d58c4a 100644
--- a/client/src/app/+signup/+register/register.component.scss
+++ b/client/src/app/+signup/+register/register.component.scss
@@ -1,9 +1,5 @@
1@import '_variables'; 1@import '_variables';
2@import '_mixins'; 2@import '_mixins';
3@import "./_bootstrap-variables";
4
5@import '~bootstrap/scss/functions';
6@import '~bootstrap/scss/variables';
7 3
8.alert { 4.alert {
9 font-size: 15px; 5 font-size: 15px;
@@ -12,44 +8,20 @@
12 8
13.wrapper { 9.wrapper {
14 display: flex; 10 display: flex;
15 justify-content: space-between; 11 flex-direction: column;
16 flex-wrap: wrap;
17
18 & > div {
19 margin-bottom: 40px;
20 12
21 &.register-form { 13 .register-form {
22 width: 450px; 14 max-width: 600px;
15 align-self: center;
16 }
23 17
24 @media screen and (max-width: $mobile-view) { 18 .register-form,
25 width: 100%; 19 .instance-information {
26 } 20 width: 100%;
27 } 21 }
28 22
29 &.instance-information { 23 .instance-information {
30 width: 600px; 24 margin-bottom: 15px;
31 margin-bottom: 40px;
32
33 .block {
34 font-size: 15px;
35 margin-bottom: 15px;
36 padding: 0 $btn-padding-x;
37 }
38
39 @media screen and (max-width: 1500px) {
40 width: 450px;
41 }
42 @media screen and (max-width: $mobile-view) {
43 width: 100%;
44 }
45
46 ngb-accordion ::ng-deep {
47 .btn {
48 font-weight: $font-semibold !important;
49 color: pvar(--mainForegroundColor) !important;
50 }
51 }
52 }
53 } 25 }
54} 26}
55 27
@@ -58,15 +30,19 @@
58} 30}
59 31
60.input-group { 32.input-group {
61 @include peertube-input-group(400px); 33 @include peertube-input-group(100%);
62} 34}
63 35
64.input-group-append { 36.input-group-append {
65 height: 30px; 37 height: 30px;
66} 38}
67 39
40.form-group-terms {
41 width: 100% !important;
42}
43
68input:not([type=submit]) { 44input:not([type=submit]) {
69 @include peertube-input-text(400px); 45 @include peertube-input-text(100%);
70 display: block; 46 display: block;
71 47
72 &#username, 48 &#username,
@@ -76,19 +52,10 @@ input:not([type=submit]) {
76 } 52 }
77} 53}
78 54
79@media screen and (max-width: $mobile-view) {
80 .form-group-terms,
81 .input-group,
82 input:not([type=submit]) {
83 width: 100%;
84 }
85}
86
87input[type=submit], 55input[type=submit],
88button { 56button {
89 @include peertube-button; 57 @include peertube-button;
90 @include orange-button; 58 @include orange-button;
91
92} 59}
93 60
94.name-information { 61.name-information {
diff --git a/client/src/app/+signup/+register/register.component.ts b/client/src/app/+signup/+register/register.component.ts
index 5b6762631..b1f5d8e93 100644
--- a/client/src/app/+signup/+register/register.component.ts
+++ b/client/src/app/+signup/+register/register.component.ts
@@ -1,12 +1,12 @@
1import { Component, OnInit, ViewChild } from '@angular/core' 1import { Component, OnInit } from '@angular/core'
2import { FormGroup } from '@angular/forms' 2import { FormGroup } from '@angular/forms'
3import { ActivatedRoute } from '@angular/router' 3import { ActivatedRoute } from '@angular/router'
4import { AuthService, Notifier, UserService } from '@app/core' 4import { AuthService, UserService } from '@app/core'
5import { HooksService } from '@app/core/plugins/hooks.service' 5import { HooksService } from '@app/core/plugins/hooks.service'
6import { InstanceService } from '@app/shared/shared-instance'
7import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap' 6import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap'
8import { UserRegister } from '@shared/models' 7import { UserRegister } from '@shared/models'
9import { About, ServerConfig } from '@shared/models/server' 8import { ServerConfig } from '@shared/models/server'
9import { InstanceAboutAccordionComponent } from '@app/shared/shared-instance'
10 10
11@Component({ 11@Component({
12 selector: 'my-register', 12 selector: 'my-register',
@@ -14,35 +14,39 @@ import { About, ServerConfig } from '@shared/models/server'
14 styleUrls: [ './register.component.scss' ] 14 styleUrls: [ './register.component.scss' ]
15}) 15})
16export class RegisterComponent implements OnInit { 16export class RegisterComponent implements OnInit {
17 @ViewChild('accordion', { static: true }) accordion: NgbAccordion 17 accordion: NgbAccordion
18
19 info: string = null 18 info: string = null
20 error: string = null 19 error: string = null
21 success: string = null 20 success: string = null
22 signupDone = false 21 signupDone = false
23 22
24 about: About
25 aboutHtml = {
26 description: '',
27 terms: '',
28 codeOfConduct: '',
29 moderationInformation: '',
30 administrator: ''
31 }
32
33 videoUploadDisabled: boolean 23 videoUploadDisabled: boolean
34 24
25 formStepTerms: FormGroup
35 formStepUser: FormGroup 26 formStepUser: FormGroup
36 formStepChannel: FormGroup 27 formStepChannel: FormGroup
37 28
29 aboutHtml = {
30 codeOfConduct: ''
31 }
32
33 instanceInformationPanels = {
34 codeOfConduct: true,
35 terms: true,
36 administrators: false,
37 features: false,
38 moderation: false
39 }
40
41 defaultNextStepButtonLabel = $localize`Next`
42 stepUserButtonLabel = this.defaultNextStepButtonLabel
43
38 private serverConfig: ServerConfig 44 private serverConfig: ServerConfig
39 45
40 constructor ( 46 constructor (
41 private route: ActivatedRoute, 47 private route: ActivatedRoute,
42 private authService: AuthService, 48 private authService: AuthService,
43 private notifier: Notifier,
44 private userService: UserService, 49 private userService: UserService,
45 private instanceService: InstanceService,
46 private hooks: HooksService 50 private hooks: HooksService
47 ) { 51 ) {
48 } 52 }
@@ -55,19 +59,12 @@ export class RegisterComponent implements OnInit {
55 this.serverConfig = this.route.snapshot.data.serverConfig 59 this.serverConfig = this.route.snapshot.data.serverConfig
56 60
57 this.videoUploadDisabled = this.serverConfig.user.videoQuota === 0 61 this.videoUploadDisabled = this.serverConfig.user.videoQuota === 0
58 62 this.stepUserButtonLabel = this.videoUploadDisabled
59 this.instanceService.getAbout() 63 ? $localize`Signup`
60 .subscribe( 64 : this.defaultNextStepButtonLabel
61 async about => {
62 this.about = about
63
64 this.aboutHtml = await this.instanceService.buildHtml(about)
65 },
66
67 err => this.notifier.error(err.message)
68 )
69 65
70 this.hooks.runAction('action:signup.register.init', 'signup') 66 this.hooks.runAction('action:signup.register.init', 'signup')
67
71 } 68 }
72 69
73 hasSameChannelAndAccountNames () { 70 hasSameChannelAndAccountNames () {
@@ -86,6 +83,10 @@ export class RegisterComponent implements OnInit {
86 return this.formStepChannel.value['name'] 83 return this.formStepChannel.value['name']
87 } 84 }
88 85
86 onTermsFormBuilt (form: FormGroup) {
87 this.formStepTerms = form
88 }
89
89 onUserFormBuilt (form: FormGroup) { 90 onUserFormBuilt (form: FormGroup) {
90 this.formStepUser = form 91 this.formStepUser = form
91 } 92 }
@@ -102,6 +103,11 @@ export class RegisterComponent implements OnInit {
102 if (this.accordion) this.accordion.toggle('code-of-conduct') 103 if (this.accordion) this.accordion.toggle('code-of-conduct')
103 } 104 }
104 105
106 onInstanceAboutAccordionInit (instanceAboutAccordion: InstanceAboutAccordionComponent) {
107 this.accordion = instanceAboutAccordion.accordion
108 this.aboutHtml = instanceAboutAccordion.aboutHtml
109 }
110
105 async signup () { 111 async signup () {
106 this.error = null 112 this.error = null
107 113
diff --git a/client/src/app/+signup/+register/register.module.ts b/client/src/app/+signup/+register/register.module.ts
index 608045f58..c36da53d5 100644
--- a/client/src/app/+signup/+register/register.module.ts
+++ b/client/src/app/+signup/+register/register.module.ts
@@ -2,10 +2,10 @@ import { CdkStepperModule } from '@angular/cdk/stepper'
2import { NgModule } from '@angular/core' 2import { NgModule } from '@angular/core'
3import { SignupSharedModule } from '@app/+signup/shared/signup-shared.module' 3import { SignupSharedModule } from '@app/+signup/shared/signup-shared.module'
4import { SharedInstanceModule } from '@app/shared/shared-instance' 4import { SharedInstanceModule } from '@app/shared/shared-instance'
5import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'
6import { CustomStepperComponent } from './custom-stepper.component' 5import { CustomStepperComponent } from './custom-stepper.component'
7import { RegisterRoutingModule } from './register-routing.module' 6import { RegisterRoutingModule } from './register-routing.module'
8import { RegisterStepChannelComponent } from './register-step-channel.component' 7import { RegisterStepChannelComponent } from './register-step-channel.component'
8import { RegisterStepTermsComponent } from './register-step-terms.component'
9import { RegisterStepUserComponent } from './register-step-user.component' 9import { RegisterStepUserComponent } from './register-step-user.component'
10import { RegisterComponent } from './register.component' 10import { RegisterComponent } from './register.component'
11 11
@@ -14,7 +14,6 @@ import { RegisterComponent } from './register.component'
14 RegisterRoutingModule, 14 RegisterRoutingModule,
15 15
16 CdkStepperModule, 16 CdkStepperModule,
17 NgbAccordionModule,
18 17
19 SignupSharedModule, 18 SignupSharedModule,
20 19
@@ -25,6 +24,7 @@ import { RegisterComponent } from './register.component'
25 RegisterComponent, 24 RegisterComponent,
26 CustomStepperComponent, 25 CustomStepperComponent,
27 RegisterStepChannelComponent, 26 RegisterStepChannelComponent,
27 RegisterStepTermsComponent,
28 RegisterStepUserComponent 28 RegisterStepUserComponent
29 ], 29 ],
30 30