From dd8cb100c1dcb2d15cabdc5cb6cb4255963f7e95 Mon Sep 17 00:00:00 2001
From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com>
Date: Wed, 1 Jul 2020 18:43:04 +0200
Subject: [PATCH] feat: add location into feedback mail
---
.../ContentComponents/Feedback/FeedbackModal.tsx | 10 ++++++++--
src/styles/components/_modal.scss | 4 ++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/components/ContentComponents/Feedback/FeedbackModal.tsx b/src/components/ContentComponents/Feedback/FeedbackModal.tsx
index 34c0fa417..dc8308c25 100644
--- a/src/components/ContentComponents/Feedback/FeedbackModal.tsx
+++ b/src/components/ContentComponents/Feedback/FeedbackModal.tsx
@@ -52,6 +52,7 @@ const FeedbackModal: React.FC<FeedbackModalProps> = ({
const envInfo =
`Ecolyo` +
`\nv${client.appMetadata.version}` +
+ `\n\nLocation: ${window.location}` +
'\n\nBrowser:' +
`\nOn ${browser && browser.os}` +
`\nFrom ${browser && browser.name}` +
@@ -162,7 +163,7 @@ const FeedbackModal: React.FC<FeedbackModalProps> = ({
}
value={description}
></textarea>
- <div className="fb-label text-16-bold">{t('feedback.email')}</div>
+ <div className="fb-label text-15-normal">{t('feedback.email')}</div>
<input
id="idFeedbackEmail"
type="text"
@@ -175,7 +176,12 @@ const FeedbackModal: React.FC<FeedbackModalProps> = ({
}
value={email}
/>
- <StyledButton className="fb-button" onClick={sendEmail}>
+ <StyledButton
+ className="fb-button"
+ color="primary"
+ onClick={sendEmail}
+ disabled={sending}
+ >
{t('feedback.send')}
</StyledButton>
</div>
diff --git a/src/styles/components/_modal.scss b/src/styles/components/_modal.scss
index c267be398..b9abbb961 100644
--- a/src/styles/components/_modal.scss
+++ b/src/styles/components/_modal.scss
@@ -26,7 +26,7 @@
width: 36rem;
max-width: 100%;
// height: 80vh;
- max-height: 80vh;
+ max-height: 90vh;
// transform: translate(-50%, -50%);
padding: 1rem 0 0 0;
box-sizing: border-box;
@@ -56,7 +56,7 @@
@media #{$large-phone} {
// max-height: 80vh;
}
- max-height: 75vh;
+ max-height: 85vh;
// max-height: -webkit-fill-available;
display: flex;
flex-direction: column;
--
GitLab