поправил линтер, добавил кнопку добавления

codEnjoyer · Dec 14, 2023 · 3260f0e · 3260f0e
1 parent 3ce39af
commit 3260f0e
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 27 deletions.
diff --git a/frontend/src/UIComponents/customAddButton/CustomAddButton.tsx b/frontend/src/UIComponents/customAddButton/CustomAddButton.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+
+const CustomAddButton: React.FC = () => {
+    return (
+        <svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="35" cy="35" r="35" fill="#00D29D"/>
+            <path d="M35 10V60M10 34.5H35H60" stroke="white" strokeWidth="4"/>
+        </svg>
+    );
+};
+
+export default CustomAddButton;
diff --git a/frontend/src/UIComponents/customInput/CustomInput.tsx b/frontend/src/UIComponents/customInput/CustomInput.tsx
@@ -18,6 +18,7 @@ interface IPropTypes {
     register?: UseFormRegister<FormValues>,
     required?: boolean,
     value?: string,
+    handleOnChange?: (e: string) => void,
 }
 
 const CustomInput: React.FC<IPropTypes> =
@@ -33,6 +34,8 @@ const CustomInput: React.FC<IPropTypes> =
          defaultValue,
          register,
          validateRules,
+         value,
+         handleOnChange,
          ...inputProps
      }) => {
         return (
@@ -49,6 +52,8 @@ const CustomInput: React.FC<IPropTypes> =
                     defaultValue={defaultValue}
                     {...register !== undefined && name !== undefined ? {...register(name, validateRules)} : ""}
                     {...inputProps}
+                    value={value}
+                    onChange={(e) => handleOnChange ? (e.target.value) : undefined}
                 />
                 {/*{error.message && <span className="custom-input__error">{error.message}</span>}*/}
             </div>

diff --git a/frontend/src/components/authentication/AuthForm.tsx b/frontend/src/components/authentication/AuthForm.tsx
@@ -1,15 +1,15 @@
 import React, {useCallback, useState} from 'react';
 
-import CustomInput from "../../UIComponents/customInput/CustomInput.tsx";
-import CustomCheckbox from "../../UIComponents/customCheckbox/CustomCheckbox.tsx";
+import CustomInput from "../../UIComponents/customInput/CustomInput";
+import CustomCheckbox from "../../UIComponents/customCheckbox/CustomCheckbox";
 
 import {useNavigate} from "react-router-dom"
 import {useForm} from "react-hook-form";
 
 import {observer} from "mobx-react-lite";
 
-import authStore from "../../store/authStore.ts";
-import auth from "../../utils/auth.ts";
+import authStore from "../../store/authStore";
+import auth from "../../utils/auth";
 import Starfield from "react-starfield";
 
 export type FormValues = {
@@ -29,7 +29,6 @@ const AuthForm: React.FC = observer(() => {
 
     const onHandleSubmit = useCallback((data: { login: string, password: string }) => {
         authStore.signIn(data.login, data.password).then(() => navigateTo('/map'))
-        console.log(data.login, data.password)
     }, [navigateTo])
 
     return (

diff --git a/frontend/src/components/mapMenu/MapMenu.tsx b/frontend/src/components/mapMenu/MapMenu.tsx
@@ -54,7 +54,7 @@ const MapMenu: React.FC = observer(() => {
                 speedFactor={0.05}
                 backgroundColor="black"
             />
-            {user?.is_superuser
+            {!user?.is_superuser
                 ? <SuperUserMap/>
                 : <EmployeeMap user={user} formattedDate={formattedDate}/>
             }

diff --git a/frontend/src/components/mapMenu/SuperUserMap/SuperUserMap.tsx b/frontend/src/components/mapMenu/SuperUserMap/SuperUserMap.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect, useState} from 'react';
+import React, {useCallback, useEffect, useState} from 'react';
 import CustomButton from "../../../UIComponents/customButton/CustomButton.tsx";
 import mapMenuStore from "../../../store/mapMenuStore.ts";
 import CustomInput from "../../../UIComponents/customInput/CustomInput.tsx";
@@ -26,31 +26,33 @@ const SuperUserMap: React.FC<ISuperUserMap> = observer(() => {
         mapMenuStore.selectMap(map).then(() => mapMenuStore.changeCurrentMapIndex(indexMap))
     }
 
-    function handleOnClickChangeIsModalOpen() {
+    const handleOnClickChangeIsModalOpen = useCallback(() => {
         setIsUserListModalOpen(!isUsersListModalOpen)
-    }
-
+    }, [isUsersListModalOpen])
 
     return (
         <div>
-            {isUsersListModalOpen
-                ? <ModalWindow
-                    onClose={handleOnClickChangeIsModalOpen}
-                    body={<UsersListModalBody users={superUserStore.allUsers}/>}
-                    windowContentStyles=""
-                />
-                : ""}
+            {
+                isUsersListModalOpen
+                    ? <ModalWindow
+                        onClose={handleOnClickChangeIsModalOpen}
+                        body={<UsersListModalBody users={superUserStore.allUsers}/>}
+                        windowContentStyles=""
+                    />
+                    : ""
+            }
             <CustomButton handleOnClick={handleOnClickChangeIsModalOpen} text="Открыть список сотрудников"/>
-            <select>
-                {superUserStore.allUsers.map((user) =>
-                    <option key={user.username} value={user.username}>{user.username}</option>)}
-            </select>
+
+            {/*<select>*/}
+            {/*    {superUserStore.allUsers.map((user) =>*/}
+            {/*        <option key={user.username} value={user.username}>{user.username}</option>)}*/}
+            {/*</select>*/}
 
             <div className="map-create">
-                <CustomInput type="text" value={mapMenuStore.newNameMap}
-                             handleOnChange={(e) => mapMenuStore.changeNewMapName(e)}/>
                 <CustomButton text="Создать новую карту"
                               handleOnClick={() => mapMenuStore.createMap(mapMenuStore.newNameMap)}/>
+                <CustomInput type="text" value={mapMenuStore.newNameMap}
+                             handleOnChange={(e) => mapMenuStore.changeNewMapName(e)}/>
             </div>
 
             <select className="available-maps">

diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
@@ -2,18 +2,21 @@
   "compilerOptions": {
     "target": "ES2020",
     "useDefineForClassFields": true,
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "lib": [
+      "ES2020",
+      "DOM",
+      "DOM.Iterable"
+    ],
     "module": "ESNext",
     "skipLibCheck": true,
-
+    "esModuleInterop": true,
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
-
     /* Linting */
     "strict": true,
     "noUnusedLocals": true,
@@ -24,5 +27,9 @@
   "include": [
     "src"
   ],
-  "references": [{ "path": "./tsconfig.node.json"}]
+  "references": [
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
 }