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

Samu/enhancement/304-redesign-feedback-button #390

Merged
merged 9 commits into from
Feb 14, 2025
Merged

Samu/enhancement/304-redesign-feedback-button #390

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d2a70a
Samu/enhancement/304-redesing-button
SProkopios Feb 12, 2025
3037f5c
Fixing styling and font
SProkopios Feb 12, 2025
7ecb4f2
improving feedbackCards position
SProkopios Feb 12, 2025
aa4f107
Renaming classes
SProkopios Feb 12, 2025
3a2ece3
Enhancing pop-up placement
SProkopios Feb 13, 2025
645ff5a
Setting the right font
SProkopios Feb 13, 2025
70de229
Merge branch 'dev' into Samu/enhancement/304-redesign-feedback-button
Jonroi Feb 13, 2025
d25709a
Fixing tests
SProkopios Feb 13, 2025
b8bee76
Merge branch 'Samu/enhancement/304-redesign-feedback-button' of https…
SProkopios Feb 13, 2025
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
13 changes: 10 additions & 3 deletions frontend-next-migration/src/app/[lng]/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { dir } from 'i18next';
import type { Viewport } from 'next';
import { Urbanist, Rubik } from 'next/font/google';
import { Urbanist, Rubik, Sedgwick_Ave_Display } from 'next/font/google';
import { ReactNode } from 'react';
import cls from '@/preparedPages/MainPage/ui/page.module.scss';
import { CookieConsentComponent } from '@/features/CookieConsent';
import { FeedbackSideButton } from '@/features/Feedback';
import { FeedbackSideButton } from '@/shared/ui/v2/Feedback';
import { languages } from '@/shared/i18n/settings/settings';
import { withBackgroundImage } from '@/shared/lib/hocs/withBackgroundImage';
import bgPicture from '@/shared/assets/images/backgrounds/background.webp';
Expand All @@ -16,6 +16,13 @@ import '../_styles/index.scss';
// display: 'swap',
// });

const sedgwickFont = Sedgwick_Ave_Display({
subsets: ['latin'],
weight: '400',
variable: '--font-family-title',
fallback: ['system-ui', 'arial'],
});

const urbanist = Urbanist({
variable: '--font-family-main',
subsets: ['latin'],
Expand Down Expand Up @@ -62,7 +69,7 @@ export default function RootLayout(props: Props) {
<html
lang={lng}
dir={dir(lng)}
className={`${urbanist.variable} ${rubik.variable}`}
className={`${urbanist.variable} ${rubik.variable} ${sedgwickFont.variable}`}
>
<head>
<link
Expand Down
2 changes: 2 additions & 0 deletions frontend-next-migration/src/app/_styles/variables/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
:root {
--font-family-texts: "Rubik";
--font-family-main: 'Urbanist', sans-serif;
--font-family-secondary: "DM Sans";
//--font-family-title: "Sedgwick Ave Display";

--font-size-s: 14px;
--font-line-s: 20px;
Expand Down
4 changes: 4 additions & 0 deletions frontend-next-migration/src/features/Feedback/ui/FeedbackSideButton/FeedbackSideButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ import useIsMobileSize from '@/shared/lib/hooks/useIsMobileSize';
import { FeedbackCard } from '@/shared/ui/v2/Feedback';
import cls from './FeedbackSideButton.module.scss';

/**
* @deprecated
*/

type Props = {
disableMobile?: boolean;
};
Expand Down
9 changes: 9 additions & 0 deletions frontend-next-migration/src/shared/assets/icons/Feedback/Megafone.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion frontend-next-migration/src/shared/ui/v2/Feedback/ui/FeedbackCard/FeedbackCard.module.scss
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great job of refining small styling details while also enhancing other aspects of the design.

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@

align-items: center;
gap: 10px;
box-shadow: 3px 4px 0 #121212;
box-shadow: 6px 8px 1px #000000;
border-width: 4px;
border-style: solid;
border-color: #000000;
}


Expand All @@ -23,6 +26,7 @@
padding: 0 1em 0 1em;
height: fit-content;
color: var(--secondary-color) !important;
font-family: var(--font-family-title);
text-align: center;
width: 100%;
margin: 0 auto;
Expand Down Expand Up @@ -83,6 +87,7 @@
.linkToForm {
display: flex;
flex-direction: row;
font-family: var(--font-family-secondary);
}

.linkToFormContainer {
Expand Down
8 changes: 1 addition & 7 deletions frontend-next-migration/src/shared/ui/v2/Feedback/ui/FeedbackCard/FeedbackCard.tsx
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good move towards simplifying the code

Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ import { useClientTranslation } from '@/shared/i18n';
import { AppExternalLinks } from '@/shared/appLinks/appExternalLinks';
import cls from './FeedbackCard.module.scss';
import FeedbackEmoji from '../FeedbackEmoji/FeedbackEmoji';
import { Sedgwick_Ave_Display } from 'next/font/google';

const sedgwickFont = Sedgwick_Ave_Display({
subsets: ['latin'],
weight: '400',
});

export default function FeedbackCard() {
const { t } = useClientTranslation('feedbackCard');
Expand Down Expand Up @@ -62,7 +56,7 @@ export default function FeedbackCard() {
await submitFeedback();
}}
>
<h3 className={`${cls.feedbackTitle} ${sedgwickFont.className}`}>{t('title')}</h3>
<h3 className={cls.feedbackTitle}>{t('title')}</h3>
<FeedbackEmoji
listClassName={cls.emojiList}
value={feedbackEmoji}
Expand Down
49 changes: 44 additions & 5 deletions ...-migration/src/shared/ui/v2/Feedback/ui/FeedbackSideButton/FeedbackSideButton.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,73 @@
.SideButton{
//width: fit-content;
display: flex;
flex-direction: row;
gap: 1rem;
font-family: var(--font-family-main) !important;
font-size: var(--font-size-m) !important;


height: fit-content;
min-height: 100px;
min-height: 110px;
width: 3rem;
position: fixed;
bottom: 50%;
align-items: center;


-webkit-writing-mode: vertical-lr;
writing-mode: vertical-lr;
border-radius: 15px;
border-width: 4px !important;
border-style: solid !important;




right: 10px;
background-color: var(--inverted-bg-color)!important;
z-index: var(--sideButton-z-index) !important;
font-family: var(--font-family-texts) !important;
font-family: 16px !important;
line-height: 1 !important;
transform: rotate(180deg);
padding: 12px !important;
padding: 14px 0 14px 0 !important;

&:focus {
outline: none !important;
}

}

.nonActiveButton {
@extend .SideButton;
background-color: var(--inverted-bg-color) !important;
color: var(--secondary-color) !important;
border-color: var(--secondary-color) !important;
}

.activeButton {
@extend .SideButton;
background-color: var(--secondary-color) !important;
color: var(--inverted-bg-color) !important;
border-color: var(--inverted-bg-color) !important;
}

.feedbackButtonContainer {
display: flex;
}

.megafone {
transform: rotate( 180deg);
}

.FeedbackCardContainer {
display: flex;
position: fixed;
bottom: 20%;
right: calc(60px);
right: calc(10px);
z-index: calc(var(--sideButton-z-index) + 1);

top: 50%;
transform: translate(-18%, -40%);
}

.feedbackForm.hidden {
Expand Down
58 changes: 48 additions & 10 deletions ...end-next-migration/src/shared/ui/v2/Feedback/ui/FeedbackSideButton/FeedbackSideButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
'use client';
import { useState } from 'react';
import { Button, ButtonTheme } from '@/shared/ui/Button/Button';
import { useEffect, useRef, useState } from 'react';
import { Button, ButtonSize, ButtonTheme } from '@/shared/ui/Button/Button';
import { useClientTranslation } from '@/shared/i18n';
import useIsMobileSize from '@/shared/lib/hooks/useIsMobileSize';
import { FeedbackCard } from '@/shared/ui/v2/Feedback';
import cls from './FeedbackSideButton.module.scss';
import Image from 'next/image';
import megafone from '@/shared/assets/icons/Feedback/Megafone.svg';

type Props = {
disableMobile?: boolean;
Expand All @@ -16,25 +18,61 @@ const FeedbackSideButton = (props: Props) => {
const { t } = useClientTranslation('translation');
const { isMobileSize } = useIsMobileSize();
const [isFeedbackVisible, setFeedbackVisible] = useState(false);
const buttonRef = useRef<HTMLDivElement>(null);
const feedbackRef = useRef<HTMLDivElement>(null);

const handleButtonClick = () => {
setFeedbackVisible(!isFeedbackVisible);
};

useEffect(() => {
const handleMouseEvent = (event: MouseEvent) => {
if (
!feedbackRef.current?.contains(event.target as Node) &&
!buttonRef.current?.contains(event.target as Node)
) {
setFeedbackVisible(false);
}
};
if (isFeedbackVisible) {
document.addEventListener('mousedown', handleMouseEvent);
}
return () => {
document.removeEventListener('mousedown', handleMouseEvent);
};
}, [isFeedbackVisible]);

return (
(!isMobileSize || !disableMobile) && (
<>
<Button
theme={ButtonTheme.Graffiti}
className={cls.SideButton}
type="button"
onClick={handleButtonClick}
<div
className={cls.feedbackButtonContainer}
ref={buttonRef}
>
{t('feedback')}
</Button>
<Button
theme={ButtonTheme.CLEAR}
square={false}
size={ButtonSize.L}
className={isFeedbackVisible ? cls.activeButton : cls.nonActiveButton}
type="button"
onClick={handleButtonClick}
>
{t('feedback')}
<Image
src={megafone}
alt={'megafone'}
width={25}
height={25}
className={cls.megafone}
/>
</Button>
</div>
{isFeedbackVisible && (
<div className={cls.FeedbackOverlay}>
<div className={cls.FeedbackCardContainer}>
<div
ref={feedbackRef}
className={cls.FeedbackCardContainer}
>
<FeedbackCard />
</div>
</div>
Expand Down