From 7c847a16a93ad497233add3c4941fae1e5f9d0b3 Mon Sep 17 00:00:00 2001 From: Maxim Volkov Date: Fri, 18 Jul 2025 15:44:43 +0400 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D0=B5=D0=BB=D0=B8=D1=82=D1=8C=D1=81=D1=8F?= =?UTF-8?q?=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BF=D0=BE=D0=BF?= =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D0=B5=D1=82=20=D0=B2=20=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=8E=20=D1=82=D1=80=D0=BE=D0=B5=D1=82=D0=BE=D1=87=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/complain-popup.module.scss | 12 ++---- .../player/components/complain-popup.tsx | 37 +++++++++++++------ 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/app/(main)/player/components/complain-popup.module.scss b/app/(main)/player/components/complain-popup.module.scss index 4ef916c..aaff2f2 100644 --- a/app/(main)/player/components/complain-popup.module.scss +++ b/app/(main)/player/components/complain-popup.module.scss @@ -1,11 +1,5 @@ @reference '../../../globals.css'; -.complains { - @apply w-full flex flex-col gap-2.5; -} -.complain { - @apply w-full h-fit flex justify-between items-center cursor-pointer; -} -.label { - @apply text-[18px]; -} +.buttons { + @apply bg-[#191717] rounded-lg; +} \ No newline at end of file diff --git a/app/(main)/player/components/complain-popup.tsx b/app/(main)/player/components/complain-popup.tsx index 7d128db..5b2ef5c 100644 --- a/app/(main)/player/components/complain-popup.tsx +++ b/app/(main)/player/components/complain-popup.tsx @@ -5,6 +5,7 @@ import CustomButton from "@/app/ui/custom-button"; import Popup from "@/app/ui/popup/popup"; import TextArea from "@/app/ui/text-area/text-area"; import Complains from "./complains"; +import styles from "./complain-popup.module.scss"; export default function ComplainPopup() { const [isOpen, setOpen] = useState(false); @@ -31,7 +32,7 @@ export default function ComplainPopup() { text="Пожаловаться" title="Комментарий к жалобе" icoSize={24} - bgClass="bg-[#191717]" + bgClass="bg-transparent" isOpen={isOpen} setOpen={setOpen} > @@ -48,15 +49,29 @@ export default function ComplainPopup() { ); } return ( - - - +
+ + {/* TODO share modal window */} + + + + + +
); } From 50e53722c90e3b3d064e28de4e8a4b5cf6c7dad7 Mon Sep 17 00:00:00 2001 From: Maxim Volkov Date: Sat, 19 Jul 2025 14:48:26 +0400 Subject: [PATCH 2/7] =?UTF-8?q?test:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=D0=B5=20id=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=B0=D0=B6?= =?UTF-8?q?=D0=B4=D0=BE=D0=B9=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20Pla?= =?UTF-8?q?yerTooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(main)/player/components/complain-popup.tsx | 10 ++++++++-- app/(main)/player/components/complains.tsx | 1 + app/(main)/player/components/player-tooltip.tsx | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/(main)/player/components/complain-popup.tsx b/app/(main)/player/components/complain-popup.tsx index 5b2ef5c..6ff2397 100644 --- a/app/(main)/player/components/complain-popup.tsx +++ b/app/(main)/player/components/complain-popup.tsx @@ -43,6 +43,7 @@ export default function ComplainPopup() { rounded="rounded-md" hoverClass="hover:scale-[101%]" bgClass="bg-[#989AA21F]" + test-id="button:send_btn" onClick={() => handleSendComplain()} /> @@ -58,9 +59,10 @@ export default function ComplainPopup() { bgClass="bg-transparent" isOpen={isOpen} setOpen={setOpen} + test-id="button:share_btn" > {/* TODO share modal window */} - + - + ); diff --git a/app/(main)/player/components/complains.tsx b/app/(main)/player/components/complains.tsx index c9280d5..f6f43d6 100644 --- a/app/(main)/player/components/complains.tsx +++ b/app/(main)/player/components/complains.tsx @@ -31,6 +31,7 @@ export default function Complains({ onSelect }: Props) { id={obj.id} className={styles.complain} onClick={() => onSelect(obj.label)} + data-testid={`button:complain_${obj.id}`} >

{obj.label}

- + Date: Sat, 19 Jul 2025 16:18:26 +0400 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B1=D0=B0=D0=B3=D0=B8=20=D1=81=20?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D0=BE=D0=BA=20=D0=BF=D0=BE=D0=B4=D0=B5=D0=BB=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=D1=81=D1=8F=20=D0=B8=20=D0=BF=D0=BE=D0=B6=D0=B0?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/complain-popup.module.scss | 14 +++++++++++++- app/(main)/player/components/complain-popup.tsx | 17 +++++++++-------- .../player/components/player-aside.module.scss | 4 ++-- app/(main)/player/components/player-tooltip.tsx | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/app/(main)/player/components/complain-popup.module.scss b/app/(main)/player/components/complain-popup.module.scss index aaff2f2..62f4ea5 100644 --- a/app/(main)/player/components/complain-popup.module.scss +++ b/app/(main)/player/components/complain-popup.module.scss @@ -1,5 +1,17 @@ @reference '../../../globals.css'; +.complains { + @apply w-full flex flex-col gap-2.5; +} + +.complain { + @apply w-full h-fit flex justify-between items-center cursor-pointer; +} + +.label { + @apply text-[18px]; +} + .buttons { @apply bg-[#191717] rounded-lg; -} \ No newline at end of file +} diff --git a/app/(main)/player/components/complain-popup.tsx b/app/(main)/player/components/complain-popup.tsx index 6ff2397..e448d74 100644 --- a/app/(main)/player/components/complain-popup.tsx +++ b/app/(main)/player/components/complain-popup.tsx @@ -8,7 +8,8 @@ import Complains from "./complains"; import styles from "./complain-popup.module.scss"; export default function ComplainPopup() { - const [isOpen, setOpen] = useState(false); + const [isComplainOpen, setComplainOpen] = useState(false); + const [isShareOpen, setShareOpen] = useState(false); const [textValue, setTextValue] = useState(null); const [complainData, setComplainData] = useState(null); useEffect(() => { @@ -33,8 +34,8 @@ export default function ComplainPopup() { title="Комментарий к жалобе" icoSize={24} bgClass="bg-transparent" - isOpen={isOpen} - setOpen={setOpen} + isOpen={isComplainOpen} + setOpen={setComplainOpen} >