From a273f1a88eea801ea5866c44eb292b45b08f83af Mon Sep 17 00:00:00 2001
From: krokodilka <nastyab015@yandex.ru>
Date: Thu, 14 Jul 2022 20:11:00 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B2=D0=B8=D1=82=D1=87=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D1=82=D0=B8=D0=BF=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/create/createQuestion.tsx | 48 +++++------------------------
 src/create/settings.tsx       |  3 +-
 src/create/tools/list.tsx     | 37 ----------------------
 src/create/types.tsx          | 58 +++++++++++++++++++++++++++++++++++
 src/index.tsx                 |  4 +--
 5 files changed, 68 insertions(+), 82 deletions(-)
 delete mode 100644 src/create/tools/list.tsx
 create mode 100644 src/create/types.tsx

diff --git a/src/create/createQuestion.tsx b/src/create/createQuestion.tsx
index b93c5f4a..98355571 100644
--- a/src/create/createQuestion.tsx
+++ b/src/create/createQuestion.tsx
@@ -6,6 +6,7 @@ import {
 import 'suneditor/dist/css/suneditor.min.css'; // Import Sun Editor's CSS File
 import Description from "./description";
 import Settings from "./settings";
+import Types from "./types";
 
 //Значения, собираемые для отправки на бэк
 interface Values {
@@ -30,8 +31,7 @@ const types = [
     {desc:"кнопка", value:"button"},
     {desc:"ничего", value:"none"}
 ]
-
-const TextField = (props: any) => {
+export const TextField = (props: any) => {
 
     const [field, meta, helpers] = useField(props);
 
@@ -217,45 +217,11 @@ export default () => {
                         <VStack>
                             <TextField placeholder="Заголовок" name="title" type="text" />
                             <Description name="description"/>
-                            {
-                                type === 0 ? //Тип вопроса - текст?
-                                    <TextField name="text" placeholder="текст" type="text" />
-                                    :
-                                    type === 3 ? //Тип вопроса - файл?
-                                        <input type="file"/>
-                                    :
-                                    stockroom.length === 0 ? //В поле для юзерских данных есть что-то?
-                                        null //Ничего не внесено
-                                        :
-                                        type === 1 ? //Тип вопроса - селект?
-                                            <Select
-                                            >
-                                                {
-                                                    stockroom.map((e: any, i: number) => {
-                                                        return <option key={i}>{e.text}</option>
-                                                    })
-                                                }
-                                            </Select>
-                                            :
-                                            type === 2 ? //Тип вопроса - чекбокс?
-                                                stockroom.map((e:any, i:number) => {
-                                                    return <Checkbox key={i}>{e.text}</Checkbox>
-                                                })
-                                                    :
-                                                    type === 4 ? //Тип вопроса - кнопка?
-                                                        stockroom.map((e:any, i:number) => {
-                                                            return <Button
-                                                                        backgroundColor={e.color}
-                                                                        key={i}
-                                                                        onClick={(event: any) => {
-                                                                            changeFocus(e.id)
-                                                                            event.target.blur()
-                                                                        }}
-                                                                   >{e.text}</Button>
-                                                        })
-                                                        :
-                                                        null //Тип вопроса - ничего
-                            }
+                            <Types
+                                type={type}
+                                stockroom={stockroom}
+                                changeFocus={changeFocus}
+                            />
                         </VStack>
 
                         <Settings
diff --git a/src/create/settings.tsx b/src/create/settings.tsx
index 340016c6..c82ff3d6 100644
--- a/src/create/settings.tsx
+++ b/src/create/settings.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
-import {Box, Button, Checkbox, Container, Select, Textarea} from "@chakra-ui/react";
+import {Box, Button, Checkbox, Container, Select} from "@chakra-ui/react";
 import Buttons from "./tools/buttons"
-import List from "./tools/list"
 
 export default (props: any) => {
 
diff --git a/src/create/tools/list.tsx b/src/create/tools/list.tsx
deleted file mode 100644
index 6965db45..00000000
--- a/src/create/tools/list.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import {Button, VStack, HStack, Textarea, Container, Text, CloseButton} from "@chakra-ui/react";
-
-
-
-export default ({stockroom}: {stockroom: any,}) => {
-    const [color, setColor] = React.useState("#fff")
-
-    return(
-        <HStack>
-            <Button
-
-            >Добавить</Button>
-
-            <Textarea
-                placeholder="описание"
-            />
-
-            <VStack
-                border="1px solid gray"
-                height="100px"
-                minWidth="30%"
-                overflow="auto"
-            >
-                {
-                    stockroom.map((e:any, i:number) => {
-                        return(
-                            <Container border="1px solid lightgray" key={i} display="inline-flex" alignItems="center">
-                                <Text>{e.text}</Text><CloseButton/>
-                            </Container>
-                        )
-                    })
-                }
-            </VStack>
-        </HStack>
-    )
-}
\ No newline at end of file
diff --git a/src/create/types.tsx b/src/create/types.tsx
new file mode 100644
index 00000000..33608f52
--- /dev/null
+++ b/src/create/types.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import {
+    Select, Checkbox, Button,
+} from '@chakra-ui/react'
+import {TextField} from "./createQuestion";
+
+export default (props:any) => {
+    switch(props.type) {
+        case 0://Тип вопроса - текст?
+            return (<TextField name="text" placeholder="текст" type="text" />)
+            break;
+        case 1://Тип вопроса - селект?
+            return (
+                <Select>
+                    {
+                        props.stockroom.map((e: any, i: number) => {
+                            return <option key={i}>{e.text}</option>
+                        })
+                    }
+                </Select>
+            )
+            break;
+        case 2://Тип вопроса - чекбокс?
+            return(
+                <>
+                    {
+                        props.stockroom.map((e:any, i:number) => {
+                            return <Checkbox key={i}>{e.text}</Checkbox>
+                        })
+                    }
+                </>
+            )
+            break;
+        case 3://Тип вопроса - файл?
+            return (<input type="file"/>)
+            break;
+        case 4://Тип вопроса - кнопка?
+            return(
+                <>
+                    {
+                        props.stockroom.map((e:any, i:number) => {
+                            return <Button
+                                backgroundColor={e.color}
+                                key={i}
+                                onClick={(event: any) => {
+                                    props.changeFocus(e.id)
+                                    event.target.blur()
+                                }}
+                            >{e.text}</Button>
+                        })
+                    }
+                </>
+            )
+            break;
+        default:
+            return <></>
+    }
+}
\ No newline at end of file
diff --git a/src/index.tsx b/src/index.tsx
index 1dd16339..d8f8504f 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -13,7 +13,7 @@ const root = ReactDOM.createRoot(
 );
 root.render(
 
-  // <React.StrictMode>
+  <React.StrictMode>
       <ChakraProvider>
           <SnackbarProvider maxSnack={3}>
               <BrowserRouter>
@@ -26,5 +26,5 @@ root.render(
               </BrowserRouter>
           </SnackbarProvider>
         </ChakraProvider>
-  // </React.StrictMode>
+  </React.StrictMode>
 );
\ No newline at end of file