AnisB
/
XJC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolution conflit final

Browse Source
thierry
Tmadkaud 7 years ago
parent 3c3ffede1f 9bc32d9451
commit 0f57cf3d21
2 changed files with 43 additions and 107 deletions
Show Stats Download Patch File Download Diff File

10
src/app/components/home/home.component.html
Unescape Escape View File

@ -1,13 +1,3 @@
<!--
<p>
Home
</p>
<button (click)="loadRegisterComponent()">Register</button>
<button (click)="loadLoginComponent()">Login</button>
-->
<!--Main Navigation-->
<header>

140
src/app/components/register/register.component.html
Unescape Escape View File

@ -1,103 +1,49 @@
<!--
<p>
Register
</p>
<p>
Créer un compte
(c'est gratuit !)
</p>
<form class="form-inline">
<div class="form-group">
<input name="group2" type="radio" class="with-gap" id="homme">
<label for="homme">Homme</label>
</div>
<div class="form-group">
<input name="group2" type="radio" class="with-gap" id="femme">
<label for="femme">Femme</label>
</div>
</form>
<div class="from-group">
<input [(ngModel)]="currentUser.familyname" placeholder="Family name..">
</div>
<div class="from-group">
<input [(ngModel)]="currentUser.firstname" placeholder="Firstname..">
</div>
<div class="from-group">
<input [(ngModel)]="currentUser.username" placeholder="User name..">
</div>
<div class="from-group">
<input type="date" [(ngModel)]="currentUser.birthday" placeholder="Birthday..">
</div>
<div class="from-group">
<input type="email" [(ngModel)]="currentUser.email" placeholder="Email..">
</div>
<div class="from-group">
<input type="password" [(ngModel)]="currentUser.password" placeholder="Password..">
</div>
Etes-vous:
<div class="card">
<div class="well">
<p class="h5 text-center mb-4">Sign up</p>
<div class="form-group">
<input name="client" type="radio" class="with-gap" id="client">
<label for="client">Client</label>
</div>
<div class="form-group">
<input name="commercant" type="radio" class="with-gap" id="commercant">
<label for="commercant">Commercant</label>
</div>
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
<input type="text" id="orangeForm-Familyname" [(ngModel)]="currentUser.familyname" placeholder="Your family name">
</div>
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
<input type="text" id="orangeForm-Firstname" [(ngModel)]="currentUser.firstname" placeholder="Your firstname">
</div>
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
<input type="text" id="orangeForm-Username" [(ngModel)]="currentUser.username" placeholder="User name">
</div>
<div class="md-form">
<input type="text" type="date" id="orangeForm-Birthday" [(ngModel)]="currentUser.birthday" placeholder="Birthday..">
</div>
<div class="md-form">
<i class="fa fa-envelope prefix grey-text"></i>
<input type="email" id="orangeForm-email" [(ngModel)]="currentUser.email" placeholder="Your email">
</div>
<div class="md-form">
<i class="fa fa-lock prefix grey-text"></i>
<input id="orangeForm-pass" type="password" [(ngModel)]="currentUser.password" placeholder="Your password">
</div>
<form class="form-inline">
<div class="form-group">
<input name="group2" type="radio" class="with-gap" id="client">
<label for="client">Client</label>
</div>
<div class="md-form">
<input name="group2" type="radio" class="with-gap" id="client">
<label for="client">Client</label>
</div>
<div class="form-group">
<input name="group2" type="radio" class="with-gap" id="commercant">
<label for="commercant">Commercant</label>
</div>
</form>
<p>
En cliquant sur Créer un compte, vous acceptez nos Conditions
et indiquez que vous aves lu notre Politique d'utilisation des
données, y compris notre Utilisation des cookies.
</p>
<button (click)="register()">Register</button>
<button (click)="loadLoginComponent()">Go to login</button>
<button (click)="loadHomeComponent()">Go to home</button>
-->
<div class="card">
<div class="well">
<p class="h5 text-center mb-4">Sign up</p>
<div class="md-form">
<input name="group2" type="radio" class="with-gap" id="commercant">
<label for="commercant">Commercant</label>
</div>
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
<input type="text" id="orangeForm-Familyname" [(ngModel)]="currentUser.familyname" placeholder="Your family name">
</div>
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
<input type="text" id="orangeForm-Firstname" [(ngModel)]="currentUser.firstname" placeholder="Your firstname">
</div>
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
<input type="text" id="orangeForm-Username" [(ngModel)]="currentUser.username" placeholder="User name">
</div>
<div class="md-form">
<input type="text" type="date" id="orangeForm-Birthday" [(ngModel)]="currentUser.birthday" placeholder="Birthday..">
</div>
<div class="md-form">
<i class="fa fa-envelope prefix grey-text"></i>
<input type="email" id="orangeForm-email" [(ngModel)]="currentUser.email" placeholder="Your email">
</div>
<div class="md-form">
<i class="fa fa-lock prefix grey-text"></i>
<input id="orangeForm-pass" type="password" [(ngModel)]="currentUser.password" placeholder="Your password">
</div>
<div class="text-center" style="margin-top:5%">
<button class="btn btn-deep-orange" (click)="register()">Sign up</button>
<button class="btn btn-cyan" (click)="loadHomeComponent()">Back</button>
</div>
<label>
En cliquant sur Créer un compte, vous acceptez nos Conditions
et indiquez que vous aves lu notre Politique d'utilisation des
données, y compris notre Utilisation des cookies.
</label>
<div class="text-center" style="margin-top:5%">
<button class="btn btn-deep-orange" (click)="register()">Sign up</button>
<button class="btn btn-cyan" (click)="loadHomeComponent()">Back</button>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save