CyberBloom/OgeetoCaseCyberGarden
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

funct

Browse Source
This commit is contained in:
Demi-Play
2023-12-24 14:52:27 +03:00
parent dc53f7438f
commit 5801a6b2be
9 changed files with 78 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/AddUsersPage/index.jsx
View File

@@ -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 = () => {
</div>
</Box>
</Modal>
<Users></Users>
</section>
</>

12
src/Components/HomePage/index.jsx
View File

@@ -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 = () => {
<div className={styles.card}></div>
</div>
{/* <Questions></Questions> */}
{/* <Home></Home> */}
{/* <FetchUtils></FetchUtils> */}
{/* <PostForm /> */}
{/* <EditForm /> */}
<Home></Home>
{/* <Users></Users> */}
{/* <User></User> */}
{/* <GetQuestions></GetQuestions> */}
<Users></Users>
{/* <Users></Users> */}
</section>

2
src/Components/HomePageAdmin/index.jsx
View File

@@ -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 = () => {
<div className={styles.cards__container}>
<div className={styles.card}></div>
</div>
<Users></Users>
{/* <Home></Home> */}
{/* <FetchUtils></FetchUtils> */}
{/* <PostForm /> */}

3
src/Components/MeetAuthPageAdmin/index.jsx
View File

@@ -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 = () => {
<button className={styles.newMeeting__button}>Опубликовать мероприятие</button>
</div>
<EditMeetsForm></EditMeetsForm>
</section>
</>

5
src/Components/profilePage/index.jsx
View File

@@ -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 = () => {
{/* <FetchUtils></FetchUtils> */}
{/* <PostForm /> */}
{/* <EditForm /> */}
<Users></Users>
<PostForm></PostForm>
</div>
</section>
</>

108
src/components/Home/Home.jsx
View File

@@ -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 (
// <>
// <Box sx={{ flexGrow: 1, display: 'flex', justifyContent: 'flex-end', alignItems:'center'}}>
// <Grid container sx={{width: '96%'}}>
const filterMeet = meets.filter( (item, index) => index <= count )
const allMeets = () => {
setCount(meets.length)
}
return (
<>
<Box sx={{ flexGrow: 1, display: 'flex', justifyContent: 'flex-end', alignItems:'center'}}>
<Grid container sx={{width: '96%'}}>
// {Array.isArray(meets) ? (
// filterMeet.map((item, index) => (
{Array.isArray(meets) ? (
filterMeet.map((item, index) => (
// <Grid item sm={6} xl={3} md={6} lg={4} key={index}>
// <div className='event_card' >
// <div className="event-card__photo"><img className='img' src={httpApiMethods.APIURL_FILES + item.speackerImage} alt="{item.speackerImage}" /></div>
// <div className="taggs">
// <div className='tagged'>{item.tags}</div>
// <div className="feautures">{item.type}</div>
// </div>
// <h4 className="event-card__title">{item.title}</h4>
// <p className="event-card__date">{extractDateTime(item.time).date}, в {extractDateTime(item.time).time} по Московскому времени</p>
// </div>
// </Grid>
<Grid item sm={6} xl={3} md={6} lg={4} key={index}>
<div className='event_card' >
<div className="event-card__photo"><img className='img' src={httpApiMethods.APIURL_FILES + item.speackerImage} alt="{item.speackerImage}" /></div>
<div className="taggs">
<div className='tagged'>{item.tags}</div>
<div className="feautures">{item.type}</div>
</div>
<h4 className="event-card__title">{item.title}</h4>
<p className="event-card__date">{extractDateTime(item.time).date}, в {extractDateTime(item.time).time} по Московскому времени</p>
</div>
</Grid>
// ))
// ) : (
// <p>Неверный тип данных с сервера!</p>
// )}
// {/* <EditForm></EditForm> */}
// </Grid>
// </Box>
// <div className='allButton__container'>
// <button onClick={allMeets} className='allButton'>Все мероприятия</button>
// </div>
// </>
))
) : (
<p>Неверный тип данных с сервера!</p>
)}
{/* <EditForm></EditForm> */}
</Grid>
</Box>
<div className='allButton__container'>
<button onClick={allMeets} className='allButton'>Все мероприятия</button>
</div>
</>
// );
// }
);
}
// export default Home;
export default Home;

2
src/components/edit/EditMeetsForm.jsx
View File

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

6
src/components/post/Meets.jsx
View File

@@ -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 (
<div>
<h2>Post</h2>
<h2>Создать мероприятие</h2>
<div>{dataIsLoad ? "ДАнные успешно загрузилисб" : ""}</div>
<form ref={formRef} action=''>
<input type="text" placeholder='title' name='title'/>

3
src/components/post/Users.jsx
View File

@@ -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 = () => {
<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>