Refractor notification service

[github/Chocobozzz/PeerTube.git] / client / src / app / signup / signup.component.ts

diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts
index 55ebb573e10fa56a6308acbda07fef7fc31d0a62..13941ec79542e978de2e9bb05a63ea0b2b3aeec8 100644 (file)
--- a/client/src/app/signup/signup.component.ts
+++ b/client/src/app/signup/signup.component.ts
@@ -1,10 +1,7 @@
 import { Component, OnInit } from '@angular/core'
-import { Router } from '@angular/router'
-import { ServerService } from '@app/core/server'
-import { NotificationsService } from 'angular2-notifications'
+import { AuthService, Notifier, RedirectService, ServerService } from '@app/core'
 import { UserCreate } from '../../../../shared'
 import { FormReactive, UserService, UserValidatorsService } from '../shared'
-import { RedirectService } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 
@@ -14,35 +11,38 @@ import { FormValidatorService } from '@app/shared/forms/form-validators/form-val
   styleUrls: [ './signup.component.scss' ]
 })
 export class SignupComponent extends FormReactive implements OnInit {
+  info: string = null
   error: string = null
-  quotaHelpIndication = ''
+  signupDone = false
 
   constructor (
     protected formValidatorService: FormValidatorService,
+    private authService: AuthService,
     private userValidatorsService: UserValidatorsService,
-    private router: Router,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     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
+  }
+
+  get requiresEmailVerification () {
+    return this.serverService.getConfig().signup.requiresEmailVerification
   }
 
   ngOnInit () {
     this.buildForm({
       username: this.userValidatorsService.USER_USERNAME,
       password: this.userValidatorsService.USER_PASSWORD,
-      email: this.userValidatorsService.USER_EMAIL
+      email: this.userValidatorsService.USER_EMAIL,
+      terms: this.userValidatorsService.USER_TERMS
     })
-
-    this.serverService.configLoaded
-      .subscribe(() => this.buildQuotaHelpIndication())
   }
 
   signup () {
@@ -52,48 +52,27 @@ 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 })
-        )
-        this.redirectService.redirectToHomepage()
-      },
-
-      err => this.error = err.message
-    )
-  }
-
-  private 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 this.i18n('~ {{minutes}} {minutes, plural, =1 {minute} other {minutes}}', { minutes })
-  }
+        this.signupDone = true
 
+        if (this.requiresEmailVerification) {
+          this.info = this.i18n('Welcome! Now please check your emails to verify your account and complete signup.')
+          return
+        }
 
-  private buildQuotaHelpIndication () {
-    if (this.initialUserVideoQuota === -1) return
+        // Auto login
+        this.authService.login(userCreate.username, userCreate.password)
+            .subscribe(
+              () => {
+                this.notifier.success(this.i18n('You are now logged in as {{username}}!', { username: userCreate.username }))
 
-    const initialUserVideoQuotaBit = this.initialUserVideoQuota * 8
+                this.redirectService.redirectToHomepage()
+              },
 
-    // 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: this.getApproximateTime(fullHdSeconds) }),
-      this.i18n('{{seconds}} of HD videos', { seconds: this.getApproximateTime(hdSeconds) }),
-      this.i18n('{{seconds}} of average quality videos', { seconds: this.getApproximateTime(normalSeconds) })
-    ]
+              err => this.error = err.message
+            )
+      },
 
-    this.quotaHelpIndication = lines.join('<br />')
+      err => this.error = err.message
+    )
   }
 }