From f508d170e0da09f28f77005ae97f1dec77f537d5 Mon Sep 17 00:00:00 2001 From: Demi-Play Date: Fri, 22 Dec 2023 21:23:10 +0300 Subject: [PATCH] cardd --- src/App.jsx | 2 + src/Components/HomePage/index.jsx | 3 - src/Components/TableMeets/TableMeets.jsx | 85 ++++++++++++------------ src/components/Home/Home.jsx | 3 +- 4 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index dc8958a..a6aed9d 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,5 +1,7 @@ import './App.css' +import FetchUtils from './components/fetchUtils/FetchUtils' +import TableMeets from './components/fetchUtils/TableMeets.jsx' import { BrowserRouter, Routes, Route } from "react-router-dom"; import BeingPage from "./Components/BeingPage/index.jsx"; import HomePage from "./Components/HomePage/index.jsx"; diff --git a/src/Components/HomePage/index.jsx b/src/Components/HomePage/index.jsx index 680956a..6d45ad2 100644 --- a/src/Components/HomePage/index.jsx +++ b/src/Components/HomePage/index.jsx @@ -1,10 +1,7 @@ import Header from "../Header"; import styles from "./style.module.scss"; import TableMeets from '../TableMeets/TableMeets' -// import Home from "../Home/Home"; -// import FetchUtils from "../fetchUtils/FetchUtils"; -// import { style } from "@mui/system"; const events = [ { id: 1, diff --git a/src/Components/TableMeets/TableMeets.jsx b/src/Components/TableMeets/TableMeets.jsx index 038f68c..b331320 100644 --- a/src/Components/TableMeets/TableMeets.jsx +++ b/src/Components/TableMeets/TableMeets.jsx @@ -1,10 +1,25 @@ import React, { useState } from 'react'; -import styles from './style.module.scss'; -import logo from '../../img/homePage/downArrow.png'; -import { Container, Grid, Button, Typography } from '@mui/material'; -import { column } from 'stylis'; -import arrow from '../../img/homePage/downArrow.png'; +import styled from 'styled-components'; +let Table = styled.div({ + width: 1520, + border: '1px solid black' +}); + +let List = styled.div({ + display: 'flex', + // justifyContent: 'center' +}); + +let Date = styled.span({ + marginRight: 100 +}); +let Time = styled.span({ + marginRight: 100 +}); +let Name = styled.span({ + marginRight: 100 + }); const TableMeets = ({ events }) => { const [isOpenMap, setIsOpenMap] = useState({}); @@ -17,42 +32,30 @@ const TableMeets = ({ events }) => { }; return ( - - - // - // - // {events.map((event) => ( - - // - // - // {event.date} - // {event.time} - // {event.title} - // - - //
  • - //
    - // {event.date} - // {event.time} - // {event.title} - //
    toggleDropdown(event.id)}>
    - - // {isOpenMap[event.id] && ( - // - // {event.speaker} - // {event.speaker} - // {event.description} - // - // )} - // - // - // ))} - // - // - <> + +
      + {events.map((event) => ( +
    • +
      + {event.date} + + {event.title} + + + + {isOpenMap[event.id] && ( +
      + {event.speaker} + {event.speaker} +

      {event.description}

      +
      + )} +
      +
    • + ))} +
    +
    ); }; -export default TableMeets; +export default TableMeets; \ No newline at end of file diff --git a/src/components/Home/Home.jsx b/src/components/Home/Home.jsx index a43c65b..456e9d3 100644 --- a/src/components/Home/Home.jsx +++ b/src/components/Home/Home.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import Header from '../Header'; +// import Header from '../Header'; import './style.css' import styled from 'styled-components'; @@ -21,7 +21,6 @@ const Home = () => {

    Интерактивная лекция «Управление инжиниринговыми проектами на базе вуза»

    22 декабря, с 10:00 до 22:00 по Московскому времени

    - );