From b247a132709eb212fef4f77c4912dc0ec108f36b Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 29 May 2019 14:39:49 +0200
Subject: Add success icon on registration

---
 client/src/app/+verify-account/index.ts            |  2 -
 .../verify-account-ask-send-email.component.html   | 22 ---------
 .../verify-account-ask-send-email.component.scss   | 12 -----
 .../verify-account-ask-send-email.component.ts     | 57 ----------------------
 .../verify-account-email.component.html            | 15 ------
 .../verify-account-email.component.ts              | 53 --------------------
 .../verify-account-routing.module.ts               | 42 ----------------
 .../app/+verify-account/verify-account.module.ts   | 27 ----------
 8 files changed, 230 deletions(-)
 delete mode 100644 client/src/app/+verify-account/index.ts
 delete mode 100644 client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html
 delete mode 100644 client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.scss
 delete mode 100644 client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
 delete mode 100644 client/src/app/+verify-account/verify-account-email/verify-account-email.component.html
 delete mode 100644 client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts
 delete mode 100644 client/src/app/+verify-account/verify-account-routing.module.ts
 delete mode 100644 client/src/app/+verify-account/verify-account.module.ts

(limited to 'client/src/app/+verify-account')

diff --git a/client/src/app/+verify-account/index.ts b/client/src/app/+verify-account/index.ts
deleted file mode 100644
index 733f5ba77..000000000
--- a/client/src/app/+verify-account/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '@app/+verify-account/verify-account-routing.module'
-export * from '@app/+verify-account/verify-account.module'
diff --git a/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html b/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html
deleted file mode 100644
index 2e4180632..000000000
--- a/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="margin-content">
-  <div i18n class="title-page title-page-single">
-    Request email for account verification
-  </div>
-
-  <form *ngIf="requiresEmailVerification; else emailVerificationNotRequired" role="form" (ngSubmit)="askSendVerifyEmail()" [formGroup]="form">
-    <div class="form-group">
-      <label i18n for="verify-email-email">Email</label>
-      <input
-        type="email" id="verify-email-email" i18n-placeholder placeholder="Email address" required
-        formControlName="verify-email-email" [ngClass]="{ 'input-error': formErrors['verify-email-email'] }"
-      >
-      <div *ngIf="formErrors['verify-email-email']" class="form-error">
-          {{ formErrors['verify-email-email'] }}
-      </div>
-    </div>
-    <input type="submit" i18n-value value="Send verification email" [disabled]="!form.valid">
-  </form>
-  <ng-template #emailVerificationNotRequired>
-    <div i18n>This instance does not require email verification.</div>
-  </ng-template>
-</div>
diff --git a/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.scss b/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.scss
deleted file mode 100644
index efec6b706..000000000
--- a/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@import '_variables';
-@import '_mixins';
-
-input:not([type=submit]) {
-  @include peertube-input-text(340px);
-  display: block;
-}
-
-input[type=submit] {
-  @include peertube-button;
-  @include orange-button;
-}
diff --git a/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts b/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
deleted file mode 100644
index cfd471fa4..000000000
--- a/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Component, OnInit } from '@angular/core'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { Notifier, RedirectService } from '@app/core'
-import { ServerService } from '@app/core/server'
-import { FormReactive, UserService } from '@app/shared'
-import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
-import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service'
-
-@Component({
-  selector: 'my-verify-account-ask-send-email',
-  templateUrl: './verify-account-ask-send-email.component.html',
-  styleUrls: [ './verify-account-ask-send-email.component.scss' ]
-})
-
-export class VerifyAccountAskSendEmailComponent extends FormReactive implements OnInit {
-
-  constructor (
-    protected formValidatorService: FormValidatorService,
-    private userValidatorsService: UserValidatorsService,
-    private userService: UserService,
-    private serverService: ServerService,
-    private notifier: Notifier,
-    private redirectService: RedirectService,
-    private i18n: I18n
-  ) {
-    super()
-  }
-
-  get requiresEmailVerification () {
-    return this.serverService.getConfig().signup.requiresEmailVerification
-  }
-
-  ngOnInit () {
-    this.buildForm({
-      'verify-email-email': this.userValidatorsService.USER_EMAIL
-    })
-  }
-
-  askSendVerifyEmail () {
-    const email = this.form.value['verify-email-email']
-    this.userService.askSendVerifyEmail(email)
-      .subscribe(
-        () => {
-          const message = this.i18n(
-            'An email with verification link will be sent to {{email}}.',
-            { email }
-          )
-          this.notifier.success(message)
-          this.redirectService.redirectToHomepage()
-        },
-
-        err => {
-          this.notifier.error(err.message)
-        }
-      )
-  }
-}
diff --git a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.html b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.html
deleted file mode 100644
index a83d4a3c2..000000000
--- a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="margin-content">
-  <div i18n class="title-page title-page-single">
-    Verify account email confirmation
-  </div>
-
-  <div i18n *ngIf="success; else verificationError">
-    Your email has been verified and you may now login. Redirecting...
-  </div>
-  <ng-template #verificationError>
-    <div>
-      <span i18n>An error occurred. </span>
-      <a i18n routerLink="/verify-account/ask-send-email">Request new verification email.</a>
-    </div>
-  </ng-template>
-</div>
diff --git a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts
deleted file mode 100644
index f9ecf664b..000000000
--- a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Component, OnInit } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { Notifier } from '@app/core'
-import { UserService } from '@app/shared'
-
-@Component({
-  selector: 'my-verify-account-email',
-  templateUrl: './verify-account-email.component.html'
-})
-
-export class VerifyAccountEmailComponent implements OnInit {
-  success = false
-
-  private userId: number
-  private verificationString: string
-
-  constructor (
-    private userService: UserService,
-    private notifier: Notifier,
-    private router: Router,
-    private route: ActivatedRoute,
-    private i18n: I18n
-  ) {
-  }
-
-  ngOnInit () {
-    this.userId = this.route.snapshot.queryParams['userId']
-    this.verificationString = this.route.snapshot.queryParams['verificationString']
-
-    if (!this.userId || !this.verificationString) {
-      this.notifier.error(this.i18n('Unable to find user id or verification string.'))
-    } else {
-      this.verifyEmail()
-    }
-  }
-
-  verifyEmail () {
-    this.userService.verifyEmail(this.userId, this.verificationString)
-      .subscribe(
-        () => {
-          this.success = true
-          setTimeout(() => {
-            this.router.navigate([ '/login' ])
-          }, 2000)
-        },
-
-        err => {
-          this.notifier.error(err.message)
-        }
-      )
-  }
-}
diff --git a/client/src/app/+verify-account/verify-account-routing.module.ts b/client/src/app/+verify-account/verify-account-routing.module.ts
deleted file mode 100644
index a038f0336..000000000
--- a/client/src/app/+verify-account/verify-account-routing.module.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
-
-import { MetaGuard } from '@ngx-meta/core'
-
-import { VerifyAccountEmailComponent } from '@app/+verify-account/verify-account-email/verify-account-email.component'
-import {
-  VerifyAccountAskSendEmailComponent
-} from '@app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component'
-
-const verifyAccountRoutes: Routes = [
-  {
-    path: '',
-    canActivateChild: [ MetaGuard ],
-    children: [
-      {
-        path: 'email',
-        component: VerifyAccountEmailComponent,
-        data: {
-          meta: {
-            title: 'Verify account email'
-          }
-        }
-      },
-      {
-        path: 'ask-send-email',
-        component: VerifyAccountAskSendEmailComponent,
-        data: {
-          meta: {
-            title: 'Verify account ask send email'
-          }
-        }
-      }
-    ]
-  }
-]
-
-@NgModule({
-  imports: [ RouterModule.forChild(verifyAccountRoutes) ],
-  exports: [ RouterModule ]
-})
-export class VerifyAccountRoutingModule {}
diff --git a/client/src/app/+verify-account/verify-account.module.ts b/client/src/app/+verify-account/verify-account.module.ts
deleted file mode 100644
index 9092c6b4f..000000000
--- a/client/src/app/+verify-account/verify-account.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgModule } from '@angular/core'
-
-import { VerifyAccountRoutingModule } from '@app/+verify-account/verify-account-routing.module'
-import { VerifyAccountEmailComponent } from '@app/+verify-account/verify-account-email/verify-account-email.component'
-import {
-  VerifyAccountAskSendEmailComponent
-} from '@app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component'
-import { SharedModule } from '@app/shared'
-
-@NgModule({
-  imports: [
-    VerifyAccountRoutingModule,
-    SharedModule
-  ],
-
-  declarations: [
-    VerifyAccountEmailComponent,
-    VerifyAccountAskSendEmailComponent
-  ],
-
-  exports: [
-  ],
-
-  providers: [
-  ]
-})
-export class VerifyAccountModule { }
-- 
cgit v1.2.3