From f96dc1f3c44b413eef1b64b4ff9ea8abca9fc34a Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Thu, 4 Feb 2021 19:13:57 +0100
Subject: [PATCH] ordering base fields

---
 .../base-config/base-config.component.html    | 121 +++++++++---------
 .../administration/form/form.component.html   |   8 +-
 .../kind-select/kind-select.component.html    |   3 -
 src/assets/i18n/FR.json                       |   2 +
 4 files changed, 69 insertions(+), 65 deletions(-)

diff --git a/src/app/features/administration/form/base-config/base-config.component.html b/src/app/features/administration/form/base-config/base-config.component.html
index 32b888c0..9346d401 100644
--- a/src/app/features/administration/form/base-config/base-config.component.html
+++ b/src/app/features/administration/form/base-config/base-config.component.html
@@ -1,12 +1,4 @@
 <form [formGroup]="form">
-	<h1>
-		{{ 'creation.title' | translate }}
-	</h1>
-
-	<p class="subtitle">
-		{{ 'creation.want' | translate }}
-	</p>
-
 	<div class="columns">
 		<div class="column">
 			<p>
@@ -36,69 +28,76 @@
 			</button>
 		</div>
 		<div class="column">
+			<label for="creatorPseudo">
+				<span>
+					{{ 'creation.email' | translate }}
+				</span>
+			</label>
+
+			<input
+				#title
+				matInput
+				placeholder="{{ 'creation.email_placeholder' | translate }}"
+				formControlName="creatorEmail"
+				id="creatorEmail"
+				required
+			/>
+			<br />
+
 			<label class="" for="creatorEmail">
 				<span>
 					{{ 'creation.name' | translate }}
 				</span>
 			</label>
-			<label class="hidden" for="creatorPseudo">
-				<span>
-					{{ 'creation.email' | translate }}
-				</span>
-			</label>
 			<input #title matInput placeholder="pseudo" formControlName="creatorPseudo" id="creatorPseudo" required />
-			<input
-				#title
-				matInput
-				placeholder="mon-email@example.com"
-				formControlName="creatorEmail"
-				id="creatorEmail"
-				required
-			/>
 		</div>
 
 		<hr />
-		<div>
-			<h2>
-				{{ 'choices.title' | translate }}
-			</h2>
-			{{ 'dates.add' | translate }}
-			<p>
-				<i>
-					{{ 'choices.helper' | translate }}
-				</i>
-			</p>
-			{{ 'choices.answer_preset_1' | translate }}
-			{{ 'choices.add' | translate }}
-			{{ 'choices.continue' | translate }}
-		</div>
-		<div class="column">
-			<img src="assets/img/undraw_Moving_twwf.svg" alt="image WIP" />
-		</div>
-		<div class="column">
-			<button class="btn btn--warning" (click)="askInitFormDefault()">
-				<i class="fa fa-refresh"></i>
-				Tout réinitialiser
-			</button>
-			<br />
-			<button class="btn is-success" (click)="createPoll()">
-				<i class="fa fa-save"></i>
-				Enregistrer le sondage
-			</button>
-			<br />
-			<button class="btn is-default" (click)="automaticSlug()">
-				<i class="fa fa-refresh"></i>
-				Slug automatique
-			</button>
+	</div>
 
-			<div class="columns">
-				<div class="column">
-					Slug:
-				</div>
-				<div class="column">
-					<div class="well">
-						{{ poll.slug }}
-					</div>
+	<hr />
+	<div class="columns">
+		<div class="column">
+			<!--			<img src="assets/img/undraw_Moving_twwf.svg" alt="image WIP" />-->
+			<div>
+				<h2>
+					{{ 'choices.title' | translate }}
+				</h2>
+				{{ 'dates.add' | translate }}
+				<p>
+					<i>
+						{{ 'choices.helper' | translate }}
+					</i>
+				</p>
+				{{ 'choices.answer_preset_1' | translate }}
+				{{ 'choices.add' | translate }}
+				{{ 'choices.continue' | translate }}
+			</div>
+		</div>
+	</div>
+	<div class="column">
+		<button class="btn btn--warning" (click)="askInitFormDefault()">
+			<i class="fa fa-refresh"></i>
+			Tout réinitialiser
+		</button>
+		<br />
+		<button class="btn is-success" (click)="createPoll()">
+			<i class="fa fa-save"></i>
+			Enregistrer le sondage
+		</button>
+		<br />
+		<button class="btn is-default" (click)="automaticSlug()">
+			<i class="fa fa-refresh"></i>
+			Slug automatique
+		</button>
+
+		<div class="columns">
+			<div class="column">
+				Slug:
+			</div>
+			<div class="column">
+				<div class="well">
+					{{ poll.slug }}
 				</div>
 			</div>
 		</div>
diff --git a/src/app/features/administration/form/form.component.html b/src/app/features/administration/form/form.component.html
index eb595224..710a95ad 100644
--- a/src/app/features/administration/form/form.component.html
+++ b/src/app/features/administration/form/form.component.html
@@ -1,7 +1,13 @@
 <div class="admin-form padded">
 	<form [formGroup]="form">
+		<h1>
+			{{ 'creation.title' | translate }}
+		</h1>
+		<p class="subtitle">
+			{{ 'creation.want' | translate }}
+		</p>
+		<app-kind-select [poll]="poll" [form]="form"></app-kind-select>
 		<app-base-config [poll]="poll" [form]="form"></app-base-config>
-		<!--	<app-kind-select></app-kind-select>-->
 
 		<!--			choix spécialement pour les dates-->
 		<!--	<app-date-select ng-if="form.kind == 'date'"></app-date-select>-->
diff --git a/src/app/features/administration/form/kind-select/kind-select.component.html b/src/app/features/administration/form/kind-select/kind-select.component.html
index df196976..bd8b558f 100644
--- a/src/app/features/administration/form/kind-select/kind-select.component.html
+++ b/src/app/features/administration/form/kind-select/kind-select.component.html
@@ -1,7 +1,4 @@
 <div class="kind-select form-field">
-	<span class="pre-selector">
-		{{ 'creation.want' | translate }}
-	</span>
 	<div class="kind-of-poll columns">
 		<div class="column">
 			<button
diff --git a/src/assets/i18n/FR.json b/src/assets/i18n/FR.json
index a2c693b7..67cceeec 100644
--- a/src/assets/i18n/FR.json
+++ b/src/assets/i18n/FR.json
@@ -38,6 +38,8 @@
 		"choices_hint": "Utilisez les flèches haut ⬆️ et bas ⬇️ pour passer d'un choix à un autre",
 		"name": "Je peux aussi préciser mon nom si je le souhaite",
 		"name_placeholder": "mon nom",
+		"email": "Mon email",
+		"email_placeholder": "mon-email@example.com",
 		"description": "et la description serait",
 		"description_placeholder": "description"
 	},