aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/signup
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-12-11 11:06:32 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-12-11 11:06:32 +0100
commitfada8d75550dc7365f7e18ee1569b9406251d660 (patch)
treedb9dc01c18693824f83fce5020f4c1f3ae7c0865 /client/src/app/signup
parent492fd28167f770d79a430fc57451b5a9e075d8e7 (diff)
parentc2830fa8f84f61462098bf36add824f89436dfa9 (diff)
downloadPeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.gz
PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.zst
PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.zip
Merge branch 'feature/design' into develop
Diffstat (limited to 'client/src/app/signup')
-rw-r--r--client/src/app/signup/signup.component.html22
-rw-r--r--client/src/app/signup/signup.component.scss9
-rw-r--r--client/src/app/signup/signup.component.ts3
3 files changed, 22 insertions, 12 deletions
diff --git a/client/src/app/signup/signup.component.html b/client/src/app/signup/signup.component.html
index b8b7826eb..eb36b29f6 100644
--- a/client/src/app/signup/signup.component.html
+++ b/client/src/app/signup/signup.component.html
@@ -1,7 +1,8 @@
1<div class="row"> 1<div class="margin-content">
2 <div class="content-padding">
3 2
4 <h3>Signup</h3> 3 <div class="title-page title-page-single">
4 Create an account
5 </div>
5 6
6 <div *ngIf="error" class="alert alert-danger">{{ error }}</div> 7 <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
7 8
@@ -10,9 +11,9 @@
10 <label for="username">Username</label> 11 <label for="username">Username</label>
11 <input 12 <input
12 type="text" class="form-control" id="username" placeholder="Username" 13 type="text" class="form-control" id="username" placeholder="Username"
13 formControlName="username" 14 formControlName="username" [ngClass]="{ 'input-error': formErrors['username'] }"
14 > 15 >
15 <div *ngIf="formErrors.username" class="alert alert-danger"> 16 <div *ngIf="formErrors.username" class="form-error">
16 {{ formErrors.username }} 17 {{ formErrors.username }}
17 </div> 18 </div>
18 </div> 19 </div>
@@ -21,9 +22,9 @@
21 <label for="email">Email</label> 22 <label for="email">Email</label>
22 <input 23 <input
23 type="text" class="form-control" id="email" placeholder="Email" 24 type="text" class="form-control" id="email" placeholder="Email"
24 formControlName="email" 25 formControlName="email" [ngClass]="{ 'input-error': formErrors['email'] }"
25 > 26 >
26 <div *ngIf="formErrors.email" class="alert alert-danger"> 27 <div *ngIf="formErrors.email" class="form-error">
27 {{ formErrors.email }} 28 {{ formErrors.email }}
28 </div> 29 </div>
29 </div> 30 </div>
@@ -32,15 +33,14 @@
32 <label for="password">Password</label> 33 <label for="password">Password</label>
33 <input 34 <input
34 type="password" class="form-control" id="password" placeholder="Password" 35 type="password" class="form-control" id="password" placeholder="Password"
35 formControlName="password" 36 formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
36 > 37 >
37 <div *ngIf="formErrors.password" class="alert alert-danger"> 38 <div *ngIf="formErrors.password" class="form-error">
38 {{ formErrors.password }} 39 {{ formErrors.password }}
39 </div> 40 </div>
40 </div> 41 </div>
41 42
42 <input type="submit" value="Signup" class="btn btn-default" [disabled]="!form.valid"> 43 <input type="submit" value="Signup" [disabled]="!form.valid">
43 </form> 44 </form>
44 45
45 </div>
46</div> 46</div>
diff --git a/client/src/app/signup/signup.component.scss b/client/src/app/signup/signup.component.scss
new file mode 100644
index 000000000..3b4326de4
--- /dev/null
+++ b/client/src/app/signup/signup.component.scss
@@ -0,0 +1,9 @@
1input:not([type=submit]) {
2 @include peertube-input-text(340px);
3 display: block;
4}
5
6input[type=submit] {
7 @include peertube-button;
8 @include orange-button;
9}
diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts
index 28e1ed0a8..13390a32a 100644
--- a/client/src/app/signup/signup.component.ts
+++ b/client/src/app/signup/signup.component.ts
@@ -16,7 +16,8 @@ import { UserCreate } from '../../../../shared'
16 16
17@Component({ 17@Component({
18 selector: 'my-signup', 18 selector: 'my-signup',
19 templateUrl: './signup.component.html' 19 templateUrl: './signup.component.html',
20 styleUrls: [ './signup.component.scss' ]
20}) 21})
21export class SignupComponent extends FormReactive implements OnInit { 22export class SignupComponent extends FormReactive implements OnInit {
22 error: string = null 23 error: string = null