закоммичено несколько неиспользуемых кнопок, фикс убирания пробелов, изменение верстки фк + отображение используемых инпутов, фикс залиапния кнопки публикации при автоотзыве при ошибке
This commit is contained in:
parent
f589393924
commit
96a0393fef
@ -26,8 +26,16 @@ async function getQuestionList(body?: Partial<GetQuestionListRequest>) {
|
|||||||
body: { ...defaultGetQuestionListBody, ...body },
|
body: { ...defaultGetQuestionListBody, ...body },
|
||||||
method: "POST",
|
method: "POST",
|
||||||
});
|
});
|
||||||
|
console.log(response.items)
|
||||||
|
const clearArrayFromEmptySpaceBlaBlaValue = response.items?.map(question => {
|
||||||
|
let data = question
|
||||||
|
for (let key in question) {
|
||||||
|
if (question[key] === " ") data[key] = ""
|
||||||
|
}
|
||||||
|
return data
|
||||||
|
})
|
||||||
|
|
||||||
return replaceSpacesToEmptyLines(response.items);
|
return replaceSpacesToEmptyLines(clearArrayFromEmptySpaceBlaBlaValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
function editQuestion(body: EditQuestionRequest, signal?: AbortSignal) {
|
function editQuestion(body: EditQuestionRequest, signal?: AbortSignal) {
|
||||||
|
@ -270,9 +270,9 @@ export default function ButtonsOptions({
|
|||||||
gap: "6px",
|
gap: "6px",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<IconButton sx={{ borderRadius: "6px", padding: "2px" }}>
|
{/* <IconButton sx={{ borderRadius: "6px", padding: "2px" }}>
|
||||||
<HideIcon style={{ color: "#4D4D4D" }} />
|
<HideIcon style={{ color: "#4D4D4D" }} />
|
||||||
</IconButton>
|
</IconButton> */}
|
||||||
<IconButton
|
<IconButton
|
||||||
sx={{ borderRadius: "6px", padding: "2px" }}
|
sx={{ borderRadius: "6px", padding: "2px" }}
|
||||||
onClick={() => copyQuestion(question.id, question.quizId)}
|
onClick={() => copyQuestion(question.id, question.quizId)}
|
||||||
|
@ -303,9 +303,9 @@ export default function ButtonsOptionsAndPict({
|
|||||||
padding: "20px",
|
padding: "20px",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<IconButton sx={{ borderRadius: "6px", padding: "0px 2px" }}>
|
{/* <IconButton sx={{ borderRadius: "6px", padding: "0px 2px" }}>
|
||||||
<HideIcon style={{ color: "#4D4D4D" }} />
|
<HideIcon style={{ color: "#4D4D4D" }} />
|
||||||
</IconButton>
|
</IconButton> */}
|
||||||
<IconButton
|
<IconButton
|
||||||
sx={{ borderRadius: "6px" }}
|
sx={{ borderRadius: "6px" }}
|
||||||
onClick={() => copyQuestion(question.id, question.quizId)}
|
onClick={() => copyQuestion(question.id, question.quizId)}
|
||||||
|
@ -239,7 +239,7 @@ export default function QuestionsPageCard({ question, draggableProps, isDragging
|
|||||||
borderRight: "solid 1px #4D4D4D",
|
borderRight: "solid 1px #4D4D4D",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<FormControlLabel
|
{/* <FormControlLabel
|
||||||
control={
|
control={
|
||||||
<Checkbox
|
<Checkbox
|
||||||
icon={
|
icon={
|
||||||
@ -265,7 +265,7 @@ export default function QuestionsPageCard({ question, draggableProps, isDragging
|
|||||||
mr: 0,
|
mr: 0,
|
||||||
userSelect: "none",
|
userSelect: "none",
|
||||||
}}
|
}}
|
||||||
/>
|
/> */}
|
||||||
<IconButton sx={{ padding: "0" }} onClick={() => copyQuestion(question.id, question.quizId)}>
|
<IconButton sx={{ padding: "0" }} onClick={() => copyQuestion(question.id, question.quizId)}>
|
||||||
<CopyIcon style={{ color: theme.palette.brightPurple.main }} />
|
<CopyIcon style={{ color: theme.palette.brightPurple.main }} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
|
@ -209,7 +209,7 @@ export default function QuestionsPageCard({ question, questionIndex, draggablePr
|
|||||||
borderRight: "solid 1px #4D4D4D",
|
borderRight: "solid 1px #4D4D4D",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<FormControlLabel
|
{/* <FormControlLabel
|
||||||
control={
|
control={
|
||||||
<Checkbox
|
<Checkbox
|
||||||
icon={
|
icon={
|
||||||
@ -235,7 +235,7 @@ export default function QuestionsPageCard({ question, questionIndex, draggablePr
|
|||||||
mr: 0,
|
mr: 0,
|
||||||
userSelect: "none",
|
userSelect: "none",
|
||||||
}}
|
}}
|
||||||
/>
|
/> */}
|
||||||
<IconButton sx={{ padding: "0" }} onClick={() => copyQuestion(question.id, question.quizId)}>
|
<IconButton sx={{ padding: "0" }} onClick={() => copyQuestion(question.id, question.quizId)}>
|
||||||
<CopyIcon style={{ color: theme.palette.brightPurple.main }} />
|
<CopyIcon style={{ color: theme.palette.brightPurple.main }} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
|
@ -96,9 +96,9 @@ export default function ButtonsOptionsForm({ SSHC, switchState }: Props) {
|
|||||||
display: "flex",
|
display: "flex",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<IconButton sx={{ borderRadius: "6px", padding: "2px" }}>
|
{/* <IconButton sx={{ borderRadius: "6px", padding: "2px" }}>
|
||||||
<HideIcon style={{ color: "#4D4D4D" }} />
|
<HideIcon style={{ color: "#4D4D4D" }} />
|
||||||
</IconButton>
|
</IconButton> */}
|
||||||
<IconButton sx={{ borderRadius: "6px", padding: "2px" }}>
|
<IconButton sx={{ borderRadius: "6px", padding: "2px" }}>
|
||||||
<CopyIcon style={{ color: "#4D4D4D" }} />
|
<CopyIcon style={{ color: "#4D4D4D" }} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
|
@ -76,7 +76,9 @@ export const ContactForm = ({
|
|||||||
>
|
>
|
||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
width: "800px"
|
width: "530px",
|
||||||
|
borderRadius: "4px",
|
||||||
|
boxShadow: "rgba(0, 0, 0, 0.2) 0px 2px 1px -1px, rgba(0, 0, 0, 0.14) 0px 1px 1px 0px, rgba(0, 0, 0, 0.12) 0px 1px 3px 0px"
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|
||||||
@ -107,7 +109,7 @@ export const ContactForm = ({
|
|||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
|
|
||||||
<Paper
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
display: "flex",
|
display: "flex",
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
@ -174,7 +176,7 @@ export const ContactForm = ({
|
|||||||
Сделано на PenaQuiz
|
Сделано на PenaQuiz
|
||||||
</Typography>
|
</Typography>
|
||||||
</Box>
|
</Box>
|
||||||
</Paper>
|
</Box>
|
||||||
</Box >
|
</Box >
|
||||||
</Box >
|
</Box >
|
||||||
);
|
);
|
||||||
@ -206,10 +208,8 @@ const Inputs = (currentQuestion: any) => {
|
|||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
const Adress = <CustomInput onChange={({ target }) => setAdress(target.value)} id={adress} title={FC["address"].innerText || "Введите адрес"} desc={FC["address"].text || "адрес"} Icon={AddressIcon} />
|
const Adress = <CustomInput onChange={({ target }) => setAdress(target.value)} id={adress} title={FC["address"].innerText || "Введите адрес"} desc={FC["address"].text || "адрес"} Icon={AddressIcon} />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
if (Object.values(questions).some((data) => data.used)) {
|
if (Object.values(FC).some((data) => data.used)) {
|
||||||
return <>
|
return <>
|
||||||
{FC["name"].used ? Name : <></>}
|
{FC["name"].used ? Name : <></>}
|
||||||
{FC["email"].used ? Email : <></>}
|
{FC["email"].used ? Email : <></>}
|
||||||
|
@ -90,14 +90,14 @@ export default function QuizCard({ quiz, openCount = 0, applicationCount = 0, co
|
|||||||
gap: isMobile ? "10px" : "20px",
|
gap: isMobile ? "10px" : "20px",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Button
|
{/* <Button
|
||||||
variant="contained"
|
variant="contained"
|
||||||
sx={{
|
sx={{
|
||||||
padding: "10px 39px",
|
padding: "10px 39px",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Заявки
|
Заявки
|
||||||
</Button>
|
</Button> */}
|
||||||
<Button
|
<Button
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
startIcon={<PencilIcon />}
|
startIcon={<PencilIcon />}
|
||||||
@ -114,7 +114,7 @@ export default function QuizCard({ quiz, openCount = 0, applicationCount = 0, co
|
|||||||
>
|
>
|
||||||
{isMobile ? "" : "Редактировать"}
|
{isMobile ? "" : "Редактировать"}
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
{/* <Button
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
startIcon={<ChartIcon />}
|
startIcon={<ChartIcon />}
|
||||||
sx={{
|
sx={{
|
||||||
@ -125,7 +125,7 @@ export default function QuizCard({ quiz, openCount = 0, applicationCount = 0, co
|
|||||||
ml: 0,
|
ml: 0,
|
||||||
},
|
},
|
||||||
}}
|
}}
|
||||||
/>
|
/> */}
|
||||||
<IconButton
|
<IconButton
|
||||||
ref={subMenuRef}
|
ref={subMenuRef}
|
||||||
sx={{
|
sx={{
|
||||||
|
@ -85,6 +85,7 @@ export default function EditPage() {
|
|||||||
|
|
||||||
if (editQuizId) {
|
if (editQuizId) {
|
||||||
const questions = await questionApi.getList({ quiz_id: editQuizId });
|
const questions = await questionApi.getList({ quiz_id: editQuizId });
|
||||||
|
console.log(questions)
|
||||||
setQuestions(questions);
|
setQuestions(questions);
|
||||||
//Всегда должен существовать хоть 1 резулт - "line"
|
//Всегда должен существовать хоть 1 резулт - "line"
|
||||||
// console.log("сейчас будем ворошиться в этих квешенах ", questions);
|
// console.log("сейчас будем ворошиться в этих квешенах ", questions);
|
||||||
@ -154,6 +155,7 @@ export default function EditPage() {
|
|||||||
updateQuiz(quiz?.id, (state) => {
|
updateQuiz(quiz?.id, (state) => {
|
||||||
state.status = "stop";
|
state.status = "stop";
|
||||||
});
|
});
|
||||||
|
setButtonText("Опубликовать")
|
||||||
updateCanCreatePublic(false);
|
updateCanCreatePublic(false);
|
||||||
} else {
|
} else {
|
||||||
updateCanCreatePublic(true);
|
updateCanCreatePublic(true);
|
||||||
@ -164,7 +166,8 @@ export default function EditPage() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
updateQuestionHint(questions);
|
updateQuestionHint(questions);
|
||||||
}, [questions]);
|
|
||||||
|
}, [questions, quiz]);
|
||||||
|
|
||||||
const followNewPage = () => {
|
const followNewPage = () => {
|
||||||
setShowConfirmLeaveModal(false);
|
setShowConfirmLeaveModal(false);
|
||||||
|
@ -11,7 +11,7 @@ export const replaceSpacesToEmptyLines = <T = unknown>(object: T): T => {
|
|||||||
|
|
||||||
for (const [key, value] of Object.entries(object)) {
|
for (const [key, value] of Object.entries(object)) {
|
||||||
if (typeof value === "string") {
|
if (typeof value === "string") {
|
||||||
result[key] = value.replace(/ /g, "");
|
result[key] = value.replace(/\" \"/g, '""');
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user