-
+
);
diff --git a/src/elements/GenerateCard/style.css b/src/elements/GenerateCard/style.css
index d1b7c6e..a7af3b8 100644
--- a/src/elements/GenerateCard/style.css
+++ b/src/elements/GenerateCard/style.css
@@ -1,5 +1,6 @@
.generatecard-block{
width: 400px;
+ height: 548px;
display: flex;
flex-direction: column;
gap:30px;
diff --git a/src/elements/TourCard/index.tsx b/src/elements/TourCard/index.tsx
index b4e4983..2f0a350 100644
--- a/src/elements/TourCard/index.tsx
+++ b/src/elements/TourCard/index.tsx
@@ -1,18 +1,23 @@
-import React from "react";
+import React, { useState } from "react";
import { Button } from '../../elements/Button'
import { Block } from '../../elements/Block'
import './style.css'
+import { MyMap } from "../../сomponents/map";
+import Sidebar from "react-sidebar";
export interface PlaceCardIE{
title:string,
- type: string,
- imageURL?: string
+ description: string,
+ icon: string,
+ location: number[]
+
}
export interface TourCardIE{
- title:string,
+ name:string,
+ description:string,
days:number,
- placeCards: PlaceCardIE[],
+ points: PlaceCardIE[],
imageURL?: string
}
@@ -21,37 +26,53 @@ export const PlaceCard: React.FC{props.title}
- {props.type}
+ {props.description.slice(0,50)}
- 
-
-
-
-
- {props.title}
-
-
- {props.days} дней,
- {props.placeCards.length} мест
-
- {
- props.placeCards.map((value, index) =>
+
+
+
+
);
diff --git a/src/elements/TourCard/style.css b/src/elements/TourCard/style.css
index cf18754..7071c72 100644
--- a/src/elements/TourCard/style.css
+++ b/src/elements/TourCard/style.css
@@ -1,5 +1,6 @@
.tourcard-block{
width: 400px;
+ height: 548px;
display: flex;
flex-direction: column;
gap:50px;
@@ -41,14 +42,17 @@
flex-direction: column;
gap:20px;
margin-top: 30px;
+ height: 260px;
+ overflow-y: scroll;
}
-
+.placesWrapper::-webkit-scrollbar {
+ width: 0;
+ }
.placeCard{
width: 100%;
display: flex;
flex-direction: row;
justify-content: space-between;
-
}
.placeImage{
diff --git a/src/pages/GenerateTour/index.tsx b/src/pages/GenerateTour/index.tsx
new file mode 100644
index 0000000..27d75c9
--- /dev/null
+++ b/src/pages/GenerateTour/index.tsx
@@ -0,0 +1,73 @@
+import React, { useEffect, useState } from "react";
+import { DatePicker, Select } from 'antd';
+import { RusPassHeader } from "../../elements/Header";
+import { Block } from "../../elements/Block";
+import { Button } from "../../elements/Button";
+import { TourCard, TourCardIE } from "../../elements/TourCard";
+import './style.css'
+import axios from "axios";
+import { backend } from "../../consts";
+const { RangePicker } = DatePicker;
+
+export const GenerateTour = () =>{
+
+ const [dates, setDates] = useState()
+ const [theme, setTheme] = useState('jack')
+ const [generate, setGenerate] = useState(false)
+ const [toursData, setToursData] = useState(new Array
+ {/*
+
-
+ open={showMap}
+ styles={{ sidebar: { background: "white" } }}
+ > */}
+
+
+
+
+
+
+
+ {props.name}
+
+
+ {props.days} дней,
+ {props.points.length} мест
+
+ {
+ props.points.map((value, index) =>
+
-
+
+ );
+}
diff --git a/src/pages/GenerateTour/style.css b/src/pages/GenerateTour/style.css
new file mode 100644
index 0000000..327cae6
--- /dev/null
+++ b/src/pages/GenerateTour/style.css
@@ -0,0 +1,34 @@
+.btn-y{
+ width: 200px!important;
+ background-color: #FFCF08;
+ border-radius: 10px;
+ padding: 15px 50px;
+ outline: none;
+ border: none;
+ cursor: pointer;
+}
+
+.generateTourBlock{
+ display: flex;
+ flex-direction: column;
+ gap:30px
+}
+
+.tourCardsWrapper{
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ gap:15px
+}
+
+.tourToolBar{
+ display: flex;
+ flex-direction: row;
+ gap:15px;
+ align-items: center;
+}
+
+.generateTourContent{
+ padding:50px;
+
+}
\ No newline at end of file
diff --git a/src/pages/Main/index.tsx b/src/pages/Main/index.tsx
index abb22c5..2857763 100644
--- a/src/pages/Main/index.tsx
+++ b/src/pages/Main/index.tsx
@@ -8,24 +8,27 @@ import './style.css'
export const Main: react.FC = () => {
const TourPropsCard = {
- title: 'Я покажу тебе Москву',
+ name: 'Я покажу тебе Москву',
days: 8,
imageURL: 'https://images.unsplash.com/photo-1575936123452-b67c3203c357?ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8Mnx8aW1hZ2V8ZW58MHx8MHx8fDA%3D&w=1000&q=80',
- placeCards: [
+ points: [
{
title:'Парк Горького',
- type: 'Место',
- imageURL:'https://images.unsplash.com/photo-1575936123452-b67c3203c357?ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8Mnx8aW1hZ2V8ZW58MHx8MHx8fDA%3D&w=1000&q=80',
+ description: 'Место',
+ icon:'https://images.unsplash.com/photo-1575936123452-b67c3203c357?ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8Mnx8aW1hZ2V8ZW58MHx8MHx8fDA%3D&w=1000&q=80',
+ location:[1,2]
},
{
title:'Отель Москва',
- type: 'Отель',
- imageURL:'https://images.unsplash.com/photo-1575936123452-b67c3203c357?ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8Mnx8aW1hZ2V8ZW58MHx8MHx8fDA%3D&w=1000&q=80',
+ description: 'Отель',
+ icon:'https://images.unsplash.com/photo-1575936123452-b67c3203c357?ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8Mnx8aW1hZ2V8ZW58MHx8MHx8fDA%3D&w=1000&q=80',
+ location:[1,2]
},
{
title:'Ресторан Сказка',
- type: 'Ресторан',
- imageURL:'https://images.unsplash.com/photo-1575936123452-b67c3203c357?ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8Mnx8aW1hZ2V8ZW58MHx8MHx8fDA%3D&w=1000&q=80',
+ description: 'Ресторан',
+ icon:'https://images.unsplash.com/photo-1575936123452-b67c3203c357?ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8Mnx8aW1hZ2V8ZW58MHx8MHx8fDA%3D&w=1000&q=80',
+ location:[1,2]
}
]
} as TourCardIE
diff --git a/src/router.tsx b/src/router.tsx
index b8c3a52..ed5248d 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -6,6 +6,7 @@ import { Register } from './pages/Register';
import { Login } from './pages/Login';
import { Main } from './pages/Main';
import { EventMatch } from './pages/EventMatch';
+import { GenerateTour } from './pages/GenerateTour';
const routes = [
@@ -28,7 +29,12 @@ const routes = [
{
path: '/event-match',
element:
+
+
+
+
+ setDates(e as any)}
+ >
+
+ Рекомендованные Туры
+
+ {
+ generate? tours:null
+ }
+
+
+