From 856a8237276f4d54f1d91fcadaf49bf366605f16 Mon Sep 17 00:00:00 2001 From: Nastya Date: Wed, 1 May 2024 02:35:50 +0300 Subject: [PATCH 1/3] -- --- .../QuizStatistics/StastisticsPromocode.tsx | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/pages/dashboard/Content/QuizStatistics/StastisticsPromocode.tsx b/src/pages/dashboard/Content/QuizStatistics/StastisticsPromocode.tsx index fb00be8..733285c 100644 --- a/src/pages/dashboard/Content/QuizStatistics/StastisticsPromocode.tsx +++ b/src/pages/dashboard/Content/QuizStatistics/StastisticsPromocode.tsx @@ -1,4 +1,4 @@ -import { useState } from "react"; +import { useEffect, useState } from "react"; import moment from "moment"; import { Table, @@ -16,13 +16,35 @@ import { useAllPromocodes } from "@root/api/promocode/swr"; import { usePromocodeStatistics } from "@root/utils/hooks/usePromocodeStatistics"; import type { Moment } from "moment"; +import { Promocode } from "@root/model/promocodes"; +import { promocodeApi } from "../../../../api/promocode/requests"; + +async function getPromocodes() { + return await promocodeApi.getPromocodeList({ + limit: 500, + filter: { + active: true, + }, + page: 0 + }) +} export const StatisticsPromocode = () => { const [from, setFrom] = useState( moment(moment().subtract(4, "weeks")) ); const [to, setTo] = useState(moment()); - const promocodes = useAllPromocodes(); + const [promocodes, setPromocodes] = useState([]); + + useEffect(() => { + (async () => { + const { items } = await getPromocodes() + console.log(items) + //@ts-ignore + setPromocodes(items) + })() + }, []) + const promocodeStatistics = usePromocodeStatistics({ to, from }); const theme = useTheme(); From 5a27ada25061dbcb97b6be703a8e23cefbf577a6 Mon Sep 17 00:00:00 2001 From: IlyaDoronin Date: Wed, 8 May 2024 15:31:35 +0300 Subject: [PATCH 2/3] feat: new media link --- src/pages/dashboard/Content/Support/Chat/ChatDocument.tsx | 2 +- src/pages/dashboard/Content/Support/Chat/ChatImage.tsx | 2 +- src/pages/dashboard/Content/Support/Chat/ChatVideo.tsx | 2 +- src/pages/dashboard/Content/Support/ChatImageNewWindow.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/dashboard/Content/Support/Chat/ChatDocument.tsx b/src/pages/dashboard/Content/Support/Chat/ChatDocument.tsx index c0ba536..572202c 100644 --- a/src/pages/dashboard/Content/Support/Chat/ChatDocument.tsx +++ b/src/pages/dashboard/Content/Support/Chat/ChatDocument.tsx @@ -47,7 +47,7 @@ export default function ChatDocument({ diff --git a/src/pages/dashboard/Content/Support/Chat/ChatVideo.tsx b/src/pages/dashboard/Content/Support/Chat/ChatVideo.tsx index 3ce2b0d..b1c4c88 100644 --- a/src/pages/dashboard/Content/Support/Chat/ChatVideo.tsx +++ b/src/pages/dashboard/Content/Support/Chat/ChatVideo.tsx @@ -59,7 +59,7 @@ export default function ChatImage({ }} controls > - + diff --git a/src/pages/dashboard/Content/Support/ChatImageNewWindow.tsx b/src/pages/dashboard/Content/Support/ChatImageNewWindow.tsx index 4138ea5..4c7040b 100644 --- a/src/pages/dashboard/Content/Support/ChatImageNewWindow.tsx +++ b/src/pages/dashboard/Content/Support/ChatImageNewWindow.tsx @@ -12,7 +12,7 @@ export default function ChatImageNewWindow() { maxHeight: "100vh", maxWidth: "100vw", }} - src={`https://storage.yandexcloud.net/pair/${srcImage}`} + src={`https://admin.pena/pair/${srcImage}`} /> ); From 887bcccd5535c691a6941ee75d597c9c9ef44dbd Mon Sep 17 00:00:00 2001 From: IlyaDoronin Date: Wed, 8 May 2024 15:33:44 +0300 Subject: [PATCH 3/3] fix --- .../QuizStatistics/StastisticsPromocode.tsx | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/src/pages/dashboard/Content/QuizStatistics/StastisticsPromocode.tsx b/src/pages/dashboard/Content/QuizStatistics/StastisticsPromocode.tsx index 20d14a1..5223fd7 100644 --- a/src/pages/dashboard/Content/QuizStatistics/StastisticsPromocode.tsx +++ b/src/pages/dashboard/Content/QuizStatistics/StastisticsPromocode.tsx @@ -1,4 +1,4 @@ -import { useEffect, useState } from "react"; +import { useState } from "react"; import moment from "moment"; import { Table, @@ -16,35 +16,13 @@ import { useAllPromocodes } from "@root/api/promocode/swr"; import { usePromocodeStatistics } from "@root/utils/hooks/usePromocodeStatistics"; import type { Moment } from "moment"; -import { Promocode } from "@root/model/promocodes"; -import { promocodeApi } from "../../../../api/promocode/requests"; - -async function getPromocodes() { - return await promocodeApi.getPromocodeList({ - limit: 500, - filter: { - active: true, - }, - page: 0 - }) -} export const StatisticsPromocode = () => { const [from, setFrom] = useState( moment(moment().subtract(4, "weeks")) ); const [to, setTo] = useState(moment()); - const [promocodes, setPromocodes] = useState([]); - - useEffect(() => { - (async () => { - const { items } = await getPromocodes() - console.log(items) - //@ts-ignore - setPromocodes(items) - })() - }, []) - + const promocodes = useAllPromocodes(); const promocodeStatistics = usePromocodeStatistics({ to, from }); const theme = useTheme();