From d5bc5777b787060dfaa84c1ed7599bff272b5507 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Thu, 29 Apr 2021 10:17:13 +0200
Subject: [PATCH 01/18] add good hash in route

---
 src/app/core/components/footer/footer.component.html  |  2 +-
 src/app/core/services/api.service.ts                  | 11 ++++++++---
 src/app/core/services/poll.service.ts                 |  6 +++++-
 .../consultation/consultation-routing.module.ts       |  8 +++++---
 .../features/consultation/consultation.component.html |  6 +++---
 .../features/consultation/consultation.component.ts   |  3 ++-
 src/app/routes-framadate.ts                           |  4 ++--
 src/environments/environment.ts                       |  8 ++++----
 8 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html
index 9410a3e2..a62e391f 100644
--- a/src/app/core/components/footer/footer.component.html
+++ b/src/app/core/components/footer/footer.component.html
@@ -45,7 +45,7 @@
 					dessin-anime
 				</strong>
 			</button>
-			<button class="btn is-primary" routerLink="/poll/citron/consultation/9199bdd9e0d4b29deafbf3463c0727fc">
+			<button class="btn is-primary" routerLink="/poll/citron/consultation/1c01ed9c94fc640a1be864f197ff808c">
 				consulter le sondage
 
 				<strong>
diff --git a/src/app/core/services/api.service.ts b/src/app/core/services/api.service.ts
index b4a427e9..b80e686f 100644
--- a/src/app/core/services/api.service.ts
+++ b/src/app/core/services/api.service.ts
@@ -41,8 +41,13 @@ export class ApiService {
 		this.axiosInstance.defaults.headers.post['Content-Type'] = 'application/json';
 		this.axiosInstance.defaults.headers.post['Accept'] = 'application/json';
 		this.axiosInstance.defaults.headers.post['Charset'] = 'UTF-8';
+		this.axiosInstance.defaults.headers.post['Accept-Charset'] = 'UTF-8';
 		this.axiosInstance.defaults.headers.post['Access-Control-Allow-Methods'] = 'GET, POST, PUT, DELETE, OPTIONS';
+		this.axiosInstance.defaults.headers.post['Referrer-Policy'] = 'origin-when-cross-origin';
 		this.axiosInstance.defaults.headers.post['Access-Control-Allow-Origin'] = '*';
+		this.axiosInstance.defaults.headers.post['Allow-Origin'] = '*';
+		this.axiosInstance.defaults.headers.post['Access-Control-Allow-Headers'] =
+			'Origin, X-Requested-With, Content-Type, Accept';
 
 		console.log('this.axiosInstance.defaults.headers', this.axiosInstance.defaults.headers);
 	}
@@ -116,11 +121,11 @@ export class ApiService {
 
 		console.log('vote_stack', vote_stack);
 		console.log('this.baseHref', this.baseHref);
-		let headers = ApiService.makeHeaders(vote_stack);
+		const headers = ApiService.makeHeaders(vote_stack);
 		console.log('headers', headers);
-		let url = `${this.baseHref}/poll/${poll.custom_url}/answer`;
+		const url = `${this.baseHref}/poll/${poll.custom_url}/answer`;
 
-		let axiosconf = {
+		const axiosconf = {
 			url,
 			method: 'POST',
 			body: vote_stack,
diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index d8dec5e1..f1ef9c65 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -75,7 +75,11 @@ export class PollService implements Resolve<Poll> {
 		if (slug) {
 			const poll: Poll | undefined = await this.apiService.getPollBySlug(slug);
 			console.log({ loadPollBySlugResponse: poll });
-			this.updateCurrentPoll(poll);
+			if (poll) {
+				this.updateCurrentPoll(poll);
+			} else {
+				this.toastService.display(`sondage ${slug} non trouvé`);
+			}
 		}
 	}
 	public async loadPollBySlugWithPasswordHash(slug: string, hash: string): Promise<void> {
diff --git a/src/app/features/consultation/consultation-routing.module.ts b/src/app/features/consultation/consultation-routing.module.ts
index ceeb4b99..e09b8d72 100644
--- a/src/app/features/consultation/consultation-routing.module.ts
+++ b/src/app/features/consultation/consultation-routing.module.ts
@@ -4,10 +4,12 @@ import { RouterModule, Routes } from '@angular/router';
 import { ConsultationComponent } from './consultation.component';
 
 const routes: Routes = [
-	{ path: '', component: ConsultationComponent },
-	{ path: '/:hash', component: ConsultationComponent },
+	{
+		path: '/',
+		component: ConsultationComponent,
+		children: [{ path: '/:hash', component: ConsultationComponent }],
+	},
 ];
-
 @NgModule({
 	imports: [RouterModule.forChild(routes)],
 	exports: [RouterModule],
diff --git a/src/app/features/consultation/consultation.component.html b/src/app/features/consultation/consultation.component.html
index 6acc730f..282057e0 100644
--- a/src/app/features/consultation/consultation.component.html
+++ b/src/app/features/consultation/consultation.component.html
@@ -103,14 +103,14 @@
 						(click)="addVoteStack()"
 						[disabled]="!myTempVoteStack"
 						[ngClass]="{ 'btn--primary': myTempVoteStack }"
-						*ngIf="!myVoteStack || !myVoteStack.id"
+						*ngIf="!storageService.vote_stack || !storageService.vote_stack.id"
 					>
 						<i class="fa fa-paper-plane" aria-hidden="true"></i> Envoyer
 					</button>
 					<button
 						class="btn btn--primary btn-block submit-votestack update"
-						(click)="updateVote(myVoteStack)"
-						*ngIf="myVoteStack && myVoteStack.id"
+						(click)="updateVote(storageService.vote_stack)"
+						*ngIf="storageService.vote_stack && storageService.vote_stack.id"
 					>
 						<i class="fa fa-edit" aria-hidden="true"></i> Mettre à jour
 					</button>
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts
index c6aa4e66..ff7fefdd 100644
--- a/src/app/features/consultation/consultation.component.ts
+++ b/src/app/features/consultation/consultation.component.ts
@@ -9,6 +9,7 @@ import { PollUtilities } from '../old-stuff/config/PollUtilities';
 import { Comment } from '../../core/models/comment.model';
 import { StorageService } from '../../core/services/storage.service';
 import { ApiService } from '../../core/services/api.service';
+import { Stack } from '../../core/models/stack.model';
 
 @Component({
 	selector: 'app-consultation',
@@ -74,7 +75,7 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 		}
 	}
 
-	updateVote() {
+	updateVote(votestack: Stack) {
 		alert('TODO');
 	}
 
diff --git a/src/app/routes-framadate.ts b/src/app/routes-framadate.ts
index 05c20a5f..3b18424f 100644
--- a/src/app/routes-framadate.ts
+++ b/src/app/routes-framadate.ts
@@ -25,7 +25,7 @@ export const routes: Routes = [
 		path: 'poll/:slug/administration',
 		loadChildren: () =>
 			import('./features/administration/administration.module').then((m) => m.AdministrationModule),
-		resolve: { poll: PollService },
+		// resolve: { poll: PollService },
 	},
 	{
 		path: 'poll/:slug/consultation',
@@ -35,7 +35,7 @@ export const routes: Routes = [
 	{
 		path: 'poll/:slug/participation',
 		loadChildren: () => import('./features/participation/participation.module').then((m) => m.ParticipationModule),
-		resolve: { poll: PollService },
+		// resolve: { poll: PollService },
 	},
 	{
 		path: 'oldstuff',
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 229e5d01..b0fcef5a 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,12 +4,12 @@
 
 const backendApiUrlsInDev = {
 	local: '/api/v1',
-	// remote: 'http://localhost:8000/api/v1',
-	remote: 'https://framadate-api.cipherbliss.com/api/v1',
+	remote: 'http://localhost:8000/api/v1',
+	// remote: 'https://framadate-api.cipherbliss.com/api/v1',
 };
 const apiV1 = {
-	// baseHref: 'http://localhost:8000/api/v1',
-	baseHref: 'https://framadate-api.cipherbliss.com/api/v1',
+	baseHref: 'http://localhost:8000/api/v1',
+	// baseHref: 'https://framadate-api.cipherbliss.com/api/v1',
 	api_new_poll: '/poll/',
 	api_get_poll: '/poll/{id}',
 	api_new_vote_stack: '/poll/{id}/answer',

From fdcb7327f0b65a4ce8c7ae6f8a5bec9f5592c026 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Thu, 29 Apr 2021 10:41:47 +0200
Subject: [PATCH 02/18] move old stuff

---
 .../old-stuff/config/PollConfig.ts            |  2 +-
 .../old-stuff/config/defaultConfigs.ts        |  0
 .../date-value-accessor.metadata.json         |  0
 .../date-value-accessor.ts                    |  0
 .../date-value-accessor/index.metadata.json   |  0
 .../custom-lib/date-value-accessor/index.ts   |  0
 .../date-value-accessor/module.metadata.json  |  0
 .../custom-lib/date-value-accessor/module.ts  |  0
 .../old-stuff/mocks/choice.ts                 |  0
 .../mocks/comment-same-text-error.json        |  0
 .../mocks/comment-too-fast-error.json         |  0
 .../mocks/config-poll-dessins-animes.json     |  0
 .../old-stuff/mocks/created-comment.json      |  0
 .../old-stuff/mocks/mock-comments.ts          |  0
 .../old-stuff/mocks/mock-graph.ts             |  0
 .../old-stuff/mocks/mock-poll3.ts             |  0
 .../old-stuff/mocks/mock-success-vote.ts      |  0
 .../old-stuff/mocks/mockmypolls.ts            |  0
 .../old-stuff/mocks/votestack-success.json    |  0
 .../old-stuff/old-stuff-routing.module.ts     |  0
 .../old-stuff/old-stuff.module.ts             |  2 +-
 .../pages/admin/admin.component.html          |  0
 .../pages/admin/admin.component.scss          |  0
 .../pages/admin/admin.component.spec.ts       |  0
 .../old-stuff/pages/admin/admin.component.ts  |  4 +--
 .../pages/answers/answers.component.html      |  0
 .../pages/answers/answers.component.scss      |  0
 .../pages/answers/answers.component.spec.ts   |  0
 .../pages/answers/answers.component.ts        |  0
 .../create-or-retrieve.component.html         |  0
 .../create-or-retrieve.component.scss         |  0
 .../create-or-retrieve.component.spec.ts      |  0
 .../create-or-retrieve.component.ts           |  0
 .../pages/dates/dates.component.html          |  0
 .../pages/dates/dates.component.scss          |  0
 .../pages/dates/dates.component.spec.ts       |  0
 .../old-stuff/pages/dates/dates.component.ts  |  4 +--
 .../end-confirmation.component.html           |  0
 .../end-confirmation.component.scss           |  0
 .../end-confirmation.component.spec.ts        |  0
 .../end-confirmation.component.ts             |  2 +-
 .../example/base-page/base.component.html     |  0
 .../example/base-page/base.component.scss     |  0
 .../example/base-page/base.component.spec.ts  |  0
 .../pages/example/base-page/base.component.ts |  0
 .../pages/example/kind/kind.component.html    |  2 +-
 .../pages/example/kind/kind.component.scss    |  0
 .../pages/example/kind/kind.component.spec.ts |  0
 .../pages/example/kind/kind.component.ts      |  0
 .../example/pictures/pictures.component.html  |  0
 .../example/pictures/pictures.component.scss  |  0
 .../pictures/pictures.component.spec.ts       |  0
 .../example/pictures/pictures.component.ts    |  0
 .../old-stuff/pages/home/home.component.html  |  0
 .../old-stuff/pages/home/home.component.scss  |  0
 .../pages/home/home.component.spec.ts         |  0
 .../old-stuff/pages/home/home.component.ts    |  0
 .../pages/password/password.component.html    |  0
 .../pages/password/password.component.scss    |  0
 .../pages/password/password.component.spec.ts |  0
 .../pages/password/password.component.ts      |  0
 .../poll-display/poll-display.component.html  |  0
 .../poll-display/poll-display.component.scss  |  1 +
 .../poll-display.component.spec.ts            |  0
 .../poll-display/poll-display.component.ts    |  2 +-
 .../poll-graphic/poll-graphic.component.html  |  0
 .../poll-graphic/poll-graphic.component.scss  |  0
 .../poll-graphic.component.spec.ts            |  0
 .../poll-graphic/poll-graphic.component.ts    |  0
 .../pages/resume/resume.component.html        |  0
 .../pages/resume/resume.component.scss        |  0
 .../pages/resume/resume.component.spec.ts     |  0
 .../pages/resume/resume.component.ts          |  0
 .../visibility/visibility.component.html      |  0
 .../visibility/visibility.component.scss      |  0
 .../visibility/visibility.component.spec.ts   |  0
 .../pages/visibility/visibility.component.ts  |  4 +--
 .../choices-list/choices-list.component.html  |  0
 .../choices-list/choices-list.component.scss  |  0
 .../choices-list.component.spec.ts            |  0
 .../choices-list/choices-list.component.ts    |  0
 .../comments-list.component.html              |  0
 .../comments-list.component.scss              |  0
 .../comments-list.component.spec.ts           |  0
 .../comments-list/comments-list.component.ts  |  0
 .../voting-choice.component.html              |  0
 .../voting-choice.component.scss              |  2 +-
 .../voting-choice.component.spec.ts           |  0
 .../voting-choice/voting-choice.component.ts  |  0
 .../voting-comment.component.html             |  0
 .../voting-comment.component.scss             |  0
 .../voting-comment.component.spec.ts          |  0
 .../voting-comment.component.ts               |  0
 .../voting-graph/voting-graph.component.html  |  0
 .../voting-graph/voting-graph.component.scss  |  0
 .../voting-graph.component.spec.ts            |  0
 .../voting-graph/voting-graph.component.ts    |  0
 .../voting-navigation.component.html          |  0
 .../voting-navigation.component.scss          |  0
 .../voting-navigation.component.spec.ts       |  0
 .../voting-navigation.component.ts            |  0
 .../voting-summary.component.html             |  0
 .../voting-summary.component.scss             |  2 +-
 .../voting-summary.component.spec.ts          |  0
 .../voting-summary.component.ts               |  0
 .../pages/voting/voting.component.html        |  0
 .../pages/voting/voting.component.scss        |  0
 .../pages/voting/voting.component.spec.ts     |  0
 .../pages/voting/voting.component.ts          |  0
 .../old-stuff/services/config.service.ts      |  6 ++--
 .../services/progression.service.spec.ts      |  0
 .../ui/copy-text/copy-text.component.html     |  0
 .../ui/copy-text/copy-text.component.scss     |  0
 .../ui/copy-text/copy-text.component.spec.ts  |  0
 .../ui/copy-text/copy-text.component.ts       |  2 +-
 .../resettable-input.directive.spec.ts        |  0
 .../directives/resettable-input.directive.ts  |  0
 .../erasable-input.component.html             |  0
 .../erasable-input.component.scss             |  0
 .../erasable-input.component.spec.ts          |  0
 .../erasable-input.component.ts               |  0
 .../ui/two-links/two-links.component.html     |  0
 .../ui/two-links/two-links.component.scss     |  0
 .../ui/two-links/two-links.component.spec.ts  |  0
 .../ui/two-links/two-links.component.ts       |  0
 .../components/footer/footer.component.html   | 29 -------------------
 .../components/header/header.component.html   | 28 ++++++++++++++++++
 .../config => core/services}/DateUtilities.ts |  0
 .../config => core/services}/PollUtilities.ts |  3 +-
 .../form/date-select/date-select.component.ts |  9 ++++--
 .../consultation-routing.module.ts            |  2 +-
 .../consultation/consultation.component.ts    |  2 +-
 .../poll-display/poll-display.component.scss  |  1 -
 src/app/routes-framadate.ts                   |  4 ---
 134 files changed, 56 insertions(+), 57 deletions(-)
 rename {src/app/features => mocks}/old-stuff/config/PollConfig.ts (97%)
 rename {src/app/features => mocks}/old-stuff/config/defaultConfigs.ts (100%)
 rename {src/app/features => mocks}/old-stuff/custom-lib/date-value-accessor/date-value-accessor.metadata.json (100%)
 rename {src/app/features => mocks}/old-stuff/custom-lib/date-value-accessor/date-value-accessor.ts (100%)
 rename {src/app/features => mocks}/old-stuff/custom-lib/date-value-accessor/index.metadata.json (100%)
 rename {src/app/features => mocks}/old-stuff/custom-lib/date-value-accessor/index.ts (100%)
 rename {src/app/features => mocks}/old-stuff/custom-lib/date-value-accessor/module.metadata.json (100%)
 rename {src/app/features => mocks}/old-stuff/custom-lib/date-value-accessor/module.ts (100%)
 rename {src/app/features => mocks}/old-stuff/mocks/choice.ts (100%)
 rename {src/app/features => mocks}/old-stuff/mocks/comment-same-text-error.json (100%)
 rename {src/app/features => mocks}/old-stuff/mocks/comment-too-fast-error.json (100%)
 rename {src/app/features => mocks}/old-stuff/mocks/config-poll-dessins-animes.json (100%)
 rename {src/app/features => mocks}/old-stuff/mocks/created-comment.json (100%)
 rename {src/app/features => mocks}/old-stuff/mocks/mock-comments.ts (100%)
 rename {src/app/features => mocks}/old-stuff/mocks/mock-graph.ts (100%)
 rename {src/app/features => mocks}/old-stuff/mocks/mock-poll3.ts (100%)
 rename {src/app/features => mocks}/old-stuff/mocks/mock-success-vote.ts (100%)
 rename {src/app/features => mocks}/old-stuff/mocks/mockmypolls.ts (100%)
 rename {src/app/features => mocks}/old-stuff/mocks/votestack-success.json (100%)
 rename {src/app/features => mocks}/old-stuff/old-stuff-routing.module.ts (100%)
 rename {src/app/features => mocks}/old-stuff/old-stuff.module.ts (98%)
 rename {src/app/features => mocks}/old-stuff/pages/admin/admin.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/admin/admin.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/admin/admin.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/admin/admin.component.ts (91%)
 rename {src/app/features => mocks}/old-stuff/pages/answers/answers.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/answers/answers.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/answers/answers.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/answers/answers.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/dates/dates.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/dates/dates.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/dates/dates.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/dates/dates.component.ts (95%)
 rename {src/app/features => mocks}/old-stuff/pages/end-confirmation/end-confirmation.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/end-confirmation/end-confirmation.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/end-confirmation/end-confirmation.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/end-confirmation/end-confirmation.component.ts (90%)
 rename {src/app/features => mocks}/old-stuff/pages/example/base-page/base.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/example/base-page/base.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/example/base-page/base.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/example/base-page/base.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/example/kind/kind.component.html (98%)
 rename {src/app/features => mocks}/old-stuff/pages/example/kind/kind.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/example/kind/kind.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/example/kind/kind.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/example/pictures/pictures.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/example/pictures/pictures.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/example/pictures/pictures.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/example/pictures/pictures.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/home/home.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/home/home.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/home/home.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/home/home.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/password/password.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/password/password.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/password/password.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/password/password.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/poll/poll-display/poll-display.component.html (100%)
 create mode 100644 mocks/old-stuff/pages/poll/poll-display/poll-display.component.scss
 rename {src/app/features => mocks}/old-stuff/pages/poll/poll-display/poll-display.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/poll/poll-display/poll-display.component.ts (96%)
 rename {src/app/features => mocks}/old-stuff/pages/poll/poll-graphic/poll-graphic.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/poll/poll-graphic/poll-graphic.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/poll/poll-graphic/poll-graphic.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/poll/poll-graphic/poll-graphic.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/resume/resume.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/resume/resume.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/resume/resume.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/resume/resume.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/visibility/visibility.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/visibility/visibility.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/visibility/visibility.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/visibility/visibility.component.ts (85%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/choices-list/choices-list.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/choices-list/choices-list.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/choices-list/choices-list.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/choices-list/choices-list.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/comments-list/comments-list.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/comments-list/comments-list.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/comments-list/comments-list.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/comments-list/comments-list.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-choice/voting-choice.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-choice/voting-choice.component.scss (98%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-choice/voting-choice.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-choice/voting-choice.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-comment/voting-comment.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-comment/voting-comment.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-comment/voting-comment.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-comment/voting-comment.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-graph/voting-graph.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-graph/voting-graph.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-graph/voting-graph.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-graph/voting-graph.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-navigation/voting-navigation.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-navigation/voting-navigation.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-navigation/voting-navigation.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-summary/voting-summary.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-summary/voting-summary.component.scss (84%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-summary/voting-summary.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting-summary/voting-summary.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/pages/voting/voting.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/services/config.service.ts (99%)
 rename {src/app/features => mocks}/old-stuff/services/progression.service.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/ui/copy-text/copy-text.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/ui/copy-text/copy-text.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/ui/copy-text/copy-text.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/ui/copy-text/copy-text.component.ts (88%)
 rename {src/app/features => mocks}/old-stuff/ui/directives/resettable-input.directive.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/ui/directives/resettable-input.directive.ts (100%)
 rename {src/app/features => mocks}/old-stuff/ui/erasable-input/erasable-input.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/ui/erasable-input/erasable-input.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/ui/erasable-input/erasable-input.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/ui/erasable-input/erasable-input.component.ts (100%)
 rename {src/app/features => mocks}/old-stuff/ui/two-links/two-links.component.html (100%)
 rename {src/app/features => mocks}/old-stuff/ui/two-links/two-links.component.scss (100%)
 rename {src/app/features => mocks}/old-stuff/ui/two-links/two-links.component.spec.ts (100%)
 rename {src/app/features => mocks}/old-stuff/ui/two-links/two-links.component.ts (100%)
 rename src/app/{features/old-stuff/config => core/services}/DateUtilities.ts (100%)
 rename src/app/{features/old-stuff/config => core/services}/PollUtilities.ts (94%)
 delete mode 100644 src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.scss

diff --git a/src/app/features/old-stuff/config/PollConfig.ts b/mocks/old-stuff/config/PollConfig.ts
similarity index 97%
rename from src/app/features/old-stuff/config/PollConfig.ts
rename to mocks/old-stuff/config/PollConfig.ts
index 483b5539..b45b3573 100644
--- a/src/app/features/old-stuff/config/PollConfig.ts
+++ b/mocks/old-stuff/config/PollConfig.ts
@@ -1,7 +1,7 @@
 /**
  * une option de date dans les sondages spéciaux
  */
-import { environment } from '../../../../environments/environment';
+import { environment } from '../../../src/environments/environment';
 import { DateChoice, defaultAnswers, otherDefaultDates, PollAnswer } from './defaultConfigs';
 
 export interface DateOption {
diff --git a/src/app/features/old-stuff/config/defaultConfigs.ts b/mocks/old-stuff/config/defaultConfigs.ts
similarity index 100%
rename from src/app/features/old-stuff/config/defaultConfigs.ts
rename to mocks/old-stuff/config/defaultConfigs.ts
diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/date-value-accessor.metadata.json b/mocks/old-stuff/custom-lib/date-value-accessor/date-value-accessor.metadata.json
similarity index 100%
rename from src/app/features/old-stuff/custom-lib/date-value-accessor/date-value-accessor.metadata.json
rename to mocks/old-stuff/custom-lib/date-value-accessor/date-value-accessor.metadata.json
diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/date-value-accessor.ts b/mocks/old-stuff/custom-lib/date-value-accessor/date-value-accessor.ts
similarity index 100%
rename from src/app/features/old-stuff/custom-lib/date-value-accessor/date-value-accessor.ts
rename to mocks/old-stuff/custom-lib/date-value-accessor/date-value-accessor.ts
diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/index.metadata.json b/mocks/old-stuff/custom-lib/date-value-accessor/index.metadata.json
similarity index 100%
rename from src/app/features/old-stuff/custom-lib/date-value-accessor/index.metadata.json
rename to mocks/old-stuff/custom-lib/date-value-accessor/index.metadata.json
diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/index.ts b/mocks/old-stuff/custom-lib/date-value-accessor/index.ts
similarity index 100%
rename from src/app/features/old-stuff/custom-lib/date-value-accessor/index.ts
rename to mocks/old-stuff/custom-lib/date-value-accessor/index.ts
diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/module.metadata.json b/mocks/old-stuff/custom-lib/date-value-accessor/module.metadata.json
similarity index 100%
rename from src/app/features/old-stuff/custom-lib/date-value-accessor/module.metadata.json
rename to mocks/old-stuff/custom-lib/date-value-accessor/module.metadata.json
diff --git a/src/app/features/old-stuff/custom-lib/date-value-accessor/module.ts b/mocks/old-stuff/custom-lib/date-value-accessor/module.ts
similarity index 100%
rename from src/app/features/old-stuff/custom-lib/date-value-accessor/module.ts
rename to mocks/old-stuff/custom-lib/date-value-accessor/module.ts
diff --git a/src/app/features/old-stuff/mocks/choice.ts b/mocks/old-stuff/mocks/choice.ts
similarity index 100%
rename from src/app/features/old-stuff/mocks/choice.ts
rename to mocks/old-stuff/mocks/choice.ts
diff --git a/src/app/features/old-stuff/mocks/comment-same-text-error.json b/mocks/old-stuff/mocks/comment-same-text-error.json
similarity index 100%
rename from src/app/features/old-stuff/mocks/comment-same-text-error.json
rename to mocks/old-stuff/mocks/comment-same-text-error.json
diff --git a/src/app/features/old-stuff/mocks/comment-too-fast-error.json b/mocks/old-stuff/mocks/comment-too-fast-error.json
similarity index 100%
rename from src/app/features/old-stuff/mocks/comment-too-fast-error.json
rename to mocks/old-stuff/mocks/comment-too-fast-error.json
diff --git a/src/app/features/old-stuff/mocks/config-poll-dessins-animes.json b/mocks/old-stuff/mocks/config-poll-dessins-animes.json
similarity index 100%
rename from src/app/features/old-stuff/mocks/config-poll-dessins-animes.json
rename to mocks/old-stuff/mocks/config-poll-dessins-animes.json
diff --git a/src/app/features/old-stuff/mocks/created-comment.json b/mocks/old-stuff/mocks/created-comment.json
similarity index 100%
rename from src/app/features/old-stuff/mocks/created-comment.json
rename to mocks/old-stuff/mocks/created-comment.json
diff --git a/src/app/features/old-stuff/mocks/mock-comments.ts b/mocks/old-stuff/mocks/mock-comments.ts
similarity index 100%
rename from src/app/features/old-stuff/mocks/mock-comments.ts
rename to mocks/old-stuff/mocks/mock-comments.ts
diff --git a/src/app/features/old-stuff/mocks/mock-graph.ts b/mocks/old-stuff/mocks/mock-graph.ts
similarity index 100%
rename from src/app/features/old-stuff/mocks/mock-graph.ts
rename to mocks/old-stuff/mocks/mock-graph.ts
diff --git a/src/app/features/old-stuff/mocks/mock-poll3.ts b/mocks/old-stuff/mocks/mock-poll3.ts
similarity index 100%
rename from src/app/features/old-stuff/mocks/mock-poll3.ts
rename to mocks/old-stuff/mocks/mock-poll3.ts
diff --git a/src/app/features/old-stuff/mocks/mock-success-vote.ts b/mocks/old-stuff/mocks/mock-success-vote.ts
similarity index 100%
rename from src/app/features/old-stuff/mocks/mock-success-vote.ts
rename to mocks/old-stuff/mocks/mock-success-vote.ts
diff --git a/src/app/features/old-stuff/mocks/mockmypolls.ts b/mocks/old-stuff/mocks/mockmypolls.ts
similarity index 100%
rename from src/app/features/old-stuff/mocks/mockmypolls.ts
rename to mocks/old-stuff/mocks/mockmypolls.ts
diff --git a/src/app/features/old-stuff/mocks/votestack-success.json b/mocks/old-stuff/mocks/votestack-success.json
similarity index 100%
rename from src/app/features/old-stuff/mocks/votestack-success.json
rename to mocks/old-stuff/mocks/votestack-success.json
diff --git a/src/app/features/old-stuff/old-stuff-routing.module.ts b/mocks/old-stuff/old-stuff-routing.module.ts
similarity index 100%
rename from src/app/features/old-stuff/old-stuff-routing.module.ts
rename to mocks/old-stuff/old-stuff-routing.module.ts
diff --git a/src/app/features/old-stuff/old-stuff.module.ts b/mocks/old-stuff/old-stuff.module.ts
similarity index 98%
rename from src/app/features/old-stuff/old-stuff.module.ts
rename to mocks/old-stuff/old-stuff.module.ts
index 3dea8e28..c4502415 100644
--- a/src/app/features/old-stuff/old-stuff.module.ts
+++ b/mocks/old-stuff/old-stuff.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { ConfirmationService, DialogModule, MessageService } from 'primeng';
 
-import { SharedModule } from '../../shared/shared.module';
+import { SharedModule } from '../../src/app/shared/shared.module';
 import { DateValueAccessorModule } from './custom-lib/date-value-accessor';
 import { OldStuffRoutingModule } from './old-stuff-routing.module';
 import { AdminComponent } from './pages/admin/admin.component';
diff --git a/src/app/features/old-stuff/pages/admin/admin.component.html b/mocks/old-stuff/pages/admin/admin.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/admin/admin.component.html
rename to mocks/old-stuff/pages/admin/admin.component.html
diff --git a/src/app/features/old-stuff/pages/admin/admin.component.scss b/mocks/old-stuff/pages/admin/admin.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/admin/admin.component.scss
rename to mocks/old-stuff/pages/admin/admin.component.scss
diff --git a/src/app/features/old-stuff/pages/admin/admin.component.spec.ts b/mocks/old-stuff/pages/admin/admin.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/admin/admin.component.spec.ts
rename to mocks/old-stuff/pages/admin/admin.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/admin/admin.component.ts b/mocks/old-stuff/pages/admin/admin.component.ts
similarity index 91%
rename from src/app/features/old-stuff/pages/admin/admin.component.ts
rename to mocks/old-stuff/pages/admin/admin.component.ts
index 370973d2..ba67f433 100644
--- a/src/app/features/old-stuff/pages/admin/admin.component.ts
+++ b/mocks/old-stuff/pages/admin/admin.component.ts
@@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core';
 import { ConfigService } from '../../services/config.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { HttpClient } from '@angular/common/http';
-import { PollUtilities } from '../../config/PollUtilities';
-import { environment } from '../../../../../environments/environment';
+import { PollUtilities } from '../../../../src/app/core/services/PollUtilities';
+import { environment } from '../../../../src/environments/environment';
 
 @Component({
 	selector: 'app-admin',
diff --git a/src/app/features/old-stuff/pages/answers/answers.component.html b/mocks/old-stuff/pages/answers/answers.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/answers/answers.component.html
rename to mocks/old-stuff/pages/answers/answers.component.html
diff --git a/src/app/features/old-stuff/pages/answers/answers.component.scss b/mocks/old-stuff/pages/answers/answers.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/answers/answers.component.scss
rename to mocks/old-stuff/pages/answers/answers.component.scss
diff --git a/src/app/features/old-stuff/pages/answers/answers.component.spec.ts b/mocks/old-stuff/pages/answers/answers.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/answers/answers.component.spec.ts
rename to mocks/old-stuff/pages/answers/answers.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/answers/answers.component.ts b/mocks/old-stuff/pages/answers/answers.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/answers/answers.component.ts
rename to mocks/old-stuff/pages/answers/answers.component.ts
diff --git a/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html b/mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html
rename to mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.html
diff --git a/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.scss b/mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.scss
rename to mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.scss
diff --git a/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.spec.ts b/mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.spec.ts
rename to mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.ts b/mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.ts
rename to mocks/old-stuff/pages/create-or-retrieve/create-or-retrieve.component.ts
diff --git a/src/app/features/old-stuff/pages/dates/dates.component.html b/mocks/old-stuff/pages/dates/dates.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/dates/dates.component.html
rename to mocks/old-stuff/pages/dates/dates.component.html
diff --git a/src/app/features/old-stuff/pages/dates/dates.component.scss b/mocks/old-stuff/pages/dates/dates.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/dates/dates.component.scss
rename to mocks/old-stuff/pages/dates/dates.component.scss
diff --git a/src/app/features/old-stuff/pages/dates/dates.component.spec.ts b/mocks/old-stuff/pages/dates/dates.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/dates/dates.component.spec.ts
rename to mocks/old-stuff/pages/dates/dates.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/dates/dates.component.ts b/mocks/old-stuff/pages/dates/dates.component.ts
similarity index 95%
rename from src/app/features/old-stuff/pages/dates/dates.component.ts
rename to mocks/old-stuff/pages/dates/dates.component.ts
index 1caed356..f78a93d9 100644
--- a/src/app/features/old-stuff/pages/dates/dates.component.ts
+++ b/mocks/old-stuff/pages/dates/dates.component.ts
@@ -1,8 +1,8 @@
 import { DOCUMENT } from '@angular/common';
 import { ChangeDetectorRef, Component, Inject, OnInit } from '@angular/core';
 
-import { ToastService } from '../../../../core/services/toast.service';
-import { DateUtilities } from '../../config/DateUtilities';
+import { ToastService } from '../../../../src/app/core/services/toast.service';
+import { DateUtilities } from '../../../../src/app/core/services/DateUtilities';
 import { otherDefaultDates } from '../../config/defaultConfigs';
 import { ConfigService } from '../../services/config.service';
 import { BaseComponent } from '../example/base-page/base.component';
diff --git a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.html b/mocks/old-stuff/pages/end-confirmation/end-confirmation.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.html
rename to mocks/old-stuff/pages/end-confirmation/end-confirmation.component.html
diff --git a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.scss b/mocks/old-stuff/pages/end-confirmation/end-confirmation.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.scss
rename to mocks/old-stuff/pages/end-confirmation/end-confirmation.component.scss
diff --git a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.spec.ts b/mocks/old-stuff/pages/end-confirmation/end-confirmation.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.spec.ts
rename to mocks/old-stuff/pages/end-confirmation/end-confirmation.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.ts b/mocks/old-stuff/pages/end-confirmation/end-confirmation.component.ts
similarity index 90%
rename from src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.ts
rename to mocks/old-stuff/pages/end-confirmation/end-confirmation.component.ts
index ac4eab66..cba66989 100644
--- a/src/app/features/old-stuff/pages/end-confirmation/end-confirmation.component.ts
+++ b/mocks/old-stuff/pages/end-confirmation/end-confirmation.component.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 
-import { ToastService } from '../../../../core/services/toast.service';
+import { ToastService } from '../../../../src/app/core/services/toast.service';
 import { ConfigService } from '../../services/config.service';
 import { BaseComponent } from '../example/base-page/base.component';
 
diff --git a/src/app/features/old-stuff/pages/example/base-page/base.component.html b/mocks/old-stuff/pages/example/base-page/base.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/example/base-page/base.component.html
rename to mocks/old-stuff/pages/example/base-page/base.component.html
diff --git a/src/app/features/old-stuff/pages/example/base-page/base.component.scss b/mocks/old-stuff/pages/example/base-page/base.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/example/base-page/base.component.scss
rename to mocks/old-stuff/pages/example/base-page/base.component.scss
diff --git a/src/app/features/old-stuff/pages/example/base-page/base.component.spec.ts b/mocks/old-stuff/pages/example/base-page/base.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/example/base-page/base.component.spec.ts
rename to mocks/old-stuff/pages/example/base-page/base.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/example/base-page/base.component.ts b/mocks/old-stuff/pages/example/base-page/base.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/example/base-page/base.component.ts
rename to mocks/old-stuff/pages/example/base-page/base.component.ts
diff --git a/src/app/features/old-stuff/pages/example/kind/kind.component.html b/mocks/old-stuff/pages/example/kind/kind.component.html
similarity index 98%
rename from src/app/features/old-stuff/pages/example/kind/kind.component.html
rename to mocks/old-stuff/pages/example/kind/kind.component.html
index 10c0467e..0cf28006 100644
--- a/src/app/features/old-stuff/pages/example/kind/kind.component.html
+++ b/mocks/old-stuff/pages/example/kind/kind.component.html
@@ -47,7 +47,7 @@
 
 		<br />
 
-		<a href="/" class="btn btn--primary btn--outline">
+		<a href='/' class="btn btn--primary btn--outline">
 			primary - outline - default
 		</a>
 
diff --git a/src/app/features/old-stuff/pages/example/kind/kind.component.scss b/mocks/old-stuff/pages/example/kind/kind.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/example/kind/kind.component.scss
rename to mocks/old-stuff/pages/example/kind/kind.component.scss
diff --git a/src/app/features/old-stuff/pages/example/kind/kind.component.spec.ts b/mocks/old-stuff/pages/example/kind/kind.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/example/kind/kind.component.spec.ts
rename to mocks/old-stuff/pages/example/kind/kind.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/example/kind/kind.component.ts b/mocks/old-stuff/pages/example/kind/kind.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/example/kind/kind.component.ts
rename to mocks/old-stuff/pages/example/kind/kind.component.ts
diff --git a/src/app/features/old-stuff/pages/example/pictures/pictures.component.html b/mocks/old-stuff/pages/example/pictures/pictures.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/example/pictures/pictures.component.html
rename to mocks/old-stuff/pages/example/pictures/pictures.component.html
diff --git a/src/app/features/old-stuff/pages/example/pictures/pictures.component.scss b/mocks/old-stuff/pages/example/pictures/pictures.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/example/pictures/pictures.component.scss
rename to mocks/old-stuff/pages/example/pictures/pictures.component.scss
diff --git a/src/app/features/old-stuff/pages/example/pictures/pictures.component.spec.ts b/mocks/old-stuff/pages/example/pictures/pictures.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/example/pictures/pictures.component.spec.ts
rename to mocks/old-stuff/pages/example/pictures/pictures.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/example/pictures/pictures.component.ts b/mocks/old-stuff/pages/example/pictures/pictures.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/example/pictures/pictures.component.ts
rename to mocks/old-stuff/pages/example/pictures/pictures.component.ts
diff --git a/src/app/features/old-stuff/pages/home/home.component.html b/mocks/old-stuff/pages/home/home.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/home/home.component.html
rename to mocks/old-stuff/pages/home/home.component.html
diff --git a/src/app/features/old-stuff/pages/home/home.component.scss b/mocks/old-stuff/pages/home/home.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/home/home.component.scss
rename to mocks/old-stuff/pages/home/home.component.scss
diff --git a/src/app/features/old-stuff/pages/home/home.component.spec.ts b/mocks/old-stuff/pages/home/home.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/home/home.component.spec.ts
rename to mocks/old-stuff/pages/home/home.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/home/home.component.ts b/mocks/old-stuff/pages/home/home.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/home/home.component.ts
rename to mocks/old-stuff/pages/home/home.component.ts
diff --git a/src/app/features/old-stuff/pages/password/password.component.html b/mocks/old-stuff/pages/password/password.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/password/password.component.html
rename to mocks/old-stuff/pages/password/password.component.html
diff --git a/src/app/features/old-stuff/pages/password/password.component.scss b/mocks/old-stuff/pages/password/password.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/password/password.component.scss
rename to mocks/old-stuff/pages/password/password.component.scss
diff --git a/src/app/features/old-stuff/pages/password/password.component.spec.ts b/mocks/old-stuff/pages/password/password.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/password/password.component.spec.ts
rename to mocks/old-stuff/pages/password/password.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/password/password.component.ts b/mocks/old-stuff/pages/password/password.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/password/password.component.ts
rename to mocks/old-stuff/pages/password/password.component.ts
diff --git a/src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.html b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.html
rename to mocks/old-stuff/pages/poll/poll-display/poll-display.component.html
diff --git a/mocks/old-stuff/pages/poll/poll-display/poll-display.component.scss b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.scss
new file mode 100644
index 00000000..97075968
--- /dev/null
+++ b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.scss
@@ -0,0 +1 @@
+@import '../../../../../src/styles/variables';
diff --git a/src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.spec.ts b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.spec.ts
rename to mocks/old-stuff/pages/poll/poll-display/poll-display.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.ts b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts
similarity index 96%
rename from src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.ts
rename to mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts
index 9489db1a..768b8686 100644
--- a/src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.ts
+++ b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts
@@ -3,7 +3,7 @@ import { BaseComponent } from '../../example/base-page/base.component';
 import { ConfigService } from '../../../services/config.service';
 import { mockComments } from '../../../mocks/mock-comments';
 import { ActivatedRoute, Router } from '@angular/router';
-import { environment } from '../../../../../../environments/environment';
+import { environment } from '../../../../../src/environments/environment';
 import { mockPoll3 } from '../../../mocks/mock-poll3';
 
 @Component({
diff --git a/src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.html b/mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.html
rename to mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.html
diff --git a/src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.scss b/mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.scss
rename to mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.scss
diff --git a/src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.spec.ts b/mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.spec.ts
rename to mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.ts b/mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/poll/poll-graphic/poll-graphic.component.ts
rename to mocks/old-stuff/pages/poll/poll-graphic/poll-graphic.component.ts
diff --git a/src/app/features/old-stuff/pages/resume/resume.component.html b/mocks/old-stuff/pages/resume/resume.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/resume/resume.component.html
rename to mocks/old-stuff/pages/resume/resume.component.html
diff --git a/src/app/features/old-stuff/pages/resume/resume.component.scss b/mocks/old-stuff/pages/resume/resume.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/resume/resume.component.scss
rename to mocks/old-stuff/pages/resume/resume.component.scss
diff --git a/src/app/features/old-stuff/pages/resume/resume.component.spec.ts b/mocks/old-stuff/pages/resume/resume.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/resume/resume.component.spec.ts
rename to mocks/old-stuff/pages/resume/resume.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/resume/resume.component.ts b/mocks/old-stuff/pages/resume/resume.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/resume/resume.component.ts
rename to mocks/old-stuff/pages/resume/resume.component.ts
diff --git a/src/app/features/old-stuff/pages/visibility/visibility.component.html b/mocks/old-stuff/pages/visibility/visibility.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/visibility/visibility.component.html
rename to mocks/old-stuff/pages/visibility/visibility.component.html
diff --git a/src/app/features/old-stuff/pages/visibility/visibility.component.scss b/mocks/old-stuff/pages/visibility/visibility.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/visibility/visibility.component.scss
rename to mocks/old-stuff/pages/visibility/visibility.component.scss
diff --git a/src/app/features/old-stuff/pages/visibility/visibility.component.spec.ts b/mocks/old-stuff/pages/visibility/visibility.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/visibility/visibility.component.spec.ts
rename to mocks/old-stuff/pages/visibility/visibility.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/visibility/visibility.component.ts b/mocks/old-stuff/pages/visibility/visibility.component.ts
similarity index 85%
rename from src/app/features/old-stuff/pages/visibility/visibility.component.ts
rename to mocks/old-stuff/pages/visibility/visibility.component.ts
index e29a8fb1..63f581f4 100644
--- a/src/app/features/old-stuff/pages/visibility/visibility.component.ts
+++ b/mocks/old-stuff/pages/visibility/visibility.component.ts
@@ -1,8 +1,8 @@
 import { Location } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 
-import { environment } from '../../../../../environments/environment';
-import { PollUtilities } from '../../config/PollUtilities';
+import { environment } from '../../../../src/environments/environment';
+import { PollUtilities } from '../../../../src/app/core/services/PollUtilities';
 import { ConfigService } from '../../services/config.service';
 import { BaseComponent } from '../example/base-page/base.component';
 
diff --git a/src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.html b/mocks/old-stuff/pages/voting/choices-list/choices-list.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.html
rename to mocks/old-stuff/pages/voting/choices-list/choices-list.component.html
diff --git a/src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.scss b/mocks/old-stuff/pages/voting/choices-list/choices-list.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.scss
rename to mocks/old-stuff/pages/voting/choices-list/choices-list.component.scss
diff --git a/src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.spec.ts b/mocks/old-stuff/pages/voting/choices-list/choices-list.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.spec.ts
rename to mocks/old-stuff/pages/voting/choices-list/choices-list.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.ts b/mocks/old-stuff/pages/voting/choices-list/choices-list.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/choices-list/choices-list.component.ts
rename to mocks/old-stuff/pages/voting/choices-list/choices-list.component.ts
diff --git a/src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.html b/mocks/old-stuff/pages/voting/comments-list/comments-list.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.html
rename to mocks/old-stuff/pages/voting/comments-list/comments-list.component.html
diff --git a/src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.scss b/mocks/old-stuff/pages/voting/comments-list/comments-list.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.scss
rename to mocks/old-stuff/pages/voting/comments-list/comments-list.component.scss
diff --git a/src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.spec.ts b/mocks/old-stuff/pages/voting/comments-list/comments-list.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.spec.ts
rename to mocks/old-stuff/pages/voting/comments-list/comments-list.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.ts b/mocks/old-stuff/pages/voting/comments-list/comments-list.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/comments-list/comments-list.component.ts
rename to mocks/old-stuff/pages/voting/comments-list/comments-list.component.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.html b/mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.html
rename to mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.html
diff --git a/src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.scss b/mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.scss
similarity index 98%
rename from src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.scss
rename to mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.scss
index 4b2f821e..c619c0b3 100644
--- a/src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.scss
+++ b/mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.scss
@@ -5,7 +5,7 @@
 // -- IMPORTS
 // ----------------------------
 
-@import '../../../../../../styles/variables';
+@import '../../../../../src/styles/variables';
 
 // -- VARIABLES
 // ----------------------------
diff --git a/src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.spec.ts b/mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.spec.ts
rename to mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.ts b/mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-choice/voting-choice.component.ts
rename to mocks/old-stuff/pages/voting/voting-choice/voting-choice.component.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.html b/mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.html
rename to mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.html
diff --git a/src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.scss b/mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.scss
rename to mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.scss
diff --git a/src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.spec.ts b/mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.spec.ts
rename to mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.ts b/mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-comment/voting-comment.component.ts
rename to mocks/old-stuff/pages/voting/voting-comment/voting-comment.component.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.html b/mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.html
rename to mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.html
diff --git a/src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.scss b/mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.scss
rename to mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.scss
diff --git a/src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.spec.ts b/mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.spec.ts
rename to mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.ts b/mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-graph/voting-graph.component.ts
rename to mocks/old-stuff/pages/voting/voting-graph/voting-graph.component.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html b/mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html
rename to mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.html
diff --git a/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.scss b/mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.scss
rename to mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.scss
diff --git a/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.spec.ts b/mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.spec.ts
rename to mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.ts b/mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-navigation/voting-navigation.component.ts
rename to mocks/old-stuff/pages/voting/voting-navigation/voting-navigation.component.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.html b/mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.html
rename to mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.html
diff --git a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.scss b/mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.scss
similarity index 84%
rename from src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.scss
rename to mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.scss
index df5b9f7c..8fc60aa0 100644
--- a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.scss
+++ b/mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../../../styles/variables';
+@import '../../../../../src/styles/variables';
 
 .person {
 	font-weight: 700;
diff --git a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.spec.ts b/mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.spec.ts
rename to mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.ts b/mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting-summary/voting-summary.component.ts
rename to mocks/old-stuff/pages/voting/voting-summary/voting-summary.component.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting.component.html b/mocks/old-stuff/pages/voting/voting.component.html
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting.component.html
rename to mocks/old-stuff/pages/voting/voting.component.html
diff --git a/src/app/features/old-stuff/pages/voting/voting.component.scss b/mocks/old-stuff/pages/voting/voting.component.scss
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting.component.scss
rename to mocks/old-stuff/pages/voting/voting.component.scss
diff --git a/src/app/features/old-stuff/pages/voting/voting.component.spec.ts b/mocks/old-stuff/pages/voting/voting.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting.component.spec.ts
rename to mocks/old-stuff/pages/voting/voting.component.spec.ts
diff --git a/src/app/features/old-stuff/pages/voting/voting.component.ts b/mocks/old-stuff/pages/voting/voting.component.ts
similarity index 100%
rename from src/app/features/old-stuff/pages/voting/voting.component.ts
rename to mocks/old-stuff/pages/voting/voting.component.ts
diff --git a/src/app/features/old-stuff/services/config.service.ts b/mocks/old-stuff/services/config.service.ts
similarity index 99%
rename from src/app/features/old-stuff/services/config.service.ts
rename to mocks/old-stuff/services/config.service.ts
index 50b10d55..9e1d6434 100644
--- a/src/app/features/old-stuff/services/config.service.ts
+++ b/mocks/old-stuff/services/config.service.ts
@@ -3,10 +3,10 @@ import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { ConfirmationService } from 'primeng/api';
 
-import { environment } from '../../../../environments/environment';
-import { ToastService } from '../../../core/services/toast.service';
+import { environment } from '../../../src/environments/environment';
+import { ToastService } from '../../../src/app/core/services/toast.service';
 import { PollConfig } from '../config/PollConfig';
-import { PollUtilities } from '../config/PollUtilities';
+import { PollUtilities } from '../../../src/app/core/services/PollUtilities';
 import { mockPoll3 } from '../mocks/mock-poll3';
 import { mockSuccessVote } from '../mocks/mock-success-vote';
 import { mockMyPolls } from '../mocks/mockmypolls';
diff --git a/src/app/features/old-stuff/services/progression.service.spec.ts b/mocks/old-stuff/services/progression.service.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/services/progression.service.spec.ts
rename to mocks/old-stuff/services/progression.service.spec.ts
diff --git a/src/app/features/old-stuff/ui/copy-text/copy-text.component.html b/mocks/old-stuff/ui/copy-text/copy-text.component.html
similarity index 100%
rename from src/app/features/old-stuff/ui/copy-text/copy-text.component.html
rename to mocks/old-stuff/ui/copy-text/copy-text.component.html
diff --git a/src/app/features/old-stuff/ui/copy-text/copy-text.component.scss b/mocks/old-stuff/ui/copy-text/copy-text.component.scss
similarity index 100%
rename from src/app/features/old-stuff/ui/copy-text/copy-text.component.scss
rename to mocks/old-stuff/ui/copy-text/copy-text.component.scss
diff --git a/src/app/features/old-stuff/ui/copy-text/copy-text.component.spec.ts b/mocks/old-stuff/ui/copy-text/copy-text.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/ui/copy-text/copy-text.component.spec.ts
rename to mocks/old-stuff/ui/copy-text/copy-text.component.spec.ts
diff --git a/src/app/features/old-stuff/ui/copy-text/copy-text.component.ts b/mocks/old-stuff/ui/copy-text/copy-text.component.ts
similarity index 88%
rename from src/app/features/old-stuff/ui/copy-text/copy-text.component.ts
rename to mocks/old-stuff/ui/copy-text/copy-text.component.ts
index 31c295b9..c9029eb2 100644
--- a/src/app/features/old-stuff/ui/copy-text/copy-text.component.ts
+++ b/mocks/old-stuff/ui/copy-text/copy-text.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { ClipboardService } from 'ngx-clipboard';
 
-import { ToastService } from '../../../../core/services/toast.service';
+import { ToastService } from '../../../../src/app/core/services/toast.service';
 
 @Component({
 	selector: 'app-copy-text',
diff --git a/src/app/features/old-stuff/ui/directives/resettable-input.directive.spec.ts b/mocks/old-stuff/ui/directives/resettable-input.directive.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/ui/directives/resettable-input.directive.spec.ts
rename to mocks/old-stuff/ui/directives/resettable-input.directive.spec.ts
diff --git a/src/app/features/old-stuff/ui/directives/resettable-input.directive.ts b/mocks/old-stuff/ui/directives/resettable-input.directive.ts
similarity index 100%
rename from src/app/features/old-stuff/ui/directives/resettable-input.directive.ts
rename to mocks/old-stuff/ui/directives/resettable-input.directive.ts
diff --git a/src/app/features/old-stuff/ui/erasable-input/erasable-input.component.html b/mocks/old-stuff/ui/erasable-input/erasable-input.component.html
similarity index 100%
rename from src/app/features/old-stuff/ui/erasable-input/erasable-input.component.html
rename to mocks/old-stuff/ui/erasable-input/erasable-input.component.html
diff --git a/src/app/features/old-stuff/ui/erasable-input/erasable-input.component.scss b/mocks/old-stuff/ui/erasable-input/erasable-input.component.scss
similarity index 100%
rename from src/app/features/old-stuff/ui/erasable-input/erasable-input.component.scss
rename to mocks/old-stuff/ui/erasable-input/erasable-input.component.scss
diff --git a/src/app/features/old-stuff/ui/erasable-input/erasable-input.component.spec.ts b/mocks/old-stuff/ui/erasable-input/erasable-input.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/ui/erasable-input/erasable-input.component.spec.ts
rename to mocks/old-stuff/ui/erasable-input/erasable-input.component.spec.ts
diff --git a/src/app/features/old-stuff/ui/erasable-input/erasable-input.component.ts b/mocks/old-stuff/ui/erasable-input/erasable-input.component.ts
similarity index 100%
rename from src/app/features/old-stuff/ui/erasable-input/erasable-input.component.ts
rename to mocks/old-stuff/ui/erasable-input/erasable-input.component.ts
diff --git a/src/app/features/old-stuff/ui/two-links/two-links.component.html b/mocks/old-stuff/ui/two-links/two-links.component.html
similarity index 100%
rename from src/app/features/old-stuff/ui/two-links/two-links.component.html
rename to mocks/old-stuff/ui/two-links/two-links.component.html
diff --git a/src/app/features/old-stuff/ui/two-links/two-links.component.scss b/mocks/old-stuff/ui/two-links/two-links.component.scss
similarity index 100%
rename from src/app/features/old-stuff/ui/two-links/two-links.component.scss
rename to mocks/old-stuff/ui/two-links/two-links.component.scss
diff --git a/src/app/features/old-stuff/ui/two-links/two-links.component.spec.ts b/mocks/old-stuff/ui/two-links/two-links.component.spec.ts
similarity index 100%
rename from src/app/features/old-stuff/ui/two-links/two-links.component.spec.ts
rename to mocks/old-stuff/ui/two-links/two-links.component.spec.ts
diff --git a/src/app/features/old-stuff/ui/two-links/two-links.component.ts b/mocks/old-stuff/ui/two-links/two-links.component.ts
similarity index 100%
rename from src/app/features/old-stuff/ui/two-links/two-links.component.ts
rename to mocks/old-stuff/ui/two-links/two-links.component.ts
diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html
index a62e391f..fbf8ee53 100644
--- a/src/app/core/components/footer/footer.component.html
+++ b/src/app/core/components/footer/footer.component.html
@@ -26,34 +26,5 @@
 				canal Matrix
 			</a>
 		</p>
-		<div class="demo" *ngIf="!env.production">
-			Environnement de développement: voici des liens de démonstration issus des fixtures Doctrine de
-			date-poll-api.
-			<button class="btn is-primary" [routerLink]="['/poll/aujourdhui-ou-demain/consultation']">
-				consulter le sondage
-				<strong>
-					aujourdhui-ou-demain
-				</strong>
-			</button>
-			<button class="btn is-primary" [routerLink]="['/poll/citron/hash/consultation']">
-				<strong>
-					citron
-				</strong>
-			</button>
-			<button class="btn is-primary" [routerLink]="['/poll/dessin-anime/consultation']">
-				<strong>
-					dessin-anime
-				</strong>
-			</button>
-			<button class="btn is-primary" routerLink="/poll/citron/consultation/1c01ed9c94fc640a1be864f197ff808c">
-				consulter le sondage
-
-				<strong>
-					citron
-				</strong>
-
-				avec son hash md5 de mot de passe intégré
-			</button>
-		</div>
 	</div>
 </footer>
diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html
index 41034276..cb97f35a 100644
--- a/src/app/core/components/header/header.component.html
+++ b/src/app/core/components/header/header.component.html
@@ -46,4 +46,32 @@
 			menu mobile
 		</div>
 	</nav>
+	<div class="demo padded box" *ngIf="!env.production">
+		Environnement de développement: voici des liens de démonstration issus des fixtures Doctrine de date-poll-api.
+		<button class="btn is-primary" [routerLink]="['/poll/aujourdhui-ou-demain/consultation']">
+			consulter le sondage
+			<strong>
+				aujourdhui-ou-demain
+			</strong>
+		</button>
+		<button class="btn is-primary" [routerLink]="['/poll/citron/hash/consultation']">
+			<strong>
+				citron
+			</strong>
+		</button>
+		<button class="btn is-primary" [routerLink]="['/poll/dessin-anime/consultation']">
+			<strong>
+				dessin-anime
+			</strong>
+		</button>
+		<button class="btn is-primary" routerLink="/poll/citron/consultation/1c01ed9c94fc640a1be864f197ff808c">
+			consulter le sondage
+
+			<strong>
+				citron
+			</strong>
+
+			avec son hash md5 de mot de passe intégré
+		</button>
+	</div>
 </header>
diff --git a/src/app/features/old-stuff/config/DateUtilities.ts b/src/app/core/services/DateUtilities.ts
similarity index 100%
rename from src/app/features/old-stuff/config/DateUtilities.ts
rename to src/app/core/services/DateUtilities.ts
diff --git a/src/app/features/old-stuff/config/PollUtilities.ts b/src/app/core/services/PollUtilities.ts
similarity index 94%
rename from src/app/features/old-stuff/config/PollUtilities.ts
rename to src/app/core/services/PollUtilities.ts
index 30db26cf..9e710b9e 100644
--- a/src/app/features/old-stuff/config/PollUtilities.ts
+++ b/src/app/core/services/PollUtilities.ts
@@ -1,7 +1,6 @@
 import { HttpHeaders } from '@angular/common/http';
-import { PollConfig } from './PollConfig';
 import { Injectable } from '@angular/core';
-import { Poll } from '../../../core/models/poll.model';
+import { Poll } from '../models/poll.model';
 
 @Injectable({
 	providedIn: 'root',
diff --git a/src/app/features/administration/form/date-select/date-select.component.ts b/src/app/features/administration/form/date-select/date-select.component.ts
index 2208051f..e06eecdc 100644
--- a/src/app/features/administration/form/date-select/date-select.component.ts
+++ b/src/app/features/administration/form/date-select/date-select.component.ts
@@ -3,11 +3,16 @@ import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { UuidService } from '../../../../core/services/uuid.service';
 import { ToastService } from '../../../../core/services/toast.service';
 import { PollService } from '../../../../core/services/poll.service';
-import { DateUtilities } from '../../../old-stuff/config/DateUtilities';
+import { DateUtilities } from '../../../../core/services/DateUtilities';
 import { ApiService } from '../../../../core/services/api.service';
 import { Router } from '@angular/router';
 import { DOCUMENT } from '@angular/common';
-import { DateChoice, moreTimeOfDay, otherDefaultDates, TimeSlices } from '../../../old-stuff/config/defaultConfigs';
+import {
+	DateChoice,
+	moreTimeOfDay,
+	otherDefaultDates,
+	TimeSlices,
+} from '../../../../../../mocks/old-stuff/config/defaultConfigs';
 import { CdkDragDrop, moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop';
 import { TranslateService } from '@ngx-translate/core';
 
diff --git a/src/app/features/consultation/consultation-routing.module.ts b/src/app/features/consultation/consultation-routing.module.ts
index e09b8d72..36484ca2 100644
--- a/src/app/features/consultation/consultation-routing.module.ts
+++ b/src/app/features/consultation/consultation-routing.module.ts
@@ -5,7 +5,7 @@ import { ConsultationComponent } from './consultation.component';
 
 const routes: Routes = [
 	{
-		path: '/',
+		path: '',
 		component: ConsultationComponent,
 		children: [{ path: '/:hash', component: ConsultationComponent }],
 	},
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts
index ff7fefdd..7a495ecf 100644
--- a/src/app/features/consultation/consultation.component.ts
+++ b/src/app/features/consultation/consultation.component.ts
@@ -5,7 +5,7 @@ import { Poll } from '../../core/models/poll.model';
 import { ModalService } from '../../core/services/modal.service';
 import { PollService } from '../../core/services/poll.service';
 import { DateService } from '../../core/services/date.service';
-import { PollUtilities } from '../old-stuff/config/PollUtilities';
+import { PollUtilities } from '../../core/services/PollUtilities';
 import { Comment } from '../../core/models/comment.model';
 import { StorageService } from '../../core/services/storage.service';
 import { ApiService } from '../../core/services/api.service';
diff --git a/src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.scss b/src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.scss
deleted file mode 100644
index 5ab410dc..00000000
--- a/src/app/features/old-stuff/pages/poll/poll-display/poll-display.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../../../../styles/variables';
diff --git a/src/app/routes-framadate.ts b/src/app/routes-framadate.ts
index 3b18424f..64e14374 100644
--- a/src/app/routes-framadate.ts
+++ b/src/app/routes-framadate.ts
@@ -37,10 +37,6 @@ export const routes: Routes = [
 		loadChildren: () => import('./features/participation/participation.module').then((m) => m.ParticipationModule),
 		// resolve: { poll: PollService },
 	},
-	{
-		path: 'oldstuff',
-		loadChildren: () => import('./features/old-stuff/old-stuff.module').then((m) => m.OldStuffModule),
-	},
 	{
 		path: 'success',
 		component: SuccessComponent,

From b9181b5b3fe6b7163ffefbb0bea3e70a186bee53 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Thu, 29 Apr 2021 10:45:22 +0200
Subject: [PATCH 03/18] rename utils services

---
 mocks/old-stuff/pages/admin/admin.component.ts                | 4 ++--
 mocks/old-stuff/pages/dates/dates.component.ts                | 4 ++--
 mocks/old-stuff/pages/visibility/visibility.component.ts      | 4 ++--
 mocks/old-stuff/services/config.service.ts                    | 4 ++--
 .../services/{DateUtilities.ts => date.utilities.service.ts}  | 2 +-
 .../services/{PollUtilities.ts => poll.utilities.service.ts}  | 2 +-
 .../administration/form/date-select/date-select.component.ts  | 4 ++--
 src/app/features/consultation/consultation.component.ts       | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)
 rename src/app/core/services/{DateUtilities.ts => date.utilities.service.ts} (97%)
 rename src/app/core/services/{PollUtilities.ts => poll.utilities.service.ts} (98%)

diff --git a/mocks/old-stuff/pages/admin/admin.component.ts b/mocks/old-stuff/pages/admin/admin.component.ts
index ba67f433..cb56c601 100644
--- a/mocks/old-stuff/pages/admin/admin.component.ts
+++ b/mocks/old-stuff/pages/admin/admin.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ConfigService } from '../../services/config.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { HttpClient } from '@angular/common/http';
-import { PollUtilities } from '../../../../src/app/core/services/PollUtilities';
+import { PollUtilitiesService } from '../../../../src/app/core/services/poll.utilities.service';
 import { environment } from '../../../../src/environments/environment';
 
 @Component({
@@ -16,7 +16,7 @@ export class AdminComponent implements OnInit {
 	constructor(
 		public config: ConfigService,
 		public router: Router,
-		private utils: PollUtilities,
+		private utils: PollUtilitiesService,
 		public http: HttpClient,
 		public activeRoute: ActivatedRoute
 	) {}
diff --git a/mocks/old-stuff/pages/dates/dates.component.ts b/mocks/old-stuff/pages/dates/dates.component.ts
index f78a93d9..ce9d8046 100644
--- a/mocks/old-stuff/pages/dates/dates.component.ts
+++ b/mocks/old-stuff/pages/dates/dates.component.ts
@@ -2,7 +2,7 @@ import { DOCUMENT } from '@angular/common';
 import { ChangeDetectorRef, Component, Inject, OnInit } from '@angular/core';
 
 import { ToastService } from '../../../../src/app/core/services/toast.service';
-import { DateUtilities } from '../../../../src/app/core/services/DateUtilities';
+import { DateUtilitiesService } from '../../../../src/app/core/services/date.utilities.service';
 import { otherDefaultDates } from '../../config/defaultConfigs';
 import { ConfigService } from '../../services/config.service';
 import { BaseComponent } from '../example/base-page/base.component';
@@ -23,7 +23,7 @@ export class DatesComponent extends BaseComponent implements OnInit {
 		public config: ConfigService,
 		private cd: ChangeDetectorRef,
 		private toastService: ToastService,
-		private dateUtilities: DateUtilities,
+		private dateUtilities: DateUtilitiesService,
 		@Inject(DOCUMENT) private document: any
 	) {
 		super(config);
diff --git a/mocks/old-stuff/pages/visibility/visibility.component.ts b/mocks/old-stuff/pages/visibility/visibility.component.ts
index 63f581f4..6d18a1fd 100644
--- a/mocks/old-stuff/pages/visibility/visibility.component.ts
+++ b/mocks/old-stuff/pages/visibility/visibility.component.ts
@@ -2,7 +2,7 @@ import { Location } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 
 import { environment } from '../../../../src/environments/environment';
-import { PollUtilities } from '../../../../src/app/core/services/PollUtilities';
+import { PollUtilitiesService } from '../../../../src/app/core/services/poll.utilities.service';
 import { ConfigService } from '../../services/config.service';
 import { BaseComponent } from '../example/base-page/base.component';
 
@@ -16,7 +16,7 @@ export class VisibilityComponent extends BaseComponent implements OnInit {
 	public showCustomPassword = false;
 	public baseUrl = environment.api.baseHref;
 
-	constructor(public config: ConfigService, public utils: PollUtilities) {
+	constructor(public config: ConfigService, public utils: PollUtilitiesService) {
 		super(config);
 	}
 
diff --git a/mocks/old-stuff/services/config.service.ts b/mocks/old-stuff/services/config.service.ts
index 9e1d6434..d24f085e 100644
--- a/mocks/old-stuff/services/config.service.ts
+++ b/mocks/old-stuff/services/config.service.ts
@@ -6,7 +6,7 @@ import { ConfirmationService } from 'primeng/api';
 import { environment } from '../../../src/environments/environment';
 import { ToastService } from '../../../src/app/core/services/toast.service';
 import { PollConfig } from '../config/PollConfig';
-import { PollUtilities } from '../../../src/app/core/services/PollUtilities';
+import { PollUtilitiesService } from '../../../src/app/core/services/poll.utilities.service';
 import { mockPoll3 } from '../mocks/mock-poll3';
 import { mockSuccessVote } from '../mocks/mock-success-vote';
 import { mockMyPolls } from '../mocks/mockmypolls';
@@ -25,7 +25,7 @@ export class ConfigService extends PollConfig {
 		private http: HttpClient,
 		private toastService: ToastService,
 		private router: Router,
-		private utils: PollUtilities,
+		private utils: PollUtilitiesService,
 		private confirmationService: ConfirmationService
 	) {
 		super();
diff --git a/src/app/core/services/DateUtilities.ts b/src/app/core/services/date.utilities.service.ts
similarity index 97%
rename from src/app/core/services/DateUtilities.ts
rename to src/app/core/services/date.utilities.service.ts
index 58cc0b2a..e33e01f2 100644
--- a/src/app/core/services/DateUtilities.ts
+++ b/src/app/core/services/date.utilities.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 @Injectable({
 	providedIn: 'root',
 })
-export class DateUtilities {
+export class DateUtilitiesService {
 	/**
 	 * add some days to a date, to compute intervals
 	 * @param days
diff --git a/src/app/core/services/PollUtilities.ts b/src/app/core/services/poll.utilities.service.ts
similarity index 98%
rename from src/app/core/services/PollUtilities.ts
rename to src/app/core/services/poll.utilities.service.ts
index 9e710b9e..e252ac91 100644
--- a/src/app/core/services/PollUtilities.ts
+++ b/src/app/core/services/poll.utilities.service.ts
@@ -5,7 +5,7 @@ import { Poll } from '../models/poll.model';
 @Injectable({
 	providedIn: 'root',
 })
-export class PollUtilities {
+export class PollUtilitiesService {
 	// utils functions
 	/**
 	 * generate unique id to have a default url for future poll
diff --git a/src/app/features/administration/form/date-select/date-select.component.ts b/src/app/features/administration/form/date-select/date-select.component.ts
index e06eecdc..227e8839 100644
--- a/src/app/features/administration/form/date-select/date-select.component.ts
+++ b/src/app/features/administration/form/date-select/date-select.component.ts
@@ -3,7 +3,7 @@ import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { UuidService } from '../../../../core/services/uuid.service';
 import { ToastService } from '../../../../core/services/toast.service';
 import { PollService } from '../../../../core/services/poll.service';
-import { DateUtilities } from '../../../../core/services/DateUtilities';
+import { DateUtilitiesService } from '../../../../core/services/date.utilities.service';
 import { ApiService } from '../../../../core/services/api.service';
 import { Router } from '@angular/router';
 import { DOCUMENT } from '@angular/common';
@@ -43,7 +43,7 @@ export class DateSelectComponent implements OnInit {
 		private uuidService: UuidService,
 		private toastService: ToastService,
 		private pollService: PollService,
-		public dateUtilities: DateUtilities,
+		public dateUtilities: DateUtilitiesService,
 		private apiService: ApiService,
 		private router: Router,
 		private translateService: TranslateService,
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts
index 7a495ecf..d738cc28 100644
--- a/src/app/features/consultation/consultation.component.ts
+++ b/src/app/features/consultation/consultation.component.ts
@@ -5,7 +5,7 @@ import { Poll } from '../../core/models/poll.model';
 import { ModalService } from '../../core/services/modal.service';
 import { PollService } from '../../core/services/poll.service';
 import { DateService } from '../../core/services/date.service';
-import { PollUtilities } from '../../core/services/PollUtilities';
+import { PollUtilitiesService } from '../../core/services/poll.utilities.service';
 import { Comment } from '../../core/models/comment.model';
 import { StorageService } from '../../core/services/storage.service';
 import { ApiService } from '../../core/services/api.service';
@@ -34,7 +34,7 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 
 	constructor(
 		private router: Router,
-		private utils: PollUtilities,
+		private utils: PollUtilitiesService,
 		private _Activatedroute: ActivatedRoute,
 		public storageService: StorageService,
 		public api: ApiService,

From 3a89645e66b9445e61bf67c50805b9682a538931 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Thu, 29 Apr 2021 10:56:36 +0200
Subject: [PATCH 04/18] auto send vote in dev mode

---
 .../core/services/poll.utilities.service.ts   | 80 ++++++++++++++++-
 .../consultation/consultation.component.ts    | 87 +++----------------
 2 files changed, 87 insertions(+), 80 deletions(-)

diff --git a/src/app/core/services/poll.utilities.service.ts b/src/app/core/services/poll.utilities.service.ts
index e252ac91..3514cde9 100644
--- a/src/app/core/services/poll.utilities.service.ts
+++ b/src/app/core/services/poll.utilities.service.ts
@@ -1,6 +1,7 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Poll } from '../models/poll.model';
+import { Comment } from '../models/comment.model';
 
 @Injectable({
 	providedIn: 'root',
@@ -67,11 +68,84 @@ export class PollUtilitiesService {
 			'Access-Control-Allow-Origin': '*',
 		};
 
-		const requestOptions = {
-			headers: new HttpHeaders(headerDict),
+		return {
+			headers: headerDict,
 			body: bodyContent,
 		};
+	}
 
-		return requestOptions;
+	exportCSV(poll: Poll): void {
+		let rows = [];
+		const now = new Date();
+		const headers = [
+			['export de sondage Framadate ', poll.custom_url],
+			['le', now.toISOString()],
+			[poll.id, poll.title, poll.custom_url, poll.creation_date],
+			['pseudo'],
+		];
+
+		const listOfChoices = ['choices : '];
+		poll.choices.map((choice) => {
+			listOfChoices.push(choice.name);
+		});
+		listOfChoices.push('pseudo');
+
+		poll.stacks.map((voteStack) => {
+			const voteStackInArray = [voteStack.pseudo];
+			const keysVotes = Object.keys(voteStack.votes);
+
+			keysVotes.map((id) => {
+				voteStackInArray.push(voteStack.votes[id].value ? voteStack.votes[id].value : '');
+			});
+			rows.push(voteStackInArray);
+		});
+		const headersComments = [['comments'], ['pseudo', 'text', 'creation_date']];
+		const comments = [];
+		poll.comments.map((item: Comment) => {
+			comments.push([item.pseudo, item.text, new Date(item.created_at), '\n']);
+		});
+		headers.push(listOfChoices);
+		rows = [headers, listOfChoices, rows, headersComments, comments];
+
+		const convertedCsv = rows
+			.map((elem) => {
+				console.log('elem', elem);
+				return elem
+					.map((item) => {
+						console.log('item', item);
+						if (typeof item === typeof Array) {
+							return item.join('\n');
+						}
+						return item;
+					})
+					.join('\n');
+			})
+			.join('\n');
+		console.log('rows', rows);
+		console.log('convertedCsv', convertedCsv);
+
+		const csvContent = 'data:text/csv;charset=utf-8,' + convertedCsv;
+		console.log('csvContent', csvContent);
+		const encodedUri = encodeURI(csvContent);
+		const link = document.createElement('a');
+		link.setAttribute('href', encodedUri);
+		const exportFileName =
+			(poll.urlPublic ? poll.urlPublic : this.makeSlug(poll)) + '_export_' + new Date() + '.csv';
+		link.setAttribute('download', exportFileName);
+		document.body.appendChild(link); // Required for FF
+		link.click(); // This will download the data file named "my_data.csv".
+	}
+
+	download(filename: string, text: string): void {
+		const element = document.createElement('a');
+		element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
+		element.setAttribute('download', filename);
+
+		element.style.display = 'none';
+		document.body.appendChild(element);
+
+		element.click();
+
+		document.body.removeChild(element);
 	}
 }
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts
index d738cc28..132a061a 100644
--- a/src/app/features/consultation/consultation.component.ts
+++ b/src/app/features/consultation/consultation.component.ts
@@ -10,6 +10,7 @@ import { Comment } from '../../core/models/comment.model';
 import { StorageService } from '../../core/services/storage.service';
 import { ApiService } from '../../core/services/api.service';
 import { Stack } from '../../core/models/stack.model';
+import { environment } from '../../../environments/environment';
 
 @Component({
 	selector: 'app-consultation',
@@ -50,6 +51,10 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 			if (newpoll) {
 				this.isArchived = new Date(newpoll.expiracy_date) < new Date();
 				this.poll.is_archived = this.isArchived;
+
+				if (!environment.production) {
+					this.addVoteStack();
+				}
 			}
 		});
 
@@ -83,7 +88,9 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 		this.api.sendVoteStackOfPoll(this.poll, this.storageService.vote_stack).subscribe((resp) => {
 			console.log('resp', resp);
 
-			this.api.getPollBySlug(this.poll.custom_url);
+			if (resp) {
+				this.api.getPollBySlug(this.poll.custom_url);
+			}
 		});
 	}
 
@@ -91,85 +98,11 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 	 * export all the poll data available to the public as a CSV single file
 	 */
 	exportCSV() {
-		let rows = [];
-		const now = new Date();
-		const headers = [
-			['export de sondage Framadate ', this.poll.custom_url],
-			['le', now.toISOString()],
-			[this.poll.id, this.poll.title, this.poll.custom_url, this.poll.creation_date],
-			['pseudo'],
-		];
-
-		const listOfChoices = ['choices : '];
-		this.poll.choices.map((choice) => {
-			listOfChoices.push(choice.name);
-		});
-		listOfChoices.push('pseudo');
-
-		this.poll.stacks.map((voteStack) => {
-			const voteStackInArray = [voteStack.pseudo];
-			const keysVotes = Object.keys(voteStack.votes);
-
-			keysVotes.map((id) => {
-				voteStackInArray.push(voteStack.votes[id].value ? voteStack.votes[id].value : '');
-			});
-			rows.push(voteStackInArray);
-		});
-		const headersComments = [['comments'], ['pseudo', 'text', 'creation_date']];
-		const comments = [];
-		this.poll.comments.map((item: Comment) => {
-			comments.push([item.pseudo, item.text, new Date(item.created_at), '\n']);
-		});
-		headers.push(listOfChoices);
-		rows = [headers, listOfChoices, rows, headersComments, comments];
-
-		const convertedCsv = rows
-			.map((elem) => {
-				console.log('elem', elem);
-				return elem
-					.map((item) => {
-						console.log('item', item);
-						if (typeof item === typeof Array) {
-							return item.join('\n');
-						}
-						return item;
-					})
-					.join('\n');
-			})
-			.join('\n');
-		console.log('rows', rows);
-		console.log('convertedCsv', convertedCsv);
-
-		const csvContent = 'data:text/csv;charset=utf-8,' + convertedCsv;
-		console.log('csvContent', csvContent);
-		const encodedUri = encodeURI(csvContent);
-		const link = document.createElement('a');
-		link.setAttribute('href', encodedUri);
-		const exportFileName =
-			(this.poll.urlPublic ? this.poll.urlPublic : this.utils.makeSlug(this.poll)) +
-			'_export_' +
-			new Date() +
-			'.csv';
-		link.setAttribute('download', exportFileName);
-		document.body.appendChild(link); // Required for FF
-		link.click(); // This will download the data file named "my_data.csv".
+		this.utils.exportCSV(this.poll);
 	}
 
 	exportJson() {
-		this.download('export_poll_' + this.pollSlug + '.json', JSON.stringify(this.poll));
-	}
-
-	download(filename, text) {
-		const element = document.createElement('a');
-		element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
-		element.setAttribute('download', filename);
-
-		element.style.display = 'none';
-		document.body.appendChild(element);
-
-		element.click();
-
-		document.body.removeChild(element);
+		this.utils.download('export_poll_' + this.pollSlug + '.json', JSON.stringify(this.poll));
 	}
 
 	duplicate() {

From 31f0f19a9ae2120ac3394414e79649a44ee2de14 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Thu, 29 Apr 2021 12:49:23 +0200
Subject: [PATCH 05/18] manage mobile menu, and add poll title to page title

---
 src/app/app.component.html                    |  2 +-
 .../components/header/header.component.html   |  5 +-
 .../components/header/header.component.ts     |  6 +-
 .../navigation/navigation.component.html      | 88 ++++++++++---------
 .../navigation/navigation.component.ts        |  5 +-
 src/app/core/services/poll.service.ts         |  4 +
 .../consultation/consultation.component.ts    |  5 +-
 .../feedback/feedback.component.scss          |  2 +-
 src/environments/environment.prod.ts          |  3 +-
 src/environments/environment.ts               |  3 +-
 10 files changed, 71 insertions(+), 52 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index ce833dc8..8f398fd4 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,6 +1,6 @@
 <mat-sidenav-container (backdropClick)="sidenav.toggle()">
 	<mat-sidenav #sidenav mode="side">
-		<app-navigation></app-navigation>
+		<app-navigation [appTitle]="appTitle" [appLogo]="appLogo"></app-navigation>
 	</mat-sidenav>
 
 	<mat-sidenav-content>
diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html
index cb97f35a..74d20d14 100644
--- a/src/app/core/components/header/header.component.html
+++ b/src/app/core/components/header/header.component.html
@@ -43,10 +43,11 @@
 			</div>
 		</div>
 		<div class="mobile-menu" *ngIf="mobileMenuVisible">
-			menu mobile
+			<!--			menu mobile-->
+			<app-navigation [appTitle]="appTitle" [appLogo]="appLogo"></app-navigation>
 		</div>
 	</nav>
-	<div class="demo padded box" *ngIf="!env.production">
+	<div class="demo padded box" *ngIf="env.display_routes">
 		Environnement de développement: voici des liens de démonstration issus des fixtures Doctrine de date-poll-api.
 		<button class="btn is-primary" [routerLink]="['/poll/aujourdhui-ou-demain/consultation']">
 			consulter le sondage
diff --git a/src/app/core/components/header/header.component.ts b/src/app/core/components/header/header.component.ts
index 57146ba7..c0854c11 100644
--- a/src/app/core/components/header/header.component.ts
+++ b/src/app/core/components/header/header.component.ts
@@ -15,9 +15,9 @@ import { environment } from '../../../../environments/environment';
 export class HeaderComponent implements OnInit {
 	public _user: Observable<Owner> = this.userService.user;
 	public env = environment;
-	@Input() public appTitle: string = 'FramaDate Funky';
-	@Input() public appLogo: string;
-	mobileMenuVisible = false;
+	@Input() public appTitle = environment.appTitle;
+	@Input() public appLogo = environment.appLogo;
+	mobileMenuVisible = true;
 
 	constructor(private userService: UserService) {}
 
diff --git a/src/app/core/components/sibebar/navigation/navigation.component.html b/src/app/core/components/sibebar/navigation/navigation.component.html
index fa4f467a..91d19652 100644
--- a/src/app/core/components/sibebar/navigation/navigation.component.html
+++ b/src/app/core/components/sibebar/navigation/navigation.component.html
@@ -5,58 +5,66 @@
 			<a
 				class="navbar-item"
 				*ngFor="let poll of _pollsAvailables | async"
-				routerLink="{{ '/poll/' + poll.slug + '/consultation' }}"
+				routerLink="{{ '/poll/' + poll.custom_url + '/consultation' }}"
 				routerLinkActive="is-active"
 			>
-				« {{ poll.slug }} »
+				« {{ poll.custom_url }} »
 			</a>
 		</div>
 	</div>
 
 	<hr />
 
-	<div class="navbar-item has-dropdown is-hoverable is-warning" *ngIf="devModeEnabled">
-		<a class="navbar-link"> Modules </a>
-		<div class="navbar-dropdown">
-			<a class="navbar-item" routerLink="oldstuff" routerLinkActive="is-active">
-				Old stuff
-			</a>
-			<a class="navbar-item" routerLink="administration" routerLinkActive="is-active">
-				Administration
-			</a>
-			<a class="navbar-item" routerLink="consultation" routerLinkActive="is-active">
-				Consultation
-			</a>
-			<a class="navbar-item" routerLink="participation" routerLinkActive="is-active">
-				Participation
+	<div class="navbar-item has-dropdown is-hoverable is-warning" *ngIf="environment.display_routes">
+		<div class="padded">
+			<a class="navbar-link"> Modules </a>
+			<div class="navbar-dropdown">
+				<a class="navbar-item" routerLink="/#/administration" routerLinkActive="is-active">
+					{{ 'creation.title' | translate }}
+				</a>
+			</div>
+
+			<hr />
+			<a class="navbar-item" routerLink="/poll/inexistentPoll/consultation" routerLinkActive="is-active">
+				« tester une page 404 »
 			</a>
+			<hr />
+			<button
+				class="btn"
+				[routerLink]="['/poll/aujourdhui-ou-demain/consultation']"
+				routerLinkActive="is-primary"
+			>
+				consulter le sondage
+				<strong>
+					aujourdhui-ou-demain
+				</strong>
+			</button>
+			<button class="btn" [routerLink]="['/poll/citron/hash/consultation']" routerLinkActive="is-primary">
+				<strong>
+					citron
+				</strong>
+				sans pass
+			</button>
+			<button class="btn" [routerLink]="['/poll/dessin-anime/consultation']" routerLinkActive="is-primary">
+				<strong>
+					dessin-anime
+				</strong>
+			</button>
+			<button
+				class="btn"
+				[routerLink]="['/poll/citron/consultation/1c01ed9c94fc640a1be864f197ff808c']"
+				routerLinkActive="is-primary"
+			>
+				<strong>
+					citron
+				</strong>
+
+				avec son hash md5 de mot de passe intégré
+			</button>
 		</div>
-
-		<hr />
-		<a class="navbar-item" routerLink="/poll/inexistentPoll/consultation" routerLinkActive="is-active">
-			« inexistentPoll »
-		</a>
-		<hr />
-		<a class="button is-block" routerLink="oldstuff/step/creation" routerLinkActive="active"> Création </a>
-		<a class="button is-block" routerLink="oldstuff/step/date" routerLinkActive="active"> Les Dates </a>
-		<a class="button is-block" routerLink="oldstuff/step/answers" routerLinkActive="active"> Réponses </a>
-		<a class="button is-block" routerLink="oldstuff/step/visibility" routerLinkActive="active"> Visibilité </a>
-		<a class="button is-block" routerLink="oldstuff/step/resume" routerLinkActive="active"> Résumé </a>
-		<a class="button is-block" routerLink="oldstuff/step/end" routerLinkActive="active"> Confirmation </a>
-		<a class="button is-block" routerLink="oldstuff/step/admin"> Administration </a>
-
-		<hr />
-
-		<a class="button is-block" routerLink="oldstuff/step/kind" routerLinkActive="active"> Page démo </a>
-		<a class="button is-block" routerLink="oldstuff/vote/poll/id/1" routerLinkActive="active"> Sondage 1 </a>
-		<a class="button is-block" routerLink="oldstuff/vote/poll/id/2" routerLinkActive="active"> Sondage 2 </a>
-		<a class="button is-block" routerLink="oldstuff/vote/poll/id/3" routerLinkActive="active">
-			Sondage 3 (dessins animés)
-		</a>
-		<a class="button is-block" routerLink="oldstuff/graphic/toto" routerLinkActive="active"> Graphique </a>
 	</div>
 
-	<a class="button is-block" routerLink="oldstuff/step/home" routerLinkActive="active">
+	<a class="button is-block" [routerLink]="['/home']" routerLinkActive="active">
 		<i class="fa fa-home" aria-hidden="true"></i> Accueil
 	</a>
 </nav>
diff --git a/src/app/core/components/sibebar/navigation/navigation.component.ts b/src/app/core/components/sibebar/navigation/navigation.component.ts
index cc46e897..37884608 100644
--- a/src/app/core/components/sibebar/navigation/navigation.component.ts
+++ b/src/app/core/components/sibebar/navigation/navigation.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 
 import { Poll } from '../../../models/poll.model';
@@ -13,6 +13,9 @@ import { environment } from '../../../../../environments/environment';
 export class NavigationComponent implements OnInit {
 	public _pollsAvailables: Observable<Poll[]> = this.mockingService.pollsAvailables;
 	public devModeEnabled = !environment.production;
+	@Input() public appTitle = 'FramaDate Funky';
+	@Input() public appLogo: string;
+	public environment = environment;
 
 	constructor(private mockingService: MockingService) {}
 
diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index f1ef9c65..b145f707 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -13,6 +13,7 @@ import { UuidService } from './uuid.service';
 import { HttpClient } from '@angular/common/http';
 import { environment } from '../../../environments/environment';
 import { StorageService } from './storage.service';
+import { Title } from '@angular/platform-browser';
 
 @Injectable({
 	providedIn: 'root',
@@ -28,6 +29,7 @@ export class PollService implements Resolve<Poll> {
 		private storageService: StorageService,
 		private userService: UserService,
 		private uuidService: UuidService,
+		private titleService: Title,
 		private toastService: ToastService
 	) {}
 
@@ -74,9 +76,11 @@ export class PollService implements Resolve<Poll> {
 		console.log('slug', slug);
 		if (slug) {
 			const poll: Poll | undefined = await this.apiService.getPollBySlug(slug);
+
 			console.log({ loadPollBySlugResponse: poll });
 			if (poll) {
 				this.updateCurrentPoll(poll);
+				this.titleService.setTitle(`☑️ ${poll.title} - ${environment.appTitle}`);
 			} else {
 				this.toastService.display(`sondage ${slug} non trouvé`);
 			}
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts
index 132a061a..3ae752ba 100644
--- a/src/app/features/consultation/consultation.component.ts
+++ b/src/app/features/consultation/consultation.component.ts
@@ -11,6 +11,7 @@ import { StorageService } from '../../core/services/storage.service';
 import { ApiService } from '../../core/services/api.service';
 import { Stack } from '../../core/models/stack.model';
 import { environment } from '../../../environments/environment';
+import { Title } from '@angular/platform-browser';
 
 @Component({
 	selector: 'app-consultation',
@@ -62,7 +63,7 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 			console.log('params', params);
 			this.pollSlug = params.get('slug');
 			this.passHash = params.get('hash');
-			console.log('hash, slug', this.passHash, this.pollSlug);
+
 			if (this.passHash) {
 				this.pollService.loadPollBySlugWithPasswordHash(this.pollSlug, this.passHash);
 			} else {
@@ -86,7 +87,7 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 
 	addVoteStack() {
 		this.api.sendVoteStackOfPoll(this.poll, this.storageService.vote_stack).subscribe((resp) => {
-			console.log('resp', resp);
+			console.log('sendVoteStackOfPoll resp', resp);
 
 			if (resp) {
 				this.api.getPollBySlug(this.poll.custom_url);
diff --git a/src/app/shared/components/feedback/feedback.component.scss b/src/app/shared/components/feedback/feedback.component.scss
index b5963fdb..c7b6c2f5 100644
--- a/src/app/shared/components/feedback/feedback.component.scss
+++ b/src/app/shared/components/feedback/feedback.component.scss
@@ -1,6 +1,6 @@
 :host {
 	position: fixed;
-	bottom: 1em;
+	bottom: 4em;
 	right: 1em;
 	color: white;
 	.feedback-choices {
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 77223ef5..5e832bca 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -3,7 +3,7 @@ const backendApiUrlsInDev = {
 	remote: 'https://framadate-api.cipherbliss.com/api/v1',
 };
 const apiV1 = {
-	baseHref: 'http://localhost:8000/api/v1',
+	baseHref: 'https://framadate-api.cipherbliss.com/api/v1',
 	api_new_poll: '/poll/',
 	api_get_poll: '/poll/{id}',
 	'api_test-mail-poll': '/api/v1/poll/mail/test-mail-poll/{emailChoice}',
@@ -12,6 +12,7 @@ const apiV1 = {
 
 export const environment = {
 	production: true,
+	display_routes: true,
 	autofill: true,
 	appTitle: 'FramaDate Funky',
 	appVersion: '2.1.0',
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b0fcef5a..c483393a 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -18,7 +18,8 @@ const apiV1 = {
 };
 
 export const environment = {
-	production: false,
+	production: true,
+	display_routes: true,
 	autofill: true,
 	appTitle: 'FramaDate Funky',
 	appVersion: '2.1.0',

From 78a88d3163f73a161649a0ed17d4038f458d5bcc Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Thu, 29 Apr 2021 12:56:48 +0200
Subject: [PATCH 06/18] nav disable default show

---
 .../components/sibebar/navigation/navigation.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/components/sibebar/navigation/navigation.component.html b/src/app/core/components/sibebar/navigation/navigation.component.html
index 91d19652..98404d74 100644
--- a/src/app/core/components/sibebar/navigation/navigation.component.html
+++ b/src/app/core/components/sibebar/navigation/navigation.component.html
@@ -64,7 +64,7 @@
 		</div>
 	</div>
 
-	<a class="button is-block" [routerLink]="['/home']" routerLinkActive="active">
+	<a class="button is-block" [routerLink]="['/']" routerLinkActive="active">
 		<i class="fa fa-home" aria-hidden="true"></i> Accueil
 	</a>
 </nav>

From 69f8eac147f413a1f7bbb9c2d2b12b6526e63419 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Thu, 29 Apr 2021 16:12:56 +0200
Subject: [PATCH 07/18] nav items for demos in mobile menu

---
 .../components/header/header.component.html   |  59 +++++----
 .../components/header/header.component.ts     |   2 +-
 .../navigation/navigation.component.html      | 124 ++++++++----------
 .../navigation/navigation.component.scss      |   4 +
 4 files changed, 97 insertions(+), 92 deletions(-)

diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html
index 74d20d14..24188ab8 100644
--- a/src/app/core/components/header/header.component.html
+++ b/src/app/core/components/header/header.component.html
@@ -49,30 +49,41 @@
 	</nav>
 	<div class="demo padded box" *ngIf="env.display_routes">
 		Environnement de développement: voici des liens de démonstration issus des fixtures Doctrine de date-poll-api.
-		<button class="btn is-primary" [routerLink]="['/poll/aujourdhui-ou-demain/consultation']">
-			consulter le sondage
-			<strong>
-				aujourdhui-ou-demain
-			</strong>
-		</button>
-		<button class="btn is-primary" [routerLink]="['/poll/citron/hash/consultation']">
-			<strong>
-				citron
-			</strong>
-		</button>
-		<button class="btn is-primary" [routerLink]="['/poll/dessin-anime/consultation']">
-			<strong>
-				dessin-anime
-			</strong>
-		</button>
-		<button class="btn is-primary" routerLink="/poll/citron/consultation/1c01ed9c94fc640a1be864f197ff808c">
-			consulter le sondage
+		<div class="padded">
+			<div class="">
+				<a class="navbar-item" [routerLink]="['/poll/dessin-anime/consultation']" routerLinkActive="is-primary">
+					<em>
+						dessin-anime
+					</em>
+				</a>
+				<a
+					class="navbar-item"
+					[routerLink]="['/poll/aujourdhui-ou-demain/consultation']"
+					routerLinkActive="is-primary"
+				>
+					consulter le sondage
+					<em>
+						aujourdhui-ou-demain
+					</em>
+				</a>
+				<a class="navbar-item" [routerLink]="['/poll/citron/hash/consultation']" routerLinkActive="is-primary">
+					<em>
+						citron
+					</em>
+					sans pass
+				</a>
 
-			<strong>
-				citron
-			</strong>
-
-			avec son hash md5 de mot de passe intégré
-		</button>
+				<a
+					class="navbar-item"
+					[routerLink]="['/poll/citron/consultation/1c01ed9c94fc640a1be864f197ff808c']"
+					routerLinkActive="is-primary"
+				>
+					<em>
+						citron
+					</em>
+					+ pass
+				</a>
+			</div>
+		</div>
 	</div>
 </header>
diff --git a/src/app/core/components/header/header.component.ts b/src/app/core/components/header/header.component.ts
index c0854c11..f2b56dd6 100644
--- a/src/app/core/components/header/header.component.ts
+++ b/src/app/core/components/header/header.component.ts
@@ -17,7 +17,7 @@ export class HeaderComponent implements OnInit {
 	public env = environment;
 	@Input() public appTitle = environment.appTitle;
 	@Input() public appLogo = environment.appLogo;
-	mobileMenuVisible = true;
+	mobileMenuVisible = false;
 
 	constructor(private userService: UserService) {}
 
diff --git a/src/app/core/components/sibebar/navigation/navigation.component.html b/src/app/core/components/sibebar/navigation/navigation.component.html
index 98404d74..2ee6ea2d 100644
--- a/src/app/core/components/sibebar/navigation/navigation.component.html
+++ b/src/app/core/components/sibebar/navigation/navigation.component.html
@@ -1,70 +1,60 @@
-<nav class="has-background-light">
-	<div class="navbar-item has-dropdown is-hoverable">
-		<a class="navbar-link"> Tous les sondages </a>
-		<div class="navbar-dropdown">
-			<a
-				class="navbar-item"
-				*ngFor="let poll of _pollsAvailables | async"
-				routerLink="{{ '/poll/' + poll.custom_url + '/consultation' }}"
-				routerLinkActive="is-active"
-			>
-				« {{ poll.custom_url }} »
-			</a>
-		</div>
-	</div>
-
-	<hr />
-
-	<div class="navbar-item has-dropdown is-hoverable is-warning" *ngIf="environment.display_routes">
-		<div class="padded">
-			<a class="navbar-link"> Modules </a>
-			<div class="navbar-dropdown">
-				<a class="navbar-item" routerLink="/#/administration" routerLinkActive="is-active">
-					{{ 'creation.title' | translate }}
-				</a>
-			</div>
-
-			<hr />
-			<a class="navbar-item" routerLink="/poll/inexistentPoll/consultation" routerLinkActive="is-active">
-				« tester une page 404 »
-			</a>
-			<hr />
-			<button
-				class="btn"
-				[routerLink]="['/poll/aujourdhui-ou-demain/consultation']"
-				routerLinkActive="is-primary"
-			>
-				consulter le sondage
-				<strong>
-					aujourdhui-ou-demain
-				</strong>
-			</button>
-			<button class="btn" [routerLink]="['/poll/citron/hash/consultation']" routerLinkActive="is-primary">
-				<strong>
-					citron
-				</strong>
-				sans pass
-			</button>
-			<button class="btn" [routerLink]="['/poll/dessin-anime/consultation']" routerLinkActive="is-primary">
-				<strong>
-					dessin-anime
-				</strong>
-			</button>
-			<button
-				class="btn"
-				[routerLink]="['/poll/citron/consultation/1c01ed9c94fc640a1be864f197ff808c']"
-				routerLinkActive="is-primary"
-			>
-				<strong>
-					citron
-				</strong>
-
-				avec son hash md5 de mot de passe intégré
-			</button>
-		</div>
-	</div>
-
-	<a class="button is-block" [routerLink]="['/']" routerLinkActive="active">
+<nav class="has-background-light padded">
+	<!--	<div class='navbar-item has-dropdown is-hoverable'>-->
+	<!--		<a class='navbar-link'> Tous les sondages </a>-->
+	<!--		<div class='navbar-dropdown'>-->
+	<!--			<a-->
+	<!--				class='navbar-item'-->
+	<!--				*ngFor='let poll of _pollsAvailables | async'-->
+	<!--				routerLink="{{ '/poll/' + poll.custom_url + '/consultation' }}"-->
+	<!--				routerLinkActive='is-active'-->
+	<!--			>-->
+	<!--				« {{ poll.custom_url }} »-->
+	<!--			</a>-->
+	<!--		</div>-->
+	<!--	</div>-->
+	<a class="navbar-item is-block" [routerLink]="['/']" routerLinkActive="active">
 		<i class="fa fa-home" aria-hidden="true"></i> Accueil
 	</a>
+	<a class="navbar-item" [routerLink]="['/#/administration']" routerLinkActive="is-primary">
+		{{ 'creation.title' | translate }}
+	</a>
+	<div class="navbar-item has-dropdown is-hoverable is-warning" *ngIf="environment.display_routes">
+		<div class="padded">
+			<a class="navbar-link"> Démos fixtures</a>
+			<div class="navbar-dropdown">
+				<a class="navbar-item" [routerLink]="['/poll/dessin-anime/consultation']" routerLinkActive="is-primary">
+					<em>
+						dessin-anime
+					</em>
+				</a>
+				<a
+					class="navbar-item"
+					[routerLink]="['/poll/aujourdhui-ou-demain/consultation']"
+					routerLinkActive="is-primary"
+				>
+					consulter le sondage
+					<em>
+						aujourdhui-ou-demain
+					</em>
+				</a>
+				<a class="navbar-item" [routerLink]="['/poll/citron/hash/consultation']" routerLinkActive="is-primary">
+					<em>
+						citron
+					</em>
+					sans pass
+				</a>
+
+				<a
+					class="navbar-item"
+					[routerLink]="['/poll/citron/consultation/1c01ed9c94fc640a1be864f197ff808c']"
+					routerLinkActive="is-primary"
+				>
+					<em>
+						citron
+					</em>
+					+ pass
+				</a>
+			</div>
+		</div>
+	</div>
 </nav>
diff --git a/src/app/core/components/sibebar/navigation/navigation.component.scss b/src/app/core/components/sibebar/navigation/navigation.component.scss
index e69de29b..f3234026 100644
--- a/src/app/core/components/sibebar/navigation/navigation.component.scss
+++ b/src/app/core/components/sibebar/navigation/navigation.component.scss
@@ -0,0 +1,4 @@
+em {
+	margin-left: 1ch;
+	margin-right: 1ch;
+}

From 9e4d5187b523891568387526e1a7cc749d6a5a44 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Thu, 29 Apr 2021 16:17:35 +0200
Subject: [PATCH 08/18] change icons for answer

---
 src/assets/img/buddy/icon_voter_MAYBE.svg | 10 ++++++++++
 src/assets/img/buddy/icon_voter_NO.svg    |  3 +++
 src/assets/img/buddy/icon_voter_YES.svg   |  9 +++++++++
 src/assets/img/check-2.svg                |  6 ------
 src/assets/img/check.svg                  |  3 ---
 src/assets/img/croix.svg                  |  3 ---
 src/assets/img/icon_voter_MAYBE.svg       | 12 ++++--------
 src/assets/img/icon_voter_NO.svg          |  2 +-
 src/assets/img/icon_voter_YES.svg         | 10 ++--------
 9 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 src/assets/img/buddy/icon_voter_MAYBE.svg
 create mode 100644 src/assets/img/buddy/icon_voter_NO.svg
 create mode 100644 src/assets/img/buddy/icon_voter_YES.svg
 delete mode 100644 src/assets/img/check-2.svg
 delete mode 100644 src/assets/img/check.svg
 delete mode 100644 src/assets/img/croix.svg

diff --git a/src/assets/img/buddy/icon_voter_MAYBE.svg b/src/assets/img/buddy/icon_voter_MAYBE.svg
new file mode 100644
index 00000000..f8d8ade1
--- /dev/null
+++ b/src/assets/img/buddy/icon_voter_MAYBE.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="24" viewBox="0 0 22 24">
+    <g fill="none" fill-rule="evenodd">
+        <path fill="#4A4A4A" fill-rule="nonzero" d="M16.556 13.749a10.963 10.963 0 0 0-16.112 0 .965.965 0 0 0-.25.639v3.833a.958.958 0 0 0 .959.946h14.694c.53 0 .959-.43.959-.959v-3.833a.965.965 0 0 0-.25-.626z"/>
+        <circle cx="8.5" cy="4.472" r="4.472" fill="#4A4A4A" fill-rule="nonzero"/>
+        <path fill="#FFF" fill-rule="nonzero" stroke="#FFF" stroke-width="4" d="M14.067 20.083l-2.926-3.048a.629.629 0 0 1 .03-.828.568.568 0 0 1 .795-.032l2.1 2.189 3.968-4.134a.568.568 0 0 1 .795.032c.216.225.23.586.03.828l-4.792 4.993z"/>
+        <path fill="#F5A623" fill-rule="nonzero" d="M14.067 20.083l-2.926-3.048a.629.629 0 0 1 .03-.828.568.568 0 0 1 .795-.032l2.1 2.189 3.968-4.134a.568.568 0 0 1 .795.032c.216.225.23.586.03.828l-4.792 4.993zM19 12.083c1.792.903 3 2.609 3 4.564 0 1.867-1.101 3.506-2.76 4.436l-.028-1.06c1.125-.819 1.8-2.046 1.8-3.376 0-1.403-.753-2.69-1.984-3.504L19 12.083z"/>
+        <path fill="#FFF" fill-rule="nonzero" stroke="#FFF" stroke-width="3" d="M10 12.083c-1.792.903-3 2.609-3 4.564 0 1.867 1.101 3.506 2.76 4.436l.028-1.06c-1.125-.819-1.8-2.046-1.8-3.376 0-1.403.753-2.69 1.984-3.504l.028-1.06z"/>
+        <path fill="#F5A623" fill-rule="nonzero" d="M10 12.083c-1.792.903-3 2.609-3 4.564 0 1.867 1.101 3.506 2.76 4.436l.028-1.06c-1.125-.819-1.8-2.046-1.8-3.376 0-1.403.753-2.69 1.984-3.504l.028-1.06z"/>
+    </g>
+</svg>
diff --git a/src/assets/img/buddy/icon_voter_NO.svg b/src/assets/img/buddy/icon_voter_NO.svg
new file mode 100644
index 00000000..4c9e3c03
--- /dev/null
+++ b/src/assets/img/buddy/icon_voter_NO.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+	<path fill="#CD0000" fill-rule="evenodd" d="M7.314 6.05l4.465-4.461A.918.918 0 0 0 10.484.294L6.018 4.71 1.525.22A.92.92 0 0 0 .229 1.516l4.484 4.536-4.392 4.333a.918.918 0 1 0 1.296 1.295L6 7.299l4.355 4.353a.92.92 0 0 0 1.295-1.295L7.314 6.05z"/>
+</svg>
diff --git a/src/assets/img/buddy/icon_voter_YES.svg b/src/assets/img/buddy/icon_voter_YES.svg
new file mode 100644
index 00000000..3d97906e
--- /dev/null
+++ b/src/assets/img/buddy/icon_voter_YES.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="21" viewBox="0 0 20 21">
+    <defs>
+        <path id="a" d="M8.667 10.205c2.13-.029 4.221.541 6.03 1.638l.336.212-4.56 5.008L7.9 14.338a1.887 1.887 0 0 0-2.017-.472 1.84 1.84 0 0 0-1.216 1.653c-.024.44.114.873.385 1.22l.108.126 2.047 2.165H1.493a1.325 1.325 0 0 1-1.286-1.18L.2 17.718v-3.537a.65.65 0 0 1 .133-.4 10.822 10.822 0 0 1 7.655-3.573l.339-.007zm8.466 5.046v2.468c0 .71-.572 1.291-1.293 1.312h-2.127l3.42-3.78zM8.66.361c2.507 0 4.54 2 4.54 4.469 0 2.468-2.033 4.47-4.54 4.47S4.12 7.297 4.12 4.83 6.153.36 8.66.36z"/>
+    </defs>
+    <g fill="none" fill-rule="nonzero">
+        <use fill="#4A4A4A" xlink:href="#a"/>
+        <path fill="#429A00" d="M19.18 10.25a.673.673 0 0 0-.947.053l-7.746 8.531-3.467-3.668a.67.67 0 0 0-.94-.072.651.651 0 0 0 0 .932l4.453 4.725 8.694-9.595a.649.649 0 0 0-.047-.905z"/>
+    </g>
+</svg>
diff --git a/src/assets/img/check-2.svg b/src/assets/img/check-2.svg
deleted file mode 100644
index 2fd97ed2..00000000
--- a/src/assets/img/check-2.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="19" height="15" viewBox="0 0 19 15">
-    <g fill="#F5A623" fill-rule="evenodd">
-        <path d="M13.412 0C16.749 1.504 19 4.347 19 7.607c0 3.11-2.051 5.843-5.14 7.393l-.053-1.766c2.095-1.366 3.353-3.41 3.353-5.627 0-2.34-1.402-4.484-3.696-5.841L13.412 0zM5.588 0C2.251 1.504 0 4.347 0 7.607 0 10.717 2.051 13.45 5.14 15l.053-1.766C3.098 11.868 1.84 9.824 1.84 7.607c0-2.34 1.402-4.484 3.696-5.841L5.588 0z"/>
-        <path d="M8.326 12.692L4.648 8.588a.891.891 0 0 1 .038-1.114.681.681 0 0 1 .999-.043l2.641 2.947 4.989-5.565a.681.681 0 0 1 .999.043.891.891 0 0 1 .038 1.114l-6.026 6.722z"/>
-    </g>
-</svg>
diff --git a/src/assets/img/check.svg b/src/assets/img/check.svg
deleted file mode 100644
index 52234938..00000000
--- a/src/assets/img/check.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12" viewBox="0 0 16 12">
-    <path fill="#429A00" fill-rule="evenodd" d="M6.133 12L.281 5.903a1.257 1.257 0 0 1 .062-1.656 1.136 1.136 0 0 1 1.589-.064l4.201 4.378L14.068.293a1.136 1.136 0 0 1 1.59.064c.432.45.458 1.172.06 1.656L6.134 12z"/>
-</svg>
diff --git a/src/assets/img/croix.svg b/src/assets/img/croix.svg
deleted file mode 100644
index 1c398859..00000000
--- a/src/assets/img/croix.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
-    <path fill="#CD0000" fill-rule="evenodd" d="M7.314 6.05l4.465-4.461A.918.918 0 0 0 10.484.294L6.018 4.71 1.525.22A.92.92 0 0 0 .229 1.516l4.484 4.536-4.392 4.333a.918.918 0 1 0 1.296 1.295L6 7.299l4.355 4.353a.92.92 0 0 0 1.295-1.295L7.314 6.05z"/>
-</svg>
diff --git a/src/assets/img/icon_voter_MAYBE.svg b/src/assets/img/icon_voter_MAYBE.svg
index f8d8ade1..2fd97ed2 100644
--- a/src/assets/img/icon_voter_MAYBE.svg
+++ b/src/assets/img/icon_voter_MAYBE.svg
@@ -1,10 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="22" height="24" viewBox="0 0 22 24">
-    <g fill="none" fill-rule="evenodd">
-        <path fill="#4A4A4A" fill-rule="nonzero" d="M16.556 13.749a10.963 10.963 0 0 0-16.112 0 .965.965 0 0 0-.25.639v3.833a.958.958 0 0 0 .959.946h14.694c.53 0 .959-.43.959-.959v-3.833a.965.965 0 0 0-.25-.626z"/>
-        <circle cx="8.5" cy="4.472" r="4.472" fill="#4A4A4A" fill-rule="nonzero"/>
-        <path fill="#FFF" fill-rule="nonzero" stroke="#FFF" stroke-width="4" d="M14.067 20.083l-2.926-3.048a.629.629 0 0 1 .03-.828.568.568 0 0 1 .795-.032l2.1 2.189 3.968-4.134a.568.568 0 0 1 .795.032c.216.225.23.586.03.828l-4.792 4.993z"/>
-        <path fill="#F5A623" fill-rule="nonzero" d="M14.067 20.083l-2.926-3.048a.629.629 0 0 1 .03-.828.568.568 0 0 1 .795-.032l2.1 2.189 3.968-4.134a.568.568 0 0 1 .795.032c.216.225.23.586.03.828l-4.792 4.993zM19 12.083c1.792.903 3 2.609 3 4.564 0 1.867-1.101 3.506-2.76 4.436l-.028-1.06c1.125-.819 1.8-2.046 1.8-3.376 0-1.403-.753-2.69-1.984-3.504L19 12.083z"/>
-        <path fill="#FFF" fill-rule="nonzero" stroke="#FFF" stroke-width="3" d="M10 12.083c-1.792.903-3 2.609-3 4.564 0 1.867 1.101 3.506 2.76 4.436l.028-1.06c-1.125-.819-1.8-2.046-1.8-3.376 0-1.403.753-2.69 1.984-3.504l.028-1.06z"/>
-        <path fill="#F5A623" fill-rule="nonzero" d="M10 12.083c-1.792.903-3 2.609-3 4.564 0 1.867 1.101 3.506 2.76 4.436l.028-1.06c-1.125-.819-1.8-2.046-1.8-3.376 0-1.403.753-2.69 1.984-3.504l.028-1.06z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="19" height="15" viewBox="0 0 19 15">
+    <g fill="#F5A623" fill-rule="evenodd">
+        <path d="M13.412 0C16.749 1.504 19 4.347 19 7.607c0 3.11-2.051 5.843-5.14 7.393l-.053-1.766c2.095-1.366 3.353-3.41 3.353-5.627 0-2.34-1.402-4.484-3.696-5.841L13.412 0zM5.588 0C2.251 1.504 0 4.347 0 7.607 0 10.717 2.051 13.45 5.14 15l.053-1.766C3.098 11.868 1.84 9.824 1.84 7.607c0-2.34 1.402-4.484 3.696-5.841L5.588 0z"/>
+        <path d="M8.326 12.692L4.648 8.588a.891.891 0 0 1 .038-1.114.681.681 0 0 1 .999-.043l2.641 2.947 4.989-5.565a.681.681 0 0 1 .999.043.891.891 0 0 1 .038 1.114l-6.026 6.722z"/>
     </g>
 </svg>
diff --git a/src/assets/img/icon_voter_NO.svg b/src/assets/img/icon_voter_NO.svg
index 4c9e3c03..1c398859 100644
--- a/src/assets/img/icon_voter_NO.svg
+++ b/src/assets/img/icon_voter_NO.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
-	<path fill="#CD0000" fill-rule="evenodd" d="M7.314 6.05l4.465-4.461A.918.918 0 0 0 10.484.294L6.018 4.71 1.525.22A.92.92 0 0 0 .229 1.516l4.484 4.536-4.392 4.333a.918.918 0 1 0 1.296 1.295L6 7.299l4.355 4.353a.92.92 0 0 0 1.295-1.295L7.314 6.05z"/>
+    <path fill="#CD0000" fill-rule="evenodd" d="M7.314 6.05l4.465-4.461A.918.918 0 0 0 10.484.294L6.018 4.71 1.525.22A.92.92 0 0 0 .229 1.516l4.484 4.536-4.392 4.333a.918.918 0 1 0 1.296 1.295L6 7.299l4.355 4.353a.92.92 0 0 0 1.295-1.295L7.314 6.05z"/>
 </svg>
diff --git a/src/assets/img/icon_voter_YES.svg b/src/assets/img/icon_voter_YES.svg
index 3d97906e..52234938 100644
--- a/src/assets/img/icon_voter_YES.svg
+++ b/src/assets/img/icon_voter_YES.svg
@@ -1,9 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="21" viewBox="0 0 20 21">
-    <defs>
-        <path id="a" d="M8.667 10.205c2.13-.029 4.221.541 6.03 1.638l.336.212-4.56 5.008L7.9 14.338a1.887 1.887 0 0 0-2.017-.472 1.84 1.84 0 0 0-1.216 1.653c-.024.44.114.873.385 1.22l.108.126 2.047 2.165H1.493a1.325 1.325 0 0 1-1.286-1.18L.2 17.718v-3.537a.65.65 0 0 1 .133-.4 10.822 10.822 0 0 1 7.655-3.573l.339-.007zm8.466 5.046v2.468c0 .71-.572 1.291-1.293 1.312h-2.127l3.42-3.78zM8.66.361c2.507 0 4.54 2 4.54 4.469 0 2.468-2.033 4.47-4.54 4.47S4.12 7.297 4.12 4.83 6.153.36 8.66.36z"/>
-    </defs>
-    <g fill="none" fill-rule="nonzero">
-        <use fill="#4A4A4A" xlink:href="#a"/>
-        <path fill="#429A00" d="M19.18 10.25a.673.673 0 0 0-.947.053l-7.746 8.531-3.467-3.668a.67.67 0 0 0-.94-.072.651.651 0 0 0 0 .932l4.453 4.725 8.694-9.595a.649.649 0 0 0-.047-.905z"/>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12" viewBox="0 0 16 12">
+    <path fill="#429A00" fill-rule="evenodd" d="M6.133 12L.281 5.903a1.257 1.257 0 0 1 .062-1.656 1.136 1.136 0 0 1 1.589-.064l4.201 4.378L14.068.293a1.136 1.136 0 0 1 1.59.064c.432.45.458 1.172.06 1.656L6.134 12z"/>
 </svg>

From 765299e1c3ae69bebfbad281592d9460ef4f9aa4 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 30 Apr 2021 09:26:54 +0200
Subject: [PATCH 09/18] toast message on error send vote stack

---
 src/app/core/services/poll.service.ts         | 33 -------------------
 .../consultation/consultation.component.ts    |  7 ++--
 .../poll-results-detailed.component.html      |  1 -
 .../poll-results-detailed.component.ts        |  9 +----
 4 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index b145f707..94302300 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -171,39 +171,6 @@ export class PollService implements Resolve<Poll> {
 		this.toastService.display('Les commentaires de ce sondage ont été supprimés.');
 	}
 
-	public buildAnswersByChoiceLabelByPseudo(poll: Poll): Map<string, Map<string, Answer>> {
-		const pseudos: Set<string> = new Set();
-		poll.choices.forEach((choice: Choice) => {
-			// choice.voters.forEach((users: Set<Owner>) => {
-			// 	users.forEach((user: Owner) => {
-			// 		pseudos.add(user.pseudo);
-			// 	});
-			// });
-		});
-
-		const list = new Map<string, Map<string, Answer>>();
-		pseudos.forEach((pseudo: string) => {
-			list.set(
-				pseudo,
-				new Map<string, Answer>(
-					poll.choices.map((choice: Choice) => {
-						return [choice.name, undefined];
-					})
-				)
-			);
-		});
-
-		poll.choices.forEach((choice: Choice) => {
-			choice.participants.forEach((users: Set<Owner>, answer: Answer) => {
-				users.forEach((user: Owner) => {
-					list.get(user.pseudo).set(choice.name, answer);
-				});
-			});
-		});
-
-		return list;
-	}
-
 	newPollFromForm(form: any): any {
 		const newpoll = new Poll(
 			this.userService.getCurrentUser(),
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts
index 3ae752ba..94a19b98 100644
--- a/src/app/features/consultation/consultation.component.ts
+++ b/src/app/features/consultation/consultation.component.ts
@@ -6,12 +6,11 @@ import { ModalService } from '../../core/services/modal.service';
 import { PollService } from '../../core/services/poll.service';
 import { DateService } from '../../core/services/date.service';
 import { PollUtilitiesService } from '../../core/services/poll.utilities.service';
-import { Comment } from '../../core/models/comment.model';
 import { StorageService } from '../../core/services/storage.service';
 import { ApiService } from '../../core/services/api.service';
 import { Stack } from '../../core/models/stack.model';
 import { environment } from '../../../environments/environment';
-import { Title } from '@angular/platform-browser';
+import { ToastService } from '../../core/services/toast.service';
 
 @Component({
 	selector: 'app-consultation',
@@ -42,7 +41,7 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 		public api: ApiService,
 		public pollService: PollService,
 		public dateService: DateService,
-		private modalService: ModalService
+		public toastService: ToastService
 	) {}
 
 	ngOnInit(): void {
@@ -91,6 +90,8 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 
 			if (resp) {
 				this.api.getPollBySlug(this.poll.custom_url);
+			} else {
+				this.toastService.display('erreur à la réception du nouveau vote', 'error');
 			}
 		});
 	}
diff --git a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html
index 44e6e7fb..8468857a 100644
--- a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html
+++ b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html
@@ -19,7 +19,6 @@
 				Score
 			</td>
 			<td *ngFor="let choice of poll.choices">
-				<!--			{{choice.id}} )-->
 				{{ choice.score }}
 			</td>
 		</tr>
diff --git a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.ts b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.ts
index e88994bd..556c2df3 100644
--- a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.ts
+++ b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.ts
@@ -9,24 +9,17 @@ import { PollService } from '../../../core/services/poll.service';
 	templateUrl: './poll-results-detailed.component.html',
 	styleUrls: ['./poll-results-detailed.component.scss'],
 })
-export class PollResultsDetailedComponent implements OnInit {
+export class PollResultsDetailedComponent {
 	@Input() public poll: Poll;
 
 	constructor(private pollService: PollService) {}
 
-	ngOnInit(): void {}
-
-	public buildAnswersByChoiceLabelByPseudo(): Map<string, Map<string, Answer>> {
-		return this.pollService.buildAnswersByChoiceLabelByPseudo(this.poll);
-	}
-
 	stackHasVotesForChoice(stack, choice: any) {
 		return undefined !== stack.votes[choice];
 	}
 
 	getValue(stack, choice: any) {
 		if (this.stackHasVotesForChoice(stack, choice)) {
-			console.log('stack.votes[choice.id]', stack.votes[choice]);
 			return stack.votes[choice].value;
 		}
 		return null;

From 585d3a215e62ee115d0bace3c5bc0c6f650c2b59 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 30 Apr 2021 10:59:46 +0200
Subject: [PATCH 10/18] creation poll style, fill DTO for creation

---
 mocks/db.json                                 |   4 +-
 mocks/old-stuff/config/PollConfig.ts          |   2 +-
 mocks/old-stuff/old-stuff-routing.module.ts   |   2 +-
 .../old-stuff/pages/admin/admin.component.ts  |   2 +-
 .../poll-display/poll-display.component.ts    |   2 +-
 .../visibility/visibility.component.html      |   4 +-
 .../pages/visibility/visibility.component.ts  |   2 +-
 mocks/old-stuff/services/config.service.ts    |   8 +-
 src/app/app-routing.module.ts                 |   2 +-
 src/app/core/models/poll.model.ts             |  37 +----
 src/app/core/services/api.service.ts          |  36 +++--
 src/app/core/services/poll.service.ts         | 125 +++++++----------
 .../core/services/poll.utilities.service.ts   |  11 +-
 .../base-config/base-config.component.html    |  59 ++++----
 .../form/base-config/base-config.component.ts |  12 +-
 .../administration/form/form.component.html   | 129 ++++++++++--------
 .../administration/form/form.component.scss   |  18 ++-
 .../administration/form/form.component.ts     |  35 +++--
 .../kind-select/kind-select.component.html    |   4 +-
 .../consultation/consultation.component.html  |   2 +-
 .../consultation/consultation.component.ts    |  23 ++--
 src/app/routes-framadate.ts                   |   6 +-
 src/environments/environment.prod.ts          |   1 +
 src/environments/environment.ts               |   3 +-
 src/styles/partials/_form-controls.scss       |   4 +-
 25 files changed, 268 insertions(+), 265 deletions(-)

diff --git a/mocks/db.json b/mocks/db.json
index c1bf054c..ef57cf5a 100644
--- a/mocks/db.json
+++ b/mocks/db.json
@@ -6,7 +6,7 @@
 	"polls": [
 		{
 			"id": 1,
-			"slug": "picnic",
+			"custom_url": "picnic",
 			"configuration": {
 				"id": 1,
 				"isAboutDate": true,
@@ -24,7 +24,7 @@
 		},
 		{
 			"id": 2,
-			"slug": "vacances",
+			"custom_url": "vacances",
 			"configuration": {
 				"id": 2,
 				"isAboutDate": true,
diff --git a/mocks/old-stuff/config/PollConfig.ts b/mocks/old-stuff/config/PollConfig.ts
index b45b3573..99ceac24 100644
--- a/mocks/old-stuff/config/PollConfig.ts
+++ b/mocks/old-stuff/config/PollConfig.ts
@@ -54,7 +54,7 @@ export class PollConfig {
 	currentPoll; // current poll selected with createPoll or getPoll of ConfigService
 	passwordAccess = 0;
 	password = '';
-	customUrl = ''; // custom slug in the url, must be unique
+	customUrl = ''; // custom custom_url in the url, must be unique
 	customUrlIsUnique = null; // given by the backend
 	urlSlugPublic = null;
 	urlPublic = environment.production ? '' : document.location.href + '/poll/id/4';
diff --git a/mocks/old-stuff/old-stuff-routing.module.ts b/mocks/old-stuff/old-stuff-routing.module.ts
index 8a84fe53..a51f91e5 100644
--- a/mocks/old-stuff/old-stuff-routing.module.ts
+++ b/mocks/old-stuff/old-stuff-routing.module.ts
@@ -33,7 +33,7 @@ const routes: Routes = [
 	{ path: 'step/end', component: EndConfirmationComponent },
 	{ path: 'graphic/:poll', component: PollGraphicComponent },
 	{ path: 'vote/poll/id/:id', component: PollDisplayComponent },
-	{ path: 'vote/poll/slug/:slug', component: PollDisplayComponent },
+	{ path: 'vote/poll/custom_url/:custom_url', component: PollDisplayComponent },
 	{ path: 'votingchoice', component: VotingChoiceComponent },
 	{ path: 'voting', component: VotingComponent },
 ];
diff --git a/mocks/old-stuff/pages/admin/admin.component.ts b/mocks/old-stuff/pages/admin/admin.component.ts
index cb56c601..5e0c1fd3 100644
--- a/mocks/old-stuff/pages/admin/admin.component.ts
+++ b/mocks/old-stuff/pages/admin/admin.component.ts
@@ -39,7 +39,7 @@ export class AdminComponent implements OnInit {
 		});
 	}
 
-	// fetch poll with its ID or slug.
+	// fetch poll with its ID or custom_url.
 	fetchPoll() {
 		const token = this.tokenForAdministration;
 		const headers = this.utils.makeHeaders({ token: token });
diff --git a/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts
index 768b8686..61a98bbe 100644
--- a/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts
+++ b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts
@@ -28,7 +28,7 @@ export class PollDisplayComponent extends BaseComponent implements OnInit {
 
 	ngOnInit(): void {}
 
-	// fetch poll with its ID or slug.
+	// fetch poll with its ID or custom_url.
 	fetchPoll() {
 		const id = this.activeRoute.snapshot.params.poll;
 		const pollSlug = this.activeRoute.snapshot.params.pollSlug;
diff --git a/mocks/old-stuff/pages/visibility/visibility.component.html b/mocks/old-stuff/pages/visibility/visibility.component.html
index 1244f37e..d57e4f74 100644
--- a/mocks/old-stuff/pages/visibility/visibility.component.html
+++ b/mocks/old-stuff/pages/visibility/visibility.component.html
@@ -102,8 +102,8 @@
 		{{ 'visibility.access_instructions' | translate }}
 	</sub>
 	<div class="preview-url">
-		<a [href]="'/vote/poll/slug/' + config.customUrl">
-			{{ '/vote/poll/slug/' + config.customUrl }}
+		<a [href]="'/vote/poll/custom_url/' + config.customUrl">
+			{{ '/vote/poll/custom_url/' + config.customUrl }}
 		</a>
 	</div>
 	<br />
diff --git a/mocks/old-stuff/pages/visibility/visibility.component.ts b/mocks/old-stuff/pages/visibility/visibility.component.ts
index 6d18a1fd..c2996329 100644
--- a/mocks/old-stuff/pages/visibility/visibility.component.ts
+++ b/mocks/old-stuff/pages/visibility/visibility.component.ts
@@ -21,7 +21,7 @@ export class VisibilityComponent extends BaseComponent implements OnInit {
 	}
 
 	ngOnInit(): void {
-		this.config.customUrl = 'un slug';
+		this.config.customUrl = 'un custom_url';
 		this.config.expirationDate = this.config
 			.addDaysToDate(this.config.expiracyDateDefaultInDays, new Date())
 			.toISOString()
diff --git a/mocks/old-stuff/services/config.service.ts b/mocks/old-stuff/services/config.service.ts
index d24f085e..fe22909f 100644
--- a/mocks/old-stuff/services/config.service.ts
+++ b/mocks/old-stuff/services/config.service.ts
@@ -97,12 +97,12 @@ export class ConfigService extends PollConfig {
 		// TODO: http requests moved to apiService
 		this.customUrlIsUnique = null;
 		if (!slug) {
-			slug = 'un slug';
+			slug = 'un custom_url';
 		}
 
 		this.loading = true;
 		// TODO
-		this.todo('check slug is unique');
+		this.todo('check custom_url is unique');
 		this.http
 			.get(`${this.apiBaseHref}/check-slug-is-uniq/${slug}`, this.utils.makeHeaders({ slug: this.customUrl }))
 			.subscribe(
@@ -163,7 +163,7 @@ export class ConfigService extends PollConfig {
 	}
 
 	/**
-	 * get one poll by its slug choice_label
+	 * get one poll by its custom_url choice_label
 	 * @param url
 	 */
 	getPollByURL(url: string) {
@@ -219,7 +219,7 @@ export class ConfigService extends PollConfig {
 		this.pollId = res.poll.id;
 		this.owner_modifier_token = res.owner_modifier_token;
 		this.urlPublic = this.apiBaseHref + '/vote/poll/id/' + res.poll.id;
-		this.urlSlugPublic = this.apiBaseHref + '/vote/poll/slug/' + res.poll.id;
+		this.urlSlugPublic = this.apiBaseHref + '/vote/poll/custom_url/' + res.poll.id;
 		if (res.poll.customUrl) {
 			this.urlSlugPublic = this.apiBaseHref + '/vote/poll/id/' + res.poll.customUrl;
 		}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 4a0e9f19..f347c701 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router';
 import { routes } from './routes-framadate';
 
 @NgModule({
-	imports: [RouterModule.forRoot(routes, { useHash: true })],
+	imports: [RouterModule.forRoot(routes)],
 	exports: [RouterModule],
 })
 export class AppRoutingModule {}
diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts
index cab6ce48..a9fc1241 100644
--- a/src/app/core/models/poll.model.ts
+++ b/src/app/core/models/poll.model.ts
@@ -10,14 +10,10 @@ export class Poll {
 
 	public default_expiracy_days_from_now = 60;
 
-	public title = 'mon titre';
-
 	public kind: string;
 
 	public description?: string;
 
-	public custom_url?: string;
-
 	public expiracy_date?: string;
 
 	public creation_date?: string;
@@ -49,40 +45,13 @@ export class Poll {
 	public dateChoices: Choice[] = [];
 	// sets of days as strings, config to set identical time for days in a special days poll
 	public timeChoices: Choice[] = []; // ranges of time expressed as strings
-	constructor(public owner: Owner = new Owner(), public urlPublic: string = '', public slug: string = '') {}
-
-	public static adaptFromLocalJsonServer(
-		item: Pick<Poll, 'owner' | 'title' | 'description' | 'slug' | 'configuration' | 'comments' | 'choices'>
-	): Poll {
-		return new Poll(
-			new Owner(item.owner.pseudo, item.owner.email, undefined),
-			''
-			// item.slug,
-			// item.title,
-			// item.description
-			// item.configuration,
-			// item.comments
-			// 	.map(
-			// 		(c: Pick<Comment, 'author' | 'content' | 'dateCreated'>) =>
-			// 			new Comment(c.author, c.content, new Date(c.dateCreated))
-			// 	)
-			// 	.sort(Comment.sortChronologically),
-			// item.choices.map((c: Pick<Choice, 'label' | 'url' | 'participants' | 'counts'>) => {
-			// 	const choice = new Choice(c.label, c.url, new Map(c.participants));
-			// 	choice.participants.forEach((value, key) => {
-			// 		choice.participants.set(key, new Set(value));
-			// 	});
-			// 	choice.updateCounts();
-			// 	return choice;
-			// })
-		);
-	}
+	constructor(public owner: Owner = new Owner(), public title = 'mon titre', public custom_url: string = '') {}
 
 	public getAdministrationUrl(): string {
-		return `${environment.api.baseHref}/administration/polls/${this.slug}`;
+		return `${environment.api.baseHref}/administration/polls/${this.custom_url}`;
 	}
 
 	public getParticipationUrl(): string {
-		return `${environment.api.baseHref}/participation/polls/${this.slug}`;
+		return `${environment.api.baseHref}/participation/polls/${this.custom_url}`;
 	}
 }
diff --git a/src/app/core/services/api.service.ts b/src/app/core/services/api.service.ts
index b80e686f..73dc252b 100644
--- a/src/app/core/services/api.service.ts
+++ b/src/app/core/services/api.service.ts
@@ -116,7 +116,7 @@ export class ApiService {
 	 * @param poll
 	 * @param vote_stack
 	 */
-	public sendVoteStackOfPoll(poll: Poll, vote_stack: Stack): Observable<any> {
+	public sendNewVoteStackOfPoll(poll: Poll, vote_stack: Stack): Observable<any> {
 		// api_new_vote_stack                   POST       ANY      ANY    /api/v1/poll/{id}/answer
 
 		console.log('vote_stack', vote_stack);
@@ -181,7 +181,7 @@ export class ApiService {
 		}
 	}
 
-	public async getPollBySlug(slug: string): Promise<Poll | undefined> {
+	public async getPollByCustomUrl(slug: string): Promise<Poll | undefined> {
 		try {
 			// TODO: this interceptor should be avoided if backends returns the good object
 			const adapterInterceptor: number = this.axiosInstance.interceptors.response.use(
@@ -192,7 +192,7 @@ export class ApiService {
 			);
 
 			const response: AxiosResponse<Poll> = await this.axiosInstance.get<Poll>(`${this.pollsEndpoint}/${slug}`);
-			console.log('fetch API : asking for poll with slug=' + slug, { response });
+			console.log('fetch API : asking for poll with custom_url=' + slug, { response });
 
 			axios.interceptors.request.eject(adapterInterceptor);
 
@@ -206,12 +206,12 @@ export class ApiService {
 		}
 	}
 
-	public async getPollBySlugWithHash(slug: string, hash: string): Promise<Poll | undefined> {
+	public async getPollByCustomUrlWithHash(slug: string, hash: string): Promise<Poll | undefined> {
 		try {
 			const response: AxiosResponse<Poll> = await this.axiosInstance.get<Poll>(
 				`${this.pollsEndpoint}/${slug}/pass/${hash}`
 			);
-			console.log('fetch API : asking for poll with slug=' + slug, { response });
+			console.log('fetch API : asking for poll with custom_url=' + slug, { response });
 
 			return response && response.data && !Array.isArray(response.data) ? response.data : undefined;
 		} catch (error) {
@@ -225,7 +225,7 @@ export class ApiService {
 
 	public async getSlug(slug: string): Promise<boolean> {
 		try {
-			// TODO: scenario should be : if we can get this slug, it exists. if not, it doesn't. It's just a GET.
+			// TODO: scenario should be : if we can get this custom_url, it exists. if not, it doesn't. It's just a GET.
 			const response: AxiosResponse = await this.axiosInstance.get(
 				`${this.pollsEndpoint}${this.slugsEndpoint}/${slug}`
 			);
@@ -244,12 +244,9 @@ export class ApiService {
 	////////////
 	// UPDATE //
 
-	public async sendEmailToUserOfItsPollsList(email: string): Promise<void> {
-		// If user is not authenticated: the list of polls is send to user's email by the backend.
+	public async sendUpdateVoteStack(vote_stack: Stack) {
 		try {
-			await this.axiosInstance.get<Poll[]>(
-				`${this.usersEndpoint}/${email}${this.usersPollsEndpoint}${this.usersPollsSendEmailEndpoint}`
-			);
+			return await this.axiosInstance.patch(`${this.baseHref}/vote_stack/${vote_stack.id}`, vote_stack);
 		} catch (error) {
 			ApiService.handleError(error);
 		}
@@ -295,9 +292,6 @@ export class ApiService {
 		}
 	}
 
-	/////////////////////
-	// PRIVATE METHODS //
-
 	public async deletePollAnswers(slug: string): Promise<boolean> {
 		try {
 			const response: AxiosResponse = await this.axiosInstance.delete(
@@ -319,4 +313,18 @@ export class ApiService {
 			ApiService.handleError(error);
 		}
 	}
+	/////////////////////
+	// PRIVATE METHODS //
+	/////////////////////
+
+	public async sendEmailToUserOfItsPollsList(email: string): Promise<void> {
+		// If user is not authenticated: the list of polls is send to user's email by the backend.
+		try {
+			await this.axiosInstance.get<Poll[]>(
+				`${this.usersEndpoint}/${email}${this.usersPollsEndpoint}${this.usersPollsSendEmailEndpoint}`
+			);
+		} catch (error) {
+			ApiService.handleError(error);
+		}
+	}
 }
diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index 94302300..3a717d84 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -40,15 +40,19 @@ export class PollService implements Resolve<Poll> {
 	 */
 	public async resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<Poll> {
 		const segments: string[] = state.url.split('/');
-		const wantedSlug: string = segments.includes('poll') ? segments[segments.indexOf('poll') + 1] : '';
-		if (!wantedSlug && state.url.includes('administration')) {
+		const wantedcustom_url: string = segments.includes('poll') ? segments[segments.indexOf('poll') + 1] : '';
+		if (!wantedcustom_url && state.url.includes('administration')) {
 			// creation of new poll
 			const poll = new Poll(this.userService.getCurrentUser(), this.uuidService.getUUID(), '');
 			this._poll.next(poll);
-			this.router.navigate(['poll/' + poll.slug + '/administration']);
+			this.router.navigate(['poll/' + poll.custom_url + '/administration']);
 		}
-		if (!this._poll.getValue() || !this._poll.getValue().slug || this._poll.getValue().slug !== wantedSlug) {
-			await this.loadPollBySlug(wantedSlug);
+		if (
+			!this._poll.getValue() ||
+			!this._poll.getValue().custom_url ||
+			this._poll.getValue().custom_url !== wantedcustom_url
+		) {
+			await this.loadPollBycustom_url(wantedcustom_url);
 		}
 		if (this._poll.getValue()) {
 			return this._poll.getValue();
@@ -72,25 +76,25 @@ export class PollService implements Resolve<Poll> {
 		}
 	}
 
-	public async loadPollBySlug(slug: string): Promise<void> {
-		console.log('slug', slug);
-		if (slug) {
-			const poll: Poll | undefined = await this.apiService.getPollBySlug(slug);
+	public async loadPollBycustom_url(custom_url: string): Promise<void> {
+		console.log('custom_url', custom_url);
+		if (custom_url) {
+			const poll: Poll | undefined = await this.apiService.getPollByCustomUrl(custom_url);
 
-			console.log({ loadPollBySlugResponse: poll });
+			console.log({ loadPollBycustom_urlResponse: poll });
 			if (poll) {
 				this.updateCurrentPoll(poll);
 				this.titleService.setTitle(`☑️ ${poll.title} - ${environment.appTitle}`);
 			} else {
-				this.toastService.display(`sondage ${slug} non trouvé`);
+				this.toastService.display(`sondage ${custom_url} non trouvé`);
 			}
 		}
 	}
-	public async loadPollBySlugWithPasswordHash(slug: string, hash: string): Promise<void> {
-		console.log('slug', slug);
-		if (slug) {
-			const poll: Poll | undefined = await this.apiService.getPollBySlugWithHash(slug, hash);
-			console.log({ loadPollBySlugResponse: poll });
+	public async loadPollBycustom_urlWithPasswordHash(custom_url: string, hash: string): Promise<void> {
+		console.log('custom_url', custom_url);
+		if (custom_url) {
+			const poll: Poll | undefined = await this.apiService.getPollByCustomUrlWithHash(custom_url, hash);
+			console.log({ loadPollBycustom_urlResponse: poll });
 			this.updateCurrentPoll(poll);
 		}
 	}
@@ -98,15 +102,17 @@ export class PollService implements Resolve<Poll> {
 	public updateCurrentPoll(poll: Poll): void {
 		this.storageService.setChoicesForVoteStack(poll.choices);
 
+		this.toastService.display('sondage bien mis à jour', 'success');
+
 		console.log('poll', poll);
 		this._poll.next(poll);
 	}
 
 	/**
-	 *  make a uniq slug for the current poll creation
+	 *  make a uniq custom_url for the current poll creation
 	 * @param config
 	 */
-	makeSlug(config: Poll): string {
+	makecustom_url(config: Poll): string {
 		console.log('config', config);
 		let str = '';
 		str =
@@ -152,80 +158,45 @@ export class PollService implements Resolve<Poll> {
 		const currentPoll = this._poll.getValue();
 		currentPoll.choices.find((c) => c.name === choice.name)?.updateParticipation(user, response);
 		this.updateCurrentPoll(currentPoll);
-		this.apiService.createParticipation(currentPoll.slug, choice.name, user.pseudo, response);
+		this.apiService.createParticipation(currentPoll.custom_url, choice.name, user.pseudo, response);
 		this.toastService.display('Votre participation au sondage a été enregistrée.');
 	}
 
 	public async deleteAllAnswers(): Promise<void> {
-		await this.apiService.deletePollAnswers(this._poll.getValue().slug);
+		await this.apiService.deletePollAnswers(this._poll.getValue().custom_url);
 		this.toastService.display('Les participations des votants à ce sondage ont été supprimées.');
 	}
 
 	public async addComment(comment: string): Promise<void> {
-		await this.apiService.createComment(this._poll.getValue().slug, comment);
+		await this.apiService.createComment(this._poll.getValue().custom_url, comment);
 		this.toastService.display('Votre commentaire a été enregistré.');
 	}
 
 	public async deleteComments(): Promise<void> {
-		await this.apiService.deletePollComments(this._poll.getValue().slug);
+		await this.apiService.deletePollComments(this._poll.getValue().custom_url);
 		this.toastService.display('Les commentaires de ce sondage ont été supprimés.');
 	}
 
-	newPollFromForm(form: any): any {
-		const newpoll = new Poll(
-			this.userService.getCurrentUser(),
-			this.uuidService.getUUID(),
-			form.controls.title.value
-		);
-		/**
-		 * convert to API version 1 config poll
-		 */
-		const apiV1Poll = {
-			menuVisible: true,
-			expiracyDateDefaultInDays: newpoll.configuration.expiresDaysDelay,
-			deletionDateAfterLastModification: newpoll.configuration.expiracyAfterLastModificationInDays,
-			pollType: newpoll.configuration.isAboutDate ? 'dates' : 'classic', // classic or dates
-			title: newpoll.title,
-			description: newpoll.description,
-			myName: newpoll.owner.pseudo,
-			myComment: '',
-			isAdmin: true, // when we create a poll, we are admin on it
-			myVoteStack: {},
-			myTempVoteStack: 0,
-			myEmail: newpoll.owner.email,
-			myPolls: [], // list of retrieved polls from the backend api
-			/*
-				 date specific poll, we have the choice to setup different hours (timeList) for all possible dates (dateList), or use the same hours for all dates
-				*/
-			allowSeveralHours: 'true',
-			// access
-			visibility: newpoll.configuration.areResultsPublic, // visible to one with the link:
-			voteChoices: newpoll.configuration.isMaybeAnswerAvailable ? 'yes, maybe, no' : 'yes', // possible answers to a vote choice: only "yes", "yes, maybe, no"
-			creationDate: new Date(),
-			expirationDate: '', // expiracy date
-			voteStackId: null, // id of the vote stack to update
-			pollId: null, // id of the current poll when created. data given by the backend api
-			pollSlug: null, // id of the current poll when created. data given by the backend api
-			currentPoll: null, // current poll selected with createPoll or getPoll of ConfigService
-			passwordAccess: newpoll.configuration.isProtectedByPassword,
-			password: newpoll.configuration.password,
-			customUrl: newpoll.slug, // custom slug in the url, must be unique
-			customUrlIsUnique: null, // given by the backend
-			urlSlugPublic: null,
-			urlPublic: null,
-			urlAdmin: null,
-			adminKey: '', // key to change config of the poll
-			owner_modifier_token: '', // key to change a vote stack
-			canModifyAnswers: newpoll.configuration.isAllowingtoChangeOwnAnswers, // bool for the frontend selector
-			whoCanChangeAnswers: newpoll.configuration.whoCanChangeAnswers, // everybody, self, nobody (: just admin)
-			dateList: newpoll.dateChoices, // sets of days as strings, config to set identical time for days in a special days poll
-			timeList: newpoll.timeChoices, // ranges of time expressed as strings
+	/**
+	 * @description convert to API version 1 data transition object
+	 * @param form
+	 */
+	newPollFromForm(form: any): Poll {
+		const newOwner = this.storageService.vote_stack.owner;
 
-			answers: newpoll.choices,
-			// modals
-			displayConfirmVoteModalAdmin: false,
-		};
-		console.log('apiV1Poll', apiV1Poll);
-		return apiV1Poll;
+		const newpoll = new Poll(newOwner, form.value.custom_url, form.value.title);
+
+		const pollKeys = Object.keys(newpoll);
+		const formFields = Object.keys(form.value);
+
+		for (const fieldOfForm of formFields) {
+			if (pollKeys.indexOf(fieldOfForm) !== -1) {
+				newpoll[fieldOfForm] = form.value[fieldOfForm];
+			}
+		}
+		newpoll.expiracy_date = form.value.expiracy_date;
+
+		console.log('newpoll', newpoll);
+		return newpoll;
 	}
 }
diff --git a/src/app/core/services/poll.utilities.service.ts b/src/app/core/services/poll.utilities.service.ts
index 3514cde9..0b6471fe 100644
--- a/src/app/core/services/poll.utilities.service.ts
+++ b/src/app/core/services/poll.utilities.service.ts
@@ -20,7 +20,7 @@ export class PollUtilitiesService {
 	}
 
 	/**
-	 * make a uniq slug for the current poll creation
+	 * make a uniq custom_url for the current poll creation
 	 * @param str
 	 */
 	makeSlug(config: Poll) {
@@ -37,7 +37,12 @@ export class PollUtilitiesService {
 			config.creatorPseudo +
 			'_' +
 			config.title;
-		str = str.replace(/^\s+|\s+$/g, ''); // trim
+
+		return this.makeSlugFromString(str);
+	}
+
+	makeSlugFromString(text: string): string {
+		let str = text.replace(/^\s+|\s+$/g, ''); // trim
 		str = str.toLowerCase();
 
 		// remove accents, swap ñ for n, etc
@@ -130,7 +135,7 @@ export class PollUtilitiesService {
 		const link = document.createElement('a');
 		link.setAttribute('href', encodedUri);
 		const exportFileName =
-			(poll.urlPublic ? poll.urlPublic : this.makeSlug(poll)) + '_export_' + new Date() + '.csv';
+			(poll.custom_url ? poll.custom_url : this.makeSlug(poll)) + '_export_' + new Date() + '.csv';
 		link.setAttribute('download', exportFileName);
 		document.body.appendChild(link); // Required for FF
 		link.click(); // This will download the data file named "my_data.csv".
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 85decc75..2984cca1 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
@@ -4,7 +4,6 @@
 			<p>
 				{{ 'creation.choose_title' | translate }}
 			</p>
-			<h2 class="title is-2">slug: {{ form.value.slug }}</h2>
 			<br />
 			<label class="hidden" for="title">Titre</label>
 			<input
@@ -29,35 +28,39 @@
 			</button>
 		</div>
 		<div class="column">
-			<label for="creatorPseudo">
-				<span>
-					{{ 'creation.email' | translate }}
-				</span>
-			</label>
+			<p>
+				<label for="creatorPseudo">
+					<span>
+						{{ 'creation.email' | translate }}
+					</span>
+				</label>
 
-			<input
-				#creatorEmail
-				matInput
-				placeholder="{{ 'creation.email_placeholder' | translate }}"
-				formControlName="creatorEmail"
-				id="creatorEmail"
-				required
-			/>
+				<input
+					#creatorEmail
+					matInput
+					placeholder="{{ 'creation.email_placeholder' | translate }}"
+					formControlName="creatorEmail"
+					id="creatorEmail"
+					required
+				/>
+			</p>
 			<br />
 
-			<label class="" for="creatorEmail">
-				<span>
-					{{ 'creation.name' | translate }}
-				</span>
-			</label>
-			<input
-				#creatorPseudo
-				matInput
-				placeholder="pseudo"
-				formControlName="creatorPseudo"
-				id="creatorPseudo"
-				required
-			/>
+			<p>
+				<label class="" for="creatorPseudo">
+					<span>
+						{{ 'creation.name' | translate }}
+					</span>
+				</label>
+				<input
+					#creatorPseudo
+					matInput
+					placeholder="pseudo"
+					formControlName="creatorPseudo"
+					id="creatorPseudo"
+					required
+				/>
+			</p>
 		</div>
 
 		<hr />
@@ -66,7 +69,7 @@
 	<hr />
 	<div class="columns">
 		<div class="column">
-			<img src="assets/img/undraw_Moving_twwf.svg" alt="image WIP" />
+			<!--			<img src="assets/img/undraw_Moving_twwf.svg" alt="image WIP" />-->
 			<div>
 				<h2>
 					{{ 'choices.title' | translate }}
diff --git a/src/app/features/administration/form/base-config/base-config.component.ts b/src/app/features/administration/form/base-config/base-config.component.ts
index 8d0b4d7b..8c34ab6c 100644
--- a/src/app/features/administration/form/base-config/base-config.component.ts
+++ b/src/app/features/administration/form/base-config/base-config.component.ts
@@ -8,6 +8,7 @@ import { Router } from '@angular/router';
 import { DOCUMENT } from '@angular/common';
 import { Poll } from '../../../../core/models/poll.model';
 import { environment } from '../../../../../environments/environment';
+import { PollUtilitiesService } from '../../../../core/services/poll.utilities.service';
 
 @Component({
 	selector: 'app-base-config',
@@ -26,6 +27,7 @@ export class BaseConfigComponent {
 		private uuidService: UuidService,
 		private toastService: ToastService,
 		private pollService: PollService,
+		private utilitiesService: PollUtilitiesService,
 		private apiService: ApiService,
 		private router: Router,
 		@Inject(DOCUMENT) private document: Document
@@ -52,11 +54,11 @@ export class BaseConfigComponent {
 			if (this.form.valid) {
 				console.log('Le sondage est correctement rempli, prêt à enregistrer.');
 				const newpoll = this.pollService.newPollFromForm(this.form);
-				// TODO : save the poll
-
 				this.apiService.createPoll(newpoll).then((resp) => {
 					console.log('resp', resp);
 					router.navigate(['success']);
+
+					this.toastService.display('sauvegarde du nouveau sondage réussie');
 				});
 			} else {
 				this.toastService.display('invalid form');
@@ -65,14 +67,14 @@ export class BaseConfigComponent {
 	}
 
 	public updateSlug(): void {
-		const newValueFormatted = 'TODO';
+		const newValueFormatted = this.pollService.makecustom_url(this.poll);
 		this.form.patchValue({ slug: newValueFormatted });
 	}
 
 	/**
-	 * set the poll slug from other data of the poll
+	 * set the poll custom_url from other data of the poll
 	 */
 	automaticSlug() {
-		this.form.patchValue({ slug: this.pollService.makeSlug(this.form.value) });
+		this.form.patchValue({ slug: this.utilitiesService.makeUuid() });
 	}
 }
diff --git a/src/app/features/administration/form/form.component.html b/src/app/features/administration/form/form.component.html
index 1938a652..0ab9696a 100644
--- a/src/app/features/administration/form/form.component.html
+++ b/src/app/features/administration/form/form.component.html
@@ -1,69 +1,86 @@
 <div class="admin-form padded">
-	<form [formGroup]="form">
-		<header class="columns">
-			<div class="column">
-				<h1>
-					{{ 'creation.title' | translate }}
-				</h1>
-			</div>
-			<div class="column">
-				<button
-					class="btn is-success"
-					(click)="apiService.createPoll(poll)"
-					[disabled]="!form.valid || !form.valid"
-				>
-					<i class="fa fa-save"></i>
-					Enregistrer le sondage
-				</button>
-			</div>
-		</header>
-		<main class="columns">
-			<div class="column">
-				<p class="subtitle">
-					{{ 'creation.want' | translate }}
-				</p>
+	<div class="container is-max-widescreen">
+		<form [formGroup]="form">
+			<header class="columns">
+				<div class="column">
+					<h1 class="title is-2">
+						{{ 'creation.title' | translate }}
+					</h1>
+				</div>
+				<div class="column">
+					<button class="btn is-success" (click)="apiService.createPoll(poll)">
+						<!--					[disabled]="!form.valid || !form.valid"-->
+						<i class="fa fa-save"></i>
+						Enregistrer le sondage
+					</button>
+				</div>
+			</header>
+			<main class="columns">
+				<div class="column">
+					<p class="label is-medium">
+						{{ 'creation.want' | translate }}
+					</p>
 
-				<app-kind-select [form]="form"></app-kind-select>
-				<app-base-config [form]="form"></app-base-config>
-				<!--				<app-date-select-->
-				<!--					*ngIf="form.value.configuration && form.value.configuration.isAboutDate"-->
-				<!--					[form]="form"-->
-				<!--				></app-date-select>-->
-				<!--								<app-text-select ng-if="!form.value.isAboutDate" [form]="form"></app-text-select>-->
+					<app-kind-select [form]="form"></app-kind-select>
 
-				<button
-					class="btn"
-					[class]="{ 'is-primary': advancedDisplayEnabled, 'is-info': !advancedDisplayEnabled }"
-					(click)="advancedDisplayEnabled = !advancedDisplayEnabled"
-				>
-					<i class="fa fa-save"></i>
-					{{ 'creation.advanced' | translate }}
-				</button>
-				<app-advanced-config [poll]="poll" [form]="form" *ngIf="advancedDisplayEnabled"></app-advanced-config>
-			</div>
-		</main>
-		<footer class="column" *ngIf="show_debug_data">
-			<h2>Debug data</h2>
-			<pre class="debug padded warning">
+					<div class="field is-grouped is-grouped-right">
+						<p class="control">
+							<a class="button is-light" (click)="goPreviousStep()">
+								Précédent
+							</a>
+						</p>
+						<p class="control">
+							<a class="button is-primary" (click)="goNextStep()">
+								Suivant
+							</a>
+						</p>
+					</div>
+
+					<app-base-config [form]="form"></app-base-config>
+					<!--								<app-date-select-->
+					<!--									*ngIf="form.value.configuration && form.value.kind == 'date'"-->
+					<!--									[form]="form"-->
+					<!--								></app-date-select>-->
+					<!--												<app-text-select ng-if="!form.value.isAboutDate" [form]="form"></app-text-select>-->
+
+					<button
+						class="btn"
+						[class]="{ 'is-primary': advancedDisplayEnabled, 'is-info': !advancedDisplayEnabled }"
+						(click)="advancedDisplayEnabled = !advancedDisplayEnabled"
+					>
+						<i class="fa fa-save"></i>
+						{{ 'creation.advanced' | translate }}
+					</button>
+					<app-advanced-config
+						[poll]="poll"
+						[form]="form"
+						*ngIf="advancedDisplayEnabled"
+					></app-advanced-config>
+				</div>
+			</main>
+			<footer class="column" *ngIf="show_debug_data">
+				<h2>Debug data</h2>
+				<pre class="debug padded warning">
 				form values :
 					{{ form.value | json }}
 				</pre
-			>
-			<pre class="debug padded warning">
+				>
+				<pre class="debug padded warning">
 				poll initial values :
 				{{ poll | json }}
 				</pre
-			>
-		</footer>
-		<hr />
-		<div class="validation">
-			<div class="has-background-danger" *ngIf="!form.valid && form.touched">
-				le formulaire est invalide
-				<pre>
+				>
+			</footer>
+			<hr />
+			<div class="validation">
+				<div class="has-background-danger" *ngIf="!form.valid && form.touched">
+					le formulaire est invalide
+					<pre>
 		 {{ form.errors | json }}
 		</pre
-				>
+					>
+				</div>
 			</div>
-		</div>
-	</form>
+		</form>
+	</div>
 </div>
diff --git a/src/app/features/administration/form/form.component.scss b/src/app/features/administration/form/form.component.scss
index 3814f6aa..9632e62e 100644
--- a/src/app/features/administration/form/form.component.scss
+++ b/src/app/features/administration/form/form.component.scss
@@ -1,15 +1,8 @@
 @import '../../../../styles/variables';
 :host {
-	input,
-	textarea {
-		padding: 0.5em;
-		border: solid #eee;
-
-		width: 90%;
-	}
-	.form-field {
-		display: block;
-		margin-top: 1em;
+	.admin-form {
+		max-width: 800px;
+		margin: 0 auto;
 	}
 	.form-row {
 		margin-top: 0.5em;
@@ -75,6 +68,11 @@
 	.example-list.cdk-drop-list-dragging .example-box:not(.cdk-drag-placeholder) {
 		transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
 	}
+	.ng-pristine,
+	.ng-dirty {
+		border-left: $white 3px solid;
+		padding-left: 1em;
+	}
 	.ng-touched.ng-invalid {
 		border-left: $danger 3px solid;
 		padding-left: 1em;
diff --git a/src/app/features/administration/form/form.component.ts b/src/app/features/administration/form/form.component.ts
index 5e29d004..41c3fd1f 100644
--- a/src/app/features/administration/form/form.component.ts
+++ b/src/app/features/administration/form/form.component.ts
@@ -7,6 +7,8 @@ import { ToastService } from '../../../core/services/toast.service';
 import { PollService } from '../../../core/services/poll.service';
 import { DOCUMENT } from '@angular/common';
 import { Router } from '@angular/router';
+import { environment } from '../../../../environments/environment';
+import { PollUtilitiesService } from '../../../core/services/poll.utilities.service';
 
 @Component({
 	selector: 'app-admin-form',
@@ -24,7 +26,7 @@ export class FormComponent implements OnInit {
 	constructor(
 		private fb: FormBuilder,
 		private cd: ChangeDetectorRef,
-		private uuidService: UuidService,
+		private pollUtilitiesService: PollUtilitiesService,
 		private toastService: ToastService,
 		private pollService: PollService,
 		public apiService: ApiService,
@@ -39,14 +41,14 @@ export class FormComponent implements OnInit {
 		console.log('pollsAvailable', pollsAvailable);
 	}
 
-	initFormDefault(showDemoValues = true): void {
+	initFormDefault(showDemoValues = environment.autofill): void {
 		const creationDate = new Date();
 
 		this.form = this.fb.group({
 			title: ['', [Validators.required, Validators.minLength(12)]],
 			creatorPseudo: ['', [Validators.required]],
 			creatorEmail: ['', [Validators.required]],
-			slug: [this.uuidService.getUUID(), [Validators.required]],
+			custom_url: [this.pollUtilitiesService.makeUuid(), [Validators.required]],
 			description: ['', [Validators.required]],
 			choices: this.fb.array([
 				this.fb.group({
@@ -84,7 +86,7 @@ export class FormComponent implements OnInit {
 				expiresDaysDelay: [60, [Validators.required, Validators.min(1)]],
 				maxCountOfAnswers: [150, [Validators.required, Validators.min(1)]],
 				allowComments: [true, [Validators.required]],
-				password: [this.uuidService.getUUID(), [Validators.required]],
+				password: [this.pollUtilitiesService.makeUuid(), [Validators.required]],
 				dateCreated: [creationDate, [Validators.required]],
 				hasSeveralHours: [true, [Validators.required]],
 				hasMaxCountOfAnswers: [true, [Validators.required, Validators.min(1)]],
@@ -104,10 +106,11 @@ export class FormComponent implements OnInit {
 	 * add example values to the form, overrides defaults of PollConfiguration
 	 */
 	setDemoValues(): void {
+		const title = 'le titre de démo oh oh';
 		this.form.patchValue({
-			title: 'le titre de démo oh oh',
+			title: title,
+			custom_url: this.pollUtilitiesService.makeSlugFromString(title),
 			description: 'répondez SVP <3 ! *-* ',
-			slug: this.uuidService.getUUID(),
 			creatorPseudo: 'Chuck Norris',
 			creatorEmail: 'chucknorris@example.com',
 			isAboutDate: true,
@@ -124,9 +127,25 @@ export class FormComponent implements OnInit {
 				expiresDaysDelay: 60,
 			},
 			comments: [],
-			choices: [],
-			dateChoices: [],
+			choices: [
+				{
+					name: 'un choix',
+					url: 'https://placekitten.com/120/150',
+				},
+			],
+			dateChoices: [
+				{
+					name: new Date(),
+				},
+			],
 			timeChoices: [],
 		});
 	}
+
+	goPreviousStep() {
+		alert('todo');
+	}
+	goNextStep() {
+		alert('todo');
+	}
 }
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 f322436f..2608ef3e 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,7 @@
 <div class="kind-select form-field">
 	<form [formGroup]="form">
-		<div class="kind-of-poll columns">
-			<div class="column" *ngIf="template_questions_answers">
+		<div class="kind-of-poll control">
+			<div class="select" *ngIf="template_questions_answers">
 				<!--			version maquette questions réponses-->
 				<select name="type" id="type" class="input" formControlName="kind">
 					<option [value]="'date'">{{ 'creation.kind.date' | translate }}</option>
diff --git a/src/app/features/consultation/consultation.component.html b/src/app/features/consultation/consultation.component.html
index 282057e0..c195a8d2 100644
--- a/src/app/features/consultation/consultation.component.html
+++ b/src/app/features/consultation/consultation.component.html
@@ -109,7 +109,7 @@
 					</button>
 					<button
 						class="btn btn--primary btn-block submit-votestack update"
-						(click)="updateVote(storageService.vote_stack)"
+						(click)="updateVoteStack(storageService.vote_stack)"
 						*ngIf="storageService.vote_stack && storageService.vote_stack.id"
 					>
 						<i class="fa fa-edit" aria-hidden="true"></i> Mettre à jour
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts
index 94a19b98..37625c74 100644
--- a/src/app/features/consultation/consultation.component.ts
+++ b/src/app/features/consultation/consultation.component.ts
@@ -80,13 +80,20 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 		}
 	}
 
-	updateVote(votestack: Stack) {
+	updateVoteStack(vote_stack: Stack): void {
 		alert('TODO');
+		this.api.sendUpdateVoteStack(vote_stack).then((resp) => {
+			console.log('sendUpdateVoteStack resp', resp);
+
+			this.toastService.display('vote bien mis à jour', 'success');
+		});
 	}
 
-	addVoteStack() {
-		this.api.sendVoteStackOfPoll(this.poll, this.storageService.vote_stack).subscribe((resp) => {
-			console.log('sendVoteStackOfPoll resp', resp);
+	addVoteStack(): void {
+		this.api.sendNewVoteStackOfPoll(this.poll, this.storageService.vote_stack).subscribe((resp) => {
+			console.log('sendNewVoteStackOfPoll resp', resp);
+
+			this.toastService.display('vote ajouté', 'success');
 
 			if (resp) {
 				this.api.getPollBySlug(this.poll.custom_url);
@@ -99,19 +106,19 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 	/**
 	 * export all the poll data available to the public as a CSV single file
 	 */
-	exportCSV() {
+	exportCSV(): void {
 		this.utils.exportCSV(this.poll);
 	}
 
-	exportJson() {
+	exportJson(): void {
 		this.utils.download('export_poll_' + this.pollSlug + '.json', JSON.stringify(this.poll));
 	}
 
-	duplicate() {
+	duplicate(): void {
 		alert('TODO');
 	}
 
-	print() {
+	print(): void {
 		alert('TODO');
 	}
 }
diff --git a/src/app/routes-framadate.ts b/src/app/routes-framadate.ts
index 64e14374..b7c61df2 100644
--- a/src/app/routes-framadate.ts
+++ b/src/app/routes-framadate.ts
@@ -22,18 +22,18 @@ export const routes: Routes = [
 		// resolve: {poll: PollService},
 	},
 	{
-		path: 'poll/:slug/administration',
+		path: 'poll/:custom_url/administration',
 		loadChildren: () =>
 			import('./features/administration/administration.module').then((m) => m.AdministrationModule),
 		// resolve: { poll: PollService },
 	},
 	{
-		path: 'poll/:slug/consultation',
+		path: 'poll/:custom_url/consultation',
 		loadChildren: () => import('./features/consultation/consultation.module').then((m) => m.ConsultationModule),
 		// resolve: { poll: PollService },
 	},
 	{
-		path: 'poll/:slug/participation',
+		path: 'poll/:custom_url/participation',
 		loadChildren: () => import('./features/participation/participation.module').then((m) => m.ParticipationModule),
 		// resolve: { poll: PollService },
 	},
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 5e832bca..b92940e1 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -14,6 +14,7 @@ export const environment = {
 	production: true,
 	display_routes: true,
 	autofill: true,
+	autoSendNewPoll: false,
 	appTitle: 'FramaDate Funky',
 	appVersion: '2.1.0',
 	appLogo: 'assets/img/logo.png',
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index c483393a..a3570729 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -18,9 +18,10 @@ const apiV1 = {
 };
 
 export const environment = {
-	production: true,
+	production: false,
 	display_routes: true,
 	autofill: true,
+	autoSendNewPoll: true,
 	appTitle: 'FramaDate Funky',
 	appVersion: '2.1.0',
 	appLogo: 'assets/img/logo.png',
diff --git a/src/styles/partials/_form-controls.scss b/src/styles/partials/_form-controls.scss
index 8857d5d9..0e1fbe29 100644
--- a/src/styles/partials/_form-controls.scss
+++ b/src/styles/partials/_form-controls.scss
@@ -19,13 +19,15 @@ option {
 	-moz-appearance: none;
 	border-radius: 0;
 	background-color: transparent;
-	background-image: url('/assets/img/fleche_bas.svg');
+	//background-image: url('/assets/img/fleche_bas.svg');
 	padding-right: 2.5rem;
 	background-repeat: no-repeat;
 	background-size: 9px 8px;
 	background-position: right 1rem center;
 	background-clip: border-box;
 	min-width: 10rem;
+	margin-bottom: 0.25rem;
+	border-bottom: 2px solid $primary_color !important;
 }
 
 select {

From 12a41b502217ce8c2f0df9673ca7a21f80550409 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 30 Apr 2021 11:27:54 +0200
Subject: [PATCH 11/18] auto save on dev env

---
 mocks/old-stuff/config/PollConfig.ts          |  2 +-
 mocks/old-stuff/services/config.service.ts    |  1 +
 src/app/core/services/poll.service.ts         | 24 +++++++-----
 .../advanced-config.component.html            |  6 +--
 .../base-config/base-config.component.html    |  5 +--
 .../form/base-config/base-config.component.ts | 37 ++-----------------
 .../administration/form/form.component.html   | 16 ++++----
 .../administration/form/form.component.ts     | 35 ++++++++++++++++--
 .../stepper/stepper.component.ts              |  2 +-
 .../consultation/consultation.component.ts    |  6 +--
 .../user-polls/user-polls.component.html      |  4 +-
 src/environments/environment.ts               |  2 +-
 12 files changed, 72 insertions(+), 68 deletions(-)

diff --git a/mocks/old-stuff/config/PollConfig.ts b/mocks/old-stuff/config/PollConfig.ts
index 99ceac24..32e5d94f 100644
--- a/mocks/old-stuff/config/PollConfig.ts
+++ b/mocks/old-stuff/config/PollConfig.ts
@@ -50,7 +50,7 @@ export class PollConfig {
 	expirationDate = ''; // expiracy date
 	voteStackId = null; // id of the vote stack to update
 	pollId = null; // id of the current poll when created. data given by the backend api
-	pollSlug = null; // id of the current poll when created. data given by the backend api
+	custom_url = null; // id of the current poll when created. data given by the backend api
 	currentPoll; // current poll selected with createPoll or getPoll of ConfigService
 	passwordAccess = 0;
 	password = '';
diff --git a/mocks/old-stuff/services/config.service.ts b/mocks/old-stuff/services/config.service.ts
index fe22909f..9a1268f2 100644
--- a/mocks/old-stuff/services/config.service.ts
+++ b/mocks/old-stuff/services/config.service.ts
@@ -20,6 +20,7 @@ import { mockMyPolls } from '../mocks/mockmypolls';
 export class ConfigService extends PollConfig {
 	loading = false;
 	apiBaseHref: any = environment.api.baseHref;
+	pollSlug: string;
 
 	constructor(
 		private http: HttpClient,
diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index 3a717d84..7197c678 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -143,15 +143,21 @@ export class PollService implements Resolve<Poll> {
 		return str + '-' + this.uuidService.getUUID();
 	}
 
-	public async saveCurrentPoll(): Promise<void> {
-		const pollUrl: Subscription = await this.apiService.createPoll(this._poll.getValue());
-		// TODO: Maybe handle the url to update currentPoll according to backend response
-		if (pollUrl) {
-			console.log('pollUrl', pollUrl);
-			this.toastService.display('Le sondage a été enregistré.');
-		} else {
-			this.toastService.display('Le sondage n’a été correctement enregistré, veuillez ré-essayer.');
-		}
+	public async saveCurrentPoll(): Promise<Subscription> {
+		// .then((resp) => {
+		// 	console.log('resp', resp);
+		// 	if (pollUrl) {
+		// 		console.log('pollUrl', pollUrl);
+		// 		this.toastService.display('Le sondage a été enregistré.');
+		// 		// TODO: redirect to view
+		// 	} else {
+		// 		this.toastService.display('Le sondage n’a été correctement enregistré, veuillez ré-essayer.');
+		// 	}
+		// })
+		// .catch((err) => {
+		// 	console.error('err', err);
+		// });
+		return await this.apiService.createPoll(this._poll.getValue());
 	}
 
 	public saveParticipation(choice: Choice, user: Owner, response: Answer): void {
diff --git a/src/app/features/administration/form/advanced-config/advanced-config.component.html b/src/app/features/administration/form/advanced-config/advanced-config.component.html
index 1bd574b7..d378952f 100644
--- a/src/app/features/administration/form/advanced-config/advanced-config.component.html
+++ b/src/app/features/administration/form/advanced-config/advanced-config.component.html
@@ -31,14 +31,14 @@
 		<span
 			>{{ urlPrefix }}
 			<strong>
-				{{ form.controls.slug.value }}
+				{{ form.controls.custom_url.value }}
 			</strong>
 		</span>
-		<app-copy-text [textToCopy]="form.controls.slug.value"></app-copy-text>
+		<app-copy-text [textToCopy]="form.controls.custom_url.value"></app-copy-text>
 
 		<button
 			mat-button
-			*ngIf="form.controls.slug.value"
+			*ngIf="form.controls.custom_url.value"
 			matSuffix
 			mat-icon-button
 			aria-label="Clear"
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 2984cca1..262ed155 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
@@ -92,10 +92,7 @@
 			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>
diff --git a/src/app/features/administration/form/base-config/base-config.component.ts b/src/app/features/administration/form/base-config/base-config.component.ts
index 8c34ab6c..ecb0fcc4 100644
--- a/src/app/features/administration/form/base-config/base-config.component.ts
+++ b/src/app/features/administration/form/base-config/base-config.component.ts
@@ -34,47 +34,18 @@ export class BaseConfigComponent {
 	) {}
 
 	askInitFormDefault(): void {
-		// this.initFormDefault(false);
-		this.toastService.display('formulaire réinitialisé');
-	}
-
-	public createPoll(): void {
-		console.log('this.form', this.form);
-		const newpoll = this.pollService.newPollFromForm(this.form);
-		console.log('newpoll', newpoll);
-		const router = this.router;
-
-		if (!environment.production) {
-			this.toastService.display('mode dev : envoi du form sans validation');
-			this.apiService.createPoll(newpoll).then((resp) => {
-				console.log('resp', resp);
-				router.navigate(['success']);
-			});
-		} else {
-			if (this.form.valid) {
-				console.log('Le sondage est correctement rempli, prêt à enregistrer.');
-				const newpoll = this.pollService.newPollFromForm(this.form);
-				this.apiService.createPoll(newpoll).then((resp) => {
-					console.log('resp', resp);
-					router.navigate(['success']);
-
-					this.toastService.display('sauvegarde du nouveau sondage réussie');
-				});
-			} else {
-				this.toastService.display('invalid form');
-			}
-		}
+		this.toastService.display('formulaire réinitialisé', 'info');
 	}
 
 	public updateSlug(): void {
 		const newValueFormatted = this.pollService.makecustom_url(this.poll);
-		this.form.patchValue({ slug: newValueFormatted });
+		this.form.patchValue({ custom_url: newValueFormatted });
 	}
 
 	/**
 	 * set the poll custom_url from other data of the poll
 	 */
-	automaticSlug() {
-		this.form.patchValue({ slug: this.utilitiesService.makeUuid() });
+	automaticSlug(): void {
+		this.form.patchValue({ custom_url: this.utilitiesService.makeUuid() });
 	}
 }
diff --git a/src/app/features/administration/form/form.component.html b/src/app/features/administration/form/form.component.html
index 0ab9696a..d91f5c6d 100644
--- a/src/app/features/administration/form/form.component.html
+++ b/src/app/features/administration/form/form.component.html
@@ -8,8 +8,8 @@
 					</h1>
 				</div>
 				<div class="column">
-					<button class="btn is-success" (click)="apiService.createPoll(poll)">
-						<!--					[disabled]="!form.valid || !form.valid"-->
+					<!--					[disabled]="!form.valid || !form.valid"-->
+					<button class="btn is-success" (click)="createPoll()">
 						<i class="fa fa-save"></i>
 						Enregistrer le sondage
 					</button>
@@ -37,11 +37,11 @@
 					</div>
 
 					<app-base-config [form]="form"></app-base-config>
-					<!--								<app-date-select-->
-					<!--									*ngIf="form.value.configuration && form.value.kind == 'date'"-->
-					<!--									[form]="form"-->
-					<!--								></app-date-select>-->
-					<!--												<app-text-select ng-if="!form.value.isAboutDate" [form]="form"></app-text-select>-->
+					<app-date-select
+						*ngIf="form.value.configuration && form.value.kind == 'date'"
+						[form]="form"
+					></app-date-select>
+					<app-text-select *ngIf="!form.value.kind == 'date'" [form]="form"></app-text-select>
 
 					<button
 						class="btn"
@@ -67,7 +67,7 @@
 				>
 				<pre class="debug padded warning">
 				poll initial values :
-				{{ poll | json }}
+					{{ poll | json }}
 				</pre
 				>
 			</footer>
diff --git a/src/app/features/administration/form/form.component.ts b/src/app/features/administration/form/form.component.ts
index 41c3fd1f..4caec57e 100644
--- a/src/app/features/administration/form/form.component.ts
+++ b/src/app/features/administration/form/form.component.ts
@@ -36,9 +36,6 @@ export class FormComponent implements OnInit {
 
 	ngOnInit(): void {
 		this.initFormDefault();
-
-		const pollsAvailable = this.pollService.getAllAvailablePolls();
-		console.log('pollsAvailable', pollsAvailable);
 	}
 
 	initFormDefault(showDemoValues = environment.autofill): void {
@@ -100,6 +97,10 @@ export class FormComponent implements OnInit {
 			this.setDemoValues();
 			this.toastService.display('default values filled for demo');
 		}
+
+		if (environment.autoSendNewPoll) {
+			this.createPoll();
+		}
 	}
 
 	/**
@@ -148,4 +149,32 @@ export class FormComponent implements OnInit {
 	goNextStep() {
 		alert('todo');
 	}
+
+	public createPoll(): void {
+		console.log('this.form', this.form);
+		const newpoll = this.pollService.newPollFromForm(this.form);
+		console.log('newpoll', newpoll);
+		const router = this.router;
+
+		if (!environment.production) {
+			this.toastService.display('mode dev : envoi du form sans validation');
+			this.apiService.createPoll(newpoll).then((resp) => {
+				console.log('resp', resp);
+				router.navigate(['success']);
+			});
+		} else {
+			if (this.form.valid) {
+				console.log('Le sondage est correctement rempli, prêt à enregistrer.');
+				const newpoll = this.pollService.newPollFromForm(this.form);
+				this.apiService.createPoll(newpoll).then((resp) => {
+					console.log('resp', resp);
+					router.navigate(['poll', this.form.value.custom_url, 'consultation']);
+
+					this.toastService.display('sauvegarde du nouveau sondage réussie');
+				});
+			} else {
+				this.toastService.display('invalid form');
+			}
+		}
+	}
 }
diff --git a/src/app/features/administration/stepper/stepper.component.ts b/src/app/features/administration/stepper/stepper.component.ts
index d527c416..744c9658 100644
--- a/src/app/features/administration/stepper/stepper.component.ts
+++ b/src/app/features/administration/stepper/stepper.component.ts
@@ -25,7 +25,7 @@ export class StepperComponent implements OnInit {
 	ngOnInit(): void {
 		this.pollFormGroup = this.fb.group({
 			question: [this.poll ? this.poll.title : '', [Validators.required]],
-			slug: [this.poll ? this.poll.slug : this.uuidService.getUUID(), [Validators.required]],
+			slug: [this.poll ? this.poll.custom_url : this.uuidService.getUUID(), [Validators.required]],
 			description: [this.poll ? this.poll.description : ''],
 		});
 
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts
index 37625c74..abec918a 100644
--- a/src/app/features/consultation/consultation.component.ts
+++ b/src/app/features/consultation/consultation.component.ts
@@ -64,9 +64,9 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 			this.passHash = params.get('hash');
 
 			if (this.passHash) {
-				this.pollService.loadPollBySlugWithPasswordHash(this.pollSlug, this.passHash);
+				this.pollService.loadPollBycustom_urlWithPasswordHash(this.pollSlug, this.passHash);
 			} else {
-				this.pollService.loadPollBySlug(this.pollSlug).then((resp) => {
+				this.pollService.loadPollBycustom_url(this.pollSlug).then((resp) => {
 					console.log('resp', resp);
 					this.fetching = false;
 				});
@@ -96,7 +96,7 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 			this.toastService.display('vote ajouté', 'success');
 
 			if (resp) {
-				this.api.getPollBySlug(this.poll.custom_url);
+				this.api.getPollByCustomUrl(this.poll.custom_url);
 			} else {
 				this.toastService.display('erreur à la réception du nouveau vote', 'error');
 			}
diff --git a/src/app/features/user-profile/user-polls/user-polls.component.html b/src/app/features/user-profile/user-polls/user-polls.component.html
index 1b24d918..e863b7ad 100644
--- a/src/app/features/user-profile/user-polls/user-polls.component.html
+++ b/src/app/features/user-profile/user-polls/user-polls.component.html
@@ -26,8 +26,8 @@
 						<tr *ngFor="let poll of (_user | async)?.polls">
 							<th>{{ poll.title }}</th>
 							<td>
-								<a routerLink="{{ '../../poll/' + poll.slug + '/consultation' }}">
-									{{ poll.slug }}
+								<a routerLink="{{ '../../poll/' + poll.custom_url + '/consultation' }}">
+									{{ poll.custom_url }}
 								</a>
 							</td>
 						</tr>
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index a3570729..c35aa216 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -3,7 +3,7 @@
 // The list of file replacements can be found in `angular.json`.
 
 const backendApiUrlsInDev = {
-	local: '/api/v1',
+	local: 'http://localhost:8000/api/v1',
 	remote: 'http://localhost:8000/api/v1',
 	// remote: 'https://framadate-api.cipherbliss.com/api/v1',
 };

From d08bba4fcb4ffbb5b4b28cd948babc21059b8bfe Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 30 Apr 2021 12:37:04 +0200
Subject: [PATCH 12/18] flatten form fields

---
 mocks/old-stuff/config/PollConfig.ts          |  2 +-
 src/app/core/models/poll.model.ts             | 12 +++-
 src/app/core/services/poll.service.ts         |  4 +-
 src/app/core/services/storage.service.ts      | 18 +++++-
 .../advanced-config.component.html            |  2 +-
 .../date-select/date-select.component.html    | 20 +++----
 .../form/date-select/date-select.component.ts | 13 +++--
 .../administration/form/form.component.html   |  5 +-
 .../administration/form/form.component.ts     | 55 +++++++++----------
 .../kind-select/kind-select.component.html    |  4 +-
 10 files changed, 77 insertions(+), 58 deletions(-)

diff --git a/mocks/old-stuff/config/PollConfig.ts b/mocks/old-stuff/config/PollConfig.ts
index 32e5d94f..fd45ce06 100644
--- a/mocks/old-stuff/config/PollConfig.ts
+++ b/mocks/old-stuff/config/PollConfig.ts
@@ -40,7 +40,7 @@ export class PollConfig {
 	myEmail: string = environment.production ? '' : 'tktest@tktest.com';
 	myPolls: any = []; // list of retrieved polls from the backend api
 	/*
-     date specific poll, we have the choice to setup different hours (timeList) for all possible dates (dateList), or use the same hours for all dates
+     date specific poll, we have the choice to setup different hours (timeSlices) for all possible dates (dateList), or use the same hours for all dates
     */
 	allowSeveralHours = 'true';
 	// access
diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts
index a9fc1241..805662aa 100644
--- a/src/app/core/models/poll.model.ts
+++ b/src/app/core/models/poll.model.ts
@@ -4,6 +4,7 @@ import { Choice } from './choice.model';
 import { Comment } from './comment.model';
 import { PollConfiguration } from './configuration.model';
 import { Owner } from './owner.model';
+import { DateChoice, TimeSlices } from '../../../../mocks/old-stuff/config/defaultConfigs';
 
 export class Poll {
 	public id = 0;
@@ -23,11 +24,18 @@ export class Poll {
 	public creatorEmail?: string;
 
 	public is_archived?: boolean;
+	public is_zero_knowledge?: boolean = false;
+	public allow_comments?: boolean = true;
+	public has_several_hours?: boolean = false;
+
 	public allowSeveralHours?: boolean;
 
 	public archiveNumberOfDays?: number;
+
 	public max_score?: number;
 
+	public max_count_of_answers?: number = 150;
+
 	public configuration: PollConfiguration = new PollConfiguration();
 
 	public comments: Comment[] = [];
@@ -42,9 +50,9 @@ export class Poll {
 
 	public modification_policy = 'everybody';
 
-	public dateChoices: Choice[] = [];
+	public dateChoices: DateChoice[] = [];
 	// sets of days as strings, config to set identical time for days in a special days poll
-	public timeChoices: Choice[] = []; // ranges of time expressed as strings
+	public timeSlices: TimeSlices[] = []; // ranges of time expressed as strings
 	constructor(public owner: Owner = new Owner(), public title = 'mon titre', public custom_url: string = '') {}
 
 	public getAdministrationUrl(): string {
diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index 7197c678..904a4e14 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -14,6 +14,7 @@ import { HttpClient } from '@angular/common/http';
 import { environment } from '../../../environments/environment';
 import { StorageService } from './storage.service';
 import { Title } from '@angular/platform-browser';
+import { TimeSlices } from '../../../../mocks/old-stuff/config/defaultConfigs';
 
 @Injectable({
 	providedIn: 'root',
@@ -200,7 +201,8 @@ export class PollService implements Resolve<Poll> {
 				newpoll[fieldOfForm] = form.value[fieldOfForm];
 			}
 		}
-		newpoll.expiracy_date = form.value.expiracy_date;
+		newpoll.dateChoices = this.storageService.dateList;
+		newpoll.timeSlices = this.storageService.timeSlices;
 
 		console.log('newpoll', newpoll);
 		return newpoll;
diff --git a/src/app/core/services/storage.service.ts b/src/app/core/services/storage.service.ts
index b4c72bbc..d7e4e2fc 100644
--- a/src/app/core/services/storage.service.ts
+++ b/src/app/core/services/storage.service.ts
@@ -7,6 +7,12 @@ import { Stack } from '../models/stack.model';
 import { Choice } from '../models/choice.model';
 import { Vote } from '../models/vote.model';
 import { environment } from '../../../environments/environment';
+import {
+	DateChoice,
+	moreTimeOfDay,
+	otherDefaultDates,
+	TimeSlices,
+} from '../../../../mocks/old-stuff/config/defaultConfigs';
 
 @Injectable({
 	providedIn: 'root',
@@ -21,13 +27,19 @@ export class StorageService {
 	@LocalStorage()
 	public userPollsIds: string[];
 
+	@LocalStorage()
+	public dateList: DateChoice[] = otherDefaultDates;
+
+	@LocalStorage()
+	public timeSlices: TimeSlices[] = moreTimeOfDay;
+
 	@LocalStorage()
 	public vote_stack: Stack = new Stack();
 
 	setChoicesForVoteStack(choices_list: Choice[]) {
 		this.vote_stack.votes = [];
 
-		for (let choice of choices_list) {
+		for (const choice of choices_list) {
 			if (environment.autofill) {
 				this.vote_stack.votes.push(new Vote(choice.id, 'yes'));
 			} else {
@@ -37,7 +49,7 @@ export class StorageService {
 	}
 
 	toggleAnswer(choice_id: number, value: string) {
-		for (let vote of this.vote_stack.votes) {
+		for (const vote of this.vote_stack.votes) {
 			if (vote.choice_id == choice_id) {
 				if (vote.value == value) {
 					vote.value = '';
@@ -49,7 +61,7 @@ export class StorageService {
 	}
 
 	choiceHasAnswerOfValue(choice_id: number, value: any) {
-		for (let vote of this.vote_stack.votes) {
+		for (const vote of this.vote_stack.votes) {
 			if (vote.choice_id == choice_id) {
 				if (vote.value == value) {
 					return true;
diff --git a/src/app/features/administration/form/advanced-config/advanced-config.component.html b/src/app/features/administration/form/advanced-config/advanced-config.component.html
index d378952f..223b9325 100644
--- a/src/app/features/administration/form/advanced-config/advanced-config.component.html
+++ b/src/app/features/administration/form/advanced-config/advanced-config.component.html
@@ -148,7 +148,7 @@
 			Nombre de réponses limitées à ce nombre
 		</mat-checkbox>
 		<input
-			*ngIf="form.value.configuration.hasMaxCountOfAnswers"
+			*ngIf="form.value.hasMaxCountOfAnswers"
 			#maxCountOfAnswers
 			id="maxCountOfAnswers"
 			matInput
diff --git a/src/app/features/administration/form/date-select/date-select.component.html b/src/app/features/administration/form/date-select/date-select.component.html
index 6ebedc37..034b2233 100644
--- a/src/app/features/administration/form/date-select/date-select.component.html
+++ b/src/app/features/administration/form/date-select/date-select.component.html
@@ -43,10 +43,10 @@
 	<div class="dates-list">
 		<button
 			class="btn"
-			[class.is-primary]="form.value.configuration.hasSeveralHours"
+			[class.is-primary]="form.value.hasSeveralHours"
 			(click)="
 				form.patchValue({
-					configuration: { hasSeveralHours: !form.value.configuration.hasSeveralHours }
+					configuration: { hasSeveralHours: !form.value.hasSeveralHours }
 				})
 			"
 		>
@@ -55,10 +55,10 @@
 			<span> horaires avancées</span>
 		</button>
 		<div class="is-info notification">
-			<span *ngIf="form.value.configuration.hasSeveralHours">
+			<span *ngIf="form.value.hasSeveralHours">
 				Chaque jour aura ses plages de temps personnalisées
 			</span>
-			<span *ngIf="!form.value.configuration.hasSeveralHours">
+			<span *ngIf="!form.value.hasSeveralHours">
 				Tous les jours auront les mêmes plages de temps
 			</span>
 		</div>
@@ -68,7 +68,7 @@
 				<div class="column has-text-right">
 					<button
 						(click)="addTime()"
-						*ngIf="!form.value.configuration.hasSeveralHours"
+						*ngIf="!form.value.hasSeveralHours"
 						class="btn btn--primary"
 						id="add_time_button"
 					>
@@ -79,7 +79,7 @@
 					</button>
 					<button
 						(click)="removeAllTimes()"
-						*ngIf="form.value.configuration.hasSeveralHours"
+						*ngIf="form.value.hasSeveralHours"
 						class="btn btn--warning"
 						id="remove_time_button"
 					>
@@ -90,7 +90,7 @@
 					</button>
 					<button
 						(click)="resetTimes()"
-						*ngIf="form.value.configuration.hasSeveralHours"
+						*ngIf="form.value.hasSeveralHours"
 						class="btn btn--warning"
 						id="reset_time_button"
 					>
@@ -101,7 +101,7 @@
 					</button>
 				</div>
 			</div>
-			<div class="range-time" *ngIf="!form.value.configuration.hasSeveralHours">
+			<div class="range-time" *ngIf="!form.value.hasSeveralHours">
 				<h2>
 					<span class="count-dates-txt">
 						{{ 'dates.count_time' | translate }}
@@ -182,12 +182,12 @@
 						</button>
 						<button
 							(click)="addTimeToDate(choice, id)"
-							*ngIf="form.value.configuration.hasSeveralHours"
+							*ngIf="form.value.hasSeveralHours"
 							class="btn btn--primary"
 						>
 							{{ 'dates.add_time' | translate }}
 						</button>
-						<div *ngIf="form.value.configuration.hasSeveralHours" class="several-times">
+						<div *ngIf="form.value.hasSeveralHours" class="several-times">
 							plage horaire distincte
 							<br />
 							<div *ngFor="let timeItem of choice.timeList; index as idTime" class="time-choice">
diff --git a/src/app/features/administration/form/date-select/date-select.component.ts b/src/app/features/administration/form/date-select/date-select.component.ts
index 227e8839..d5a9cb7c 100644
--- a/src/app/features/administration/form/date-select/date-select.component.ts
+++ b/src/app/features/administration/form/date-select/date-select.component.ts
@@ -15,6 +15,7 @@ import {
 } from '../../../../../../mocks/old-stuff/config/defaultConfigs';
 import { CdkDragDrop, moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop';
 import { TranslateService } from '@ngx-translate/core';
+import { StorageService } from '../../../../core/services/storage.service';
 
 @Component({
 	selector: 'app-date-select',
@@ -32,8 +33,8 @@ export class DateSelectComponent implements OnInit {
 	endDateInterval: string;
 	intervalDays: any;
 	intervalDaysDefault = 7;
-	dateList: DateChoice[] = otherDefaultDates; // sets of days as strings, config to set identical time for days in a special days poll
-	timeList: TimeSlices[] = moreTimeOfDay; // ranges of time expressed as strings
+	dateList: DateChoice[]; // sets of days as strings, config to set identical time for days in a special days poll
+	timeList: TimeSlices[]; // ranges of time expressed as strings
 	dateCalendarEnum: Date[] = [new Date('02/09/2021')];
 	selectionKind = 'range';
 
@@ -45,10 +46,14 @@ export class DateSelectComponent implements OnInit {
 		private pollService: PollService,
 		public dateUtilities: DateUtilitiesService,
 		private apiService: ApiService,
+		private storageService: StorageService,
 		private router: Router,
 		private translateService: TranslateService,
 		@Inject(DOCUMENT) private document: any
-	) {}
+	) {
+		this.dateList = this.storageService.dateList;
+		this.timeList = this.storageService.timeSlices;
+	}
 
 	ngOnInit(): void {
 		// this.setDefaultDatesForInterval();
@@ -249,7 +254,7 @@ export class DateSelectComponent implements OnInit {
 	}
 
 	dropTimeItem(event: any) {
-		// moveItemInArray(this.timeList, event.previousIndex, event.currentIndex);
+		// moveItemInArray(this.timeSlices, event.previousIndex, event.currentIndex);
 		if (event.previousContainer === event.container) {
 			moveItemInArray(event.container.data, event.previousIndex, event.currentIndex);
 		} else {
diff --git a/src/app/features/administration/form/form.component.html b/src/app/features/administration/form/form.component.html
index d91f5c6d..50adfa27 100644
--- a/src/app/features/administration/form/form.component.html
+++ b/src/app/features/administration/form/form.component.html
@@ -37,10 +37,7 @@
 					</div>
 
 					<app-base-config [form]="form"></app-base-config>
-					<app-date-select
-						*ngIf="form.value.configuration && form.value.kind == 'date'"
-						[form]="form"
-					></app-date-select>
+					<app-date-select *ngIf="form.value && form.value.kind == 'date'" [form]="form"></app-date-select>
 					<app-text-select *ngIf="!form.value.kind == 'date'" [form]="form"></app-text-select>
 
 					<button
diff --git a/src/app/features/administration/form/form.component.ts b/src/app/features/administration/form/form.component.ts
index 4caec57e..f095211d 100644
--- a/src/app/features/administration/form/form.component.ts
+++ b/src/app/features/administration/form/form.component.ts
@@ -42,7 +42,7 @@ export class FormComponent implements OnInit {
 		const creationDate = new Date();
 
 		this.form = this.fb.group({
-			title: ['', [Validators.required, Validators.minLength(12)]],
+			title: ['', [Validators.required, Validators.minLength(5)]],
 			creatorPseudo: ['', [Validators.required]],
 			creatorEmail: ['', [Validators.required]],
 			custom_url: [this.pollUtilitiesService.makeUuid(), [Validators.required]],
@@ -64,30 +64,28 @@ export class FormComponent implements OnInit {
 					]),
 				}),
 			]),
+			// these time choice are meant to be the same for each day
 			timeChoices: this.fb.array([
 				this.fb.group({
 					label: ['', [Validators.required]],
 				}),
 			]),
 			kind: ['', [Validators.required]],
-			configuration: this.fb.group({
-				areResultsPublic: [true, [Validators.required]],
-				whoCanChangeAnswers: ['everybody', [Validators.required]],
-				isProtectedByPassword: [false, [Validators.required]],
-				isOwnerNotifiedByEmailOnNewVote: [false, [Validators.required]],
-				isOwnerNotifiedByEmailOnNewComment: [false, [Validators.required]],
-				isMaybeAnswerAvailable: [false, [Validators.required]],
-
-				isAboutDate: [true, [Validators.required]],
-				isZeroKnoledge: [false, [Validators.required]],
-				expiresDaysDelay: [60, [Validators.required, Validators.min(1)]],
-				maxCountOfAnswers: [150, [Validators.required, Validators.min(1)]],
-				allowComments: [true, [Validators.required]],
-				password: [this.pollUtilitiesService.makeUuid(), [Validators.required]],
-				dateCreated: [creationDate, [Validators.required]],
-				hasSeveralHours: [true, [Validators.required]],
-				hasMaxCountOfAnswers: [true, [Validators.required, Validators.min(1)]],
-			}),
+			areResultsPublic: [true, [Validators.required]],
+			whoCanChangeAnswers: ['everybody', [Validators.required]],
+			isProtectedByPassword: [false, [Validators.required]],
+			isOwnerNotifiedByEmailOnNewVote: [false, [Validators.required]],
+			isOwnerNotifiedByEmailOnNewComment: [false, [Validators.required]],
+			isMaybeAnswerAvailable: [false, [Validators.required]],
+			isAboutDate: [true, [Validators.required]],
+			isZeroKnoledge: [false, [Validators.required]],
+			expiresDaysDelay: [60, [Validators.required, Validators.min(1)]],
+			maxCountOfAnswers: [150, [Validators.required, Validators.min(1)]],
+			allowComments: [true, [Validators.required]],
+			password: [this.pollUtilitiesService.makeUuid(), [Validators.required]],
+			dateCreated: [creationDate, [Validators.required]],
+			hasSeveralHours: [true, [Validators.required]],
+			hasMaxCountOfAnswers: [true, [Validators.required, Validators.min(1)]],
 			startDateInterval: ['', [Validators.required]],
 			endDateInterval: ['', [Validators.required]],
 		});
@@ -111,22 +109,19 @@ export class FormComponent implements OnInit {
 		this.form.patchValue({
 			title: title,
 			custom_url: this.pollUtilitiesService.makeSlugFromString(title),
-			description: 'répondez SVP <3 ! *-* ',
+			description: 'répondez SVP <3 ! *-*',
 			creatorPseudo: 'Chuck Norris',
 			creatorEmail: 'chucknorris@example.com',
 			isAboutDate: true,
 			// hasSeveralHours: true,
 			kind: 'date',
-			// TODO aplatir les contrôles
-			configuration: {
-				whoCanChangeAnswers: 'everybody',
-				isProtectedByPassword: false,
-				isOwnerNotifiedByEmailOnNewVote: false,
-				isOwnerNotifiedByEmailOnNewComment: false,
-				isMaybeAnswerAvailable: false,
-				areResultsPublic: true,
-				expiresDaysDelay: 60,
-			},
+			whoCanChangeAnswers: 'everybody',
+			isProtectedByPassword: false,
+			isOwnerNotifiedByEmailOnNewVote: false,
+			isOwnerNotifiedByEmailOnNewComment: false,
+			isMaybeAnswerAvailable: false,
+			areResultsPublic: true,
+			expiresDaysDelay: 60,
 			comments: [],
 			choices: [
 				{
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 2608ef3e..4845628e 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
@@ -13,7 +13,7 @@
 				<div class="column">
 					<button
 						class="btn-block btn"
-						[ngClass]="{ 'is-primary': form.value.configuration.isAboutDate }"
+						[ngClass]="{ 'is-primary': form.value.isAboutDate }"
 						(click)="
 							form.patchValue({
 								configuration: {
@@ -29,7 +29,7 @@
 				<div class="column">
 					<button
 						class="btn-block btn btn-default"
-						[ngClass]="{ 'is-primary': !form.value.configuration.isAboutDate }"
+						[ngClass]="{ 'is-primary': !form.value.isAboutDate }"
 						(click)="
 							form.patchValue({
 								configuration: {

From e405a09c78af01fdb02a0fa7b4f75fc92cee7c34 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 30 Apr 2021 12:39:21 +0200
Subject: [PATCH 13/18] advanced fields flattened

---
 .../advanced-config.component.html            | 22 +++++++++----------
 .../administration/form/form.component.ts     |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/app/features/administration/form/advanced-config/advanced-config.component.html b/src/app/features/administration/form/advanced-config/advanced-config.component.html
index 223b9325..17b43677 100644
--- a/src/app/features/administration/form/advanced-config/advanced-config.component.html
+++ b/src/app/features/administration/form/advanced-config/advanced-config.component.html
@@ -95,7 +95,7 @@
 				<i class="fa fa-close"></i>
 			</button>
 		</div>
-		<mat-checkbox class="is-not-flex" formControlName="configuration.areResultsPublic">
+		<mat-checkbox class="is-not-flex" formControlName="areResultsPublic">
 			Les participants pourront consulter les résultats
 		</mat-checkbox>
 		<h3 class="title is-3">
@@ -103,7 +103,7 @@
 			Accès sécurisé
 		</h3>
 
-		<mat-checkbox class="is-not-flex" formControlName="configuration.isProtectedByPassword">
+		<mat-checkbox class="is-not-flex" formControlName="isProtectedByPassword">
 			Le sondage sera protégé par un mot de passe
 		</mat-checkbox>
 
@@ -114,7 +114,7 @@
 			matInput
 			type="password"
 			placeholder="password"
-			formControlName="configuration.password"
+			formControlName="password"
 			required
 		/>
 
@@ -122,13 +122,13 @@
 			<i class="fa fa-enveloppe"></i>
 			Notifications
 		</h3>
-		<mat-checkbox class="is-not-flex" formControlName="configuration.isOwnerNotifiedByEmailOnNewVote">
+		<mat-checkbox class="is-not-flex" formControlName="isOwnerNotifiedByEmailOnNewVote">
 			Vous recevrez un mail à chaque nouvelle participation
 		</mat-checkbox>
-		<mat-checkbox class="is-not-flex" formControlName="configuration.isOwnerNotifiedByEmailOnNewComment">
+		<mat-checkbox class="is-not-flex" formControlName="isOwnerNotifiedByEmailOnNewComment">
 			Vous recevrez un mail à chaque nouveau commentaire
 		</mat-checkbox>
-		<mat-checkbox class="is-not-flex" formControlName="configuration.isMaybeAnswerAvailable">
+		<mat-checkbox class="is-not-flex" formControlName="isMaybeAnswerAvailable">
 			La réponse « peut-être » sera disponible
 		</mat-checkbox>
 	</fieldset>
@@ -138,13 +138,13 @@
 			Fonctionnalités pas encore disponibles:
 		</h2>
 		<app-wip-todo></app-wip-todo>
-		<mat-checkbox class="is-not-flex" formControlName="configuration.isProtectedByPassword">
+		<mat-checkbox class="is-not-flex" formControlName="isProtectedByPassword">
 			Spécifier un lien unique de vote à des participants définis
 		</mat-checkbox>
-		<mat-checkbox class="is-not-flex" formControlName="configuration.allowComments">
+		<mat-checkbox class="is-not-flex" formControlName="allowComments">
 			Autoriser les commentaires
 		</mat-checkbox>
-		<mat-checkbox class="is-not-flex" formControlName="configuration.hasMaxCountOfAnswers">
+		<mat-checkbox class="is-not-flex" formControlName="hasMaxCountOfAnswers">
 			Nombre de réponses limitées à ce nombre
 		</mat-checkbox>
 		<input
@@ -154,11 +154,11 @@
 			matInput
 			type="number"
 			placeholder="Nombre de réponses max"
-			formControlName="configuration.maxCountOfAnswers"
+			formControlName="maxCountOfAnswers"
 			required
 		/>
 
-		<mat-checkbox class="is-not-flex" formControlName="configuration.isZeroKnoledge">
+		<mat-checkbox class="is-not-flex" formControlName="isZeroKnoledge">
 			Les informations du sondage seront chiffrés en base de données
 		</mat-checkbox>
 	</fieldset>
diff --git a/src/app/features/administration/form/form.component.ts b/src/app/features/administration/form/form.component.ts
index f095211d..20955fbb 100644
--- a/src/app/features/administration/form/form.component.ts
+++ b/src/app/features/administration/form/form.component.ts
@@ -105,7 +105,7 @@ export class FormComponent implements OnInit {
 	 * add example values to the form, overrides defaults of PollConfiguration
 	 */
 	setDemoValues(): void {
-		const title = 'le titre de démo oh oh';
+		const title = 'le titre de démo oh oh' + new Date();
 		this.form.patchValue({
 			title: title,
 			custom_url: this.pollUtilitiesService.makeSlugFromString(title),

From 975997b7675876f5596e34533e50d76f1c6c8809 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 30 Apr 2021 14:15:21 +0200
Subject: [PATCH 14/18] splitting date choices with a separator

---
 src/app/core/models/poll.model.ts             |  7 +++
 src/app/core/services/api.service.ts          | 10 ---
 src/app/core/services/poll.service.ts         | 32 +++++++++-
 src/app/core/services/storage.service.ts      |  7 +++
 .../administration.component.ts               |  4 +-
 .../date-select/date-select.component.html    | 54 ++++++++--------
 .../administration/form/form.component.html   |  2 +
 .../success/success.component.html            | 62 +++++++++++++++++--
 .../success/success.component.ts              | 13 +++-
 .../consultation/consultation.component.ts    |  6 +-
 src/app/routes-framadate.ts                   |  4 +-
 11 files changed, 151 insertions(+), 50 deletions(-)

diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts
index 805662aa..7b66cc90 100644
--- a/src/app/core/models/poll.model.ts
+++ b/src/app/core/models/poll.model.ts
@@ -6,6 +6,11 @@ import { PollConfiguration } from './configuration.model';
 import { Owner } from './owner.model';
 import { DateChoice, TimeSlices } from '../../../../mocks/old-stuff/config/defaultConfigs';
 
+export class ChoiceGroup {
+	date_string: string;
+	choices: Choice[];
+}
+
 export class Poll {
 	public id = 0;
 
@@ -42,6 +47,8 @@ export class Poll {
 
 	public choices: Choice[] = [];
 
+	public choicesDateGrouped: ChoiceGroup[] = [];
+
 	public votes = [];
 
 	public stacks = [];
diff --git a/src/app/core/services/api.service.ts b/src/app/core/services/api.service.ts
index 73dc252b..8f95aade 100644
--- a/src/app/core/services/api.service.ts
+++ b/src/app/core/services/api.service.ts
@@ -183,19 +183,9 @@ export class ApiService {
 
 	public async getPollByCustomUrl(slug: string): Promise<Poll | undefined> {
 		try {
-			// TODO: this interceptor should be avoided if backends returns the good object
-			const adapterInterceptor: number = this.axiosInstance.interceptors.response.use(
-				(response: AxiosResponse): AxiosResponse => {
-					console.log('response', response);
-					return response;
-				}
-			);
-
 			const response: AxiosResponse<Poll> = await this.axiosInstance.get<Poll>(`${this.pollsEndpoint}/${slug}`);
 			console.log('fetch API : asking for poll with custom_url=' + slug, { response });
 
-			axios.interceptors.request.eject(adapterInterceptor);
-
 			return response && response.data && !Array.isArray(response.data) ? response.data : undefined;
 		} catch (error) {
 			if (error.response?.status === 404) {
diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index 904a4e14..85316d11 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -20,7 +20,7 @@ import { TimeSlices } from '../../../../mocks/old-stuff/config/defaultConfigs';
 	providedIn: 'root',
 })
 export class PollService implements Resolve<Poll> {
-	private _poll: BehaviorSubject<Poll | undefined> = new BehaviorSubject<Poll | undefined>(undefined);
+	_poll: BehaviorSubject<Poll | undefined> = new BehaviorSubject<Poll | undefined>(undefined);
 	public readonly poll: Observable<Poll | undefined> = this._poll.asObservable();
 
 	constructor(
@@ -42,6 +42,8 @@ export class PollService implements Resolve<Poll> {
 	public async resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<Poll> {
 		const segments: string[] = state.url.split('/');
 		const wantedcustom_url: string = segments.includes('poll') ? segments[segments.indexOf('poll') + 1] : '';
+
+		// FIXME should be handled by routing
 		if (!wantedcustom_url && state.url.includes('administration')) {
 			// creation of new poll
 			const poll = new Poll(this.userService.getCurrentUser(), this.uuidService.getUUID(), '');
@@ -100,7 +102,14 @@ export class PollService implements Resolve<Poll> {
 		}
 	}
 
+	/**
+	 * update poll and parse its fields
+	 * @param poll
+	 */
 	public updateCurrentPoll(poll: Poll): void {
+		if (poll.kind == 'date') {
+			poll.choices = this.parseDateChoices(poll.choices);
+		}
 		this.storageService.setChoicesForVoteStack(poll.choices);
 
 		this.toastService.display('sondage bien mis à jour', 'success');
@@ -207,4 +216,25 @@ export class PollService implements Resolve<Poll> {
 		console.log('newpoll', newpoll);
 		return newpoll;
 	}
+
+	public parseDateChoices(choices: Choice[]) {
+		const SEPARATOR_DATE_TIME_SLICE = ' >>> ';
+		const parsedChoices = [];
+
+		for (const c of choices) {
+			const time_list = [];
+			const choice = { name: c.name };
+			if (c.name.includes(SEPARATOR_DATE_TIME_SLICE)) {
+				const date_string = '';
+				const time_slice = '';
+				choice.name = time_slice;
+			}
+			parsedChoices.push({
+				date_string: choice,
+				choices: c,
+			});
+		}
+		console.log('parsedChoices', parsedChoices);
+		return [];
+	}
 }
diff --git a/src/app/core/services/storage.service.ts b/src/app/core/services/storage.service.ts
index d7e4e2fc..12d67cbd 100644
--- a/src/app/core/services/storage.service.ts
+++ b/src/app/core/services/storage.service.ts
@@ -39,6 +39,7 @@ export class StorageService {
 	setChoicesForVoteStack(choices_list: Choice[]) {
 		this.vote_stack.votes = [];
 
+		// text choices
 		for (const choice of choices_list) {
 			if (environment.autofill) {
 				this.vote_stack.votes.push(new Vote(choice.id, 'yes'));
@@ -70,4 +71,10 @@ export class StorageService {
 		}
 		return false;
 	}
+
+	parseDateChoices(datechoices) {
+		const choices: Choice[] = [];
+
+		return choices;
+	}
 }
diff --git a/src/app/features/administration/administration.component.ts b/src/app/features/administration/administration.component.ts
index 5111b2e2..720a359e 100644
--- a/src/app/features/administration/administration.component.ts
+++ b/src/app/features/administration/administration.component.ts
@@ -3,8 +3,6 @@ import { ActivatedRoute } from '@angular/router';
 import { Subscription } from 'rxjs';
 
 import { Poll } from '../../core/models/poll.model';
-import { ModalService } from '../../core/services/modal.service';
-import { UserService } from '../../core/services/user.service';
 
 @Component({
 	selector: 'app-administration',
@@ -15,7 +13,7 @@ export class AdministrationComponent implements OnInit, OnDestroy {
 	public poll: Poll = new Poll();
 	private routeSubscription: Subscription;
 
-	constructor(private route: ActivatedRoute, private userService: UserService, private modalService: ModalService) {}
+	constructor(private route: ActivatedRoute) {}
 
 	ngOnInit(): void {
 		this.routeSubscription = this.route.data.subscribe((data: { poll: Poll }) => {
diff --git a/src/app/features/administration/form/date-select/date-select.component.html b/src/app/features/administration/form/date-select/date-select.component.html
index 034b2233..a7cbf852 100644
--- a/src/app/features/administration/form/date-select/date-select.component.html
+++ b/src/app/features/administration/form/date-select/date-select.component.html
@@ -204,34 +204,34 @@
 						</div>
 					</div>
 				</div>
-				<div class="column calendar-column">
-					<button class="btn" (click)="selectionKind = 'range'" [class.is-primary]="selectionKind == 'range'">
-						plage de jours
-					</button>
+				<!--				<div class="column calendar-column">-->
+				<!--					<button class="btn" (click)="selectionKind = 'range'" [class.is-primary]="selectionKind == 'range'">-->
+				<!--						plage de jours-->
+				<!--					</button>-->
 
-					<button
-						class="btn"
-						(click)="selectionKind = 'multiple'"
-						[class.is-primary]="selectionKind == 'multiple'"
-					>
-						jours séparés
-					</button>
-					<button class="btn" (click)="setDefaultDatesForInterval()">
-						réinitialiser</button
-					><button class="btn" (click)="dateCalendarEnum = [today]">
-						vider
-					</button>
-					<div class="text-center">
-						<br />
-						<p-calendar
-							[(ngModel)]="dateCalendarEnum"
-							[locale]="'calendar_widget' | translate"
-							[inline]="true"
-							[monthNavigator]="true"
-							[selectionMode]="selectionKind"
-						></p-calendar>
-					</div>
-				</div>
+				<!--					<button-->
+				<!--						class="btn"-->
+				<!--						(click)="selectionKind = 'multiple'"-->
+				<!--						[class.is-primary]="selectionKind == 'multiple'"-->
+				<!--					>-->
+				<!--						jours séparés-->
+				<!--					</button>-->
+				<!--					<button class="btn" (click)="setDefaultDatesForInterval()">-->
+				<!--						réinitialiser</button-->
+				<!--					><button class="btn" (click)="dateCalendarEnum = [today]">-->
+				<!--						vider-->
+				<!--					</button>-->
+				<!--					<div class="text-center">-->
+				<!--						<br />-->
+				<!--						<p-calendar-->
+				<!--							[(ngModel)]="dateCalendarEnum"-->
+				<!--							[locale]="'calendar_widget' | translate"-->
+				<!--							[inline]="true"-->
+				<!--							[monthNavigator]="true"-->
+				<!--							[selectionMode]="selectionKind"-->
+				<!--						></p-calendar>-->
+				<!--					</div>-->
+				<!--				</div>-->
 			</div>
 		</div>
 	</div>
diff --git a/src/app/features/administration/form/form.component.html b/src/app/features/administration/form/form.component.html
index 50adfa27..6be19904 100644
--- a/src/app/features/administration/form/form.component.html
+++ b/src/app/features/administration/form/form.component.html
@@ -1,4 +1,6 @@
 <div class="admin-form padded">
+	<app-success [poll]="poll"></app-success>
+
 	<div class="container is-max-widescreen">
 		<form [formGroup]="form">
 			<header class="columns">
diff --git a/src/app/features/administration/success/success.component.html b/src/app/features/administration/success/success.component.html
index cb3015cf..5c87e8e5 100644
--- a/src/app/features/administration/success/success.component.html
+++ b/src/app/features/administration/success/success.component.html
@@ -1,16 +1,70 @@
 <section class="hero is-medium is-success">
 	<div class="hero-body">
 		<div class="container">
-			<h1 class="title">
-				Création de sondage réussie
+			<h1 class="title is-1">
+				{{ 'resume.title' | translate }}
 			</h1>
 			<h2 class="subtitle">
-				Bravo! partagez le lien de votre sondage. Un récapitulatif a été envoyé à votre adresse email.
+				{{ 'resume.admins' | translate }}
 			</h2>
 		</div>
 	</div>
 </section>
 <br />
 <section class="text-center">
-	<img src="assets/img/undraw_group_selfie_ijc6.svg" alt="image succès" />
+	<section class="admin">
+		<h2 i18n></h2>
+		<p>
+			Votre sondage «
+			<strong class="poll-title">
+				{{ poll.title }}
+			</strong>
+			» a bien été créé !
+		</p>
+		<p>
+			Voici les liens d’accès au sondage, conservez-les soigneusement ! (Si vous les perdez vous pourrez toujours
+			les recevoir par email)
+		</p>
+
+		<p>
+			Pour accéder au sondage et à tous ses paramètres :
+			<a href="{{ poll.custom_url }}">{{ poll.custom_url }} </a>
+		</p>
+		<app-copy-text [textToCopy]="poll.custom_url"></app-copy-text>
+		<a href="{{ poll.custom_url }}">
+			Voir le sondage coté administrateur·ice
+		</a>
+		<p class="note">
+			Note : Le sondage sera supprimé {{ poll.default_expiracy_days_from_now }} jours après la date de sa dernière
+			modification.
+		</p>
+	</section>
+	<section class="public">
+		<h2 i18n>{{ 'resume.users' | translate }}</h2>
+		<p>
+			Pour accéder au sondage :
+			<a href="{{ poll.custom_url }}">{{ poll.custom_url }} </a>
+		</p>
+		<app-copy-text [textToCopy]="poll.custom_url"></app-copy-text>
+		<a href="{{ poll.custom_url }}">
+			Voir le sondage
+		</a>
+	</section>
+	<section class="mail">
+		<h2 i18n>{{ 'resume.links_mail' | translate }}</h2>
+		<p>
+			Pour être sur de retrouver ces liens, nous pouvons vous les envoyer sur votre mail :
+			<input type="email" [(ngModel)]="mailToRecieve" placeholder="email" />
+		</p>
+
+		<button class="btn btn--primary" (click)="sendToEmail()">
+			<i class="fa fa-paper-plane" aria-hidden="true"></i>
+			Envoyer les liens du sondage
+		</button>
+		<a href="{{ poll.custom_url }}">
+			Voir le sondage
+		</a>
+	</section>
+
+	<!--	<img src="assets/img/undraw_group_selfie_ijc6.svg" alt="image succès" />-->
 </section>
diff --git a/src/app/features/administration/success/success.component.ts b/src/app/features/administration/success/success.component.ts
index 13e175db..5d9a0d1a 100644
--- a/src/app/features/administration/success/success.component.ts
+++ b/src/app/features/administration/success/success.component.ts
@@ -1,4 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
+import { PollService } from '../../../core/services/poll.service';
+import { Poll } from '../../../core/models/poll.model';
 
 @Component({
 	selector: 'app-success',
@@ -6,7 +8,14 @@ import { Component, OnInit } from '@angular/core';
 	styleUrls: ['./success.component.scss'],
 })
 export class SuccessComponent implements OnInit {
-	constructor() {}
+	@Input() poll: Poll;
+	mailToRecieve: string;
+
+	constructor(private pollService: PollService) {}
 
 	ngOnInit(): void {}
+
+	sendToEmail() {
+		alert('todo');
+	}
 }
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts
index abec918a..53342e94 100644
--- a/src/app/features/consultation/consultation.component.ts
+++ b/src/app/features/consultation/consultation.component.ts
@@ -96,7 +96,11 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 			this.toastService.display('vote ajouté', 'success');
 
 			if (resp) {
-				this.api.getPollByCustomUrl(this.poll.custom_url);
+				const response: Promise<Poll | undefined> = this.api.getPollByCustomUrl(this.poll.custom_url);
+				response.then((res: Poll | undefined) => {
+					res.choices = this.pollService.parseDateChoices(res.choices);
+					this.pollService._poll.next(res);
+				});
 			} else {
 				this.toastService.display('erreur à la réception du nouveau vote', 'error');
 			}
diff --git a/src/app/routes-framadate.ts b/src/app/routes-framadate.ts
index b7c61df2..fa93c168 100644
--- a/src/app/routes-framadate.ts
+++ b/src/app/routes-framadate.ts
@@ -19,7 +19,7 @@ export const routes: Routes = [
 		path: 'administration',
 		loadChildren: () =>
 			import('./features/administration/administration.module').then((m) => m.AdministrationModule),
-		// resolve: {poll: PollService},
+		// resolve: { poll: PollService },
 	},
 	{
 		path: 'poll/:custom_url/administration',
@@ -30,7 +30,7 @@ export const routes: Routes = [
 	{
 		path: 'poll/:custom_url/consultation',
 		loadChildren: () => import('./features/consultation/consultation.module').then((m) => m.ConsultationModule),
-		// resolve: { poll: PollService },
+		resolve: { poll: PollService },
 	},
 	{
 		path: 'poll/:custom_url/participation',

From 86c0ff815f824b9119d36482cd85fc668eccf7cb Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 30 Apr 2021 15:42:50 +0200
Subject: [PATCH 15/18] group display of days

---
 .../components/header/header.component.html   | 14 +++-
 src/app/core/models/poll.model.ts             |  2 +-
 src/app/core/services/poll.service.ts         | 24 ++----
 .../success/success.component.html            |  4 +-
 .../consultation/consultation.component.html  |  6 +-
 .../consultation/consultation.component.ts    |  2 +-
 .../poll-results-compact.component.html       | 84 ++++++++++++++-----
 7 files changed, 88 insertions(+), 48 deletions(-)

diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html
index 24188ab8..bbe7f57f 100644
--- a/src/app/core/components/header/header.component.html
+++ b/src/app/core/components/header/header.component.html
@@ -51,7 +51,19 @@
 		Environnement de développement: voici des liens de démonstration issus des fixtures Doctrine de date-poll-api.
 		<div class="padded">
 			<div class="">
-				<a class="navbar-item" [routerLink]="['/poll/dessin-anime/consultation']" routerLinkActive="is-primary">
+				<a
+					class="navbar-item"
+					[routerLink]="['/poll/le-titre-de-demo-oh-oh/consultation']"
+					routerLinkActive="is-primary"
+				>
+					<em>
+						le-titre-de-demo-oh-oh
+					</em> </a
+				><a
+					class="navbar-item"
+					[routerLink]="['/poll/dessin-anime/consultation']"
+					routerLinkActive="is-primary"
+				>
 					<em>
 						dessin-anime
 					</em>
diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts
index 7b66cc90..cc940ff2 100644
--- a/src/app/core/models/poll.model.ts
+++ b/src/app/core/models/poll.model.ts
@@ -47,7 +47,7 @@ export class Poll {
 
 	public choices: Choice[] = [];
 
-	public choicesDateGrouped: ChoiceGroup[] = [];
+	public choices_grouped: ChoiceGroup[] = [];
 
 	public votes = [];
 
diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index 85316d11..72e3f8aa 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -217,24 +217,12 @@ export class PollService implements Resolve<Poll> {
 		return newpoll;
 	}
 
+	/**
+	 * regrouper les jours et périodes de temps
+	 * @param choices
+	 */
 	public parseDateChoices(choices: Choice[]) {
-		const SEPARATOR_DATE_TIME_SLICE = ' >>> ';
-		const parsedChoices = [];
-
-		for (const c of choices) {
-			const time_list = [];
-			const choice = { name: c.name };
-			if (c.name.includes(SEPARATOR_DATE_TIME_SLICE)) {
-				const date_string = '';
-				const time_slice = '';
-				choice.name = time_slice;
-			}
-			parsedChoices.push({
-				date_string: choice,
-				choices: c,
-			});
-		}
-		console.log('parsedChoices', parsedChoices);
-		return [];
+		console.log('choices before', choices);
+		return choices;
 	}
 }
diff --git a/src/app/features/administration/success/success.component.html b/src/app/features/administration/success/success.component.html
index 5c87e8e5..56d6c98a 100644
--- a/src/app/features/administration/success/success.component.html
+++ b/src/app/features/administration/success/success.component.html
@@ -30,7 +30,9 @@
 			Pour accéder au sondage et à tous ses paramètres :
 			<a href="{{ poll.custom_url }}">{{ poll.custom_url }} </a>
 		</p>
-		<app-copy-text [textToCopy]="poll.custom_url"></app-copy-text>
+		<app-copy-text
+			[textToCopy]="window.location.href + '/poll/' + poll.custom_url + '/consultation'"
+		></app-copy-text>
 		<a href="{{ poll.custom_url }}">
 			Voir le sondage coté administrateur·ice
 		</a>
diff --git a/src/app/features/consultation/consultation.component.html b/src/app/features/consultation/consultation.component.html
index c195a8d2..59887051 100644
--- a/src/app/features/consultation/consultation.component.html
+++ b/src/app/features/consultation/consultation.component.html
@@ -116,9 +116,9 @@
 					</button>
 				</div>
 
-				<footer class="card-footer" *ngIf="!isArchived">
-					TODO links
-				</footer>
+				<!--				<footer class="card-footer" *ngIf="!isArchived">-->
+				<!--					TODO links-->
+				<!--				</footer>-->
 			</div>
 		</div>
 	</div>
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts
index 53342e94..c6bdb655 100644
--- a/src/app/features/consultation/consultation.component.ts
+++ b/src/app/features/consultation/consultation.component.ts
@@ -53,7 +53,7 @@ export class ConsultationComponent implements OnInit, OnDestroy {
 				this.poll.is_archived = this.isArchived;
 
 				if (!environment.production) {
-					this.addVoteStack();
+					// this.addVoteStack();
 				}
 			}
 		});
diff --git a/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html b/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html
index 8584c748..24c838e1 100644
--- a/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html
+++ b/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html
@@ -1,27 +1,65 @@
 {{ poll.choices.length }} choix
-<div class="box" *ngFor="let choice of poll.choices">
-	<div class="columns is-vcentered is-mobile">
-		<div class="column">
-			<label class="label" *ngIf="poll.kind == 'text'">{{ choice.name }} </label>
-			<label class="label" *ngIf="poll.kind == 'date'">
-				{{ choice.name }} : {{ choice.name | date: 'short':'Europe/Paris':'fr_FR' }}
-			</label>
-		</div>
-		<div class="column is-narrow">
-			<span class="max_score" *ngIf="poll.max_score > 0 && choice.score == poll.max_score">
-				<i class="fa fa-star fa-2x"></i>
-			</span>
-		</div>
-		<div class="column is-narrow">
-			<button class="button is-white" (click)="openModal(poll, choice)">
-				<i class="fa fa-info-circle"></i>
-			</button>
-		</div>
-		<div class="column is-narrow">
-			<div class="buttons has-addons is-right">
-				<app-choice-button [poll]="poll" [choice]="choice" [answerKind]="'YES'"></app-choice-button>
-				<app-choice-button [poll]="poll" [choice]="choice" [answerKind]="'MAYBE'"></app-choice-button>
-				<app-choice-button [poll]="poll" [choice]="choice" [answerKind]="'NO'"></app-choice-button>
+<div class="date-choices" *ngIf="poll.kind == 'date'">
+	<div class="box" *ngFor="let group of poll.choices_grouped">
+		<h3 class="title is-3">
+			{{ group.date_string }}
+		</h3>
+		<div class="box" *ngFor="let choice of group.choices">
+			<div class="columns is-vcentered is-mobile">
+				<div class="column">
+					<label class="label" *ngIf="poll.kind == 'text'">{{ choice.name }} </label>
+					<label class="label" *ngIf="poll.kind == 'date'">
+						{{ choice.name }} : {{ choice.name | date: 'short':'Europe/Paris':'fr_FR' }}
+					</label>
+				</div>
+				<div class="column is-narrow">
+					<span class="max_score" *ngIf="poll.max_score > 0 && choice.score == poll.max_score">
+						<i class="fa fa-star fa-2x"></i>
+					</span>
+				</div>
+				<div class="column is-narrow">
+					<button class="button is-white" (click)="openModal(poll, choice)">
+						<i class="fa fa-info-circle"></i>
+					</button>
+				</div>
+				<div class="column is-narrow">
+					<div class="buttons has-addons is-right">
+						<!--				TODO limit answers possible with poll allowed_answers-->
+						<app-choice-button [poll]="poll" [choice]="choice" [answerKind]="'YES'"></app-choice-button>
+						<app-choice-button [poll]="poll" [choice]="choice" [answerKind]="'MAYBE'"></app-choice-button>
+						<app-choice-button [poll]="poll" [choice]="choice" [answerKind]="'NO'"></app-choice-button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="texts" *ngIf="poll.kind == 'text'">
+	<div class="box" *ngFor="let choice of poll.choices">
+		<div class="columns is-vcentered is-mobile">
+			<div class="column">
+				<label class="label" *ngIf="poll.kind == 'text'">{{ choice.name }} </label>
+				<label class="label" *ngIf="poll.kind == 'date'">
+					{{ choice.name }} : {{ choice.name | date: 'short':'Europe/Paris':'fr_FR' }}
+				</label>
+			</div>
+			<div class="column is-narrow">
+				<span class="max_score" *ngIf="poll.max_score > 0 && choice.score == poll.max_score">
+					<i class="fa fa-star fa-2x"></i>
+				</span>
+			</div>
+			<div class="column is-narrow">
+				<button class="button is-white" (click)="openModal(poll, choice)">
+					<i class="fa fa-info-circle"></i>
+				</button>
+			</div>
+			<div class="column is-narrow">
+				<div class="buttons has-addons is-right">
+					<!--				TODO limit answers possible with poll allowed_answers-->
+					<app-choice-button [poll]="poll" [choice]="choice" [answerKind]="'YES'"></app-choice-button>
+					<app-choice-button [poll]="poll" [choice]="choice" [answerKind]="'MAYBE'"></app-choice-button>
+					<app-choice-button [poll]="poll" [choice]="choice" [answerKind]="'NO'"></app-choice-button>
+				</div>
 			</div>
 		</div>
 	</div>

From 16db2a69cf687e2f99b9faec96e87c4d89d06458 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 30 Apr 2021 15:49:43 +0200
Subject: [PATCH 16/18] ability to toggle answers on grouped choices

---
 src/app/core/services/storage.service.ts                 | 1 +
 .../poll-results-compact.component.html                  | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/core/services/storage.service.ts b/src/app/core/services/storage.service.ts
index 12d67cbd..7017dc94 100644
--- a/src/app/core/services/storage.service.ts
+++ b/src/app/core/services/storage.service.ts
@@ -50,6 +50,7 @@ export class StorageService {
 	}
 
 	toggleAnswer(choice_id: number, value: string) {
+		console.log('this.vote_stack', this.vote_stack);
 		for (const vote of this.vote_stack.votes) {
 			if (vote.choice_id == choice_id) {
 				if (vote.value == value) {
diff --git a/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html b/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html
index 24c838e1..73b87c07 100644
--- a/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html
+++ b/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html
@@ -7,9 +7,9 @@
 		<div class="box" *ngFor="let choice of group.choices">
 			<div class="columns is-vcentered is-mobile">
 				<div class="column">
-					<label class="label" *ngIf="poll.kind == 'text'">{{ choice.name }} </label>
-					<label class="label" *ngIf="poll.kind == 'date'">
-						{{ choice.name }} : {{ choice.name | date: 'short':'Europe/Paris':'fr_FR' }}
+					<label class="label">
+						<!--						{{choice.id}}	)-->
+						{{ choice.name }}
 					</label>
 				</div>
 				<div class="column is-narrow">
@@ -39,9 +39,6 @@
 		<div class="columns is-vcentered is-mobile">
 			<div class="column">
 				<label class="label" *ngIf="poll.kind == 'text'">{{ choice.name }} </label>
-				<label class="label" *ngIf="poll.kind == 'date'">
-					{{ choice.name }} : {{ choice.name | date: 'short':'Europe/Paris':'fr_FR' }}
-				</label>
 			</div>
 			<div class="column is-narrow">
 				<span class="max_score" *ngIf="poll.max_score > 0 && choice.score == poll.max_score">

From bfdb18b316ffaf614b58a33ebdb195d1e793cc0a Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 30 Apr 2021 16:00:22 +0200
Subject: [PATCH 17/18] update url to copy after creation

---
 src/app/core/models/poll.model.ts                |  1 +
 .../administration/form/form.component.html      |  4 ++--
 .../success/success.component.html               | 16 +++++++++-------
 .../administration/success/success.component.ts  |  1 +
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts
index cc940ff2..4a797788 100644
--- a/src/app/core/models/poll.model.ts
+++ b/src/app/core/models/poll.model.ts
@@ -16,6 +16,7 @@ export class Poll {
 
 	public default_expiracy_days_from_now = 60;
 
+	public admin_key: string;
 	public kind: string;
 
 	public description?: string;
diff --git a/src/app/features/administration/form/form.component.html b/src/app/features/administration/form/form.component.html
index 6be19904..581348a4 100644
--- a/src/app/features/administration/form/form.component.html
+++ b/src/app/features/administration/form/form.component.html
@@ -1,6 +1,4 @@
 <div class="admin-form padded">
-	<app-success [poll]="poll"></app-success>
-
 	<div class="container is-max-widescreen">
 		<form [formGroup]="form">
 			<header class="columns">
@@ -82,4 +80,6 @@
 			</div>
 		</form>
 	</div>
+
+	<app-success [poll]="poll"></app-success>
 </div>
diff --git a/src/app/features/administration/success/success.component.html b/src/app/features/administration/success/success.component.html
index 56d6c98a..e47e1598 100644
--- a/src/app/features/administration/success/success.component.html
+++ b/src/app/features/administration/success/success.component.html
@@ -30,10 +30,8 @@
 			Pour accéder au sondage et à tous ses paramètres :
 			<a href="{{ poll.custom_url }}">{{ poll.custom_url }} </a>
 		</p>
-		<app-copy-text
-			[textToCopy]="window.location.href + '/poll/' + poll.custom_url + '/consultation'"
-		></app-copy-text>
-		<a href="{{ poll.custom_url }}">
+		<app-copy-text [textToCopy]="window.location.href + 'poll/admin/' + poll.admin_key + ''"></app-copy-text>
+		<a [href]="window.location.href + 'poll/admin/' + poll.admin_key + ''">
 			Voir le sondage coté administrateur·ice
 		</a>
 		<p class="note">
@@ -45,10 +43,14 @@
 		<h2 i18n>{{ 'resume.users' | translate }}</h2>
 		<p>
 			Pour accéder au sondage :
-			<a href="{{ poll.custom_url }}">{{ poll.custom_url }} </a>
+			<a href="{{ window.location.href + 'poll/' + poll.custom_url + 'consultation' }}"
+				>{{ window.location.href + 'poll/' + poll.custom_url + 'consultation' }}
+			</a>
 		</p>
-		<app-copy-text [textToCopy]="poll.custom_url"></app-copy-text>
-		<a href="{{ poll.custom_url }}">
+		<app-copy-text
+			[textToCopy]="window.location.href + 'poll/' + poll.custom_url + '/consultation'"
+		></app-copy-text>
+		<a href="{{ window.location.href + 'poll/' + poll.custom_url + 'consultation' }}">
 			Voir le sondage
 		</a>
 	</section>
diff --git a/src/app/features/administration/success/success.component.ts b/src/app/features/administration/success/success.component.ts
index 5d9a0d1a..6dcb2d5d 100644
--- a/src/app/features/administration/success/success.component.ts
+++ b/src/app/features/administration/success/success.component.ts
@@ -10,6 +10,7 @@ import { Poll } from '../../../core/models/poll.model';
 export class SuccessComponent implements OnInit {
 	@Input() poll: Poll;
 	mailToRecieve: string;
+	window: any = window;
 
 	constructor(private pollService: PollService) {}
 

From b2ee8ec668d252a23389780f977bba3c58a79512 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 30 Apr 2021 16:12:02 +0200
Subject: [PATCH 18/18] link function

---
 src/app/core/models/poll.model.ts             |  5 +++--
 .../base-config/base-config.component.html    |  3 +--
 .../success/success.component.html            | 22 +++++++------------
 .../success/success.component.ts              |  2 ++
 src/environments/environment.prod.ts          |  1 +
 src/environments/environment.ts               |  1 +
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts
index 4a797788..3324b3f5 100644
--- a/src/app/core/models/poll.model.ts
+++ b/src/app/core/models/poll.model.ts
@@ -64,10 +64,11 @@ export class Poll {
 	constructor(public owner: Owner = new Owner(), public title = 'mon titre', public custom_url: string = '') {}
 
 	public getAdministrationUrl(): string {
-		return `${environment.api.baseHref}/administration/polls/${this.custom_url}`;
+		return `${environment.frontDomain}/poll/admin/${this.admin_key}`;
 	}
 
 	public getParticipationUrl(): string {
-		return `${environment.api.baseHref}/participation/polls/${this.custom_url}`;
+		// TODO handle pass access
+		return `${environment.frontDomain}/poll/${this.custom_url}/consultation`;
 	}
 }
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 262ed155..d1884a65 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
@@ -26,8 +26,7 @@
 			>
 				<i class="fa fa-close"></i>
 			</button>
-		</div>
-		<div class="column">
+
 			<p>
 				<label for="creatorPseudo">
 					<span>
diff --git a/src/app/features/administration/success/success.component.html b/src/app/features/administration/success/success.component.html
index e47e1598..9eda1f6f 100644
--- a/src/app/features/administration/success/success.component.html
+++ b/src/app/features/administration/success/success.component.html
@@ -28,10 +28,10 @@
 
 		<p>
 			Pour accéder au sondage et à tous ses paramètres :
-			<a href="{{ poll.custom_url }}">{{ poll.custom_url }} </a>
+			<a href="{{ poll.getAdministrationUrl() }}">{{ poll.getAdministrationUrl() }} </a>
 		</p>
-		<app-copy-text [textToCopy]="window.location.href + 'poll/admin/' + poll.admin_key + ''"></app-copy-text>
-		<a [href]="window.location.href + 'poll/admin/' + poll.admin_key + ''">
+		<app-copy-text [textToCopy]="poll.getAdministrationUrl()"></app-copy-text>
+		<a [href]="poll.getAdministrationUrl()">
 			Voir le sondage coté administrateur·ice
 		</a>
 		<p class="note">
@@ -42,17 +42,11 @@
 	<section class="public">
 		<h2 i18n>{{ 'resume.users' | translate }}</h2>
 		<p>
-			Pour accéder au sondage :
-			<a href="{{ window.location.href + 'poll/' + poll.custom_url + 'consultation' }}"
-				>{{ window.location.href + 'poll/' + poll.custom_url + 'consultation' }}
-			</a>
+			Pour modifier le sondage :
+			<a href="{{ poll.getAdministrationUrl() }}">{{ poll.getAdministrationUrl() }} </a>
 		</p>
-		<app-copy-text
-			[textToCopy]="window.location.href + 'poll/' + poll.custom_url + '/consultation'"
-		></app-copy-text>
-		<a href="{{ window.location.href + 'poll/' + poll.custom_url + 'consultation' }}">
-			Voir le sondage
-		</a>
+		<app-copy-text [textToCopy]="poll.getAdministrationUrl()"></app-copy-text>
+		<a href="{{ poll.getAdministrationUrl() }}"> <i class="fa fa-pencil"></i> Modifier le sondage </a>
 	</section>
 	<section class="mail">
 		<h2 i18n>{{ 'resume.links_mail' | translate }}</h2>
@@ -66,7 +60,7 @@
 			Envoyer les liens du sondage
 		</button>
 		<a href="{{ poll.custom_url }}">
-			Voir le sondage
+			Voir le sondage côté public
 		</a>
 	</section>
 
diff --git a/src/app/features/administration/success/success.component.ts b/src/app/features/administration/success/success.component.ts
index 6dcb2d5d..28da08fb 100644
--- a/src/app/features/administration/success/success.component.ts
+++ b/src/app/features/administration/success/success.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { PollService } from '../../../core/services/poll.service';
 import { Poll } from '../../../core/models/poll.model';
+import { environment } from 'src/environments/environment';
 
 @Component({
 	selector: 'app-success',
@@ -11,6 +12,7 @@ export class SuccessComponent implements OnInit {
 	@Input() poll: Poll;
 	mailToRecieve: string;
 	window: any = window;
+	environment = environment;
 
 	constructor(private pollService: PollService) {}
 
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index b92940e1..96c7a9d3 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -11,6 +11,7 @@ const apiV1 = {
 };
 
 export const environment = {
+	frontDomain: 'https://framadate-api.cipherbliss.com',
 	production: true,
 	display_routes: true,
 	autofill: true,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index c35aa216..e540479d 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -18,6 +18,7 @@ const apiV1 = {
 };
 
 export const environment = {
+	frontDomain: 'https://framadate-api.cipherbliss.com',
 	production: false,
 	display_routes: true,
 	autofill: true,