From 21aa634ce52beeab60bfc402178840f1f2eb0769 Mon Sep 17 00:00:00 2001 From: tykayn Date: Sat, 24 Apr 2021 12:31:34 +0200 Subject: [PATCH] =?UTF-8?q?display=20de=20sondage=20de=20d=C3=A9mo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/footer/footer.component.html | 29 +++++++++++++++++++ .../core/components/home/home.component.html | 21 -------------- src/app/core/services/api.service.ts | 2 ++ .../consultation/consultation.component.html | 20 +++++++++---- .../consultation/consultation.component.ts | 1 + .../poll-results-compact.component.html | 11 ++++--- .../poll-results-compact.component.ts | 4 ++- 7 files changed, 56 insertions(+), 32 deletions(-) diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html index fbf8ee53..9410a3e2 100644 --- a/src/app/core/components/footer/footer.component.html +++ b/src/app/core/components/footer/footer.component.html @@ -26,5 +26,34 @@ canal Matrix

+
+ Environnement de développement: voici des liens de démonstration issus des fixtures Doctrine de + date-poll-api. + + + + +
diff --git a/src/app/core/components/home/home.component.html b/src/app/core/components/home/home.component.html index afa9dbef..248de299 100644 --- a/src/app/core/components/home/home.component.html +++ b/src/app/core/components/home/home.component.html @@ -13,28 +13,7 @@ | translate }} -
- Environnement de développement: voici des liens de démonstration issus des fixtures Doctrine de - date-poll-api. - - -
image WIP
diff --git a/src/app/core/services/api.service.ts b/src/app/core/services/api.service.ts index 6846365b..0e420acf 100644 --- a/src/app/core/services/api.service.ts +++ b/src/app/core/services/api.service.ts @@ -120,6 +120,8 @@ export class ApiService { // 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); + if (response.data['poll']) { // response from cipherbliss backend, actually used by oldstuffModule response.data = response.data['poll']; diff --git a/src/app/features/consultation/consultation.component.html b/src/app/features/consultation/consultation.component.html index e7d6eb8c..890efbbe 100644 --- a/src/app/features/consultation/consultation.component.html +++ b/src/app/features/consultation/consultation.component.html @@ -12,6 +12,13 @@

{{ poll.title }}

+

{{ poll.description }}

@@ -28,12 +35,13 @@
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts index 34daa626..7f7b2566 100644 --- a/src/app/features/consultation/consultation.component.ts +++ b/src/app/features/consultation/consultation.component.ts @@ -36,6 +36,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 { 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 f7e94125..9cbfd39e 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,17 +1,20 @@
- +
-
diff --git a/src/app/features/consultation/poll-results-compact/poll-results-compact.component.ts b/src/app/features/consultation/poll-results-compact/poll-results-compact.component.ts index 2737e354..e46d3763 100644 --- a/src/app/features/consultation/poll-results-compact/poll-results-compact.component.ts +++ b/src/app/features/consultation/poll-results-compact/poll-results-compact.component.ts @@ -18,7 +18,9 @@ export class PollResultsCompactComponent implements OnInit { constructor(private modalService: ModalService) {} - ngOnInit(): void {} + ngOnInit(): void { + console.log('this.poll', this.poll); + } public openModal(choice: Choice): void { const config: MatDialogConfig = { data: choice };