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] 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,