Merge branch 'issue-55' into 'dev'

Issue 55

See merge request framasoft/framadate/funky-framadate-front!21
This commit is contained in:
Le Libre Au Quotidien 2019-12-30 11:17:17 +01:00
commit 0730d4a6ac
5 changed files with 2809 additions and 472 deletions

3180
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -29,7 +29,7 @@
"zone.js": "~0.9.1" "zone.js": "~0.9.1"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.802.1", "@angular-devkit/build-angular": "^0.803.21",
"@angular/cli": "~8.2.1", "@angular/cli": "~8.2.1",
"@angular/compiler-cli": "~8.2.0", "@angular/compiler-cli": "~8.2.0",
"@angular/language-service": "~8.2.0", "@angular/language-service": "~8.2.0",

View File

@ -1,60 +1,39 @@
<div class="container">
<section class="creation"> <section class="creation">
<h1> <h1>
{{"creation.title"|translate}} {{"creation.title"|translate}}
</h1> </h1>
<p <p class="description margin-btm-x5" i18n>
class="description" {{"config.description"|translate}}
i18n
>
{{"config.title"|translate}}
</p> </p>
<div class="btn-next"> <div class="btn-next">
<a
[routerLink]="'/home'" <button class="btn btn--full btn--primary">{{"config.letsgo"|translate}}</button>
>
<span
class="text"
i18n
>
{{"config.letsgo"|translate}}
</span>
<span class="icon right">
>
</span>
</a>
</div> </div>
</section> </section>
<section class="recuperation"> <section class="recuperation">
<h1> <h1 class="margin-top-x8">
{{"config.find_my_polls"|translate}} {{"config.find_my_polls"|translate}}
</h1> </h1>
<form <section class="list-my-polls">
(ngSubmit)="findMyPollsByEmail(emailToFind.value)" <!--<ul class="poll-list" *ngFor="let poll of config.myPolls">-->
> <a href="#" class="next margin-btm-x3">Anniversaire de tonton Patrick</a>
<label <a href="#" class="next margin-btm-x5">Anniversaire de Bernard </a>
class="description" <!--</ul>-->
for="email" </section>
i18n
> <form (ngSubmit)="findMyPollsByEmail(emailToFind.value)">
<section class="row">
<label class="description" for="email" i18n>
{{"config.find_helper"|translate}} : {{"config.find_helper"|translate}} :
</label> </label>
<input <input class="margin-btm-x5" #emailToFind type="email" name="mail" id="email" autofocus="autofocus">
#emailToFind </section>
type="email"
name="mail" <input type="submit" class="btn btn--primary btn--default btn--purple btn--black-text" value='{{"config.find_button"|translate}}'>
id="email"
autofocus="autofocus"
/>
<input
type="submit"
class="btn btn-block"
i18n-value="'config.find_button'|translate"
/>
</form> </form>
</section> </section>
<section class="list-my-polls">
<ul class="poll-list" *ngFor="let poll of config.myPolls"> </div>
<li> poll</li>
</ul>
</section>

View File

@ -1,3 +1,8 @@
.container{
display:flex;
flex-direction: column;
margin:auto;
}
h1 { h1 {
display: inline-block; display: inline-block;
margin-bottom: 3rem; margin-bottom: 3rem;
@ -14,4 +19,9 @@ h1 {
// background-color: $primary_color; // background-color: $primary_color;
} }
} }
label{
float:left;
}
input[type=email]{
display:block;
}

View File

@ -13,12 +13,12 @@
"title": "Créer un sondage", "title": "Créer un sondage",
"letsgo": "C'est parti !", "letsgo": "C'est parti !",
"description": "Planifiez des rendez-vous avec vos amis ou votre famille ou créez un sondage avec du texte, des images ou des liens… un sondage quoi !", "description": "Planifiez des rendez-vous avec vos amis ou votre famille ou créez un sondage avec du texte, des images ou des liens… un sondage quoi !",
"find_my_polls": "Où sont mes sondages ?", "find_my_polls": "Mes sondages",
"find_helper": "Je cherche les sondages qui correspondent à mon mail", "find_helper": "Je cherche d'autres sondages qui correspondent à mon mail",
"find_button": "Retrouver mes sondages" "find_button": "Retrouver mes sondages"
}, },
"creation": { "creation": {
"title": "Pour commencer ", "title": "Créer un sondage",
"want": "Je veux créer un sondage", "want": "Je veux créer un sondage",
"kind": { "kind": {
"classic": "classique", "classic": "classique",