diff --git a/src/pages/ViewPublicationPage/StartPageViewPublication.tsx b/src/pages/ViewPublicationPage/StartPageViewPublication.tsx index b69612c..d3ce2f3 100644 --- a/src/pages/ViewPublicationPage/StartPageViewPublication.tsx +++ b/src/pages/ViewPublicationPage/StartPageViewPublication.tsx @@ -431,6 +431,8 @@ function QuizPreviewLayoutByType({ sx={{ width: "60%", overflow: "hidden", + display: "flex", + justifyContent: "center" }} > {backgroundBlock} diff --git a/src/pages/ViewPublicationPage/index.tsx b/src/pages/ViewPublicationPage/index.tsx index 8c44fa4..db072d1 100644 --- a/src/pages/ViewPublicationPage/index.tsx +++ b/src/pages/ViewPublicationPage/index.tsx @@ -18,7 +18,7 @@ const QID = process.env.NODE_ENV === "production" ? window.location.pathname.replace(/\//g, '') : - "6955f170-f0f8-4b04-9be1-b8e3906fca5c" + "6e96e958-d30e-49f6-aa85-32aaef975733" export const ViewPage = () => { diff --git a/src/pages/ViewPublicationPage/questions/Date.tsx b/src/pages/ViewPublicationPage/questions/Date.tsx index 7cad148..d4574f1 100644 --- a/src/pages/ViewPublicationPage/questions/Date.tsx +++ b/src/pages/ViewPublicationPage/questions/Date.tsx @@ -56,7 +56,6 @@ export const Date = ({ currentQuestion }: DateProps) => { } try { - await sendAnswer({ questionId: currentQuestion.id, body: new window.Date(date.toDate()).toLocaleDateString("ru-RU", { diff --git a/src/pages/ViewPublicationPage/questions/Emoji.tsx b/src/pages/ViewPublicationPage/questions/Emoji.tsx index 1d28054..aa723b0 100644 --- a/src/pages/ViewPublicationPage/questions/Emoji.tsx +++ b/src/pages/ViewPublicationPage/questions/Emoji.tsx @@ -44,12 +44,14 @@ export const Emoji = ({ currentQuestion }: EmojiProps) => { value={currentQuestion.content.variants.findIndex( ({ id }) => answer === id )} - onChange={({ target }) => + onChange={({ target }) =>{ + console.log(currentQuestion.content.variants[Number(target.value)]) updateAnswer( currentQuestion.id, - currentQuestion.content.variants[Number(target.value)].id + currentQuestion.content.variants[Number(target.value)].answer ) } + } sx={{ display: "flex", flexWrap: "wrap", @@ -104,18 +106,46 @@ export const Emoji = ({ currentQuestion }: EmojiProps) => { gap: "10px", }} value={index} - onClick={(event) => { + onClick={async (event) => { event.preventDefault(); - updateAnswer( - currentQuestion.id, - currentQuestion.content.variants[index].id - ); + try { + + await sendAnswer({ + questionId: currentQuestion.id, + body: currentQuestion.content.variants[index].answer, + //@ts-ignore + qid: settings.qid + }) + + updateAnswer( + currentQuestion.id, + currentQuestion.content.variants[index].id + ); + + } catch (e) { + enqueueSnackbar("ответ не был засчитан") + } + + if (answer === currentQuestion.content.variants[index].id) { deleteAnswer(currentQuestion.id); + try { + + await sendAnswer({ + questionId: currentQuestion.id, + body: "", + //@ts-ignore + qid: settings.qid + }) + + } catch (e) { + enqueueSnackbar("ответ не был засчитан") + } } }} + control={ //@ts-ignore } icon={} /> diff --git a/src/pages/ViewPublicationPage/questions/Images.tsx b/src/pages/ViewPublicationPage/questions/Images.tsx index a77dcbc..45562f7 100644 --- a/src/pages/ViewPublicationPage/questions/Images.tsx +++ b/src/pages/ViewPublicationPage/questions/Images.tsx @@ -69,30 +69,42 @@ export const Images = ({ currentQuestion }: ImagesProps) => { border: `1px solid`, borderColor: answer === variant.id ? theme.palette.primary.main : "#9A9AAF", }} - onClick={async(event) => { + onClick={async (event) => { event.preventDefault(); - + try { - + await sendAnswer({ questionId: currentQuestion.id, - body: currentQuestion.content.variants[index].id, + body: currentQuestion.content.variants[index].answer, //@ts-ignore qid: settings.qid }) - + updateAnswer( currentQuestion.id, currentQuestion.content.variants[index].id ); - + } catch (e) { enqueueSnackbar("ответ не был засчитан") } - - + + if (answer === currentQuestion.content.variants[index].id) { deleteAnswer(currentQuestion.id); + try { + + await sendAnswer({ + questionId: currentQuestion.id, + body: "", + //@ts-ignore + qid: settings.qid + }) + + } catch (e) { + enqueueSnackbar("ответ не был засчитан") + } } }} > @@ -123,7 +135,7 @@ export const Images = ({ currentQuestion }: ImagesProps) => { value={index} control={ //@ts-ignore - } icon={} /> + } icon={} /> } label={variant.answer} /> diff --git a/src/pages/ViewPublicationPage/questions/Select.tsx b/src/pages/ViewPublicationPage/questions/Select.tsx index 0efde6a..fc36882 100644 --- a/src/pages/ViewPublicationPage/questions/Select.tsx +++ b/src/pages/ViewPublicationPage/questions/Select.tsx @@ -45,15 +45,26 @@ export const Select = ({ currentQuestion }: SelectProps) => { onChange={async(_, value) => { if (value < 0) { deleteAnswer(currentQuestion.id); - + try { + + await sendAnswer({ + questionId: currentQuestion.id, + body: "", + //@ts-ignore + qid: settings.qid + }) + + } catch (e) { + enqueueSnackbar("ответ не был засчитан") + } return; } try { - + await sendAnswer({ questionId: currentQuestion.id, - body: String(value), + body: String(currentQuestion.content.variants[Number(value)].answer), //@ts-ignore qid: settings.qid }) diff --git a/src/pages/ViewPublicationPage/questions/Variant.tsx b/src/pages/ViewPublicationPage/questions/Variant.tsx index 5a0dbb9..7629802 100644 --- a/src/pages/ViewPublicationPage/questions/Variant.tsx +++ b/src/pages/ViewPublicationPage/questions/Variant.tsx @@ -165,14 +165,14 @@ const VariantItem = ({ checkedIcon={} icon={} /> - ) : - //@ts-ignore - (} icon={} /> - ) + ) : + //@ts-ignore + (} icon={} /> + ) } //@ts-ignore label={own ? : variant.answer} - onClick={async(event) => { + onClick={async (event) => { event.preventDefault(); const variantId = currentQuestion.content.variants[index].id; @@ -184,8 +184,8 @@ const VariantItem = ({ await sendAnswer({ questionId: currentQuestion.id, body: currentAnswer.includes(variantId) - ? currentAnswer?.filter((item) => item !== variantId) - : [...currentAnswer, variantId], + ? currentAnswer?.filter((item) => item !== variantId) + : [...currentAnswer, variantId], //@ts-ignore qid: settings.qid }) @@ -209,7 +209,7 @@ const VariantItem = ({ await sendAnswer({ questionId: currentQuestion.id, - body: variantId, + body: currentQuestion.content.variants[index].answer, //@ts-ignore qid: settings.qid }) @@ -221,6 +221,18 @@ const VariantItem = ({ } if (answer === variantId) { + try { + + await sendAnswer({ + questionId: currentQuestion.id, + body: "", + //@ts-ignore + qid: settings.qid + }) + + } catch (e) { + enqueueSnackbar("ответ не был засчитан") + } deleteAnswer(currentQuestion.id); } }} diff --git a/src/pages/ViewPublicationPage/questions/Varimg.tsx b/src/pages/ViewPublicationPage/questions/Varimg.tsx index 352dc4c..6692107 100644 --- a/src/pages/ViewPublicationPage/questions/Varimg.tsx +++ b/src/pages/ViewPublicationPage/questions/Varimg.tsx @@ -87,7 +87,7 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { await sendAnswer({ questionId: currentQuestion.id, - body: currentQuestion.content.variants[index].id, + body: currentQuestion.content.variants[index].answer, //@ts-ignore qid: settings.qid }) @@ -103,6 +103,18 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { if (answer === currentQuestion.content.variants[index].id) { + try { + + await sendAnswer({ + questionId: currentQuestion.id, + body: "", + //@ts-ignore + qid: settings.qid + }) + + } catch (e) { + enqueueSnackbar("ответ не был засчитан") + } deleteAnswer(currentQuestion.id); } }}