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] 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) {}