From 5801a6b2be279b653d5ae55c5c3565473cde304a Mon Sep 17 00:00:00 2001 From: Demi-Play Date: Sun, 24 Dec 2023 14:52:27 +0300 Subject: [PATCH] funct --- src/Components/AddUsersPage/index.jsx | 2 + src/Components/HomePage/index.jsx | 12 +-- src/Components/HomePageAdmin/index.jsx | 2 + src/Components/MeetAuthPageAdmin/index.jsx | 3 +- src/Components/profilePage/index.jsx | 5 + src/components/Home/Home.jsx | 108 ++++++++++----------- src/components/edit/EditMeetsForm.jsx | 2 +- src/components/post/Meets.jsx | 6 +- src/components/post/Users.jsx | 3 +- 9 files changed, 78 insertions(+), 65 deletions(-) diff --git a/src/Components/AddUsersPage/index.jsx b/src/Components/AddUsersPage/index.jsx index e55707e..f598ec6 100644 --- a/src/Components/AddUsersPage/index.jsx +++ b/src/Components/AddUsersPage/index.jsx @@ -7,6 +7,7 @@ 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%', @@ -144,6 +145,7 @@ const AddUsers = () => { + diff --git a/src/Components/HomePage/index.jsx b/src/Components/HomePage/index.jsx index 2e242f0..41f0dce 100644 --- a/src/Components/HomePage/index.jsx +++ b/src/Components/HomePage/index.jsx @@ -10,6 +10,7 @@ import { GetQuestions } from "../get/Questions"; import muza from '../../img/homePage/muza.png'; +import Home from "../Home/Home"; const APIURL = '' // const events = [ @@ -73,14 +74,13 @@ const HomePage = () => {
{/* */} - {/* */} - {/* */} - {/* */} - {/* */} + + + {/* */} - {/* */} + {/* */} - + {/* */} diff --git a/src/Components/HomePageAdmin/index.jsx b/src/Components/HomePageAdmin/index.jsx index 8292045..4b003f1 100644 --- a/src/Components/HomePageAdmin/index.jsx +++ b/src/Components/HomePageAdmin/index.jsx @@ -7,6 +7,7 @@ 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 = [ @@ -68,6 +69,7 @@ const HomePage = () => {
+ {/* */} {/* */} {/* */} diff --git a/src/Components/MeetAuthPageAdmin/index.jsx b/src/Components/MeetAuthPageAdmin/index.jsx index 5ea1bd5..c993882 100644 --- a/src/Components/MeetAuthPageAdmin/index.jsx +++ b/src/Components/MeetAuthPageAdmin/index.jsx @@ -15,6 +15,7 @@ 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', @@ -110,7 +111,7 @@ const MeetPage = () => { - + diff --git a/src/Components/profilePage/index.jsx b/src/Components/profilePage/index.jsx index 0f11dd7..b96fcac 100644 --- a/src/Components/profilePage/index.jsx +++ b/src/Components/profilePage/index.jsx @@ -3,6 +3,9 @@ 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 = () => { @@ -61,6 +64,8 @@ const ProfilePage = () => { {/* */} {/* */} {/* */} + + diff --git a/src/components/Home/Home.jsx b/src/components/Home/Home.jsx index 5c35c85..299803c 100644 --- a/src/components/Home/Home.jsx +++ b/src/components/Home/Home.jsx @@ -1,71 +1,71 @@ -// import React from 'react'; -// import './style.css' -// import styled from 'styled-components'; -// // import { HttpApiMethods } from '../utils/FetchUtils'; -// import {useState} from 'react' -// import EditForm from '../post/Meets'; -// import Grid from '@mui/material/Grid'; -// import Card from '../Card'; -// import Box from '@mui/material/Box'; +import React from 'react'; +import './style.css' +import styled from 'styled-components'; +import { HttpApiMethods } from '../utils/FetchUtils'; +import {useState} from 'react' +import EditForm from '../post/Meets'; +import Grid from '@mui/material/Grid'; +import Card from '../Card'; +import Box from '@mui/material/Box'; -// function extractDateTime(dateString) { -// const dateTime = new Date(dateString); -// const date = dateTime.toLocaleDateString(); -// const time = dateTime.toLocaleTimeString(); +function extractDateTime(dateString) { + const dateTime = new Date(dateString); + const date = dateTime.toLocaleDateString(); + 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 [count, setCount] = useState(7) +const Home = () => { + const [count, setCount] = useState(7) -// const filterMeet = meets.filter( (item, index) => index <= count ) -// const allMeets = () => { -// setCount(meets.length) -// } -// return ( -// <> -// -// + const filterMeet = meets.filter( (item, index) => index <= count ) + const allMeets = () => { + setCount(meets.length) + } + return ( + <> + + -// {Array.isArray(meets) ? ( -// filterMeet.map((item, index) => ( + {Array.isArray(meets) ? ( + filterMeet.map((item, index) => ( -// -//
-//
{item.speackerImage}
-//
-//
{item.tags}
-//
{item.type}
-//
-//

{item.title}

-//

{extractDateTime(item.time).date}, в {extractDateTime(item.time).time} по Московскому времени

-//
-// + +
+
{item.speackerImage}
+
+
{item.tags}
+
{item.type}
+
+

{item.title}

+

{extractDateTime(item.time).date}, в {extractDateTime(item.time).time} по Московскому времени

+
+ -// )) -// ) : ( -//

Неверный тип данных с сервера!

-// )} -// {/* */} -// -// -//
-// -//
-// + )) + ) : ( +

Неверный тип данных с сервера!

+ )} + {/* */} + + +
+ +
+ -// ); -// } + ); +} -// export default Home; +export default Home; diff --git a/src/components/edit/EditMeetsForm.jsx b/src/components/edit/EditMeetsForm.jsx index 42a6ae6..381b127 100644 --- a/src/components/edit/EditMeetsForm.jsx +++ b/src/components/edit/EditMeetsForm.jsx @@ -56,7 +56,7 @@ const EditMeetsForm = () => { return (
-

Edit

+

Редактирование мероприятий

{dataIsLoad ? "Данные успешно загружены" : ""}
    diff --git a/src/components/post/Meets.jsx b/src/components/post/Meets.jsx index e41febd..911576e 100644 --- a/src/components/post/Meets.jsx +++ b/src/components/post/Meets.jsx @@ -1,5 +1,6 @@ import React, { useRef, useState } from 'react'; import { HttpApiMethods } from '../utils/FetchUtils'; +import Cookies from 'js-cookie'; const PostForm = () => { @@ -7,10 +8,11 @@ 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) + const updatedMeets = httpApiMethods.AddMeetings(formData, token) .then( () => { setDataIsLoad(true) @@ -22,7 +24,7 @@ const PostForm = () => { return (
    -

    Post

    +

    Создать мероприятие

    {dataIsLoad ? "ДАнные успешно загрузилисб" : ""}
    diff --git a/src/components/post/Users.jsx b/src/components/post/Users.jsx index 00e073c..c997569 100644 --- a/src/components/post/Users.jsx +++ b/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('telegramBotUrl')) { + if (!formData.get('fio') || !formData.get('avatar') || !formData.get('username') || !formData.get('specialities') || !formData.get('email') || !formData.get('telegramBotUrl')) { console.error('Ошибка: Не все поля формы заполнены'); return; } @@ -47,6 +47,7 @@ const Users = () => { +