diff --git a/src/App.jsx b/src/App.jsx
index ee6a996..8d46a0d 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -6,7 +6,7 @@ import { BrowserRouter, Routes, Route } from "react-router-dom";
import BeingPage from "./Components/BeingPage/index.jsx";
import HomePage from "./Components/HomePage/index.jsx";
import MeetPage from "./Components/MeetPage/index.jsx";
-
+import MeetAuthPage from "./Components/MeetAuthPage/index.jsx";
@@ -21,6 +21,7 @@ function App() {
}/>
}/>
}/>
+ }/>
>
diff --git a/src/Components/Card/index.jsx b/src/Components/Card/index.jsx
index eb46431..8511f62 100644
--- a/src/Components/Card/index.jsx
+++ b/src/Components/Card/index.jsx
@@ -1,22 +1,32 @@
import './style.module.scss';
+import { HttpApiMethods } from '../fetchUtils/FetchUtils';
-
-const Card = () => {
+const httpApiMethods = new HttpApiMethods()
+function extractDateTime(dateString) {
+ const dateTime = new Date(dateString);
+ const date = dateTime.toLocaleDateString();
+ const time = dateTime.toLocaleTimeString();
+
+ return { date, time };
+}
+const Card = (item) => {
+
+ console.log(item);
return (
<>
-
@@ -50,18 +74,28 @@ const MeetPage = () => {
Еще мероприятия
-
-
-
-
-
-
-
-
-
-
-
-
+ {Array.isArray(meets) ? (
+ filterMeet.map((item, index) => (
+
+
+
+
+
+
+
{item.tags}
+
{item.type}
+
+
{item.title}
+
{extractDateTime(item.time).date}, в {extractDateTime(item.time).time} по Московскому времени
+
+
+
+
+
+ ))
+ ) : (
+ Неверный тип данных с сервера!
+ )}
diff --git a/src/Components/MeetPage/style.module.scss b/src/Components/MeetPage/style.module.scss
index bc1a9bf..63377ff 100644
--- a/src/Components/MeetPage/style.module.scss
+++ b/src/Components/MeetPage/style.module.scss
@@ -6,7 +6,13 @@
&__img {
width: 44%;
height: 300px;
- background-color: #D9D9D9;
+
+
+ img {
+
+ height: 100%;
+
+ }
}
&__mainInfo {
&_container {
diff --git a/src/Components/css/style.module.css b/src/Components/css/style.module.css
index a62fc6c..b5c9278 100644
--- a/src/Components/css/style.module.css
+++ b/src/Components/css/style.module.css
@@ -1 +1 @@
-.meets{margin-top:150px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.meets__img{width:44%;height:300px;background-color:#d9d9d9}.meets__mainInfo_container{width:50%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-ms-flex-line-pack:start;align-content:start}.meets__mainInfo_descr{color:#000;font-family:Montserrat;font-size:30px;font-style:normal;font-weight:600;line-height:normal;text-align:left}.meets__mainInfo_type{display:-webkit-box;display:-ms-flexbox;display:flex;margin-top:25px;border-radius:10px;border:1px solid var(--gray_text, #888);width:110px;height:35px;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;color:var(--gray_text, #888);font-family:Montserrat;font-size:15px;font-style:normal;font-weight:400;line-height:normal}.meets__mainInfo_status{margin-top:40px;display:-webkit-box;display:-ms-flexbox;display:flex}.meets__mainInfo_time{margin-top:40px;display:-webkit-box;display:-ms-flexbox;display:flex}.meets__mainInfo_status_img{height:26px;width:30px;margin-right:12px}.meets__otziv{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:300px;width:44%;border:1px solid var(--gray_stroke, #D0D2D8);margin-top:50px;color:#000;font-family:Montserrat;font-size:14px;font-style:normal;font-weight:400;line-height:normal}.meets__otziv_title{color:#000;font-family:Montserrat;font-size:25px;font-style:normal;font-weight:400;line-height:normal;position:absolute;left:10px;top:4px}.meets__otziv_container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.aboutMeet{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.aboutMeet__title{display:-webkit-box;display:-ms-flexbox;display:flex;color:#000;font-family:Montserrat;font-size:56px;font-style:normal;font-weight:400;line-height:normal}.aboutMeet__descr{margin-top:60px;display:-webkit-box;display:-ms-flexbox;display:flex;text-align:left;color:rgba(0,0,0,.9);font-family:Inter;font-size:24px;font-style:normal;font-weight:400;line-height:110%}.expert{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-top:200px}.expert__title{display:-webkit-box;display:-ms-flexbox;display:flex;color:#000;font-family:Montserrat;font-size:56px;font-style:normal;font-weight:400;line-height:normal}.expert__img{border-radius:10000px}.expert__container{margin-top:60px;display:-webkit-box;display:-ms-flexbox;display:flex}.expert__img{width:200px;height:200px}.expert__img_container{margin-right:50px}.expert__descr_container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;text-align:left;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.expert__descr_fullname{color:#000;font-family:Montserrat;font-size:36px;font-style:normal;font-weight:400;line-height:normal}.expert__descr_speciality{color:#000;font-family:Montserrat;font-size:32px;font-style:normal;font-weight:400;line-height:normal;margin-top:6px}.expert__descr_phone{color:#000;font-family:Montserrat;font-size:22px;font-style:normal;font-weight:400;line-height:normal;margin-top:16px}.expert__descr_email{color:#2c41ff;font-family:Montserrat;font-size:22px;font-style:normal;font-weight:400;line-height:normal;margin-top:16px}.someMeetings{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-top:200px}.someMeetings__title{display:-webkit-box;display:-ms-flexbox;display:flex;color:#000;font-family:Montserrat;font-size:56px;font-style:normal;font-weight:400;line-height:normal}.cards_container{display:-webkit-box;display:-ms-flexbox;display:flex}/*# sourceMappingURL=style.module.css.map */
\ No newline at end of file
+.meets{margin-top:150px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.meets__img{width:44%;height:300px;background-color:#d9d9d9}.meets__mainInfo_container{width:50%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-ms-flex-line-pack:start;align-content:start}.meets__mainInfo_descr{color:#000;font-family:Montserrat;font-size:30px;font-style:normal;font-weight:600;line-height:normal;text-align:left}.meets__mainInfo_type{display:-webkit-box;display:-ms-flexbox;display:flex;margin-top:25px;border-radius:10px;border:1px solid var(--gray_text, #888);width:110px;height:35px;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;color:var(--gray_text, #888);font-family:Montserrat;font-size:15px;font-style:normal;font-weight:400;line-height:normal}.meets__mainInfo_status{margin-top:40px;display:-webkit-box;display:-ms-flexbox;display:flex}.meets__mainInfo_time{margin-top:40px;display:-webkit-box;display:-ms-flexbox;display:flex}.meets__mainInfo_status_img{height:26px;width:30px;margin-right:12px}.meets__otziv{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:300px;width:44%;border:1px solid var(--gray_stroke, #D0D2D8);margin-top:50px;color:#000;font-family:Montserrat;font-size:14px;font-style:normal;font-weight:400;line-height:normal}.meets__otziv_title{color:#000;font-family:Montserrat;font-size:25px;font-style:normal;font-weight:400;line-height:normal;position:absolute;left:10px;top:4px}.meets__otziv_container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.aboutMeet{margin-top:100px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.aboutMeet__title{display:-webkit-box;display:-ms-flexbox;display:flex;color:#000;font-family:Montserrat;font-size:56px;font-style:normal;font-weight:400;line-height:normal}.aboutMeet__descr{margin-top:60px;display:-webkit-box;display:-ms-flexbox;display:flex;text-align:left;color:rgba(0,0,0,.9);font-family:Inter;font-size:24px;font-style:normal;font-weight:400;line-height:110%}.expert{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-top:200px}.expert__title{display:-webkit-box;display:-ms-flexbox;display:flex;color:#000;font-family:Montserrat;font-size:56px;font-style:normal;font-weight:400;line-height:normal}.expert__img{border-radius:10000px}.expert__container{margin-top:60px;display:-webkit-box;display:-ms-flexbox;display:flex}.expert__img{width:200px;height:200px}.expert__img_container{margin-right:50px}.expert__descr_container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;text-align:left;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.expert__descr_fullname{color:#000;font-family:Montserrat;font-size:36px;font-style:normal;font-weight:400;line-height:normal}.expert__descr_speciality{color:#000;font-family:Montserrat;font-size:32px;font-style:normal;font-weight:400;line-height:normal;margin-top:6px}.expert__descr_phone{color:#000;font-family:Montserrat;font-size:22px;font-style:normal;font-weight:400;line-height:normal;margin-top:16px}.expert__descr_email{color:#2c41ff;font-family:Montserrat;font-size:22px;font-style:normal;font-weight:400;line-height:normal;margin-top:16px}.someMeetings{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-top:200px}.someMeetings__title{display:-webkit-box;display:-ms-flexbox;display:flex;color:#000;font-family:Montserrat;font-size:56px;font-style:normal;font-weight:400;line-height:normal}.cards_container{display:-webkit-box;display:-ms-flexbox;display:flex}.newMeeting__container{margin-top:50px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.newMeeting__button{color:#000;font-family:Montserrat;font-size:22px;font-style:normal;font-weight:400;line-height:normal;border-radius:10px;background:var(--yellow, #FFED00);height:80px;width:450px}.newMeeting__link{margin-top:30px;color:#2c41ff;font-family:Montserrat;font-size:20px;font-style:normal;font-weight:400;line-height:normal;text-align:left}.newMeeting__ling_video{color:#000;font-family:Montserrat;font-size:25px;font-style:normal;font-weight:400;line-height:normal;margin-top:140px;text-align:left}.newContainer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.container__links{width:40%}.links__title{margin-top:128px;color:#000;font-family:Montserrat;font-size:24px;font-style:normal;font-weight:400;line-height:normal;text-align:left;padding-left:5px}.links__img{margin-right:10px}.links__img_container{margin-top:45px;display:-webkit-box;display:-ms-flexbox;display:flex}/*# sourceMappingURL=style.module.css.map */
\ No newline at end of file
diff --git a/src/Components/css/style.module.css.map b/src/Components/css/style.module.css.map
index 8b91c79..5a89158 100644
--- a/src/Components/css/style.module.css.map
+++ b/src/Components/css/style.module.css.map
@@ -1 +1 @@
-{"version":3,"sources":["../MeetPage/style.module.scss"],"names":[],"mappings":"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","file":"style.module.css"}
\ No newline at end of file
+{"version":3,"sources":["../MeetAuthPage/style.module.scss"],"names":[],"mappings":"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","file":"style.module.css"}
\ No newline at end of file
diff --git a/src/components/Home/Home.jsx b/src/components/Home/Home.jsx
index b9b7a8d..7c9aeb2 100644
--- a/src/components/Home/Home.jsx
+++ b/src/components/Home/Home.jsx
@@ -2,43 +2,69 @@ 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/PostForm';
+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();
+
+ return { date, time };
+}
const httpApiMethods = new HttpApiMethods()
const meets = await httpApiMethods.GetMeetings()
+
const Home = () => {
-
- function extractDateTime(dateString) {
- const dateTime = new Date(dateString);
- const date = dateTime.toLocaleDateString();
- const time = dateTime.toLocaleTimeString();
-
- return { date, time };
+ const [count, setCount] = useState(7)
+
+ const filterMeet = meets.filter( (item, index) => index <= count )
+ const allMeets = () => {
+ setCount(meets.length)
}
-
return (
-
- {Array.isArray(meets) ? (
- meets.map((item, index) => (
-
-
-
-
{item.tags}
-
{item.type}
-
-
{item.title}
-
{extractDateTime(item.time).date}, в {extractDateTime(item.time).time} по Московскому времени
-
- ))
- ) : (
-
Неверный тип данных с сервера!
- )}
- {/*
*/}
-
+ <>
+
+
+
+
+ {Array.isArray(meets) ? (
+ filterMeet.map((item, index) => (
+
+
+
+
+
+
+
{item.tags}
+
{item.type}
+
+
{item.title}
+
{extractDateTime(item.time).date}, в {extractDateTime(item.time).time} по Московскому времени
+
+
+
+
+
+ ))
+ ) : (
+ Неверный тип данных с сервера!
+ )}
+ {/* */}
+
+
+
+ Все мероприятия
+
+ >
+
+
);
}
diff --git a/src/components/Home/style.css b/src/components/Home/style.css
index d918e27..16f8cff 100644
--- a/src/components/Home/style.css
+++ b/src/components/Home/style.css
@@ -1,6 +1,6 @@
.event_card {
width: 292px;
- height: 626px;
+ height: 586px;
flex-shrink: 0;
margin-top: 100px;
margin-right: 11px;
@@ -82,4 +82,29 @@ border: 1px solid var(--gray_text, #888);
.taggs {
display: flex;
justify-content: space-between;
+}
+.allButton {
+ color: var(--Black_Text, #151515);
+ text-align: center;
+
+ /* Buttom max */
+ font-family: Gilroy;
+ font-size: 28px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 125%; /* 35px */
+ letter-spacing: -0.84px;
+ border-radius: 1000px;
+ border: 1px solid var(--Gray_Line, #D0D2D8);
+ width: 300px;
+ height: 60px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+}
+.allButton__container {
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
\ No newline at end of file
diff --git a/src/img/MeetPage/Book.png b/src/img/MeetPage/Book.png
new file mode 100644
index 0000000..61a888f
Binary files /dev/null and b/src/img/MeetPage/Book.png differ
diff --git a/src/img/MeetPage/Telegram.png b/src/img/MeetPage/Telegram.png
new file mode 100644
index 0000000..68e222c
Binary files /dev/null and b/src/img/MeetPage/Telegram.png differ
diff --git a/src/img/MeetPage/VK.png b/src/img/MeetPage/VK.png
new file mode 100644
index 0000000..4ebad27
Binary files /dev/null and b/src/img/MeetPage/VK.png differ
diff --git a/src/img/MeetPage/newAvatar.png b/src/img/MeetPage/newAvatar.png
new file mode 100644
index 0000000..18690b5
Binary files /dev/null and b/src/img/MeetPage/newAvatar.png differ