From cc27f31e0ecf08c5cae26068d19e1e715e921844 Mon Sep 17 00:00:00 2001
From: tykayn <tykayn@gmail.com>
Date: Sun, 7 Jun 2020 12:34:57 +0200
Subject: [PATCH] :zap: refacto feedback, :art: style for popup links, place
 icons before text

---
 src/app/app.module.ts                               |  1 -
 .../features/participation/participation.module.ts  |  5 ++---
 .../components}/feedback/feedback.component.html    |  8 ++++----
 .../components}/feedback/feedback.component.scss    | 13 ++++++-------
 .../components}/feedback/feedback.component.spec.ts |  0
 .../components}/feedback/feedback.component.ts      |  0
 src/app/shared/shared.module.ts                     |  4 +++-
 7 files changed, 15 insertions(+), 16 deletions(-)
 rename src/app/{features/participation => shared/components}/feedback/feedback.component.html (90%)
 rename src/app/{features/participation => shared/components}/feedback/feedback.component.scss (79%)
 rename src/app/{features/participation => shared/components}/feedback/feedback.component.spec.ts (100%)
 rename src/app/{features/participation => shared/components}/feedback/feedback.component.ts (100%)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index d19d7cb0..020415da 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -60,7 +60,6 @@ export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader {
 			},
 			useDefaultLang: false,
 		}),
-		OldStuffModule,
 		ParticipationModule,
 	],
 	providers: [Title, TranslateService],
diff --git a/src/app/features/participation/participation.module.ts b/src/app/features/participation/participation.module.ts
index 748585e6..457931c2 100644
--- a/src/app/features/participation/participation.module.ts
+++ b/src/app/features/participation/participation.module.ts
@@ -6,11 +6,10 @@ import { SharedModule } from '../../shared/shared.module';
 import { ParticipationRoutingModule } from './participation-routing.module';
 import { ParticipationComponent } from './participation.component';
 import { PollComponent } from './poll/poll.component';
-import { FeedbackComponent } from './feedback/feedback.component';
 
 @NgModule({
-	declarations: [ParticipationComponent, PollComponent, FeedbackComponent],
+	declarations: [ParticipationComponent, PollComponent],
 	imports: [CommonModule, ParticipationRoutingModule, SharedModule, TranslateModule.forChild({ extend: true })],
-	exports: [FeedbackComponent],
+	exports: [],
 })
 export class ParticipationModule {}
diff --git a/src/app/features/participation/feedback/feedback.component.html b/src/app/shared/components/feedback/feedback.component.html
similarity index 90%
rename from src/app/features/participation/feedback/feedback.component.html
rename to src/app/shared/components/feedback/feedback.component.html
index 28865ed7..ab8e07fe 100644
--- a/src/app/features/participation/feedback/feedback.component.html
+++ b/src/app/shared/components/feedback/feedback.component.html
@@ -1,20 +1,20 @@
 <div class="feedback-container">
 	<div class="feedback-choices" *ngIf="isOpen" [ngClass]="{ active: isOpen }">
 		<a class="link" href="mailto:contact@cipherbliss.com">
+			<i class="fa fa-mail-forward"></i>
 			Par email
-			<i class="fa fa-mail"></i>
 		</a>
 		<a class="link" href="https://riot.im/app/#/room/#framadate:matrix.org">
+			<i class="fa fa-matrix-org"></i>
 			Par Matrix
-			<i class="fa fa-mail"></i>
 		</a>
 		<a class="link" href="https://framateam.org/ux-framatrucs/channels/framadate">
-			Discuter sur Framateam
 			<i class="fa fa-comments"></i>
+			Discuter sur Framateam
 		</a>
 		<a class="link" href="https://framagit.org/framasoft/framadate/funky-framadate-front">
-			Créer une Issue sur Framagit
 			<i class="fa fa-gitlab"></i>
+			Créer une Issue sur Framagit
 		</a>
 	</div>
 	<div class="button" (click)="isOpen = !isOpen" [ngClass]="{ active: isOpen }">
diff --git a/src/app/features/participation/feedback/feedback.component.scss b/src/app/shared/components/feedback/feedback.component.scss
similarity index 79%
rename from src/app/features/participation/feedback/feedback.component.scss
rename to src/app/shared/components/feedback/feedback.component.scss
index c872a2e7..b5963fdb 100644
--- a/src/app/features/participation/feedback/feedback.component.scss
+++ b/src/app/shared/components/feedback/feedback.component.scss
@@ -5,7 +5,7 @@
 	color: white;
 	.feedback-choices {
 		&.active {
-			background: #8eb6ed;
+			background: #0c5593;
 			border-radius: 0.5em;
 			padding: 1em;
 			margin-bottom: 0.5em;
@@ -15,12 +15,11 @@
 		margin: 1ch;
 		display: block;
 		max-width: 10em;
-		a {
-			color: white;
-			&:hover {
-				background: white;
-				color: black;
-			}
+		color: white;
+		padding: 0.5rem 1rem;
+		&:hover {
+			background: white;
+			color: black;
 		}
 	}
 	i {
diff --git a/src/app/features/participation/feedback/feedback.component.spec.ts b/src/app/shared/components/feedback/feedback.component.spec.ts
similarity index 100%
rename from src/app/features/participation/feedback/feedback.component.spec.ts
rename to src/app/shared/components/feedback/feedback.component.spec.ts
diff --git a/src/app/features/participation/feedback/feedback.component.ts b/src/app/shared/components/feedback/feedback.component.ts
similarity index 100%
rename from src/app/features/participation/feedback/feedback.component.ts
rename to src/app/shared/components/feedback/feedback.component.ts
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 4c19901e..266abaf1 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -17,9 +17,10 @@ import { ConfirmationService, MessageService } from 'primeng/api';
 
 import { PageNotFoundComponent } from './components/page-not-found/page-not-found.component';
 import { PollPageComponent } from './components/poll-page/poll-page.component';
+import { FeedbackComponent } from './components/feedback/feedback.component';
 
 @NgModule({
-	declarations: [PageNotFoundComponent, PollPageComponent],
+	declarations: [PageNotFoundComponent, PollPageComponent, FeedbackComponent],
 	imports: [
 		CommonModule,
 		ChartsModule,
@@ -38,6 +39,7 @@ import { PollPageComponent } from './components/poll-page/poll-page.component';
 		ChartsModule,
 		ConfirmDialogModule,
 		DialogModule,
+		FeedbackComponent,
 		InputSwitchModule,
 		InputTextareaModule,
 		MessageModule,