Client: support signup

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 2d6fbaf21964e430e2753668cdd1c19dc6cec1b0..534651cea1df4de9305771464f970d2f4fc33a38 100644 (file)
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -13,6 +13,7 @@ import { AppState } from './app.service';
 import { AccountModule } from './account';
 import { CoreModule } from './core';
 import { LoginModule } from './login';
+import { SignupModule } from './signup';
 import { SharedModule } from './shared';
 import { VideosModule } from './videos';
 
@@ -49,6 +50,7 @@ const APP_PROVIDERS = [
     AccountModule,
     CoreModule,
     LoginModule,
+    SignupModule,
     SharedModule,
     VideosModule,
 

diff --git a/client/src/app/core/menu/menu.component.html b/client/src/app/core/menu/menu.component.html
index 1e9a53246fb3eff45a2831b6c7a3d51b7eede643..de17940a1daec6d723e8e634d9b7f3582e6b8bf8 100644 (file)
--- a/client/src/app/core/menu/menu.component.html
+++ b/client/src/app/core/menu/menu.component.html
@@ -12,6 +12,11 @@
       </span>
     </div>
 
+    <div *ngIf="!isLoggedIn && isRegistrationEnabled()" id="panel-user-register" class="panel-button">
+      <span class="hidden-xs glyphicon glyphicon-user"></span>
+      <a [routerLink]="['/signup']">Signup</a>
+    </div>
+
     <div *ngIf="isLoggedIn" id="panel-user-account" class="panel-button">
       <span class="hidden-xs glyphicon glyphicon-user"></span>
       <a [routerLink]="['/account']">My account</a>

diff --git a/client/src/app/core/menu/menu.component.ts b/client/src/app/core/menu/menu.component.ts
index 5ca60e5e0abcecf06be607f2d4475fe81d60d18e..d1f0fa80757fcb089c3dfc8e33db0eb28cd4cce9 100644 (file)
--- a/client/src/app/core/menu/menu.component.ts
+++ b/client/src/app/core/menu/menu.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { AuthService, AuthStatus } from '../auth';
+import { ConfigService } from '../config';
 
 @Component({
   selector: 'my-menu',
@@ -12,6 +13,7 @@ export class MenuComponent implements OnInit {
 
   constructor (
     private authService: AuthService,
+    private configService: ConfigService,
     private router: Router
   ) {}
 
@@ -33,6 +35,10 @@ export class MenuComponent implements OnInit {
     );
   }
 
+  isRegistrationEnabled() {
+    return this.configService.getConfig().signup.enabled;
+  }
+
   isUserAdmin() {
     return this.authService.isAdmin();
   }

diff --git a/client/src/app/shared/users/user.service.ts b/client/src/app/shared/users/user.service.ts
index 0d41b900d329a45401f2119e3803a54d3be73824..0727b76fd9e3f61218d7603b9b9d54871d1e28a0 100644 (file)
--- a/client/src/app/shared/users/user.service.ts
+++ b/client/src/app/shared/users/user.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { Http } from '@angular/http';
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/map';
 
@@ -11,6 +12,7 @@ export class UserService {
   static BASE_USERS_URL = '/api/v1/users/';
 
   constructor(
+    private http: Http,
     private authHttp: AuthHttp,
     private authService: AuthService,
     private restExtractor: RestExtractor
@@ -41,4 +43,16 @@ export class UserService {
                         .map(this.restExtractor.extractDataBool)
                         .catch((res) => this.restExtractor.handleError(res));
   }
+
+  signup(username: string, password: string, email: string) {
+    const body = {
+      username,
+      email,
+      password
+    };
+
+    return this.http.post(UserService.BASE_USERS_URL + 'register', body)
+                        .map(this.restExtractor.extractDataBool)
+                        .catch(this.restExtractor.handleError);
+  }
 }

diff --git a/client/src/app/signup/index.ts b/client/src/app/signup/index.ts
new file mode 100644 (file)
index 0000000..1f4290a
--- /dev/null
+++ b/client/src/app/signup/index.ts
@@ -0,0 +1,3 @@
+export * from './signup-routing.module';
+export * from './signup.component';
+export * from './signup.module';

diff --git a/client/src/app/signup/signup-routing.module.ts b/client/src/app/signup/signup-routing.module.ts
new file mode 100644 (file)
index 0000000..367eed9
--- /dev/null
+++ b/client/src/app/signup/signup-routing.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { SignupComponent } from './signup.component';
+
+const signupRoutes: Routes = [
+  {
+    path: 'signup',
+    component: SignupComponent,
+    data: {
+      meta: {
+        title: 'Signup'
+      }
+    }
+  }
+];
+
+@NgModule({
+  imports: [ RouterModule.forChild(signupRoutes) ],
+  exports: [ RouterModule ]
+})
+export class SignupRoutingModule {}

diff --git a/client/src/app/signup/signup.component.html b/client/src/app/signup/signup.component.html
new file mode 100644 (file)
index 0000000..6c9c60e
--- /dev/null
+++ b/client/src/app/signup/signup.component.html
@@ -0,0 +1,40 @@
+<h3>Signup</h3>
+
+<div *ngIf="error" class="alert alert-danger">{{ error }}</div>
+
+<form role="form" (ngSubmit)="signup()" [formGroup]="form">
+  <div class="form-group">
+    <label for="username">Username</label>
+    <input
+      type="text" class="form-control" id="username" placeholder="Username"
+      formControlName="username"
+    >
+    <div *ngIf="formErrors.username" class="alert alert-danger">
+      {{ formErrors.username }}
+    </div>
+  </div>
+
+  <div class="form-group">
+    <label for="email">Email</label>
+    <input
+      type="text" class="form-control" id="email" placeholder="Email"
+      formControlName="email"
+    >
+    <div *ngIf="formErrors.email" class="alert alert-danger">
+      {{ formErrors.email }}
+    </div>
+  </div>
+
+  <div class="form-group">
+    <label for="password">Password</label>
+    <input
+      type="password" class="form-control" id="password" placeholder="Password"
+      formControlName="password"
+    >
+    <div *ngIf="formErrors.password" class="alert alert-danger">
+      {{ formErrors.password }}
+    </div>
+  </div>
+
+  <input type="submit" value="Signup" class="btn btn-default" [disabled]="!form.valid">
+</form>

diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts
new file mode 100644 (file)
index 0000000..85f9379
--- /dev/null
+++ b/client/src/app/signup/signup.component.ts
@@ -0,0 +1,72 @@
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+
+import { NotificationsService } from 'angular2-notifications';
+
+import { AuthService } from '../core';
+import {
+  FormReactive,
+  UserService,
+  USER_USERNAME,
+  USER_EMAIL,
+  USER_PASSWORD
+} from '../shared';
+
+@Component({
+  selector: 'my-signup',
+  templateUrl: './signup.component.html'
+})
+export class SignupComponent extends FormReactive implements OnInit {
+  error: string = null;
+
+  form: FormGroup;
+  formErrors = {
+    'username': '',
+    'email': '',
+    'password': ''
+  };
+  validationMessages = {
+    'username': USER_USERNAME.MESSAGES,
+    'email': USER_EMAIL.MESSAGES,
+    'password': USER_PASSWORD.MESSAGES,
+  };
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private notificationsService: NotificationsService,
+    private userService: UserService
+  ) {
+    super();
+  }
+
+  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));
+  }
+
+  ngOnInit() {
+    this.buildForm();
+  }
+
+  signup() {
+    this.error = null;
+
+    const { username, password, email } = this.form.value;
+
+    this.userService.signup(username, password, email).subscribe(
+      () => {
+        this.notificationsService.success('Success', `Registration for ${username} complete.`);
+        this.router.navigate([ '/videos/list' ]);
+      },
+
+      err => this.error = err.text
+    );
+  }
+}

diff --git a/client/src/app/signup/signup.module.ts b/client/src/app/signup/signup.module.ts
new file mode 100644 (file)
index 0000000..acb7e55
--- /dev/null
+++ b/client/src/app/signup/signup.module.ts
@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+
+import { SignupRoutingModule } from './signup-routing.module';
+import { SignupComponent } from './signup.component';
+import { SharedModule } from '../shared';
+
+@NgModule({
+  imports: [
+    SignupRoutingModule,
+    SharedModule
+  ],
+
+  declarations: [
+    SignupComponent
+  ],
+
+  exports: [
+    SignupComponent
+  ],
+
+  providers: [
+  ]
+})
+export class SignupModule { }