Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Marianna/1196/feedback feature #1280

Merged
merged 9 commits into from
Oct 29, 2024
Merged

Marianna/1196/feedback feature #1280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
391371b
1196: Feedback feature
Mdemenko1 Sep 9, 2024
717d52e
1196: adjusting modal opening
Mdemenko1 Sep 11, 2024
c991c8d
Adjustments to the PR comments
Mdemenko1 Sep 19, 2024
0b59f8a
npm run format
Mdemenko1 Sep 19, 2024
f048128
Redesigned feedback feature
Mdemenko1 Oct 23, 2024
ed62e36
clean up
Mdemenko1 Oct 23, 2024
607dfa3
renaming css classes
Mdemenko1 Oct 24, 2024
9567229
changing Button component to <a>
Mdemenko1 Oct 25, 2024
76d0629
adjustments to the PR comments
Mdemenko1 Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/Components/Share/Share.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,36 @@ button {
justify-content: flex-end;
}

.feedback-buttons-container {
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 1.25rem;
padding-bottom: 1.25rem;
border-bottom: 1px solid rgb(176, 175, 182);
margin-left: 1rem;
}

.feedback-button-and-text {
Mdemenko1 marked this conversation as resolved.
Show resolved Hide resolved
color: var(--hover-color);
border: 1px solid var(--hover-color);
padding: 0.3125rem 1rem;
width: 10rem;
display: flex;
justify-content: center;
align-items: center;
border-radius: 0.75rem;
font-weight: bold;
font-size: 0.875rem;
text-decoration: none;
}

.feedback-button-and-text:hover {
Mdemenko1 marked this conversation as resolved.
Show resolved Hide resolved
color: var(--primary-color);
background-color: var(--hover-color);
border: 1px solid var(--hover-color);
}

.button-no-format {
cursor: pointer;
}
Expand Down
11 changes: 11 additions & 0 deletions src/Components/Share/Share.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@ import CheckIcon from '@mui/icons-material/Check';
import { Context } from '../Wrapper/Wrapper';
import dataLayerPush from '../../Assets/analytics';
import './Share.css';
import { useConfig } from '../Config/configHook';

const Share = forwardRef(function Share() {
const [copied, setCopied] = useState(false);
const { getReferrer } = useContext(Context);
const { email, survey } = useConfig('feedback_links');
const surveyLink = survey;
const intl = useIntl();

const labels = {
Expand Down Expand Up @@ -65,6 +68,14 @@ const Share = forwardRef(function Share() {

return (
<div>
<div className="feedback-buttons-container">
<a className="feedback-button-and-text" href={email}>
<FormattedMessage id="contactUsButton" defaultMessage="CONTACT US" />
</a>
<a className="feedback-button-and-text" href={surveyLink} target="_blank">
<FormattedMessage id="reportABugButton" defaultMessage="REPORT A BUG" />
</a>
</div>
<div className="share-text-container">
<p className="white-font">
<FormattedMessage id="results.share-header" defaultMessage="Share MyFriendBen Via:" />
Expand Down