добавляет исправленные типы

codEnjoyer · Nov 19, 2023 · 1616500 · 1616500
1 parent c8180bd
commit 1616500
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 149 deletions.
diff --git a/frontend/src/components/mapMenu/MapMenu.tsx b/frontend/src/components/mapMenu/MapMenu.tsx
@@ -5,9 +5,8 @@ import Coins from "./UIMapMenu/Coins.tsx";
 import './../../styles/mapMenu.scss'
 import ChooseModuleWindow from "./UIMapMenu/ChooseModuleWindow.tsx";
 import UserProfile from "./UIMapMenu/UserProfile.tsx";
-import StarUnit from "./UIMapMenu/Level/StarUnit.tsx";
+import Module from "./UIMapMenu/Level/Module.tsx";
 import mapMenuStore from "../../store/mapMenuStore.ts";
-import {ILevelType} from "../../types/LevelType.ts";
 
 const MapMenu: React.FC = () => {
     const navigate = useNavigate()
@@ -24,54 +23,6 @@ const MapMenu: React.FC = () => {
         })
     }, [navigate])
 
-    // const onHandleSignOut = () => {
-    //     authStore.logOutUser().then()
-    //     navigate('/')
-    // }
-
-    const geolocations: ILevelType[] = [
-        {
-            id: "1",
-            levels: {
-                levelName: "Уровень 1",
-                title: "Собери помидорки",
-                menu: [{
-                    taskName: "test",
-                    body: "Какая-то информация которая очень хорошо тебе поведает тайну о помидорках и ещё какая-то информация которая очень хорошо тебе поведает тайну о помидорках ",
-                }]
-            }
-        },
-        {
-            id: "2",
-            level: {
-                levelName: "Уровень 2",
-                title: "Собери не помидорки",
-                menu: [{
-                    taskName: "theory",
-                    body: "Я уже не помидорка"
-                }]
-            }
-        },
-        {
-            id: "3",
-            level: {
-                levelName: "Уровень 3",
-                title: "Начни текст",
-                menu: [
-                    {
-                        taskName: "video",
-                        body: "Я помидорка"
-                    },
-                    {
-                        taskName: "test",
-                        body: "БУБУБУБУ"
-                    }
-                ]
-            }
-        },
-
-    ]
-
     return (
         <div>
             <Coins coins={100} additionalClassname="coins"/>
@@ -81,10 +32,9 @@ const MapMenu: React.FC = () => {
             <div className="geolocations">
                 <div className="geolocations__wrapper">
                     {geolocations.map((geolocation) =>
-                        <StarUnit id={geolocation.id} level={geolocation.level} key={geolocation.id}/>)}
+                        <Module id={geolocation.id} level={geolocation.level} key={geolocation.id}/>)}
                 </div>
             </div>
-            {/*<CustomButton text="Выйти" handleOnClick={onHandleSignOut}/>*/}
         </div>
     );
 };

diff --git a/...ents/mapMenu/UIMapMenu/Level/StarUnit.tsx → ...onents/mapMenu/UIMapMenu/Level/Module.tsx b/...ents/mapMenu/UIMapMenu/Level/StarUnit.tsx → ...onents/mapMenu/UIMapMenu/Level/Module.tsx
@@ -1,14 +1,14 @@
 import React, {useState} from 'react';
 import ModalWindow from "../../../../UIComponents/modalWindow/ModalWindow.tsx";
 import ModalLevelBody from "./ModalLevelBody.tsx";
-import {LevelType} from "../../../../types/LevelType.ts";
+import {ILevelType} from "../../../../types/LevelType.ts";
 
 interface IGeolocationProps {
     id: number,
-    level: LevelType
+    level: ILevelType
 }
 
-const StarUnit: React.FC<IGeolocationProps> = ({id, level}) => {
+const Module: React.FC<IGeolocationProps> = ({id, level}) => {
     const [isOpenModalWindow, setOpenModalWindow] = useState(false)
     const classNameGeolocation = "geolocation-" + id
     return (
@@ -17,8 +17,8 @@ const StarUnit: React.FC<IGeolocationProps> = ({id, level}) => {
             {isOpenModalWindow
                 ? <ModalWindow
                     onClose={() => setOpenModalWindow(!isOpenModalWindow)}
-                    body={<ModalLevelBody levelName={level.levelName} title={level.title}
-                                          menu={level.menu}/>}
+                    body={<ModalLevelBody levelName={level} title={level}
+                                          menu={level}/>}
                 />
                 : ""}
 
@@ -45,4 +45,4 @@ const StarUnit: React.FC<IGeolocationProps> = ({id, level}) => {
 };
 
 
-export default StarUnit;
+export default Module;
diff --git a/frontend/src/components/mapMenu/UIMapMenu/Level/modalLevelBody.css b/frontend/src/components/mapMenu/UIMapMenu/Level/modalLevelBody.css
diff --git a/frontend/src/components/mapMenu/UIMapMenu/Level/modalLevelBody.css.map b/frontend/src/components/mapMenu/UIMapMenu/Level/modalLevelBody.css.map
diff --git a/frontend/src/store/mapMenuStore.ts b/frontend/src/store/mapMenuStore.ts
@@ -1,10 +1,14 @@
 import {makeAutoObservable} from "mobx";
 import axios from "axios";
+import {IMapType} from "../types/MapType.ts";
 import {IModuleType} from "../types/ModuleType.ts";
 
 class MapMenuStore {
-    mapMenu: IModuleType[] = []
-    availableMaps: { id: string }[] = []
+    mapMenu: IMapType | null = null
+    availableMaps: IMapType[] = []
+
+    modulesMap: IModuleType | null = null
+    availableModules: IModuleType[] = []
 
     constructor() {
         makeAutoObservable(this)
@@ -18,9 +22,9 @@ class MapMenuStore {
         await axios.get("http://localhost:8000/maps/" + id).then((response) => this.mapMenu = response.data)
     }
 
-    // setModulesMap(newModulesMap: IModuleType[]) {
-    //     this.modulesMap = newModulesMap
-    // }
+    setModulesMap(newModulesMap: IModuleType) {
+        this.modulesMap = newModulesMap
+    }
 
     // updateMapById(id: string) {
     //     axios.patch(id, {

diff --git a/frontend/src/types/LevelType.ts b/frontend/src/types/LevelType.ts
@@ -1,10 +1,6 @@
-import {ITaskType} from "./TaskType.ts";
-
 export interface ILevelType {
     id: string,
-    levels: {
-        levelName: string,
-        title: string
-        menu: ITaskType[]
-    }[]
+    name: string,
+    body: string,
+    tasks: string[]
 }
diff --git a/frontend/src/types/MapType.ts b/frontend/src/types/MapType.ts
@@ -1,7 +1,5 @@
-import {IModuleType} from "./ModuleType.ts";
-
 export interface IMapType {
     id: string,
     title: string,
-    modules_ids: IModuleType[]
+    modules_ids: string[]
 }
diff --git a/frontend/src/types/ModuleType.ts b/frontend/src/types/ModuleType.ts
@@ -1,8 +1,8 @@
-import {ILevelType} from "./LevelType.ts";
-
 export interface IModuleType {
-    mapId: string,
+    map_id: string,
     title: string,
-    moduleId: string,
-    modules_ids: ILevelType[]
+    previous_module_id: string,
+    next_module_id: string,
+    id: string,
+    levels_ids: string[]
 }
diff --git a/frontend/src/types/RouteType.ts b/frontend/src/types/RouteType.ts
@@ -5,4 +5,3 @@ export interface IRouteType {
     path: string,
     element: ReactNode
 }
-
diff --git a/frontend/src/types/TaskType.ts b/frontend/src/types/TaskType.ts
@@ -1,4 +1,5 @@
 export interface ITaskType {
-    taskName: string,
+    id: string,
+    name: string,
     body: string
 }