SQuiz/frontPanel
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

закоммичено несколько неиспользуемых кнопок, фикс убирания пробелов, изменение верстки фк + отображение используемых инпутов, фикс залиапния кнопки публикации при автоотзыве при ошибке

Browse Source
This commit is contained in:
Nastya 2023-12-30 02:11:37 +03:00
parent f589393924
commit 96a0393fef
10 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/question.ts
View File

@ -26,8 +26,16 @@ async function getQuestionList(body?: Partial<GetQuestionListRequest>) {
body: { ...defaultGetQuestionListBody, ...body },
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) {

4
src/pages/Questions/ButtonsOptions.tsx
View File

@ -270,9 +270,9 @@ export default function ButtonsOptions({
gap: "6px",
}}
>
<IconButton sx={{ borderRadius: "6px", padding: "2px" }}>
{/* <IconButton sx={{ borderRadius: "6px", padding: "2px" }}>
<HideIcon style={{ color: "#4D4D4D" }} />
</IconButton>
</IconButton> */}
<IconButton
sx={{ borderRadius: "6px", padding: "2px" }}
onClick={() => copyQuestion(question.id, question.quizId)}

4
src/pages/Questions/ButtonsOptionsAndPict.tsx
View File

@ -303,9 +303,9 @@ export default function ButtonsOptionsAndPict({
padding: "20px",
}}
>
<IconButton sx={{ borderRadius: "6px", padding: "0px 2px" }}>
{/* <IconButton sx={{ borderRadius: "6px", padding: "0px 2px" }}>
<HideIcon style={{ color: "#4D4D4D" }} />
</IconButton>
</IconButton> */}
<IconButton
sx={{ borderRadius: "6px" }}
onClick={() => copyQuestion(question.id, question.quizId)}

4
src/pages/Questions/DraggableList/QuestionPageCard.tsx
View File

@ -239,7 +239,7 @@ export default function QuestionsPageCard({ question, draggableProps, isDragging
borderRight: "solid 1px #4D4D4D",
}}
>
<FormControlLabel
{/* <FormControlLabel
control={
<Checkbox
icon={
@ -265,7 +265,7 @@ export default function QuestionsPageCard({ question, draggableProps, isDragging
mr: 0,
userSelect: "none",
}}
/>
/> */}
<IconButton sx={{ padding: "0" }} onClick={() => copyQuestion(question.id, question.quizId)}>
<CopyIcon style={{ color: theme.palette.brightPurple.main }} />
</IconButton>

4
src/pages/Questions/Form/FormDraggableList/QuestionPageCard.tsx
View File

@ -209,7 +209,7 @@ export default function QuestionsPageCard({ question, questionIndex, draggablePr
borderRight: "solid 1px #4D4D4D",
}}
>
<FormControlLabel
{/* <FormControlLabel
control={
<Checkbox
icon={
@ -235,7 +235,7 @@ export default function QuestionsPageCard({ question, questionIndex, draggablePr
mr: 0,
userSelect: "none",
}}
/>
/> */}
<IconButton sx={{ padding: "0" }} onClick={() => copyQuestion(question.id, question.quizId)}>
<CopyIcon style={{ color: theme.palette.brightPurple.main }} />
</IconButton>

4
src/pages/ResultPage/DescriptionForm/ButtinsOptionsForm.tsx
View File

@ -96,9 +96,9 @@ export default function ButtonsOptionsForm({ SSHC, switchState }: Props) {
display: "flex",
}}
>
<IconButton sx={{ borderRadius: "6px", padding: "2px" }}>
{/* <IconButton sx={{ borderRadius: "6px", padding: "2px" }}>
<HideIcon style={{ color: "#4D4D4D" }} />
</IconButton>
</IconButton> */}
<IconButton sx={{ borderRadius: "6px", padding: "2px" }}>
<CopyIcon style={{ color: "#4D4D4D" }} />
</IconButton>

12
src/pages/ViewPublicationPage/ContactForm.tsx
View File

@ -76,7 +76,9 @@ export const ContactForm = ({
>
<Box
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>
<Paper
<Box
sx={{
display: "flex",
alignItems: "center",
@ -174,7 +176,7 @@ export const ContactForm = ({
Сделано на PenaQuiz
</Typography>
</Box>
</Paper>
</Box>
</Box >
</Box >
);
@ -206,10 +208,8 @@ const Inputs = (currentQuestion: any) => {
//@ts-ignore
const Adress = <CustomInput onChange={({ target }) => setAdress(target.value)} id={adress} title={FC["address"].innerText || "Введите адрес"} desc={FC["address"].text || "адрес"} Icon={AddressIcon} />
//@ts-ignore
if (Object.values(questions).some((data) => data.used)) {
if (Object.values(FC).some((data) => data.used)) {
return <>
{FC["name"].used ? Name : <></>}
{FC["email"].used ? Email : <></>}

8
src/pages/createQuize/QuizCard.tsx
View File

@ -90,14 +90,14 @@ export default function QuizCard({ quiz, openCount = 0, applicationCount = 0, co
gap: isMobile ? "10px" : "20px",
}}
>
<Button
{/* <Button
variant="contained"
sx={{
padding: "10px 39px",
}}
>
Заявки
</Button>
</Button> */}
<Button
variant="outlined"
startIcon={<PencilIcon />}
@ -114,7 +114,7 @@ export default function QuizCard({ quiz, openCount = 0, applicationCount = 0, co
>
{isMobile ? "" : "Редактировать"}
</Button>
<Button
{/* <Button
variant="outlined"
startIcon={<ChartIcon />}
sx={{
@ -125,7 +125,7 @@ export default function QuizCard({ quiz, openCount = 0, applicationCount = 0, co
ml: 0,
},
}}
/>
/> */}
<IconButton
ref={subMenuRef}
sx={{

5
src/pages/startPage/EditPage.tsx
View File

@ -85,6 +85,7 @@ export default function EditPage() {
if (editQuizId) {
const questions = await questionApi.getList({ quiz_id: editQuizId });
console.log(questions)
setQuestions(questions);
//Всегда должен существовать хоть 1 резулт - "line"
// console.log("сейчас будем ворошиться в этих квешенах ", questions);
@ -154,6 +155,7 @@ export default function EditPage() {
updateQuiz(quiz?.id, (state) => {
state.status = "stop";
});
setButtonText("Опубликовать")
updateCanCreatePublic(false);
} else {
updateCanCreatePublic(true);
@ -164,7 +166,8 @@ export default function EditPage() {
useEffect(() => {
updateQuestionHint(questions);
}, [questions]);
}, [questions, quiz]);
const followNewPage = () => {
setShowConfirmLeaveModal(false);

2
src/utils/replaceSpacesToEmptyLines.ts
View File

@ -11,7 +11,7 @@ export const replaceSpacesToEmptyLines = <T = unknown>(object: T): T => {
for (const [key, value] of Object.entries(object)) {
if (typeof value === "string") {
result[key] = value.replace(/ /g, "");
result[key] = value.replace(/\" \"/g, '""');
continue;
}