ddd

src/Components/AddUsersPage/index.jsx

@@ -7,7 +7,6 @@ import Box from '@mui/material/Box';
 import del from '../../img/AddUsers/delete.png';
 import perm from '../../img/AddUsers/permission.png';
 import newAvatar from '../../img/AddUsers/newAvatar.png';
-import Users from '../post/Users';
 const style = {
     position: 'absolute',
     top: '50%',
@@ -145,7 +144,6 @@ const AddUsers = () => {
                             </div>
                         </Box>
                     </Modal>
-                    <Users></Users>
             </section>
 
         </>

src/Components/HomePage/index.jsx

@@ -1,17 +1,15 @@
 import Header from "../Header";
 import styles from "./style.module.scss";
-// import TableMeets from '../TableMeets/TableMeets'
+import TableMeets from '../TableMeets/TableMeets'
 // import EditForm from "../edit/EditMeetsForm";
 // import PostForm from "../post/Meets";
-// import Users from "../post/Users";
+import Users from "../post/Users";
 // import User from "../get/User";
-// import Questions from "../post/Questions";
+import Questions from "../post/Questions";
-// import { GetQuestions } from "../get/Questions";
+import { GetQuestions } from "../get/Questions";
 
 
 import muza from '../../img/homePage/muza.png';
-import Home from "../Home/Home";
-import { useNavigate } from "react-router-dom";
 const APIURL = ''
 
 // const events = [
@@ -38,7 +36,6 @@ const APIURL = ''
 //     // Добавьте другие мероприятия сюда
 //   ];
 const HomePage = () => {
-    
     return (
     <>
 
@@ -76,13 +73,14 @@ const HomePage = () => {
                 <div className={styles.card}></div>
             </div>
             {/* <Questions></Questions> */}
-            <Home></Home>
+            {/* <Home></Home> */}
-            
+            {/* <FetchUtils></FetchUtils> */}
-            
+            {/* <PostForm /> */}
+            {/* <EditForm /> */}
             {/* <Users></Users> */}
-            
+            {/* <User></User> */}
             {/* <GetQuestions></GetQuestions> */}
-            {/* <Users></Users> */}
+            <Users></Users>
 
         </section>
         

src/Components/HomePageAdmin/index.jsx

@@ -7,7 +7,6 @@ import TableMeets from '../TableMeets/TableMeets'
 // import PostForm from "../post/PostForm";
 // import GetMeets from '../get/Meets';
 import { useNavigate } from "react-router-dom";
-import Users from "../post/Users";
 const APIURL = ''
 
 // const events = [
@@ -69,7 +68,6 @@ const HomePage = () => {
             <div className={styles.cards__container}>
                 <div className={styles.card}></div>
             </div>
-            <Users></Users>
             {/* <Home></Home> */}
             {/* <FetchUtils></FetchUtils> */}
             {/* <PostForm /> */}

src/Components/MeetAuthPageAdmin/index.jsx

@@ -15,7 +15,6 @@ import book from '../../img/MeetPage/Book.png';
 import * as React from 'react';
 import Modal from '@mui/material/Modal';
 import newAvatarSecond from '../../img/AddUsers/newAvatar.png';
-import EditMeetsForm from "../edit/EditMeetsForm";
 
 const style = {
   position: 'absolute',
@@ -111,7 +110,7 @@ const MeetPage = () => {
                     <button className={styles.newMeeting__button}>Опубликовать мероприятие</button>
                 </div>
                
-                <EditMeetsForm></EditMeetsForm>
+                
             </section>
             
         </>

src/Components/profilePage/index.jsx

@@ -3,9 +3,6 @@ import styles from "./style.module.scss"
 import Calendar from "../Calendar";
 import avatar from '../../img/profilePage/avatar.png';
 import gift from '../../img/profilePage/gift.png';
-import Users from "../post/Users";
-import EditMeetsForm from "../edit/EditMeetsForm";
-import PostForm from "../post/Meets";
 // import Home from '../Home/Home';
 const ProfilePage = () => {
 
@@ -64,8 +61,6 @@ const ProfilePage = () => {
                     {/* <FetchUtils></FetchUtils> */}
                     {/* <PostForm /> */}
                     {/* <EditForm /> */}
-                    <Users></Users>
-                    <PostForm></PostForm>
                 </div>
             </section>
         </>

src/components/Home/Home.jsx

@@ -1,76 +1,71 @@
-import React from 'react';
+// import React from 'react';
-import './style.css'
+// import './style.css'
-import styled from 'styled-components';
+// import styled from 'styled-components';
-import { HttpApiMethods } from '../utils/FetchUtils';
+// // import { HttpApiMethods } from '../utils/FetchUtils';
-import {useState} from 'react'
+// import {useState} from 'react'
-import EditForm from '../post/Meets';
+// import EditForm from '../post/Meets';
-import Grid from '@mui/material/Grid';
+// import Grid from '@mui/material/Grid';
-import Card from '../Card';
+// import Card from '../Card';
-import Box from '@mui/material/Box';
+// import Box from '@mui/material/Box';
-import { useNavigate } from 'react-router-dom';
 
-function extractDateTime(dateString) {
+// function extractDateTime(dateString) {
-    const dateTime = new Date(dateString);
+//     const dateTime = new Date(dateString);
-    const date = dateTime.toLocaleDateString();
+//     const date = dateTime.toLocaleDateString();
-    const time = dateTime.toLocaleTimeString();
+//     const time = dateTime.toLocaleTimeString();
     
-    return { date, time };
+//     return { date, time };
-}
+// }
 
-const httpApiMethods = new HttpApiMethods()
+// const httpApiMethods = new HttpApiMethods()
 
-const meets = await httpApiMethods.GetMeetings()
+// const meets = await httpApiMethods.GetMeetings()
 
 
-const Home = () => {
+// const Home = () => {
-    const [count, setCount] = useState(7)
+//     const [count, setCount] = useState(7)
-    const navigate = useNavigate()
    
-    const handleNeed = () => {
+//     const filterMeet = meets.filter( (item, index) => index <= count )
-        navigate('/firstMeetAuth')
+//     const allMeets = () => {
-    }
+//         setCount(meets.length)
-    const filterMeet = meets.filter( (item, index) => index <= count )
+//     }
-    const allMeets = () => {
+//     return (
-        setCount(meets.length)
+//         <>
-    }
+//             <Box sx={{ flexGrow: 1, display: 'flex', justifyContent: 'flex-end', alignItems:'center'}}>
-    return (
+//                 <Grid container sx={{width: '96%'}}>
-        <>
-            <Box sx={{ flexGrow: 1, display: 'flex', justifyContent: 'flex-end', alignItems:'center'}}>
-                <Grid container sx={{width: '96%'}}>
 
                 
-                {Array.isArray(meets) ? (
+//                 {Array.isArray(meets) ? (
-                    filterMeet.map((item, index) => (
+//                     filterMeet.map((item, index) => (
                     
                         
-                        <Grid item sm={6} xl={3} md={6} lg={4} key={index}>
+//                         <Grid item sm={6} xl={3} md={6} lg={4} key={index}>
-                             <div onClick={handleNeed} className='event_card' >
+//                              <div className='event_card' >
-                                <div className="event-card__photo"><img className='img' src={httpApiMethods.APIURL_FILES + item.speackerImage} alt="{item.speackerImage}" /></div>
+//                                 <div className="event-card__photo"><img className='img' src={httpApiMethods.APIURL_FILES + item.speackerImage} alt="{item.speackerImage}" /></div>
-                                    <div className="taggs">
+//                                     <div className="taggs">
-                                        <div className='tagged'>{item.tags}</div>
+//                                         <div className='tagged'>{item.tags}</div>
-                                        <div className="feautures">{item.type}</div>
+//                                         <div className="feautures">{item.type}</div>
-                                    </div>
+//                                     </div>
-                                <h4 className="event-card__title">{item.title}</h4>
+//                                 <h4 className="event-card__title">{item.title}</h4>
-                                <p className="event-card__date">{extractDateTime(item.time).date}, в {extractDateTime(item.time).time} по Московскому времени</p>
+//                                 <p className="event-card__date">{extractDateTime(item.time).date}, в {extractDateTime(item.time).time} по Московскому времени</p>
-                            </div>
+//                             </div>
-                        </Grid>
+//                         </Grid>
                     
                     
                     
-                    ))
+//                     ))
-                ) : (
+//                 ) : (
-                    <p>Неверный тип данных с сервера!</p>
+//                     <p>Неверный тип данных с сервера!</p>
-                )}
+//                 )}
-                {/* <EditForm></EditForm> */}
+//                 {/* <EditForm></EditForm> */}
-                </Grid>
+//                 </Grid>
-            </Box>
+//             </Box>
-            <div className='allButton__container'>
+//             <div className='allButton__container'>
-                <button onClick={allMeets} className='allButton'>Все мероприятия</button>
+//                 <button onClick={allMeets} className='allButton'>Все мероприятия</button>
-            </div>
+//             </div>
-        </>
+//         </>
         
         
-    );
+//     );
-}
+// }
 
-export default Home;
+// export default Home;

src/components/edit/EditMeetsForm.jsx

@@ -56,7 +56,7 @@ const EditMeetsForm = () => {
 
     return (
         <div>
-            <h2>Редактирование мероприятий</h2>
+            <h2>Edit</h2>
             <div>{dataIsLoad ? "Данные успешно загружены" : ""}</div>
 
             <ul>

src/components/post/Meets.jsx

@@ -1,6 +1,5 @@
 import React, { useRef, useState } from 'react';
 import { HttpApiMethods } from '../utils/FetchUtils';
-import Cookies from 'js-cookie';
 
 
 const PostForm = () => {
@@ -8,11 +7,10 @@ const PostForm = () => {
     const [dataIsLoad, setDataIsLoad] = useState(false)
 
     let post = async () => {
-        const token = Cookies.get('token')
         const httpApiMethods = new HttpApiMethods();
         let formData = new FormData(formRef.current); // Изменение этой строки
         setDataIsLoad(false)
-        const updatedMeets = httpApiMethods.AddMeetings(formData, token)
+        const updatedMeets = httpApiMethods.AddMeetings(formData)
         .then(
             () => {
                 setDataIsLoad(true)
@@ -24,7 +22,7 @@ const PostForm = () => {
 
     return (
         <div>
-            <h2>Создать мероприятие</h2>
+            <h2>Post</h2>
             <div>{dataIsLoad ? "ДАнные успешно загрузилисб" : ""}</div>
             <form ref={formRef} action=''>
                 <input type="text" placeholder='title' name='title'/>

src/components/post/Users.jsx

@@ -21,7 +21,7 @@ const Users = () => {
         const httpApiMethods = new HttpApiMethods();
         let formData = new FormData(formRef.current);
 
-        if (!formData.get('fio') || !formData.get('avatar') || !formData.get('username') || !formData.get('specialities') || !formData.get('email') || !formData.get('telegramBotUrl')) {
+        if (!formData.get('fio') || !formData.get('avatar') || !formData.get('username') || !formData.get('specialities') || !formData.get('telegramBotUrl')) {
             console.error('Ошибка: Не все поля формы заполнены');
             return;
         }
@@ -47,7 +47,6 @@ const Users = () => {
                 <input type="text" placeholder='fio' name='fio' />
                 <input type="file" placeholder='avatar' name='avatar' />
                 <input type="text" placeholder='username' name='username' />
-                <input type="email" placeholder='email' name='email' />
                 <input type="text" placeholder='specialities' name='specialities' />
                 <input type="text" placeholder='telegramBotUrl' name='telegramBotUrl' />
                 <button onClick={post}>Create</button>