X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fsignup%2Fsignup.component.ts;h=16e4446785fbe742412ac11500db52ec3ffc0134;hb=ad76628b17ff8f25d3402d6d669b274116bbf76c;hp=4a49ead50d6aa9bec71ed4a018d779a9f9a35d53;hpb=b1d40cff89f7cff565a98cdbcea9a624196a169a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts
index 4a49ead50..16e444678 100644
--- a/client/src/app/signup/signup.component.ts
+++ b/client/src/app/signup/signup.component.ts
@@ -1,13 +1,11 @@
 import { Component, OnInit } from '@angular/core'
-import { FormBuilder, FormGroup } from '@angular/forms'
 import { Router } from '@angular/router'
-import { ServerService } from '@app/core/server'
-
 import { NotificationsService } from 'angular2-notifications'
 import { UserCreate } from '../../../../shared'
-import { FormReactive, USER_EMAIL, USER_PASSWORD, USER_USERNAME, UserService } from '../shared'
-import { RedirectService } from '@app/core'
+import { FormReactive, UserService, UserValidatorsService } from '../shared'
+import { RedirectService, ServerService } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
+import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 
 @Component({
   selector: 'my-signup',
@@ -16,63 +14,35 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
 })
 export class SignupComponent extends FormReactive implements OnInit {
   error: string = null
-  quotaHelpIndication = ''
-
-  form: FormGroup
-  formErrors = {
-    'username': '',
-    'email': '',
-    'password': ''
-  }
-  validationMessages = {
-    'username': USER_USERNAME.MESSAGES,
-    'email': USER_EMAIL.MESSAGES,
-    'password': USER_PASSWORD.MESSAGES
-  }
-
-  private static getApproximateTime (seconds: number) {
-    const hours = Math.floor(seconds / 3600)
-    let pluralSuffix = ''
-    if (hours > 1) pluralSuffix = 's'
-    if (hours > 0) return `~ ${hours} hour${pluralSuffix}`
-
-    const minutes = Math.floor(seconds % 3600 / 60)
-    if (minutes > 1) pluralSuffix = 's'
-
-    return `~ ${minutes} minute${pluralSuffix}`
-  }
 
   constructor (
-    private formBuilder: FormBuilder,
+    protected formValidatorService: FormValidatorService,
+    private userValidatorsService: UserValidatorsService,
     private router: Router,
     private notificationsService: NotificationsService,
     private userService: UserService,
-    private redirectService: RedirectService,
     private serverService: ServerService,
+    private redirectService: RedirectService,
     private i18n: I18n
   ) {
     super()
   }
 
-  get initialUserVideoQuota () {
-    return this.serverService.getConfig().user.videoQuota
+  get instanceHost () {
+    return window.location.host
   }
 
-  buildForm () {
-    this.form = this.formBuilder.group({
-      username: [ '', USER_USERNAME.VALIDATORS ],
-      email:    [ '', USER_EMAIL.VALIDATORS ],
-      password: [ '', USER_PASSWORD.VALIDATORS ]
-    })
-
-    this.form.valueChanges.subscribe(data => this.onValueChanged(data))
+  get requiresEmailVerification () {
+    return this.serverService.getConfig().signup.requiresEmailVerification
   }
 
   ngOnInit () {
-    this.buildForm()
-
-    this.serverService.configLoaded
-      .subscribe(() => this.buildQuotaHelpIndication())
+    this.buildForm({
+      username: this.userValidatorsService.USER_USERNAME,
+      password: this.userValidatorsService.USER_PASSWORD,
+      email: this.userValidatorsService.USER_EMAIL,
+      terms: this.userValidatorsService.USER_TERMS
+    })
   }
 
   signup () {
@@ -82,35 +52,21 @@ export class SignupComponent extends FormReactive implements OnInit {
 
     this.userService.signup(userCreate).subscribe(
       () => {
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('Registration for {{ username }} complete.', { username: userCreate.username})
-        )
+        if (this.requiresEmailVerification) {
+          this.notificationsService.alert(
+            this.i18n('Welcome'),
+            this.i18n('Please check your email to verify your account and complete signup.')
+          )
+        } else {
+          this.notificationsService.success(
+            this.i18n('Success'),
+            this.i18n('Registration for {{username}} complete.', { username: userCreate.username })
+          )
+        }
         this.redirectService.redirectToHomepage()
       },
 
       err => this.error = err.message
     )
   }
-
-  private buildQuotaHelpIndication () {
-    if (this.initialUserVideoQuota === -1) return
-
-    const initialUserVideoQuotaBit = this.initialUserVideoQuota * 8
-
-    // 1080p: ~ 6Mbps
-    // 720p: ~ 4Mbps
-    // 360p: ~ 1.5Mbps
-    const fullHdSeconds = initialUserVideoQuotaBit / (6 * 1000 * 1000)
-    const hdSeconds = initialUserVideoQuotaBit / (4 * 1000 * 1000)
-    const normalSeconds = initialUserVideoQuotaBit / (1.5 * 1000 * 1000)
-
-    const lines = [
-      this.i18n('{{ seconds }} of full HD videos', { seconds: SignupComponent.getApproximateTime(fullHdSeconds) }),
-      this.i18n('{{ seconds }} of HD videos', { seconds: SignupComponent.getApproximateTime(hdSeconds) }),
-      this.i18n('{{ seconds }} of average quality videos', { seconds: SignupComponent.getApproximateTime(normalSeconds) })
-    ]
-
-    this.quotaHelpIndication = lines.join('<br />')
-  }
 }